Merge branch 'develop' into stable (e354c5be) · Commits · Inteligr8 / aps-public-rest-api

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/ActivitiPublicRestApi.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import com.inteligr8.activiti.api.DeadletterJobsApi;
		import com.inteligr8.activiti.api.ExecutionApi;
		import com.inteligr8.activiti.api.JobsApi;
		import com.inteligr8.activiti.api.ManagementApi;
		import com.inteligr8.activiti.api.ProcessDefinitionApi;
		import com.inteligr8.activiti.api.ProcessInstanceApi;
		import com.inteligr8.activiti.api.RuntimeApi;
		import com.inteligr8.activiti.api.TimerJobsApi;
		@@ -52,6 +53,10 @@ public interface ActivitiPublicRestApi {
		return this.getApi(TimerJobsApi.class);
		}

		default ProcessDefinitionApi getProcessDefinitionApi() {
		return this.getApi(ProcessDefinitionApi.class);
		}

		default ProcessInstanceApi getProcessInstanceApi() {
		return this.getApi(ProcessInstanceApi.class);
		}

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/ProcessDefinitionApi.java

0 → 100644

+136 −0

Original line number	Diff line number	Diff line
		/*
		* This program is free software: you can redistribute it and/or modify it
		* under the terms of the GNU Lesser General Public License as published by
		* the Free Software Foundation, either version 3 of the License, or (at your
		* option) any later version.
		*
		* This program is distributed in the hope that it will be useful, but WITHOUT
		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
		* more details.
		*
		* You should have received a copy of the GNU General Public License along
		* with this program. If not, see <https://www.gnu.org/licenses/>.
		*/
		package com.inteligr8.activiti.api;

		import com.inteligr8.activiti.api.ProcessInstanceApi.Sort;
		import com.inteligr8.activiti.model.ProcessDefinitionAction;
		import com.inteligr8.activiti.model.ResultList;
		import com.inteligr8.activiti.model.SortOrder;
		import com.inteligr8.activiti.model.ProcessDefinitionAction.ActionValue;
		import com.inteligr8.alfresco.activiti.model.ProcessDefinition;
		import com.inteligr8.alfresco.activiti.model.ProcessInstance;

		import jakarta.ws.rs.Consumes;
		import jakarta.ws.rs.GET;
		import jakarta.ws.rs.PUT;
		import jakarta.ws.rs.Path;
		import jakarta.ws.rs.PathParam;
		import jakarta.ws.rs.Produces;
		import jakarta.ws.rs.QueryParam;
		import jakarta.ws.rs.core.MediaType;

		@Path("/api/repository/process-definitions")
		public interface ProcessDefinitionApi {

		@GET
		@Path("{processDefinitionId}")
		@Produces({ MediaType.APPLICATION_JSON })
		ProcessDefinition get(
		@PathParam("processDefinitionId") String processDefinitionId);

		default void activate(
		String processDefinitionId) {
		this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Activate));
		}

		default void suspend(
		String processDefinitionId) {
		this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Suspend));
		}

		@PUT
		@Path("{processDefinitionId}")
		@Consumes({ MediaType.APPLICATION_JSON })
		void act(
		@PathParam("processDefinitionId") String processDefinitionId,
		ProcessDefinitionAction action);

		default ResultList<ProcessInstance> getByTenant(
		String category,
		String categoryLike,
		String categoryNotEquals,
		String key,
		String keyLike,
		String name,
		String nameLike,
		String resourceName,
		String resourceNameLike,
		String version,
		Boolean suspended,
		boolean latest,
		String deploymentId,
		String startableByUser,
		String tenantId,
		Sort sort,
		SortOrder sortOrder,
		Integer pageStart,
		Integer pageSize) {
		return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike,
		name, nameLike, resourceName, resourceNameLike, version,
		suspended, latest, deploymentId, startableByUser,
		tenantId, null, sort, sortOrder, pageStart, pageSize);
		}

		default ResultList<ProcessInstance> getByTenants(
		String category,
		String categoryLike,
		String categoryNotEquals,
		String key,
		String keyLike,
		String name,
		String nameLike,
		String resourceName,
		String resourceNameLike,
		String version,
		Boolean suspended,
		boolean latest,
		String deploymentId,
		String startableByUser,
		String tenantIdLike,
		Sort sort,
		SortOrder sortOrder,
		Integer pageStart,
		Integer pageSize) {
		return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike,
		name, nameLike, resourceName, resourceNameLike, version,
		suspended, latest, deploymentId, startableByUser,
		null, tenantIdLike, sort, sortOrder, pageStart, pageSize);
		}

		@GET
		@Produces({ MediaType.APPLICATION_JSON })
		public ResultList<ProcessInstance> getByAny(
		@QueryParam("category") String category,
		@QueryParam("categoryLike") String categoryLike,
		@QueryParam("categoryNotEquals") String categoryNotEquals,
		@QueryParam("key") String key,
		@QueryParam("keyLike") String keyLike,
		@QueryParam("name") String name,
		@QueryParam("nameLike") String nameLike,
		@QueryParam("resourceName") String resourceName,
		@QueryParam("resourceNameLike") String resourceNameLike,
		@QueryParam("version") String version,
		@QueryParam("suspended") Boolean suspended,
		@QueryParam("latest") Boolean latest,
		@QueryParam("deploymentId") String deploymentId,
		@QueryParam("startableByUser") String startableByUser,
		@QueryParam("tenantId") String tenantId,
		@QueryParam("tenantIdLike") String tenantIdLike,
		@QueryParam("sort") Sort sort,
		@QueryParam("order") SortOrder sortOrder,
		@QueryParam("start") Integer pageStart,
		@QueryParam("size") Integer pageSize);

		}