updated cxf/jersey/jackson; jakarta vs jaxb fix

pom.xml

@@ -43,9 +43,9 @@
 		<maven.compiler.release>11</maven.compiler.release>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 		
-		<jersey.version>3.1.8</jersey.version>
-		<cxf.version>4.0.2</cxf.version>
-		<jackson.version>2.17.2</jackson.version>
+		<jersey.version>3.1.10</jersey.version>
+		<cxf.version>4.1.0</cxf.version>
+		<jackson.version>2.18.1</jackson.version>
 	</properties>
 
 	<dependencies>
@@ -61,7 +61,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>

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

@@ -17,6 +17,11 @@ package com.inteligr8.activiti.api;
 import java.io.File;
 import java.time.LocalDate;
 
+import com.inteligr8.activiti.model.Job;
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
+
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -27,12 +32,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 
-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;
-import com.inteligr8.activiti.model.SortOrder;
-
 public interface BaseJobsApi {
     
     @GET
@@ -53,17 +52,6 @@ public interface BaseJobsApi {
         @PathParam("jobId") String jobId,
         ProcessInstanceAction execute);
 
-    default void executeJob(
-        String jobId,
-        ActionValue action) {
-        this.executeJob(jobId, new ProcessInstanceAction(action));
-    }
-
-    default void executeJob(
-        String jobId) {
-        this.executeJob(jobId, new ProcessInstanceAction(ActionValue.Execute));
-    }
-
     @GET
     @Path("{jobId}/execution-stacktrace")
     @Produces({ MediaType.APPLICATION_OCTET_STREAM })

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

@@ -16,6 +16,13 @@ package com.inteligr8.activiti.api;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.Execution;
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
+import com.inteligr8.activiti.model.Variable;
+
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
@@ -26,15 +33,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-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;
-import com.inteligr8.activiti.model.SortOrder;
-import com.inteligr8.activiti.model.Variable;
-
 @Path("/api/runtime/executions")
 public interface ExecutionApi {
     
@@ -68,35 +66,6 @@ public interface ExecutionApi {
     List<String> getActiveActivities(
             @PathParam("executionId") String executionId);
 
-    default Execution signal(
-            String processInstanceId,
-            List<Variable> variables) {
-        ProcessInstanceAction action = new ProcessInstanceAction(ActionValue.Signal);
-        if (variables != null && !variables.isEmpty())
-            action.setVariables(variables);
-        return this.execute(processInstanceId, action);
-    }
-
-    default Execution signalReceived(
-            String processInstanceId,
-            String signal,
-            List<Variable> variables) {
-        ProcessInstanceAction action = new SignalEventAction(ActionValue.SignalReceived, signal);
-        if (variables != null && !variables.isEmpty())
-            action.setVariables(variables);
-        return this.execute(processInstanceId, action);
-    }
-
-    default Execution messageReceived(
-            String processInstanceId,
-            String message,
-            List<Variable> variables) {
-        ProcessInstanceAction action = new SignalEventAction(ActionValue.MessageReceived, message);
-        if (variables != null && !variables.isEmpty())
-            action.setVariables(variables);
-        return this.execute(processInstanceId, action);
-    }
-
     @PUT
     @Path("{executionId}")
     @Consumes({ MediaType.APPLICATION_JSON })
@@ -105,61 +74,39 @@ public interface ExecutionApi {
             @PathParam("executionId") String executionId,
             ProcessInstanceAction action);
 
-    default ResultList<Execution> getWithoutTenant(
-            String executionId,
-            String activityId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String processInstanceId,
-            String messageEventSubscriptionName,
-            String signalEventSubscriptionName,
-            String parentId,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
-                messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, null, true,
-                sort, sortOrder, pageStart, pageSize);
-    }
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultList<Execution> getByTenant(
+            @QueryParam("id") String executionId,
+            @QueryParam("activityId") String activityId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("processInstanceId") String processInstanceId,
+            @QueryParam("messageEventSubscriptionName") String messageEventSubscriptionName,
+            @QueryParam("signalEventSubscriptionName") String signalEventSubscriptionName,
+            @QueryParam("parentId") String parentId,
+            @QueryParam("tenantId") String tenantId,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
 
-    default ResultList<Execution> getByTenant(
-            String executionId,
-            String activityId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String processInstanceId,
-            String messageEventSubscriptionName,
-            String signalEventSubscriptionName,
-            String parentId,
-            String tenantId,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
-                messageEventSubscriptionName, signalEventSubscriptionName, parentId, tenantId, null, false,
-                sort, sortOrder, pageStart, pageSize);
-    }
-
-    default ResultList<Execution> getByTenants(
-            String executionId,
-            String activityId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String processInstanceId,
-            String messageEventSubscriptionName,
-            String signalEventSubscriptionName,
-            String parentId,
-            String tenantIdLike,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId,
-                messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, tenantIdLike, false,
-                sort, sortOrder, pageStart, pageSize);
-    }
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultList<Execution> getByTenants(
+            @QueryParam("id") String executionId,
+            @QueryParam("activityId") String activityId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("processInstanceId") String processInstanceId,
+            @QueryParam("messageEventSubscriptionName") String messageEventSubscriptionName,
+            @QueryParam("signalEventSubscriptionName") String signalEventSubscriptionName,
+            @QueryParam("parentId") String parentId,
+            @QueryParam("tenantIdLike") String tenantIdLike,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
@@ -208,12 +155,6 @@ public interface ExecutionApi {
             @PathParam("executionId") String executionId,
             List<Variable> variables);
     
-    default void updateVariable(
-            String executionId,
-            Variable variable) {
-        this.updateVariable(executionId, variable.getName(), variable);
-    }
-    
     @PUT
     @Path("{executionId}/variables/{variableName}")
     @Consumes({ MediaType.APPLICATION_JSON })

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

@@ -19,7 +19,6 @@ import com.inteligr8.activiti.model.ProcessDefinition;
 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 jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -39,16 +38,6 @@ public interface ProcessDefinitionApi {
     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 })
@@ -56,58 +45,6 @@ public interface ProcessDefinitionApi {
             @PathParam("processDefinitionId") String processDefinitionId,
             ProcessDefinitionAction action);
 
-    default ResultList<ProcessDefinition> 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<ProcessDefinition> 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<ProcessDefinition> getByAny(

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

@@ -17,6 +17,13 @@ package com.inteligr8.activiti.api;
 import java.io.File;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inteligr8.activiti.model.ProcessInstanceAction;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
+import com.inteligr8.activiti.model.Variable;
+import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -28,14 +35,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-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;
-import com.inteligr8.alfresco.activiti.model.ProcessInstance;
-
 @Path("/api/runtime/process-instances")
 public interface ProcessInstanceApi {
     
@@ -61,16 +60,6 @@ public interface ProcessInstanceApi {
     void delete(
             @PathParam("processInstanceId") String processInstanceId);
 
-    default void activate(
-            String processInstanceId) {
-        this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Activate)); 
-    }
-
-    default void suspend(
-            String processInstanceId) {
-        this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Suspend)); 
-    }
-
     @PUT
     @Path("{processInstanceId}")
     @Consumes({ MediaType.APPLICATION_JSON })
