Skip to content

Commit

Permalink
Merge pull request #4 from indeedeng/iwfio
Browse files Browse the repository at this point in the history 
Switch to new domain groupId
  • Loading branch information
@longquanzheng
longquanzheng committed Dec 12, 2022
2 parents 5f3ba8d + 2ba5f03 commit b8d4e6e
Show file tree
Hide file tree
Showing 35 changed files with 202 additions and 210 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
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:1.0.0-rc8"
implementation "io.iworkflow:iwf-java-sdk:1.0.0-rc1"

// openapi
implementation "org.openapitools:jackson-databind-nullable:0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion ...cadenceoss/iwf/SpringMainApplication.java → ...a/io/iworkflow/SpringMainApplication.java
View file
@@ -1,4 +1,4 @@
package io.github.cadenceoss.iwf;
package io.iworkflow;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
4 changes: 2 additions & 2 deletions ...thub/cadenceoss/iwf/config/DslConfig.java → ...n/java/io/iworkflow/config/DslConfig.java
View file
@@ -1,7 +1,7 @@
package io.github.cadenceoss.iwf.config;
package io.iworkflow.config;

import com.fasterxml.jackson.databind.Module;
import io.github.cadenceoss.iwf.workflow.dsl.utils.WorkflowIdGenerator;
import io.iworkflow.workflow.dsl.utils.WorkflowIdGenerator;
import io.serverlessworkflow.api.Workflow;
import io.serverlessworkflow.api.mapper.WorkflowModule;
import org.springframework.beans.factory.annotation.Value;
Expand Down
8 changes: 4 additions & 4 deletions ...enceoss/iwf/config/DslWorkflowConfig.java → ...o/iworkflow/config/DslWorkflowConfig.java
View file
@@ -1,7 +1,7 @@
package io.github.cadenceoss.iwf.config;
package io.iworkflow.config;

