inteligr8/aps-public-rest-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Action to ProcessInstanceAction

Browse Source
This commit is contained in:
Brian Long 2024-09-23 15:11:27 -04:00
parent 962ef8f98c
commit 8d993b68be
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -127,7 +127,7 @@
<plugin> <plugin>
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId> <artifactId>regex-maven-plugin</artifactId>
<version>1.0.2</version> <version>1.0.5</version>
<executions> <executions>
<execution> <execution>
<id>fix-displayName</id> <id>fix-displayName</id>

10
src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
View File

@ -27,8 +27,8 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import com.inteligr8.activiti.model.Action; import com.inteligr8.activiti.model.ProcessInstanceAction;
import com.inteligr8.activiti.model.Action.ActionValue; import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
import com.inteligr8.activiti.model.Job; import com.inteligr8.activiti.model.Job;
import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.ResultList;
@ -50,17 +50,17 @@ public interface BaseJobsApi {
@Consumes({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON })
public void executeJob( public void executeJob(
@PathParam("jobId") String jobId, @PathParam("jobId") String jobId,
Action execute); ProcessInstanceAction execute);
default void executeJob( default void executeJob(
String jobId, String jobId,
ActionValue action) { ActionValue action) {
this.executeJob(jobId, new Action(action)); this.executeJob(jobId, new ProcessInstanceAction(action));
} }
default void executeJob( default void executeJob(
String jobId) { String jobId) {
this.executeJob(jobId, new Action(ActionValue.Execute)); this.executeJob(jobId, new ProcessInstanceAction(ActionValue.Execute));
} }
@GET @GET

12
src/main/java/com/inteligr8/activiti/api/ExecutionApi.java
View File

@ -27,8 +27,8 @@ import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.inteligr8.activiti.model.Action; import com.inteligr8.activiti.model.ProcessInstanceAction;
import com.inteligr8.activiti.model.Action.ActionValue; import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
import com.inteligr8.activiti.model.Execution; import com.inteligr8.activiti.model.Execution;
import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.ResultList;
import com.inteligr8.activiti.model.SignalEventAction; import com.inteligr8.activiti.model.SignalEventAction;
@ -71,7 +71,7 @@ public interface ExecutionApi {
default Execution signal( default Execution signal(
String processInstanceId, String processInstanceId,
List<Variable> variables) { List<Variable> variables) {
Action action = new Action(ActionValue.Signal); ProcessInstanceAction action = new ProcessInstanceAction(ActionValue.Signal);
if (variables != null && !variables.isEmpty()) if (variables != null && !variables.isEmpty())
action.setVariables(variables); action.setVariables(variables);
return this.execute(processInstanceId, action); return this.execute(processInstanceId, action);
@ -81,7 +81,7 @@ public interface ExecutionApi {
String processInstanceId, String processInstanceId,
String signal, String signal,
List<Variable> variables) { List<Variable> variables) {
Action action = new SignalEventAction(ActionValue.SignalReceived, signal); ProcessInstanceAction action = new SignalEventAction(ActionValue.SignalReceived, signal);
if (variables != null && !variables.isEmpty()) if (variables != null && !variables.isEmpty())
action.setVariables(variables); action.setVariables(variables);
return this.execute(processInstanceId, action); return this.execute(processInstanceId, action);
@ -91,7 +91,7 @@ public interface ExecutionApi {
String processInstanceId, String processInstanceId,
String message, String message,
List<Variable> variables) { List<Variable> variables) {
Action action = new SignalEventAction(ActionValue.MessageReceived, message); ProcessInstanceAction action = new SignalEventAction(ActionValue.MessageReceived, message);
if (variables != null && !variables.isEmpty()) if (variables != null && !variables.isEmpty())
action.setVariables(variables); action.setVariables(variables);
return this.execute(processInstanceId, action); return this.execute(processInstanceId, action);
@ -103,7 +103,7 @@ public interface ExecutionApi {
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
Execution execute( Execution execute(
@PathParam("executionId") String executionId, @PathParam("executionId") String executionId,
Action action); ProcessInstanceAction action);
default ResultList<Execution> getWithoutTenant( default ResultList<Execution> getWithoutTenant(
String executionId, String executionId,

10
src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java
View File

@ -29,8 +29,8 @@ import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.inteligr8.activiti.model.Action; import com.inteligr8.activiti.model.ProcessInstanceAction;
import com.inteligr8.activiti.model.Action.ActionValue; import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.ResultList;
import com.inteligr8.activiti.model.SortOrder; import com.inteligr8.activiti.model.SortOrder;
import com.inteligr8.activiti.model.Variable; import com.inteligr8.activiti.model.Variable;
@ -63,12 +63,12 @@ public interface ProcessInstanceApi {
default void activate( default void activate(
String processInstanceId) { String processInstanceId) {
this.act(processInstanceId, new Action(ActionValue.Activate)); this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Activate));
} }
default void suspend( default void suspend(
String processInstanceId) { String processInstanceId) {
this.act(processInstanceId, new Action(ActionValue.Suspend)); this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Suspend));
} }
@PUT @PUT
@ -76,7 +76,7 @@ public interface ProcessInstanceApi {
@Consumes({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON })
void act( void act(
@PathParam("processInstanceId") String processInstanceId, @PathParam("processInstanceId") String processInstanceId,
Action action); ProcessInstanceAction action);
default ResultList<ProcessInstance> getWithoutTenant( default ResultList<ProcessInstance> getWithoutTenant(
String processInstanceId, String processInstanceId,

2
src/main/java/com/inteligr8/activiti/model/MessageEventAction.java
View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class MessageEventAction extends Action { public class MessageEventAction extends ProcessInstanceAction {
@JsonProperty("messageName") @JsonProperty("messageName")
private String message; private String message;

10
src/main/java/com/inteligr8/activiti/model/Action.java → src/main/java/com/inteligr8/activiti/model/ProcessInstanceAction.java
View File

@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class Action { public class ProcessInstanceAction {
public enum ActionValue { public enum ActionValue {
@JsonProperty("execute") @JsonProperty("execute")
@ -31,10 +31,10 @@ public class Action {
/** /**
* No args constructor for use in serialization * No args constructor for use in serialization
*/ */
public Action() { public ProcessInstanceAction() {
} }
public Action(ActionValue action) { public ProcessInstanceAction(ActionValue action) {
this.action = action; this.action = action;
} }
@ -46,7 +46,7 @@ public class Action {
this.action = action; this.action = action;
} }
public Action withAction(ActionValue action) { public ProcessInstanceAction withAction(ActionValue action) {
this.action = action; this.action = action;
return this; return this;
} }
@ -59,7 +59,7 @@ public class Action {
this.variables = variables; this.variables = variables;
} }
public Action withVariables(List<Variable> variables) { public ProcessInstanceAction withVariables(List<Variable> variables) {
this.variables = variables; this.variables = variables;
return this; return this;
} }

2
src/main/java/com/inteligr8/activiti/model/SignalEventAction.java
View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class SignalEventAction extends Action { public class SignalEventAction extends ProcessInstanceAction {
@JsonProperty("signalName") @JsonProperty("signalName")
private String signal; private String signal;