Commit 8d993b68 authored by Brian Long's avatar Brian Long
Browse files

rename Action to ProcessInstanceAction

parent 962ef8f9

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
					<plugin>

						<groupId>com.inteligr8</groupId>

						<artifactId>regex-maven-plugin</artifactId>

						<version>1.0.2</version>

						<version>1.0.5</version>

						<executions>

							<execution>

								<id>fix-displayName</id>

src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java

+5 −5
Original line number Diff line number Diff line
@@ -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

src/main/java/com/inteligr8/activiti/api/ExecutionApi.java

+6 −6
Original line number Diff line number Diff line
@@ -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<Variable> 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<Variable> 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<Variable> 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<Execution> getWithoutTenant(

            String executionId,

src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java

+5 −5
Original line number Diff line number Diff line
@@ -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<ProcessInstance> getWithoutTenant(

            String processInstanceId,

src/main/java/com/inteligr8/activiti/model/MessageEventAction.java

+1 −1
Original line number Diff line number Diff line
@@ -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;