import io.github.cadenceoss.iwf.workflow.dsl.DynamicDslWorkflow;
import io.github.cadenceoss.iwf.workflow.dsl.utils.DynamicDslWorkflowAdapter;
import io.iworkflow.workflow.dsl.DynamicDslWorkflow;
import io.iworkflow.workflow.dsl.utils.DynamicDslWorkflowAdapter;
import io.serverlessworkflow.api.Workflow;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -12,7 +12,7 @@
@Configuration
public class DslWorkflowConfig {
@Bean
public io.github.cadenceoss.iwf.core.Workflow dynamicWorkflow(final Map<String, DynamicDslWorkflowAdapter> adapterMap) {
public io.iworkflow.core.Workflow dynamicWorkflow(final Map<String, DynamicDslWorkflowAdapter> adapterMap) {
return new DynamicDslWorkflow(adapterMap);
}

Expand Down
18 changes: 9 additions & 9 deletions ...thub/cadenceoss/iwf/config/IwfConfig.java → ...n/java/io/iworkflow/config/IwfConfig.java
View file
@@ -1,14 +1,14 @@
package io.github.cadenceoss.iwf.config;
package io.iworkflow.config;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.ClientOptions;
import io.github.cadenceoss.iwf.core.JacksonJsonObjectEncoder;
import io.github.cadenceoss.iwf.core.Registry;
import io.github.cadenceoss.iwf.core.UntypedClient;
import io.github.cadenceoss.iwf.core.WorkerOptions;
import io.github.cadenceoss.iwf.core.WorkerService;
import io.github.cadenceoss.iwf.core.Workflow;
import io.iworkflow.core.Client;
import io.iworkflow.core.ClientOptions;
import io.iworkflow.core.JacksonJsonObjectEncoder;
import io.iworkflow.core.Registry;
import io.iworkflow.core.UntypedClient;
import io.iworkflow.core.WorkerOptions;
import io.iworkflow.core.WorkerService;
import io.iworkflow.core.Workflow;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Expand Down
2 changes: 1 addition & 1 deletion .../cadenceoss/iwf/config/JacksonConfig.java → ...va/io/iworkflow/config/JacksonConfig.java
View file
@@ -1,4 +1,4 @@
package io.github.cadenceoss.iwf.config;
package io.iworkflow.config;

import com.fasterxml.jackson.databind.Module;
import org.openapitools.jackson.nullable.JsonNullableModule;
Expand Down
16 changes: 8 additions & 8 deletions ...f/controller/BasicWorkflowController.java → ...w/controller/BasicWorkflowController.java
View file
@@ -1,11 +1,11 @@
package io.github.cadenceoss.iwf.controller;

import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.ImmutableWorkflowStartOptions;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.core.options.WorkflowIdReusePolicy;
import io.github.cadenceoss.iwf.workflow.basic.BasicWorkflow;
import io.github.cadenceoss.iwf.workflow.basic.BasicWorkflowS1;
package io.iworkflow.controller;

import io.iworkflow.core.Client;
import io.iworkflow.core.ImmutableWorkflowStartOptions;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.core.options.WorkflowIdReusePolicy;
import io.iworkflow.workflow.basic.BasicWorkflow;
import io.iworkflow.workflow.basic.BasicWorkflowS1;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
8 changes: 4 additions & 4 deletions ...iwf/controller/DslWorkflowController.java → ...low/controller/DslWorkflowController.java
View file
@@ -1,8 +1,8 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.models.SignalRequest;
import io.github.cadenceoss.iwf.models.StartWorkflowResponse;
import io.github.cadenceoss.iwf.services.DynamicWorkflowService;
import io.iworkflow.models.SignalRequest;
import io.iworkflow.models.StartWorkflowResponse;
import io.iworkflow.services.DynamicWorkflowService;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
16 changes: 5 additions & 11 deletions .../InterstateChannelWorkflowController.java → .../InterstateChannelWorkflowController.java
View file
@@ -1,20 +1,14 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.ImmutableWorkflowStartOptions;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.core.options.WorkflowIdReusePolicy;
import io.github.cadenceoss.iwf.workflow.basic.BasicWorkflow;
import io.github.cadenceoss.iwf.workflow.basic.BasicWorkflowS1;
import io.github.cadenceoss.iwf.workflow.interstatechannel.BasicInterStateChannelWorkflow;
import io.github.cadenceoss.iwf.workflow.interstatechannel.BasicInterStateChannelWorkflowState0;
import io.iworkflow.core.Client;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.workflow.interstatechannel.BasicInterStateChannelWorkflow;
import io.iworkflow.workflow.interstatechannel.BasicInterStateChannelWorkflowState0;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import java.util.Optional;

@Controller
@RequestMapping("/interstateChannel")
public class InterstateChannelWorkflowController {
Expand Down
12 changes: 6 additions & 6 deletions ...wf/controller/IwfWorkerApiController.java → ...ow/controller/IwfWorkerApiController.java
View file
@@ -1,10 +1,10 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.core.WorkerService;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateDecideRequest;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateDecideResponse;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateStartRequest;
import io.github.cadenceoss.iwf.gen.models.WorkflowStateStartResponse;
import io.iworkflow.core.WorkerService;
import io.iworkflow.gen.models.WorkflowStateDecideRequest;
import io.iworkflow.gen.models.WorkflowStateDecideResponse;
import io.iworkflow.gen.models.WorkflowStateStartRequest;
import io.iworkflow.gen.models.WorkflowStateStartResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand Down
10 changes: 5 additions & 5 deletions ...roller/PersistenceWorkflowController.java → ...roller/PersistenceWorkflowController.java
View file
@@ -1,9 +1,9 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.workflow.persistence.BasicPersistenceWorkflow;
import io.github.cadenceoss.iwf.workflow.persistence.BasicPersistenceWorkflowState1;
import io.iworkflow.core.Client;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.workflow.persistence.BasicPersistenceWorkflow;
import io.iworkflow.workflow.persistence.BasicPersistenceWorkflowState1;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
12 changes: 5 additions & 7 deletions .../controller/SignalWorkflowController.java → .../controller/SignalWorkflowController.java
View file
@@ -1,11 +1,9 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.workflow.persistence.BasicPersistenceWorkflow;
import io.github.cadenceoss.iwf.workflow.persistence.BasicPersistenceWorkflowState1;
import io.github.cadenceoss.iwf.workflow.signal.BasicSignalWorkflow;
import io.github.cadenceoss.iwf.workflow.signal.BasicSignalWorkflowState1;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.workflow.signal.BasicSignalWorkflow;
import io.iworkflow.workflow.signal.BasicSignalWorkflowState1;
import io.iworkflow.core.Client;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
10 changes: 5 additions & 5 deletions ...f/controller/TimerWorkflowController.java → ...w/controller/TimerWorkflowController.java
View file
@@ -1,9 +1,9 @@
package io.github.cadenceoss.iwf.controller;
package io.iworkflow.controller;

import io.github.cadenceoss.iwf.core.Client;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.workflow.timer.BasicTimerWorkflow;
import io.github.cadenceoss.iwf.workflow.timer.BasicTimerWorkflowState1;
import io.iworkflow.core.Client;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.workflow.timer.BasicTimerWorkflow;
import io.iworkflow.workflow.timer.BasicTimerWorkflowState1;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
2 changes: 1 addition & 1 deletion .../cadenceoss/iwf/models/SignalRequest.java → ...va/io/iworkflow/models/SignalRequest.java
View file
@@ -1,4 +1,4 @@
package io.github.cadenceoss.iwf.models;
package io.iworkflow.models;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.immutables.value.Value;
Expand Down
2 changes: 1 addition & 1 deletion ...oss/iwf/models/StartWorkflowResponse.java → ...orkflow/models/StartWorkflowResponse.java
View file
@@ -1,4 +1,4 @@
package io.github.cadenceoss.iwf.models;
package io.iworkflow.models;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.immutables.value.Value;
Expand Down
20 changes: 10 additions & 10 deletions .../iwf/services/DynamicWorkflowService.java → ...flow/services/DynamicWorkflowService.java
View file
@@ -1,13 +1,13 @@
package io.github.cadenceoss.iwf.services;

import io.github.cadenceoss.iwf.core.UntypedClient;
import io.github.cadenceoss.iwf.core.WorkflowStartOptions;
import io.github.cadenceoss.iwf.models.ImmutableStartWorkflowResponse;
import io.github.cadenceoss.iwf.models.SignalRequest;
import io.github.cadenceoss.iwf.models.StartWorkflowResponse;
import io.github.cadenceoss.iwf.workflow.dsl.DynamicDslWorkflow;
import io.github.cadenceoss.iwf.workflow.dsl.utils.DynamicDslWorkflowAdapter;
import io.github.cadenceoss.iwf.workflow.dsl.utils.WorkflowIdGenerator;
package io.iworkflow.services;

import io.iworkflow.core.UntypedClient;
import io.iworkflow.core.WorkflowStartOptions;
import io.iworkflow.models.ImmutableStartWorkflowResponse;
import io.iworkflow.models.SignalRequest;
import io.iworkflow.models.StartWorkflowResponse;
import io.iworkflow.workflow.dsl.DynamicDslWorkflow;
import io.iworkflow.workflow.dsl.utils.DynamicDslWorkflowAdapter;
import io.iworkflow.workflow.dsl.utils.WorkflowIdGenerator;
import io.serverlessworkflow.api.interfaces.State;
import org.springframework.stereotype.Service;

Expand Down
6 changes: 3 additions & 3 deletions ...oss/iwf/workflow/basic/BasicWorkflow.java → ...orkflow/workflow/basic/BasicWorkflow.java
View file
@@ -1,7 +1,7 @@
package io.github.cadenceoss.iwf.workflow.basic;
package io.iworkflow.workflow.basic;

import io.github.cadenceoss.iwf.core.StateDef;
import io.github.cadenceoss.iwf.core.Workflow;
import io.iworkflow.core.StateDef;
import io.iworkflow.core.Workflow;
import org.springframework.stereotype.Component;

import java.util.Arrays;
Expand Down
16 changes: 8 additions & 8 deletions ...s/iwf/workflow/basic/BasicWorkflowS1.java → ...kflow/workflow/basic/BasicWorkflowS1.java
View file
@@ -1,12 +1,12 @@
package io.github.cadenceoss.iwf.workflow.basic;
package io.iworkflow.workflow.basic;

import io.github.cadenceoss.iwf.core.Context;
import io.github.cadenceoss.iwf.core.StateDecision;
import io.github.cadenceoss.iwf.core.WorkflowState;
import io.github.cadenceoss.iwf.core.command.CommandRequest;
import io.github.cadenceoss.iwf.core.command.CommandResults;
import io.github.cadenceoss.iwf.core.communication.Communication;
import io.github.cadenceoss.iwf.core.persistence.Persistence;
import io.iworkflow.core.Context;
import io.iworkflow.core.StateDecision;
import io.iworkflow.core.WorkflowState;
import io.iworkflow.core.command.CommandRequest;
import io.iworkflow.core.command.CommandResults;
import io.iworkflow.core.communication.Communication;
import io.iworkflow.core.persistence.Persistence;

public class BasicWorkflowS1 implements WorkflowState<Integer> {

Expand Down
16 changes: 8 additions & 8 deletions ...s/iwf/workflow/basic/BasicWorkflowS2.java → ...kflow/workflow/basic/BasicWorkflowS2.java
View file
@@ -1,12 +1,12 @@
package io.github.cadenceoss.iwf.workflow.basic;
package io.iworkflow.workflow.basic;

import io.github.cadenceoss.iwf.core.Context;
import io.github.cadenceoss.iwf.core.StateDecision;
import io.github.cadenceoss.iwf.core.WorkflowState;
import io.github.cadenceoss.iwf.core.command.CommandRequest;
import io.github.cadenceoss.iwf.core.command.CommandResults;
import io.github.cadenceoss.iwf.core.communication.Communication;
import io.github.cadenceoss.iwf.core.persistence.Persistence;
import io.iworkflow.core.Context;
import io.iworkflow.core.StateDecision;
import io.iworkflow.core.WorkflowState;
import io.iworkflow.core.command.CommandRequest;
import io.iworkflow.core.command.CommandResults;
import io.iworkflow.core.communication.Communication;
import io.iworkflow.core.persistence.Persistence;

public class BasicWorkflowS2 implements WorkflowState<Integer> {

Expand Down
16 changes: 8 additions & 8 deletions .../iwf/workflow/dsl/DynamicDslWorkflow.java → ...flow/workflow/dsl/DynamicDslWorkflow.java
View file
@@ -1,11 +1,11 @@
package io.github.cadenceoss.iwf.workflow.dsl;

import io.github.cadenceoss.iwf.core.StateDef;
import io.github.cadenceoss.iwf.core.Workflow;
import io.github.cadenceoss.iwf.core.communication.CommunicationMethodDef;
import io.github.cadenceoss.iwf.core.persistence.DataObjectDef;
import io.github.cadenceoss.iwf.core.persistence.PersistenceFieldDef;
import io.github.cadenceoss.iwf.workflow.dsl.utils.DynamicDslWorkflowAdapter;
package io.iworkflow.workflow.dsl;

import io.iworkflow.core.StateDef;
import io.iworkflow.core.Workflow;
import io.iworkflow.core.communication.CommunicationMethodDef;
import io.iworkflow.core.persistence.DataObjectDef;
import io.iworkflow.core.persistence.PersistenceFieldDef;
import io.iworkflow.workflow.dsl.utils.DynamicDslWorkflowAdapter;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
24 changes: 12 additions & 12 deletions ...wf/workflow/dsl/DynamicWorkflowState.java → ...ow/workflow/dsl/DynamicWorkflowState.java
View file
@@ -1,16 +1,16 @@
package io.github.cadenceoss.iwf.workflow.dsl;
package io.iworkflow.workflow.dsl;

import io.github.cadenceoss.iwf.core.Context;
import io.github.cadenceoss.iwf.core.StateDecision;
import io.github.cadenceoss.iwf.core.StateMovement;
import io.github.cadenceoss.iwf.core.WorkflowState;
import io.github.cadenceoss.iwf.core.command.CommandRequest;
import io.github.cadenceoss.iwf.core.command.CommandResults;
import io.github.cadenceoss.iwf.core.communication.Communication;
import io.github.cadenceoss.iwf.core.communication.ImmutableSignalCommand;
import io.github.cadenceoss.iwf.core.communication.SignalCommand;
import io.github.cadenceoss.iwf.core.persistence.Persistence;
import io.github.cadenceoss.iwf.workflow.dsl.utils.JQFilter;
import io.iworkflow.core.Context;
import io.iworkflow.core.StateDecision;
import io.iworkflow.core.StateMovement;
import io.iworkflow.core.WorkflowState;
import io.iworkflow.core.command.CommandRequest;
import io.iworkflow.core.command.CommandResults;
import io.iworkflow.core.communication.Communication;
import io.iworkflow.core.communication.ImmutableSignalCommand;
import io.iworkflow.core.communication.SignalCommand;
import io.iworkflow.core.persistence.Persistence;
import io.iworkflow.workflow.dsl.utils.JQFilter;
import io.serverlessworkflow.api.events.OnEvents;
import io.serverlessworkflow.api.interfaces.State;
import io.serverlessworkflow.api.states.EventState;
Expand Down
12 changes: 6 additions & 6 deletions .../dsl/utils/DynamicDslWorkflowAdapter.java → .../dsl/utils/DynamicDslWorkflowAdapter.java
View file
@@ -1,10 +1,10 @@
package io.github.cadenceoss.iwf.workflow.dsl.utils;
package io.iworkflow.workflow.dsl.utils;

import io.github.cadenceoss.iwf.core.ImmutableStateDef;
import io.github.cadenceoss.iwf.core.StateDef;
import io.github.cadenceoss.iwf.core.communication.ImmutableSignalChannelDef;
import io.github.cadenceoss.iwf.core.communication.SignalChannelDef;
import io.github.cadenceoss.iwf.workflow.dsl.DynamicWorkflowState;
import io.iworkflow.core.ImmutableStateDef;
import io.iworkflow.core.StateDef;
import io.iworkflow.core.communication.ImmutableSignalChannelDef;
import io.iworkflow.core.communication.SignalChannelDef;
import io.iworkflow.workflow.dsl.DynamicWorkflowState;
import io.serverlessworkflow.api.Workflow;
import io.serverlessworkflow.api.events.EventDefinition;
import io.serverlessworkflow.api.interfaces.State;
Expand Down
2 changes: 1 addition & 1 deletion ...eoss/iwf/workflow/dsl/utils/JQFilter.java → ...workflow/workflow/dsl/utils/JQFilter.java
View file
Expand Up @@ -17,7 +17,7 @@
* permissions and limitations under the License.
*/

package io.github.cadenceoss.iwf.workflow.dsl.utils;
package io.iworkflow.workflow.dsl.utils;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion ...rkflow/dsl/utils/WorkflowIdGenerator.java → ...rkflow/dsl/utils/WorkflowIdGenerator.java
View file
@@ -1,4 +1,4 @@
package io.github.cadenceoss.iwf.workflow.dsl.utils;
package io.iworkflow.workflow.dsl.utils;

import io.serverlessworkflow.api.Workflow;

Expand Down
10 changes: 5 additions & 5 deletions ...annel/BasicInterStateChannelWorkflow.java → ...annel/BasicInterStateChannelWorkflow.java
View file
@@ -1,9 +1,9 @@
package io.github.cadenceoss.iwf.workflow.interstatechannel;
package io.iworkflow.workflow.interstatechannel;

import io.github.cadenceoss.iwf.core.StateDef;
import io.github.cadenceoss.iwf.core.Workflow;
import io.github.cadenceoss.iwf.core.communication.CommunicationMethodDef;
import io.github.cadenceoss.iwf.core.communication.InterStateChannelDef;
import io.iworkflow.core.StateDef;
import io.iworkflow.core.Workflow;
import io.iworkflow.core.communication.CommunicationMethodDef;
import io.iworkflow.core.communication.InterStateChannelDef;
import org.springframework.stereotype.Component;

import java.util.Arrays;
Expand Down

0 comments on commit b8d4e6e

Please sign in to comment.