Skip to content

attempt to upgrade sdk #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-test'
implementation "javax.validation:validation-api:2.0.1.Final"

implementation "io.github.cadence-oss:iwf-java-sdk:0.1.0"
implementation "io.github.cadence-oss:iwf-java-sdk:1.0.0-rc3"

// openapi
implementation "org.openapitools:jackson-databind-nullable:0.2.1"
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/io/github/cadenceoss/iwf/basic/BasicTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ public void testBasicWorkflow() throws InterruptedException {
final BasicWorkflow wf = new BasicWorkflow();
registry.addWorkflow(wf);

final Client client = new Client(registry, ClientOptions.localDefault);
final Client client = new Client(registry, ClientOptions.minimum(
"http://localhost:8181", "http://localhost:8080/default"
));

final String wfId = "basic-test-id" + System.currentTimeMillis() / 1000;
final WorkflowStartOptions startOptions = WorkflowStartOptions.minimum(10);
final Integer input = new Integer(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import io.github.cadenceoss.iwf.core.WorkflowState;
import io.github.cadenceoss.iwf.core.attributes.QueryAttributesRW;
import io.github.cadenceoss.iwf.core.attributes.SearchAttributesRW;
import io.github.cadenceoss.iwf.core.attributes.StateLocalAttributesR;
import io.github.cadenceoss.iwf.core.attributes.StateLocalAttributesW;
import io.github.cadenceoss.iwf.core.attributes.StateLocal;
import io.github.cadenceoss.iwf.core.command.CommandRequest;
import io.github.cadenceoss.iwf.core.command.CommandResults;
import io.github.cadenceoss.iwf.core.command.InterStateChannel;

public class BasicWorkflowS1 implements WorkflowState<Integer> {

Expand All @@ -25,12 +25,12 @@ public Class<Integer> getInputType() {
}

@Override
public CommandRequest start(final Context context, final Integer input, final StateLocalAttributesW stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes) {
public CommandRequest start(final Context context, final Integer input, StateLocal stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes, final InterStateChannel interStateChannel) {
return CommandRequest.empty;
}

@Override
public StateDecision decide(final Context context, final Integer input, final CommandResults commandResults, final StateLocalAttributesR stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes) {
public StateDecision decide(final Context context, final Integer input, final CommandResults commandResults, StateLocal stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes, final InterStateChannel interStateChannel) {
final int output = input + 1;
return StateDecision.singleNextState(BasicWorkflowS2.StateId, output);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import io.github.cadenceoss.iwf.core.WorkflowState;
import io.github.cadenceoss.iwf.core.attributes.QueryAttributesRW;
import io.github.cadenceoss.iwf.core.attributes.SearchAttributesRW;
import io.github.cadenceoss.iwf.core.attributes.StateLocalAttributesR;
import io.github.cadenceoss.iwf.core.attributes.StateLocalAttributesW;
import io.github.cadenceoss.iwf.core.attributes.StateLocal;
import io.github.cadenceoss.iwf.core.command.CommandRequest;
import io.github.cadenceoss.iwf.core.command.CommandResults;
import io.github.cadenceoss.iwf.core.command.InterStateChannel;

public class BasicWorkflowS2 implements WorkflowState<Integer> {

Expand All @@ -25,12 +25,12 @@ public Class<Integer> getInputType() {
}

@Override
public CommandRequest start(final Context context, final Integer input, final StateLocalAttributesW stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes) {
public CommandRequest start(final Context context, final Integer input, StateLocal stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes, final InterStateChannel interStateChannel) {
return CommandRequest.empty;
}

@Override
public StateDecision decide(final Context context, final Integer input, final CommandResults commandResults, final StateLocalAttributesR stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes) {
public StateDecision decide(final Context context, final Integer input, final CommandResults commandResults, StateLocal stateLocals, final SearchAttributesRW searchAttributes, final QueryAttributesRW queryAttributes, final InterStateChannel interStateChannel) {
final int output = input + 1;
return StateDecision.gracefulCompleteWorkflow(output);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/github/cadenceoss/iwf/spring/Worker.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class Worker {
ExecutorService executor = Executors.newSingleThreadExecutor();

public void start() {
System.getProperties().put( "server.port", 8181 ); //8181 port is set here
executor.submit(() -> {
SpringApplication.run(SpringMainApplication.class);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.github.cadenceoss.iwf.basic.BasicWorkflow;
import io.github.cadenceoss.iwf.core.Registry;
import io.github.cadenceoss.iwf.core.WorkerOptions;
import io.github.cadenceoss.iwf.core.WorkerService;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateDecideRequest;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateDecideResponse;
Expand All @@ -21,7 +22,7 @@ public class ApiController {
public ApiController() {
final Registry registry = new Registry();
registry.addWorkflow(new BasicWorkflow());
workerService = new WorkerService(registry);
workerService = new WorkerService(registry, WorkerOptions.defaultOptions);
}

@RequestMapping("/")
Expand Down