Skip to content

Commit bf6d7fc

Browse files
Rebase changes
1 parent e8fccb7 commit bf6d7fc

6 files changed

Lines changed: 17 additions & 22 deletions

File tree

sdk-api/src/main/java/dev/restate/sdk/ContextImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,7 @@ public <T> DurableFuture<T> signal(String name, TypeTag<T> typeTag) throws Termi
354354
checkNotInsideRun();
355355
Serde<T> serde = serdeFactory.create(typeTag);
356356
AsyncResult<Slice> result = Util.awaitCompletableFuture(handlerContext.signal(name));
357-
return DurableFuture.fromAsyncResult(result, serviceExecutor)
358-
.map(serde::deserialize);
357+
return DurableFuture.fromAsyncResult(result, serviceExecutor).map(serde::deserialize);
359358
}
360359

361360
@Override

sdk-core/src/main/java/dev/restate/sdk/core/EndpointRequestHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ public RequestProcessor processorForRequest(
203203
LoggingContextSetter.INVOCATION_TARGET_KEY, fullyQualifiedServiceMethod);
204204

205205
return new RequestProcessorImpl(
206+
StateMachine.create(headersAccessor),
206207
serviceName,
207208
handlerName,
208-
StateMachine.create(headersAccessor),
209209
svc.getServiceType(),
210210
handler,
211211
otelContext,

sdk-core/src/main/java/dev/restate/sdk/core/ExecutorSwitchingHandlerContextImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ final class ExecutorSwitchingHandlerContextImpl extends HandlerContextImpl {
4444
HeadersAccessor attemptHeaders,
4545
StateMachine.Input input,
4646
Executor coreExecutor) {
47-
super( vm,
48-
externalProgressChannel,
49-
outputSink,
47+
super(
48+
vm,
49+
externalProgressChannel,
50+
outputSink,
5051
serviceName,
5152
handlerName,
5253
serviceType,

sdk-core/src/main/java/dev/restate/sdk/core/HandlerContextImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ class HandlerContextImpl implements HandlerContextInternal {
4040
private final Consumer<Slice> outputSink;
4141

4242
private final HandlerRequest handlerRequest;
43-
private final HeadersAccessor attemptHeaders;
43+
private final HeadersAccessor attemptHeaders;
4444
private final @Nullable String objectKey;
4545
private final ServiceType serviceType;
4646
private final @Nullable HandlerType handlerType;
4747

4848
private final HashMap<Integer, Consumer<RunCompleter>> scheduledRuns;
4949

5050
HandlerContextImpl(
51-
StateMachine stateMachine,
51+
StateMachine vm,
5252
ExternalProgressChannel externalProgressChannel,
5353
Consumer<Slice> outputSink,
5454
String serviceName,
@@ -58,7 +58,7 @@ class HandlerContextImpl implements HandlerContextInternal {
5858
Context otelContext,
5959
HeadersAccessor attemptHeaders,
6060
StateMachine.Input input) {
61-
this.stateMachine = stateMachine;
61+
this.stateMachine = vm;
6262
this.externalProgressChannel = externalProgressChannel;
6363
this.outputSink = outputSink;
6464

sdk-core/src/main/java/dev/restate/sdk/core/RequestProcessorImpl.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import dev.restate.common.Slice;
1212
import dev.restate.sdk.common.TerminalException;
13-
import dev.restate.sdk.endpoint.HeadersAccessor;
1413
import dev.restate.sdk.core.sharedcore.StateMachine;
14+
import dev.restate.sdk.endpoint.HeadersAccessor;
1515
import dev.restate.sdk.endpoint.definition.HandlerDefinition;
1616
import dev.restate.sdk.endpoint.definition.ServiceType;
1717
import io.opentelemetry.context.Context;
@@ -59,9 +59,9 @@ private enum State {
5959

6060
@SuppressWarnings("unchecked")
6161
RequestProcessorImpl(
62+
StateMachine stateMachine,
6263
String serviceName,
6364
String handlerName,
64-
StateMachine stateMachine,
6565
ServiceType serviceType,
6666
HandlerDefinition<?, ?> handlerDefinition,
6767
Context otelContext,
@@ -260,32 +260,27 @@ private void startHandler() {
260260
HandlerContextImpl ctx =
261261
syscallsExecutor != null
262262
? new ExecutorSwitchingHandlerContextImpl(
263-
serviceName,
264-
handlerName,
265263
stateMachine,
266264
externalProgressChannel,
267265
this::onNextOutputSlice,
268-
fullyQualifiedHandlerName,
266+
serviceName,
267+
handlerName,
269268
serviceType,
270269
handlerDefinition.getHandlerType(),
271270
otelContext,
272271
attemptHeaders,
273-
input,
274-
this.syscallsExecutor)
275272
stateMachineInput,
276-
syscallsExecutor)
273+
this.syscallsExecutor)
277274
: new HandlerContextImpl(
278-
serviceName,
279-
handlerName,
280275
stateMachine,
281276
externalProgressChannel,
282277
this::onNextOutputSlice,
283-
fullyQualifiedHandlerName,
278+
serviceName,
279+
handlerName,
284280
serviceType,
285281
handlerDefinition.getHandlerType(),
286282
otelContext,
287283
attemptHeaders,
288-
input);
289284
stateMachineInput);
290285

291286
CompletableFuture<Slice> handlerResultFut =

sdk-serde-jackson/src/main/java/dev/restate/serde/jackson/JacksonSerdeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Slice serialize(T value) {
8686
public T deserialize(@NonNull Slice value) {
8787
try {
8888
return mapper.readValue(
89-
new ByteBufferBackedInputStream(value.asReadOnlyByteBuffer()), constructedType);
89+
new ByteBufferBackedInputStream(value.asReadOnlyByteBuffer()), constructedType);
9090
} catch (IOException e) {
9191
sneakyThrow(e);
9292
return null;

0 commit comments

Comments
 (0)