@@ -78,70 +67,43 @@ public interface ProcessInstanceApi {
             @PathParam("processInstanceId") String processInstanceId,
             ProcessInstanceAction action);
 
-    default ResultList<ProcessInstance> getWithoutTenant(
-            String processInstanceId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String businessKey,
-            String involvedUser,
-            Boolean suspended,
-            String superProcessInstanceId,
-            String subProcessInstanceId,
-            Boolean excludeSubprocesses,
-            Boolean includeProcessVariables,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
-                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
-                excludeSubprocesses, includeProcessVariables, null, null, true,
-                sort, sortOrder, pageStart, pageSize);
-    }
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<ProcessInstance> getByTenant(
+            @QueryParam("id") String processInstanceId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("businessKey") String businessKey,
+            @QueryParam("involvedUser") String involvedUser,
+            @QueryParam("suspended") Boolean suspended,
+            @QueryParam("superProcessInstanceId") String superProcessInstanceId,
+            @QueryParam("subProcessInstanceId") String subProcessInstanceId,
+            @QueryParam("excludeSubprocesses") Boolean excludeSubprocesses,
+            @QueryParam("includeProcessVariables") Boolean includeProcessVariables,
+            @QueryParam("tenantId") String tenantId,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
 
-    default ResultList<ProcessInstance> getByTenant(
-            String processInstanceId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String businessKey,
-            String involvedUser,
-            Boolean suspended,
-            String superProcessInstanceId,
-            String subProcessInstanceId,
-            Boolean excludeSubprocesses,
-            Boolean includeProcessVariables,
-            String tenantId,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
-                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
-                excludeSubprocesses, includeProcessVariables, tenantId, null, false,
-                sort, sortOrder, pageStart, pageSize);
-    }
-
-    default ResultList<ProcessInstance> getByTenants(
-            String processInstanceId,
-            String processDefinitionKey,
-            String processDefinitionId,
-            String businessKey,
-            String involvedUser,
-            Boolean suspended,
-            String superProcessInstanceId,
-            String subProcessInstanceId,
-            Boolean excludeSubprocesses,
-            Boolean includeProcessVariables,
-            String tenantIdLike,
-            Sort sort,
-            SortOrder sortOrder,
-            Integer pageStart,
-            Integer pageSize) {
-        return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId,
-                businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId,
-                excludeSubprocesses, includeProcessVariables, null, tenantIdLike, false,
-                sort, sortOrder, pageStart, pageSize);
-    }
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<ProcessInstance> getByTenants(
+            @QueryParam("id") String processInstanceId,
+            @QueryParam("processDefinitionKey") String processDefinitionKey,
+            @QueryParam("processDefinitionId") String processDefinitionId,
+            @QueryParam("businessKey") String businessKey,
+            @QueryParam("involvedUser") String involvedUser,
+            @QueryParam("suspended") Boolean suspended,
+            @QueryParam("superProcessInstanceId") String superProcessInstanceId,
+            @QueryParam("subProcessInstanceId") String subProcessInstanceId,
+            @QueryParam("excludeSubprocesses") Boolean excludeSubprocesses,
+            @QueryParam("includeProcessVariables") Boolean includeProcessVariables,
+            @QueryParam("tenantIdLike") String tenantIdLike,
+            @QueryParam("sort") Sort sort,
+            @QueryParam("order") SortOrder sortOrder,
+            @QueryParam("start") Integer pageStart,
+            @QueryParam("size") Integer pageSize);
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
@@ -197,12 +159,6 @@ public interface ProcessInstanceApi {
             @PathParam("processInstanceId") String processInstanceId,
             List<Variable> variables);
     
