Skip to content

Commit bf3db07

Browse files
slinkydeveloperslinkydeveloper
committed
Updates with renamings
1 parent 4de7bfe commit bf3db07

File tree

19 files changed

+109
-115
lines changed

19 files changed

+109
-115
lines changed

‎sdk-core/src/main/java/dev/restate/sdk/core/DeploymentManifest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import dev.restate.sdk.common.HandlerType;
1212
import dev.restate.sdk.common.ServiceType;
1313
import dev.restate.sdk.common.syscalls.ServiceDefinition;
14-
import dev.restate.sdk.core.manifest.Component;
1514
import dev.restate.sdk.core.manifest.DeploymentManifestSchema;
1615
import dev.restate.sdk.core.manifest.Handler;
16+
import dev.restate.sdk.core.manifest.Service;
1717
import java.util.stream.Collectors;
1818
import java.util.stream.Stream;
1919

@@ -28,19 +28,19 @@ public DeploymentManifest(
2828
.withMinProtocolVersion(1)
2929
.withMaxProtocolVersion(1)
3030
.withProtocolMode(protocolMode)
31-
.withComponents(
31+
.withServices(
3232
components
3333
.map(
3434
svc ->
35-
new Component()
36-
.withFullyQualifiedComponentName(svc.getServiceName())
37-
.withComponentType(convertServiceType(svc.getServiceType()))
35+
new Service()
36+
.withName(svc.getServiceName())
37+
.withTy(convertServiceType(svc.getServiceType()))
3838
.withHandlers(
3939
svc.getHandlers().stream()
4040
.map(
4141
method ->
4242
new Handler()
43-
.withHandlerType(
43+
.withTy(
4444
convertHandlerType(method.getHandlerType()))
4545
.withName(method.getName()))
4646
.collect(Collectors.toList())))
@@ -51,23 +51,23 @@ public DeploymentManifestSchema manifest() {
5151
return this.manifest;
5252
}
5353

54-
private static Component.ComponentType convertServiceType(ServiceType serviceType) {
54+
private static Service.Ty convertServiceType(ServiceType serviceType) {
5555
switch (serviceType) {
5656
case WORKFLOW:
5757
case SERVICE:
58-
return Component.ComponentType.SERVICE;
58+
return Service.Ty.SERVICE;
5959
case VIRTUAL_OBJECT:
60-
return Component.ComponentType.VIRTUAL_OBJECT;
60+
return Service.Ty.VIRTUAL_OBJECT;
6161
}
6262
throw new IllegalStateException();
6363
}
6464

65-
private static Handler.HandlerType convertHandlerType(HandlerType handlerType) {
65+
private static Handler.Ty convertHandlerType(HandlerType handlerType) {
6666
switch (handlerType) {
6767
case EXCLUSIVE:
68-
return Handler.HandlerType.EXCLUSIVE;
68+
return Handler.Ty.EXCLUSIVE;
6969
case SHARED:
70-
return Handler.HandlerType.SHARED;
70+
return Handler.Ty.SHARED;
7171
}
7272
throw new IllegalStateException();
7373
}

‎sdk-core/src/main/java/dev/restate/sdk/core/Entries.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public Result<Void> parseCompletionResult(CompletionMessage actual) {
375375
}
376376
}
377377

378-
static final class InvokeEntry<R> extends CompletableJournalEntry<InvokeEntryMessage, R> {
378+
static final class InvokeEntry<R> extends CompletableJournalEntry<CallEntryMessage, R> {
379379

380380
private final Function<ByteString, Result<R>> valueParser;
381381

@@ -384,43 +384,42 @@ static final class InvokeEntry<R> extends CompletableJournalEntry<InvokeEntryMes
384384
}
385385

386386
@Override
387-
void trace(InvokeEntryMessage expected, Span span) {
387+
void trace(CallEntryMessage expected, Span span) {
388388
span.addEvent(
389389
"Invoke",
390390
Attributes.of(
391391
Tracing.RESTATE_COORDINATION_CALL_SERVICE,
392392
expected.getServiceName(),
393393
Tracing.RESTATE_COORDINATION_CALL_METHOD,
394-
expected.getMethodName()));
394+
expected.getHandlerName()));
395395
}
396396

397397
@Override
398-
public boolean hasResult(InvokeEntryMessage actual) {
399-
return actual.getResultCase() != Protocol.InvokeEntryMessage.ResultCase.RESULT_NOT_SET;
398+
public boolean hasResult(CallEntryMessage actual) {
399+
return actual.getResultCase() != Protocol.CallEntryMessage.ResultCase.RESULT_NOT_SET;
400400
}
401401

402402
@Override
403-
String getName(InvokeEntryMessage expected) {
403+
String getName(CallEntryMessage expected) {
404404
return expected.getName();
405405
}
406406

407407
@Override
408-
void checkEntryHeader(InvokeEntryMessage expected, MessageLite actual)
409-
throws ProtocolException {
410-
if (!(actual instanceof InvokeEntryMessage)) {
408+
void checkEntryHeader(CallEntryMessage expected, MessageLite actual) throws ProtocolException {
409+
if (!(actual instanceof CallEntryMessage)) {
411410
throw ProtocolException.entryDoesNotMatch(expected, actual);
412411
}
413-
InvokeEntryMessage actualInvoke = (InvokeEntryMessage) actual;
412+
CallEntryMessage actualInvoke = (CallEntryMessage) actual;
414413

415414
if (!(expected.getServiceName().equals(actualInvoke.getServiceName())
416-
&& expected.getMethodName().equals(actualInvoke.getMethodName())
415+
&& expected.getHandlerName().equals(actualInvoke.getHandlerName())
417416
&& expected.getParameter().equals(actualInvoke.getParameter()))) {
418417
throw ProtocolException.entryDoesNotMatch(expected, actualInvoke);
419418
}
420419
}
421420

422421
@Override
423-
public Result<R> parseEntryResult(InvokeEntryMessage actual) {
422+
public Result<R> parseEntryResult(CallEntryMessage actual) {
424423
if (actual.hasValue()) {
425424
return valueParser.apply(actual.getValue());
426425
}
@@ -439,30 +438,30 @@ public Result<R> parseCompletionResult(CompletionMessage actual) {
439438
}
440439
}
441440

442-
static final class BackgroundInvokeEntry extends JournalEntry<BackgroundInvokeEntryMessage> {
441+
static final class BackgroundInvokeEntry extends JournalEntry<OneWayCallEntryMessage> {
443442

444443
static final BackgroundInvokeEntry INSTANCE = new BackgroundInvokeEntry();
445444

446445
private BackgroundInvokeEntry() {}
447446

448447
@Override
449-
public void trace(BackgroundInvokeEntryMessage expected, Span span) {
448+
public void trace(OneWayCallEntryMessage expected, Span span) {
450449
span.addEvent(
451450
"BackgroundInvoke",
452451
Attributes.of(
453452
Tracing.RESTATE_COORDINATION_CALL_SERVICE,
454453
expected.getServiceName(),
455454
Tracing.RESTATE_COORDINATION_CALL_METHOD,
456-
expected.getMethodName()));
455+
expected.getHandlerName()));
457456
}
458457

459458
@Override
460-
String getName(BackgroundInvokeEntryMessage expected) {
459+
String getName(OneWayCallEntryMessage expected) {
461460
return expected.getName();
462461
}
463462

464463
@Override
465-
void checkEntryHeader(BackgroundInvokeEntryMessage expected, MessageLite actual)
464+
void checkEntryHeader(OneWayCallEntryMessage expected, MessageLite actual)
466465
throws ProtocolException {
467466
Util.assertEntryEquals(expected, actual);
468467
}

‎sdk-core/src/main/java/dev/restate/sdk/core/InvocationStateMachine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,18 +404,18 @@ <E extends MessageLite> void processJournalEntry(
404404

405405
void enterSideEffectBlock(String name, EnterSideEffectSyscallCallback callback) {
406406
checkInsideSideEffectGuard();
407-
this.nextJournalEntry(name, MessageType.SideEffectEntryMessage);
407+
this.nextJournalEntry(name, MessageType.RunEntryMessage);
408408

409409
if (this.invocationState == InvocationState.CLOSED) {
410410
callback.onCancel(AbortedExecutionException.INSTANCE);
411411
} else if (this.invocationState == InvocationState.REPLAYING) {
412412
// Retrieve the entry
413413
this.readEntry(
414414
msg -> {
415-
Util.assertEntryClass(Protocol.SideEffectEntryMessage.class, msg);
415+
Util.assertEntryClass(Protocol.RunEntryMessage.class, msg);
416416

417417
// We have a result already, complete the callback
418-
completeSideEffectCallbackWithEntry((Protocol.SideEffectEntryMessage) msg, callback);
418+
completeSideEffectCallbackWithEntry((Protocol.RunEntryMessage) msg, callback);
419419
},
420420
callback::onCancel);
421421
} else if (this.invocationState == InvocationState.PROCESSING) {
@@ -431,7 +431,7 @@ void enterSideEffectBlock(String name, EnterSideEffectSyscallCallback callback)
431431
}
432432

433433
void exitSideEffectBlock(
434-
Protocol.SideEffectEntryMessage sideEffectEntry, ExitSideEffectSyscallCallback callback) {
434+
Protocol.RunEntryMessage sideEffectEntry, ExitSideEffectSyscallCallback callback) {
435435
this.insideSideEffect = false;
436436
if (this.invocationState == InvocationState.CLOSED) {
437437
callback.onCancel(AbortedExecutionException.INSTANCE);
@@ -454,7 +454,7 @@ void exitSideEffectBlock(
454454
this.writeEntry(sideEffectEntry);
455455

456456
// Wait for entry to be acked
457-
Protocol.SideEffectEntryMessage finalSideEffectEntry = sideEffectEntry;
457+
Protocol.RunEntryMessage finalSideEffectEntry = sideEffectEntry;
458458
this.sideEffectAckStateMachine.waitLastSideEffectAck(
459459
new SideEffectAckStateMachine.SideEffectAckCallback() {
460460
@Override
@@ -480,7 +480,7 @@ public void onError(Throwable e) {
480480
}
481481

482482
void completeSideEffectCallbackWithEntry(
483-
Protocol.SideEffectEntryMessage sideEffectEntry, ExitSideEffectSyscallCallback callback) {
483+
Protocol.RunEntryMessage sideEffectEntry, ExitSideEffectSyscallCallback callback) {
484484
if (sideEffectEntry.hasFailure()) {
485485
callback.onFailure(Util.toRestateException(sideEffectEntry.getFailure()));
486486
} else {

‎sdk-core/src/main/java/dev/restate/sdk/core/MessageHeader.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ public static MessageHeader fromMessage(MessageLite msg) {
7878
? DONE_FLAG
7979
: 0,
8080
msg.getSerializedSize());
81-
} else if (msg instanceof Protocol.InvokeEntryMessage) {
81+
} else if (msg instanceof Protocol.CallEntryMessage) {
8282
return new MessageHeader(
83-
MessageType.InvokeEntryMessage,
84-
((Protocol.InvokeEntryMessage) msg).getResultCase()
85-
!= Protocol.InvokeEntryMessage.ResultCase.RESULT_NOT_SET
83+
MessageType.CallEntryMessage,
84+
((Protocol.CallEntryMessage) msg).getResultCase()
85+
!= Protocol.CallEntryMessage.ResultCase.RESULT_NOT_SET
8686
? DONE_FLAG
8787
: 0,
8888
msg.getSerializedSize());
@@ -94,9 +94,9 @@ public static MessageHeader fromMessage(MessageLite msg) {
9494
? DONE_FLAG
9595
: 0,
9696
msg.getSerializedSize());
97-
} else if (msg instanceof Protocol.SideEffectEntryMessage) {
97+
} else if (msg instanceof Protocol.RunEntryMessage) {
9898
return new MessageHeader(
99-
MessageType.SideEffectEntryMessage, REQUIRES_ACK_FLAG, msg.getSerializedSize());
99+
MessageType.RunEntryMessage, REQUIRES_ACK_FLAG, msg.getSerializedSize());
100100
}
101101
// Messages with no flags
102102
return new MessageHeader(MessageType.fromMessage(msg), 0, msg.getSerializedSize());

‎sdk-core/src/main/java/dev/restate/sdk/core/MessageType.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public enum MessageType {
3434

3535
// Syscalls
3636
SleepEntryMessage,
37-
InvokeEntryMessage,
38-
BackgroundInvokeEntryMessage,
37+
CallEntryMessage,
38+
OneWayCallEntryMessage,
3939
AwakeableEntryMessage,
4040
CompleteAwakeableEntryMessage,
41-
SideEffectEntryMessage,
41+
RunEntryMessage,
4242

4343
// SDK specific
4444
CombinatorAwaitableEntryMessage;
@@ -94,18 +94,18 @@ public Parser<? extends MessageLite> messageParser() {
9494
return Protocol.GetStateKeysEntryMessage.parser();
9595
case SleepEntryMessage:
9696
return Protocol.SleepEntryMessage.parser();
97-
case InvokeEntryMessage:
98-
return Protocol.InvokeEntryMessage.parser();
99-
case BackgroundInvokeEntryMessage:
100-
return Protocol.BackgroundInvokeEntryMessage.parser();
97+
case CallEntryMessage:
98+
return Protocol.CallEntryMessage.parser();
99+
case OneWayCallEntryMessage:
100+
return Protocol.OneWayCallEntryMessage.parser();
101101
case AwakeableEntryMessage:
102102
return Protocol.AwakeableEntryMessage.parser();
103103
case CompleteAwakeableEntryMessage:
104104
return Protocol.CompleteAwakeableEntryMessage.parser();
105105
case CombinatorAwaitableEntryMessage:
106106
return Java.CombinatorAwaitableEntryMessage.parser();
107-
case SideEffectEntryMessage:
108-
return Protocol.SideEffectEntryMessage.parser();
107+
case RunEntryMessage:
108+
return Protocol.RunEntryMessage.parser();
109109
}
110110
throw new IllegalStateException();
111111
}
@@ -140,17 +140,17 @@ public short encode() {
140140
return GET_STATE_KEYS_ENTRY_MESSAGE_TYPE;
141141
case SleepEntryMessage:
142142
return SLEEP_ENTRY_MESSAGE_TYPE;
143-
case InvokeEntryMessage:
143+
case CallEntryMessage:
144144
return INVOKE_ENTRY_MESSAGE_TYPE;
145-
case BackgroundInvokeEntryMessage:
145+
case OneWayCallEntryMessage:
146146
return BACKGROUND_INVOKE_ENTRY_MESSAGE_TYPE;
147147
case AwakeableEntryMessage:
148148
return AWAKEABLE_ENTRY_MESSAGE_TYPE;
149149
case CompleteAwakeableEntryMessage:
150150
return COMPLETE_AWAKEABLE_ENTRY_MESSAGE_TYPE;
151151
case CombinatorAwaitableEntryMessage:
152152
return COMBINATOR_AWAITABLE_ENTRY_MESSAGE_TYPE;
153-
case SideEffectEntryMessage:
153+
case RunEntryMessage:
154154
return SIDE_EFFECT_ENTRY_MESSAGE_TYPE;
155155
}
156156
throw new IllegalStateException();
@@ -187,17 +187,17 @@ public static MessageType decode(short value) throws ProtocolException {
187187
case SLEEP_ENTRY_MESSAGE_TYPE:
188188
return SleepEntryMessage;
189189
case INVOKE_ENTRY_MESSAGE_TYPE:
190-
return InvokeEntryMessage;
190+
return CallEntryMessage;
191191
case BACKGROUND_INVOKE_ENTRY_MESSAGE_TYPE:
192-
return BackgroundInvokeEntryMessage;
192+
return OneWayCallEntryMessage;
193193
case AWAKEABLE_ENTRY_MESSAGE_TYPE:
194194
return AwakeableEntryMessage;
195195
case COMPLETE_AWAKEABLE_ENTRY_MESSAGE_TYPE:
196196
return CompleteAwakeableEntryMessage;
197197
case COMBINATOR_AWAITABLE_ENTRY_MESSAGE_TYPE:
198198
return CombinatorAwaitableEntryMessage;
199199
case SIDE_EFFECT_ENTRY_MESSAGE_TYPE:
200-
return SideEffectEntryMessage;
200+
return RunEntryMessage;
201201
}
202202
throw ProtocolException.unknownMessageType(value);
203203
}
@@ -227,18 +227,18 @@ public static MessageType fromMessage(MessageLite msg) {
227227
return MessageType.GetStateKeysEntryMessage;
228228
} else if (msg instanceof Protocol.SleepEntryMessage) {
229229
return MessageType.SleepEntryMessage;
230-
} else if (msg instanceof Protocol.InvokeEntryMessage) {
231-
return MessageType.InvokeEntryMessage;
232-
} else if (msg instanceof Protocol.BackgroundInvokeEntryMessage) {
233-
return MessageType.BackgroundInvokeEntryMessage;
230+
} else if (msg instanceof Protocol.CallEntryMessage) {
231+
return MessageType.CallEntryMessage;
232+
} else if (msg instanceof Protocol.OneWayCallEntryMessage) {
233+
return MessageType.OneWayCallEntryMessage;
234234
} else if (msg instanceof Protocol.AwakeableEntryMessage) {
235235
return MessageType.AwakeableEntryMessage;
236236
} else if (msg instanceof Protocol.CompleteAwakeableEntryMessage) {
237237
return MessageType.CompleteAwakeableEntryMessage;
238238
} else if (msg instanceof Java.CombinatorAwaitableEntryMessage) {
239239
return MessageType.CombinatorAwaitableEntryMessage;
240-
} else if (msg instanceof Protocol.SideEffectEntryMessage) {
241-
return MessageType.SideEffectEntryMessage;
240+
} else if (msg instanceof Protocol.RunEntryMessage) {
241+
return MessageType.RunEntryMessage;
242242
} else if (msg instanceof Protocol.CompletionMessage) {
243243
throw new IllegalArgumentException("SDK should never send a CompletionMessage");
244244
}

‎sdk-core/src/main/java/dev/restate/sdk/core/RestateEndpoint.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import dev.restate.sdk.common.BindableServiceFactory;
1212
import dev.restate.sdk.common.syscalls.HandlerDefinition;
1313
import dev.restate.sdk.common.syscalls.ServiceDefinition;
14-
import dev.restate.sdk.core.manifest.Component;
1514
import dev.restate.sdk.core.manifest.DeploymentManifestSchema;
15+
import dev.restate.sdk.core.manifest.Service;
1616
import io.opentelemetry.api.OpenTelemetry;
1717
import io.opentelemetry.api.trace.Span;
1818
import io.opentelemetry.api.trace.SpanKind;
@@ -94,9 +94,7 @@ public DeploymentManifestSchema handleDiscoveryRequest() {
9494
DeploymentManifestSchema response = this.deploymentManifest.manifest();
9595
LOG.info(
9696
"Replying to discovery request with services [{}]",
97-
response.getComponents().stream()
98-
.map(Component::getFullyQualifiedComponentName)
99-
.collect(Collectors.joining(",")));
97+
response.getServices().stream().map(Service::getName).collect(Collectors.joining(",")));
10098
return response;
10199
}
102100

0 commit comments

Comments
 (0)