From 8d993b68be5630a0718929cf1e47d24aa46a5257 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 23 Sep 2024 15:11:27 -0400 Subject: [PATCH] rename Action to ProcessInstanceAction --- pom.xml | 2 +- .../java/com/inteligr8/activiti/api/BaseJobsApi.java | 10 +++++----- .../com/inteligr8/activiti/api/ExecutionApi.java | 12 ++++++------ .../inteligr8/activiti/api/ProcessInstanceApi.java | 10 +++++----- .../inteligr8/activiti/model/MessageEventAction.java | 2 +- .../{Action.java => ProcessInstanceAction.java} | 10 +++++----- .../inteligr8/activiti/model/SignalEventAction.java | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/com/inteligr8/activiti/model/{Action.java => ProcessInstanceAction.java} (82%) diff --git a/pom.xml b/pom.xml index faa6e61..f91affd 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ com.inteligr8 regex-maven-plugin - 1.0.2 + 1.0.5 fix-displayName diff --git a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java index 518d5ef..3857c58 100644 --- a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java @@ -27,8 +27,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import com.inteligr8.activiti.model.Action; -import com.inteligr8.activiti.model.Action.ActionValue; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; import com.inteligr8.activiti.model.Job; import com.inteligr8.activiti.model.ResultList; @@ -50,17 +50,17 @@ public interface BaseJobsApi { @Consumes({ MediaType.APPLICATION_JSON }) public void executeJob( @PathParam("jobId") String jobId, - Action execute); + ProcessInstanceAction execute); default void executeJob( String jobId, ActionValue action) { - this.executeJob(jobId, new Action(action)); + this.executeJob(jobId, new ProcessInstanceAction(action)); } default void executeJob( String jobId) { - this.executeJob(jobId, new Action(ActionValue.Execute)); + this.executeJob(jobId, new ProcessInstanceAction(ActionValue.Execute)); } @GET diff --git a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java index aa3a49c..3047ded 100644 --- a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java @@ -27,8 +27,8 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.annotation.JsonProperty; -import com.inteligr8.activiti.model.Action; -import com.inteligr8.activiti.model.Action.ActionValue; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; import com.inteligr8.activiti.model.Execution; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.SignalEventAction; @@ -71,7 +71,7 @@ public interface ExecutionApi { default Execution signal( String processInstanceId, List variables) { - Action action = new Action(ActionValue.Signal); + ProcessInstanceAction action = new ProcessInstanceAction(ActionValue.Signal); if (variables != null && !variables.isEmpty()) action.setVariables(variables); return this.execute(processInstanceId, action); @@ -81,7 +81,7 @@ public interface ExecutionApi { String processInstanceId, String signal, List variables) { - Action action = new SignalEventAction(ActionValue.SignalReceived, signal); + ProcessInstanceAction action = new SignalEventAction(ActionValue.SignalReceived, signal); if (variables != null && !variables.isEmpty()) action.setVariables(variables); return this.execute(processInstanceId, action); @@ -91,7 +91,7 @@ public interface ExecutionApi { String processInstanceId, String message, List variables) { - Action action = new SignalEventAction(ActionValue.MessageReceived, message); + ProcessInstanceAction action = new SignalEventAction(ActionValue.MessageReceived, message); if (variables != null && !variables.isEmpty()) action.setVariables(variables); return this.execute(processInstanceId, action); @@ -103,7 +103,7 @@ public interface ExecutionApi { @Produces({ MediaType.APPLICATION_JSON }) Execution execute( @PathParam("executionId") String executionId, - Action action); + ProcessInstanceAction action); default ResultList getWithoutTenant( String executionId, diff --git a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java index 8c91c0a..be69db3 100644 --- a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java @@ -29,8 +29,8 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.annotation.JsonProperty; -import com.inteligr8.activiti.model.Action; -import com.inteligr8.activiti.model.Action.ActionValue; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.SortOrder; import com.inteligr8.activiti.model.Variable; @@ -63,12 +63,12 @@ public interface ProcessInstanceApi { default void activate( String processInstanceId) { - this.act(processInstanceId, new Action(ActionValue.Activate)); + this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Activate)); } default void suspend( String processInstanceId) { - this.act(processInstanceId, new Action(ActionValue.Suspend)); + this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Suspend)); } @PUT @@ -76,7 +76,7 @@ public interface ProcessInstanceApi { @Consumes({ MediaType.APPLICATION_JSON }) void act( @PathParam("processInstanceId") String processInstanceId, - Action action); + ProcessInstanceAction action); default ResultList getWithoutTenant( String processInstanceId, diff --git a/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java b/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java index ba1968d..32c4a97 100644 --- a/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java +++ b/src/main/java/com/inteligr8/activiti/model/MessageEventAction.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @JsonInclude(JsonInclude.Include.NON_NULL) -public class MessageEventAction extends Action { +public class MessageEventAction extends ProcessInstanceAction { @JsonProperty("messageName") private String message; diff --git a/src/main/java/com/inteligr8/activiti/model/Action.java b/src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java similarity index 82% rename from src/main/java/com/inteligr8/activiti/model/Action.java rename to src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java index 2e21c86..4cf5e1b 100644 --- a/src/main/java/com/inteligr8/activiti/model/Action.java +++ b/src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @JsonInclude(JsonInclude.Include.NON_NULL) -public class Action { +public class ProcessInstanceAction { public enum ActionValue { @JsonProperty("execute") @@ -31,10 +31,10 @@ public class Action { /** * No args constructor for use in serialization */ - public Action() { + public ProcessInstanceAction() { } - public Action(ActionValue action) { + public ProcessInstanceAction(ActionValue action) { this.action = action; } @@ -46,7 +46,7 @@ public class Action { this.action = action; } - public Action withAction(ActionValue action) { + public ProcessInstanceAction withAction(ActionValue action) { this.action = action; return this; } @@ -59,7 +59,7 @@ public class Action { this.variables = variables; } - public Action withVariables(List variables) { + public ProcessInstanceAction withVariables(List variables) { this.variables = variables; return this; } diff --git a/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java b/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java index 494cedb..a61713e 100644 --- a/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java +++ b/src/main/java/com/inteligr8/activiti/model/SignalEventAction.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @JsonInclude(JsonInclude.Include.NON_NULL) -public class SignalEventAction extends Action { +public class SignalEventAction extends ProcessInstanceAction { @JsonProperty("signalName") private String signal;