-    default void updateVariable(
-            String processInstanceId,
-            Variable variable) {
-        this.updateVariable(processInstanceId, variable.getName(), variable);
-    }
-    
     @PUT
     @Path("{processInstanceId}/variables/{variableName}")
     @Consumes({ MediaType.APPLICATION_JSON })

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestCxfApi.java

@@ -0,0 +1,12 @@
+package com.inteligr8.alfresco.activiti;
+
+/**
+ * This interface appends CXF implementation specific methods to the JAX-RS API
+ * of the APS Protected ReST API.  This is due to a lack of multi-part in the
+ * JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsProtectedRestCxfApi extends ApsProtectedRestApi, ApsPublicRestCxfApi {
+
+}

src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestJerseyApi.java

@@ -0,0 +1,12 @@
+package com.inteligr8.alfresco.activiti;
+
+/**
+ * This interface appends Jersey implementation specific methods to the JAX-RS
+ * API of the APS Protected ReST API.  This is due to a lack of multi-part in
+ * the JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsProtectedRestJerseyApi extends ApsProtectedRestApi, ApsPublicRestJerseyApi {
+
+}

src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java

@@ -51,7 +51,7 @@ public interface AppDeploymentsApi {
     @Produces({ MediaType.APPLICATION_JSON })
     ResultListDataRepresentation<AppDeployment> query(
             @QueryParam("nameLike") String nameLike,
-            @QueryParam("tenantId") Integer tenantId,
+            @QueryParam("tenantId") Long tenantId,
             @QueryParam("latest") Boolean latest,
             @QueryParam("start") Integer start,
             @QueryParam("sort") String sort,

src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java

@@ -29,7 +29,9 @@ public interface ModelsApi {
 	enum ModelType {
 		Process(0),
 		Form(2),
-		App(3);
+		App(3),
+		DecisionTable(4),
+		DataModel(5);
 		
 		private int id;
 		private ModelType(int id) {

src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java

@@ -29,7 +29,7 @@ public interface ProcessDefinitionsApi {
     @Produces({ "application/json" })
     ResultListDataRepresentation<ProcessDefinition> get(
             @QueryParam("latest") Boolean latest,
-            @QueryParam("appDefinitionId") Integer appDefinitionId,
+            @QueryParam("appDefinitionId") Long appDefinitionId,
             @QueryParam("deploymentId") String deploymentId);
 
 }

src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java

@@ -138,11 +138,6 @@ public interface TemplatesApi {
             @QueryParam("sort") TemplateSort sort,
             @QueryParam("tenantId") Long tenantId);
 
-    default Response getDocumentTemplate(
-            DocumentTemplateLight template) {
-        return this.getDocumentTemplate(template.getId(), System.currentTimeMillis());
-    }
-
     @GET
     @Path("document-templates/{templateId}")
     @Produces({ MediaType.APPLICATION_JSON })
@@ -158,7 +153,7 @@ public interface TemplatesApi {
     })
     public Response getDocumentTemplate(
             @PathParam("templateId") long id,
-            @QueryParam("version") long version);
+            @QueryParam("version") Long version);
 
     @DELETE
     @Path("document-templates/{templateId}")

src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java

@@ -40,13 +40,13 @@ public class AppDefinition {
     @JsonProperty("icon")
     private String icon;
     @JsonProperty("id")
-    private Integer id;
+    private Long id;
     @JsonProperty("modelId")
-    private Integer modelId;
+    private Long modelId;
     @JsonProperty("name")
     private String name;
     @JsonProperty("tenantId")
-    private Integer tenantId;
+    private Long tenantId;
     @JsonProperty("theme")
     private String theme;
     @JsonIgnore
@@ -113,31 +113,31 @@ public class AppDefinition {
     }
 
     @JsonProperty("id")
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
     @JsonProperty("id")
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public AppDefinition withId(Integer id) {
+    public AppDefinition withId(Long id) {
         this.id = id;
         return this;
     }
 
     @JsonProperty("modelId")
-    public Integer getModelId() {
+    public Long getModelId() {
         return modelId;
     }
 
     @JsonProperty("modelId")
-    public void setModelId(Integer modelId) {
+    public void setModelId(Long modelId) {
         this.modelId = modelId;
     }
 
-    public AppDefinition withModelId(Integer modelId) {
+    public AppDefinition withModelId(Long modelId) {
         this.modelId = modelId;
         return this;
     }
@@ -158,16 +158,16 @@ public class AppDefinition {
     }
 
     @JsonProperty("tenantId")
-    public Integer getTenantId() {
+    public Long getTenantId() {
         return tenantId;
     }
 
     @JsonProperty("tenantId")
-    public void setTenantId(Integer tenantId) {
+    public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
 
-    public AppDefinition withTenantId(Integer tenantId) {
+    public AppDefinition withTenantId(Long tenantId) {
         this.tenantId = tenantId;
         return this;
     }

src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java

@@ -1,205 +1,12 @@
 
 package com.inteligr8.alfresco.activiti.model;
 
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
 /**
  * AppDefinitionRepresentation
  * <p>
  * 
  * 
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultAppId",
-    "deploymentId",
-    "description",
-    "icon",
-    "id",
-    "modelId",
-    "name",
-    "tenantId",
-    "theme"
-})
-public class AppDefinitionRepresentation {
-
-    @JsonProperty("defaultAppId")
-    private String defaultAppId;
-    @JsonProperty("deploymentId")
-    private String deploymentId;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("icon")
-    private String icon;
-    @JsonProperty("id")
-    private Integer id;
-    @JsonProperty("modelId")
-    private Integer modelId;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("tenantId")
-    private Integer tenantId;
-    @JsonProperty("theme")
-    private String theme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("defaultAppId")
-    public String getDefaultAppId() {
-        return defaultAppId;
-    }
-
-    @JsonProperty("defaultAppId")
-    public void setDefaultAppId(String defaultAppId) {
-        this.defaultAppId = defaultAppId;
-    }
-
-    public AppDefinitionRepresentation withDefaultAppId(String defaultAppId) {
-        this.defaultAppId = defaultAppId;
-        return this;
-    }
-
-    @JsonProperty("deploymentId")
-    public String getDeploymentId() {
-        return deploymentId;
-    }
-
-    @JsonProperty("deploymentId")
-    public void setDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-    }
-
-    public AppDefinitionRepresentation withDeploymentId(String deploymentId) {
-        this.deploymentId = deploymentId;
-        return this;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public AppDefinitionRepresentation withDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    @JsonProperty("icon")
-    public String getIcon() {
-        return icon;
-    }
-
-    @JsonProperty("icon")
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public AppDefinitionRepresentation withIcon(String icon) {
-        this.icon = icon;
-        return this;
-    }
-
-    @JsonProperty("id")
-    public Integer getId() {
-        return id;
-    }
-
-    @JsonProperty("id")
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public AppDefinitionRepresentation withId(Integer id) {
-        this.id = id;
-        return this;
-    }
-
-    @JsonProperty("modelId")
-    public Integer getModelId() {
-        return modelId;
-    }
-
-    @JsonProperty("modelId")
-    public void setModelId(Integer modelId) {
-        this.modelId = modelId;
-    }
-
-    public AppDefinitionRepresentation withModelId(Integer modelId) {
-        this.modelId = modelId;
-        return this;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public AppDefinitionRepresentation withName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    @JsonProperty("tenantId")
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    @JsonProperty("tenantId")
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public AppDefinitionRepresentation withTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-        return this;
-    }
-
-    @JsonProperty("theme")
-    public String getTheme() {
-        return theme;
-    }
-
-    @JsonProperty("theme")
-    public void setTheme(String theme) {
-        this.theme = theme;
-    }
-
-    public AppDefinitionRepresentation withTheme(String theme) {
-        this.theme = theme;
-        return this;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public AppDefinitionRepresentation withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
+public class AppDefinitionRepresentation extends AppDefinition {
 
 }

src/main/java/com/inteligr8/alfresco/activiti/model/Task.java

@@ -91,7 +91,7 @@ public class Task extends Datum {
     @JsonProperty("parentTaskName")
     private String parentTaskName;
     @JsonProperty("priority")
-    private Long priority;
+    private Integer priority;
     @JsonProperty("processDefinitionCategory")
     private String processDefinitionCategory;
     @JsonProperty("processDefinitionDeploymentId")
@@ -105,7 +105,7 @@ public class Task extends Datum {
     @JsonProperty("processDefinitionName")
     private String processDefinitionName;
     @JsonProperty("processDefinitionVersion")
-    private Long processDefinitionVersion;
+    private Integer processDefinitionVersion;
     @JsonProperty("processInstanceId")
     private String processInstanceId;
     @JsonProperty("processInstanceName")
@@ -370,15 +370,15 @@ public class Task extends Datum {
         return this;
     }
 
-    public Long getPriority() {
+    public Integer getPriority() {
         return priority;
     }
 
-    public void setPriority(Long priority) {
+    public void setPriority(Integer priority) {
         this.priority = priority;
     }
 
-    public Task withPriority(Long priority) {
+    public Task withPriority(Integer priority) {
         this.priority = priority;
         return this;
     }
@@ -461,15 +461,15 @@ public class Task extends Datum {
         return this;
     }
 
-    public Long getProcessDefinitionVersion() {
+    public Integer getProcessDefinitionVersion() {
         return processDefinitionVersion;
     }
 
-    public void setProcessDefinitionVersion(Long processDefinitionVersion) {
+    public void setProcessDefinitionVersion(Integer processDefinitionVersion) {
         this.processDefinitionVersion = processDefinitionVersion;
     }
 
-    public Task withProcessDefinitionVersion(Long processDefinitionVersion) {
+    public Task withProcessDefinitionVersion(Integer processDefinitionVersion) {
         this.processDefinitionVersion = processDefinitionVersion;
         return this;
     }