From 9f4c18d37905ada4ec4f9921d5bdfb05162a7f65 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 10 Dec 2021 10:07:29 -0500 Subject: [PATCH 1/5] added more API defs --- pom.xml | 14 +- .../alfresco/activiti/ApsPublicRestApi.java | 18 + .../activiti/ApsPublicRestApiCxfImpl.java | 10 + .../activiti/ApsPublicRestApiJerseyImpl.java | 10 + .../alfresco/activiti/api/AdminApi.java | 12 +- .../activiti/api/AppDefinitionsApi.java | 57 +++ .../activiti/api/AppDefinitionsCxfApi.java | 51 +++ .../activiti/api/AppDefinitionsJerseyApi.java | 56 +++ .../alfresco/activiti/api/ModelsApi.java | 41 ++ .../activiti/model/AppDefinition.java | 205 ++++++++++ .../AppDefinitionPublishRepresentation.java | 79 ++++ .../model/AppDefinitionRepresentation.java | 205 ++++++++++ .../AppDefinitionSaveRepresentation.java | 115 ++++++ ...pDefinitionUpdateResultRepresentation.java | 187 ++++++++++ .../alfresco/activiti/model/CustomData.java | 36 ++ .../alfresco/activiti/model/Datum.java | 36 ++ .../activiti/model/ModelRepresentation.java | 349 ++++++++++++++++++ .../model/ResultListDataRepresentation.java | 117 ++++++ 18 files changed, 1592 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionPublishRepresentation.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionSaveRepresentation.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionUpdateResultRepresentation.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/CustomData.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/Datum.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java create mode 100644 src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java diff --git a/pom.xml b/pom.xml index 9410936..f122c49 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,12 @@ ${jersey.version} test + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey.version} + provided + org.glassfish.jersey.inject jersey-hk2 @@ -156,10 +162,10 @@ ${project.build.directory}/ramlgen/java com/inteligr8/alfresco/activiti/raml/**/*__*.java - - - - + + + + diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java index ce4ce6b..b7587da 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java @@ -1,7 +1,9 @@ package com.inteligr8.alfresco.activiti; import com.inteligr8.alfresco.activiti.api.AdminApi; +import com.inteligr8.alfresco.activiti.api.AppDefinitionsApi; import com.inteligr8.alfresco.activiti.api.AppVersionApi; +import com.inteligr8.alfresco.activiti.api.ModelsApi; import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi; import com.inteligr8.alfresco.activiti.api.ProfileApi; import com.inteligr8.alfresco.activiti.api.TasksApi; @@ -37,6 +39,14 @@ public abstract class ApsPublicRestApi { return this.getApi(authFilter, AdminApi.class); } + public AppDefinitionsApi getAppDefinitionsApi() { + return this.getApi(AppDefinitionsApi.class); + } + + public AppDefinitionsApi getAppDefinitionsApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, AppDefinitionsApi.class); + } + public AppVersionApi getAppVersionApi() { return this.getApi(AppVersionApi.class); } @@ -45,6 +55,14 @@ public abstract class ApsPublicRestApi { return this.getApi(authFilter, AppVersionApi.class); } + public ModelsApi getModelsApi() { + return this.getApi(ModelsApi.class); + } + + public ModelsApi getModelsApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, ModelsApi.class); + } + public ProcessInstancesApi getProcessInstancesApi() { return this.getApi(ProcessInstancesApi.class); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java index 3638e25..d7269d6 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java @@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi; +import com.inteligr8.rs.AuthorizationFilter; import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; @@ -42,5 +44,13 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi { Client getClient() { return this.client; } + + public AppDefinitionsCxfApi getAppDefinitionsCxfApi() { + return this.getApi(AppDefinitionsCxfApi.class); + } + + public AppDefinitionsCxfApi getAppDefinitionsCxfApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, AppDefinitionsCxfApi.class); + } } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java index 15ca401..730f530 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java @@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi; +import com.inteligr8.rs.AuthorizationFilter; import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; @@ -42,5 +44,13 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi { Client getClient() { return this.client; } + + public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() { + return this.getApi(AppDefinitionsJerseyApi.class); + } + + public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, AppDefinitionsJerseyApi.class); + } } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java index d466dbf..cba2ee5 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java @@ -3,11 +3,12 @@ package com.inteligr8.alfresco.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import com.inteligr8.alfresco.activiti.model.Group; import com.inteligr8.alfresco.activiti.model.Tenant; @Path("/api/enterprise/admin") @@ -15,8 +16,15 @@ public interface AdminApi { @GET @Path("/tenants") - @Consumes({ "application/json" }) @Produces({ "application/json" }) public List getTenants(); + + @GET + @Path("/groups") + @Produces({ "application/json" }) + public List getGroups( + @QueryParam("tenantId") int tenantId, + @QueryParam("functional") boolean functional, + @QueryParam("summary") boolean summary); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java new file mode 100644 index 0000000..9202322 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java @@ -0,0 +1,57 @@ + +package com.inteligr8.alfresco.activiti.api; + +import java.io.File; + +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import com.inteligr8.alfresco.activiti.model.AppDefinitionPublishRepresentation; +import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; +import com.inteligr8.alfresco.activiti.model.AppDefinitionSaveRepresentation; +import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; + +@Path("/api/enterprise/app-definitions") +public interface AppDefinitionsApi { + + @GET + @Path("{modelId}") + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionRepresentation get( + @PathParam("modelId") String modelId); + + @PUT + @Path("{modelId}") + @Consumes({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation update( + @PathParam("modelId") String modelId, + AppDefinitionSaveRepresentation updatedModel); + + @DELETE + @Path("{appDefinitionId}") + void delete( + @PathParam("appDefinitionId") String appDefinitionId); + + @GET + @Path("{modelId}/export") + @Produces({ MediaType.APPLICATION_OCTET_STREAM }) + File export( + @PathParam("modelId") String modelId); + + @POST + @Path("{modelId}/publish") + @Consumes({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation publish( + @PathParam("modelId") String modelId, + AppDefinitionPublishRepresentation publishModel); + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java new file mode 100644 index 0000000..882895c --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java @@ -0,0 +1,51 @@ + +package com.inteligr8.alfresco.activiti.api; + +import java.util.List; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.apache.cxf.jaxrs.ext.multipart.Attachment; + +import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; +import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; + +@Path("/api/enterprise/app-definitions") +public interface AppDefinitionsCxfApi { + + @POST + @Path("import") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionRepresentation import_( + List attachments); + + @POST + @Path("{modelId}/import") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionRepresentation import_( + @PathParam("modelId") String modelId, + List attachments); + + @POST + @Path("publish-app") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation publishApp( + List attachments); + + @POST + @Path("{modelId}/publish-app") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation publishApp( + @PathParam("modelId") String modelId, + List attachments); + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java new file mode 100644 index 0000000..4cf927c --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java @@ -0,0 +1,56 @@ + +package com.inteligr8.alfresco.activiti.api; + +import java.io.InputStream; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.glassfish.jersey.media.multipart.FormDataParam; + +import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; +import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; + +@Path("/api/enterprise/app-definitions") +public interface AppDefinitionsJerseyApi { + + @POST + @Path("import") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionRepresentation import_( + @FormDataParam("file") InputStream filedataStream, + @FormDataParam("file") FormDataContentDisposition filedataDisposition); + + @POST + @Path("{modelId}/import") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionRepresentation import_( + @PathParam("modelId") String modelId, + @FormDataParam("file") InputStream filedataStream, + @FormDataParam("file") FormDataContentDisposition filedataDisposition); + + @POST + @Path("publish-app") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation publishApp( + @FormDataParam("file") InputStream filedataStream, + @FormDataParam("file") FormDataContentDisposition filedataDisposition); + + @POST + @Path("{modelId}/publish-app") + @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Produces({ MediaType.APPLICATION_JSON }) + AppDefinitionUpdateResultRepresentation publishApp( + @PathParam("modelId") String modelId, + @FormDataParam("file") InputStream filedataStream, + @FormDataParam("file") FormDataContentDisposition filedataDisposition); + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java new file mode 100644 index 0000000..65ca19b --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java @@ -0,0 +1,41 @@ + +package com.inteligr8.alfresco.activiti.api; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation; + +@Path("/api/enterprise/models") +public interface ModelsApi { + + enum ModelType { + Process(0), + Form(2), + App(3); + + private int id; + private ModelType(int id) { + this.id = id; + } + + public int getId() { + return this.id; + } + } + + @GET + @Produces({ "application/json" }) + public ResultListDataRepresentation get( + @QueryParam("filter") String filter, + @QueryParam("sort") String sort, + @QueryParam("modelType") int modelType, + @QueryParam("referenceId") int referenceId); + + default ResultListDataRepresentation get(ModelType modelType, String filter, String sort) { + return this.get(filter, sort, modelType.getId(), 0); + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java new file mode 100644 index 0000000..5dcaf73 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java @@ -0,0 +1,205 @@ + +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 + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "defaultAppId", + "deploymentId", + "description", + "icon", + "id", + "modelId", + "name", + "tenantId", + "theme" +}) +public class AppDefinition { + + @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 additionalProperties = new HashMap(); + + @JsonProperty("defaultAppId") + public String getDefaultAppId() { + return defaultAppId; + } + + @JsonProperty("defaultAppId") + public void setDefaultAppId(String defaultAppId) { + this.defaultAppId = defaultAppId; + } + + public AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition 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 AppDefinition withTheme(String theme) { + this.theme = theme; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public AppDefinition withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionPublishRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionPublishRepresentation.java new file mode 100644 index 0000000..af66413 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionPublishRepresentation.java @@ -0,0 +1,79 @@ + +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; + + +/** + * AppDefinitionPublishRepresentation + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "comment", + "force" +}) +public class AppDefinitionPublishRepresentation { + + @JsonProperty("comment") + private String comment; + @JsonProperty("force") + private Boolean force; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("comment") + public String getComment() { + return comment; + } + + @JsonProperty("comment") + public void setComment(String comment) { + this.comment = comment; + } + + public AppDefinitionPublishRepresentation withComment(String comment) { + this.comment = comment; + return this; + } + + @JsonProperty("force") + public Boolean getForce() { + return force; + } + + @JsonProperty("force") + public void setForce(Boolean force) { + this.force = force; + } + + public AppDefinitionPublishRepresentation withForce(Boolean force) { + this.force = force; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public AppDefinitionPublishRepresentation withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java new file mode 100644 index 0000000..a7175ec --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java @@ -0,0 +1,205 @@ + +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 + *

+ * + * + */ +@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 additionalProperties = new HashMap(); + + @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 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; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionSaveRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionSaveRepresentation.java new file mode 100644 index 0000000..1cebbf5 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionSaveRepresentation.java @@ -0,0 +1,115 @@ + +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; + + +/** + * AppDefinitionSaveRepresentation + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "appDefinition", + "force", + "publish" +}) +public class AppDefinitionSaveRepresentation { + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + private AppDefinition appDefinition; + @JsonProperty("force") + private Boolean force; + @JsonProperty("publish") + private Boolean publish; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + public AppDefinition getAppDefinition() { + return appDefinition; + } + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + public void setAppDefinition(AppDefinition appDefinition) { + this.appDefinition = appDefinition; + } + + public AppDefinitionSaveRepresentation withAppDefinition(AppDefinition appDefinition) { + this.appDefinition = appDefinition; + return this; + } + + @JsonProperty("force") + public Boolean getForce() { + return force; + } + + @JsonProperty("force") + public void setForce(Boolean force) { + this.force = force; + } + + public AppDefinitionSaveRepresentation withForce(Boolean force) { + this.force = force; + return this; + } + + @JsonProperty("publish") + public Boolean getPublish() { + return publish; + } + + @JsonProperty("publish") + public void setPublish(Boolean publish) { + this.publish = publish; + } + + public AppDefinitionSaveRepresentation withPublish(Boolean publish) { + this.publish = publish; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public AppDefinitionSaveRepresentation withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionUpdateResultRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionUpdateResultRepresentation.java new file mode 100644 index 0000000..d6fd392 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionUpdateResultRepresentation.java @@ -0,0 +1,187 @@ + +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; + + +/** + * AppDefinitionUpdateResultRepresentation + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "appDefinition", + "customData", + "error", + "errorDescription", + "errorType", + "message", + "messageKey" +}) +public class AppDefinitionUpdateResultRepresentation { + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + private AppDefinition appDefinition; + @JsonProperty("customData") + private CustomData customData; + @JsonProperty("error") + private Boolean error; + @JsonProperty("errorDescription") + private String errorDescription; + @JsonProperty("errorType") + private Integer errorType; + @JsonProperty("message") + private String message; + @JsonProperty("messageKey") + private String messageKey; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + public AppDefinition getAppDefinition() { + return appDefinition; + } + + /** + * AppDefinitionRepresentation + *

+ * + * + */ + @JsonProperty("appDefinition") + public void setAppDefinition(AppDefinition appDefinition) { + this.appDefinition = appDefinition; + } + + public AppDefinitionUpdateResultRepresentation withAppDefinition(AppDefinition appDefinition) { + this.appDefinition = appDefinition; + return this; + } + + @JsonProperty("customData") + public CustomData getCustomData() { + return customData; + } + + @JsonProperty("customData") + public void setCustomData(CustomData customData) { + this.customData = customData; + } + + public AppDefinitionUpdateResultRepresentation withCustomData(CustomData customData) { + this.customData = customData; + return this; + } + + @JsonProperty("error") + public Boolean getError() { + return error; + } + + @JsonProperty("error") + public void setError(Boolean error) { + this.error = error; + } + + public AppDefinitionUpdateResultRepresentation withError(Boolean error) { + this.error = error; + return this; + } + + @JsonProperty("errorDescription") + public String getErrorDescription() { + return errorDescription; + } + + @JsonProperty("errorDescription") + public void setErrorDescription(String errorDescription) { + this.errorDescription = errorDescription; + } + + public AppDefinitionUpdateResultRepresentation withErrorDescription(String errorDescription) { + this.errorDescription = errorDescription; + return this; + } + + @JsonProperty("errorType") + public Integer getErrorType() { + return errorType; + } + + @JsonProperty("errorType") + public void setErrorType(Integer errorType) { + this.errorType = errorType; + } + + public AppDefinitionUpdateResultRepresentation withErrorType(Integer errorType) { + this.errorType = errorType; + return this; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + public AppDefinitionUpdateResultRepresentation withMessage(String message) { + this.message = message; + return this; + } + + @JsonProperty("messageKey") + public String getMessageKey() { + return messageKey; + } + + @JsonProperty("messageKey") + public void setMessageKey(String messageKey) { + this.messageKey = messageKey; + } + + public AppDefinitionUpdateResultRepresentation withMessageKey(String messageKey) { + this.messageKey = messageKey; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public AppDefinitionUpdateResultRepresentation withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/CustomData.java b/src/main/java/com/inteligr8/alfresco/activiti/model/CustomData.java new file mode 100644 index 0000000..d4712c5 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/CustomData.java @@ -0,0 +1,36 @@ + +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.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +public class CustomData { + + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public CustomData withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/Datum.java b/src/main/java/com/inteligr8/alfresco/activiti/model/Datum.java new file mode 100644 index 0000000..477caf6 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Datum.java @@ -0,0 +1,36 @@ + +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.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +public class Datum { + + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public Datum withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java new file mode 100644 index 0000000..06219b1 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ModelRepresentation.java @@ -0,0 +1,349 @@ + +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; + + +/** + * ModelRepresentation + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "comment", + "createdBy", + "createdByFullName", + "description", + "favorite", + "id", + "lastUpdated", + "lastUpdatedBy", + "lastUpdatedByFullName", + "latestVersion", + "modelType", + "name", + "permission", + "referenceId", + "stencilSet", + "tenantId", + "version" +}) +public class ModelRepresentation { + + @JsonProperty("comment") + private String comment; + @JsonProperty("createdBy") + private Integer createdBy; + @JsonProperty("createdByFullName") + private String createdByFullName; + @JsonProperty("description") + private String description; + @JsonProperty("favorite") + private Boolean favorite; + @JsonProperty("id") + private Integer id; + @JsonProperty("lastUpdated") + private String lastUpdated; + @JsonProperty("lastUpdatedBy") + private Integer lastUpdatedBy; + @JsonProperty("lastUpdatedByFullName") + private String lastUpdatedByFullName; + @JsonProperty("latestVersion") + private Boolean latestVersion; + @JsonProperty("modelType") + private Integer modelType; + @JsonProperty("name") + private String name; + @JsonProperty("permission") + private String permission; + @JsonProperty("referenceId") + private Integer referenceId; + @JsonProperty("stencilSet") + private Integer stencilSet; + @JsonProperty("tenantId") + private Integer tenantId; + @JsonProperty("version") + private Integer version; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("comment") + public String getComment() { + return comment; + } + + @JsonProperty("comment") + public void setComment(String comment) { + this.comment = comment; + } + + public ModelRepresentation withComment(String comment) { + this.comment = comment; + return this; + } + + @JsonProperty("createdBy") + public Integer getCreatedBy() { + return createdBy; + } + + @JsonProperty("createdBy") + public void setCreatedBy(Integer createdBy) { + this.createdBy = createdBy; + } + + public ModelRepresentation withCreatedBy(Integer createdBy) { + this.createdBy = createdBy; + return this; + } + + @JsonProperty("createdByFullName") + public String getCreatedByFullName() { + return createdByFullName; + } + + @JsonProperty("createdByFullName") + public void setCreatedByFullName(String createdByFullName) { + this.createdByFullName = createdByFullName; + } + + public ModelRepresentation withCreatedByFullName(String createdByFullName) { + this.createdByFullName = createdByFullName; + return this; + } + + @JsonProperty("description") + public String getDescription() { + return description; + } + + @JsonProperty("description") + public void setDescription(String description) { + this.description = description; + } + + public ModelRepresentation withDescription(String description) { + this.description = description; + return this; + } + + @JsonProperty("favorite") + public Boolean getFavorite() { + return favorite; + } + + @JsonProperty("favorite") + public void setFavorite(Boolean favorite) { + this.favorite = favorite; + } + + public ModelRepresentation withFavorite(Boolean favorite) { + this.favorite = favorite; + return this; + } + + @JsonProperty("id") + public Integer getId() { + return id; + } + + @JsonProperty("id") + public void setId(Integer id) { + this.id = id; + } + + public ModelRepresentation withId(Integer id) { + this.id = id; + return this; + } + + @JsonProperty("lastUpdated") + public String getLastUpdated() { + return lastUpdated; + } + + @JsonProperty("lastUpdated") + public void setLastUpdated(String lastUpdated) { + this.lastUpdated = lastUpdated; + } + + public ModelRepresentation withLastUpdated(String lastUpdated) { + this.lastUpdated = lastUpdated; + return this; + } + + @JsonProperty("lastUpdatedBy") + public Integer getLastUpdatedBy() { + return lastUpdatedBy; + } + + @JsonProperty("lastUpdatedBy") + public void setLastUpdatedBy(Integer lastUpdatedBy) { + this.lastUpdatedBy = lastUpdatedBy; + } + + public ModelRepresentation withLastUpdatedBy(Integer lastUpdatedBy) { + this.lastUpdatedBy = lastUpdatedBy; + return this; + } + + @JsonProperty("lastUpdatedByFullName") + public String getLastUpdatedByFullName() { + return lastUpdatedByFullName; + } + + @JsonProperty("lastUpdatedByFullName") + public void setLastUpdatedByFullName(String lastUpdatedByFullName) { + this.lastUpdatedByFullName = lastUpdatedByFullName; + } + + public ModelRepresentation withLastUpdatedByFullName(String lastUpdatedByFullName) { + this.lastUpdatedByFullName = lastUpdatedByFullName; + return this; + } + + @JsonProperty("latestVersion") + public Boolean getLatestVersion() { + return latestVersion; + } + + @JsonProperty("latestVersion") + public void setLatestVersion(Boolean latestVersion) { + this.latestVersion = latestVersion; + } + + public ModelRepresentation withLatestVersion(Boolean latestVersion) { + this.latestVersion = latestVersion; + return this; + } + + @JsonProperty("modelType") + public Integer getModelType() { + return modelType; + } + + @JsonProperty("modelType") + public void setModelType(Integer modelType) { + this.modelType = modelType; + } + + public ModelRepresentation withModelType(Integer modelType) { + this.modelType = modelType; + return this; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + public ModelRepresentation withName(String name) { + this.name = name; + return this; + } + + @JsonProperty("permission") + public String getPermission() { + return permission; + } + + @JsonProperty("permission") + public void setPermission(String permission) { + this.permission = permission; + } + + public ModelRepresentation withPermission(String permission) { + this.permission = permission; + return this; + } + + @JsonProperty("referenceId") + public Integer getReferenceId() { + return referenceId; + } + + @JsonProperty("referenceId") + public void setReferenceId(Integer referenceId) { + this.referenceId = referenceId; + } + + public ModelRepresentation withReferenceId(Integer referenceId) { + this.referenceId = referenceId; + return this; + } + + @JsonProperty("stencilSet") + public Integer getStencilSet() { + return stencilSet; + } + + @JsonProperty("stencilSet") + public void setStencilSet(Integer stencilSet) { + this.stencilSet = stencilSet; + } + + public ModelRepresentation withStencilSet(Integer stencilSet) { + this.stencilSet = stencilSet; + return this; + } + + @JsonProperty("tenantId") + public Integer getTenantId() { + return tenantId; + } + + @JsonProperty("tenantId") + public void setTenantId(Integer tenantId) { + this.tenantId = tenantId; + } + + public ModelRepresentation withTenantId(Integer tenantId) { + this.tenantId = tenantId; + return this; + } + + @JsonProperty("version") + public Integer getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(Integer version) { + this.version = version; + } + + public ModelRepresentation withVersion(Integer version) { + this.version = version; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public ModelRepresentation withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java new file mode 100644 index 0000000..8c457d3 --- /dev/null +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java @@ -0,0 +1,117 @@ + +package com.inteligr8.alfresco.activiti.model; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +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; + + +/** + * ResultListDataRepresentation + *

+ * + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "data", + "size", + "start", + "total" +}) +public class ResultListDataRepresentation { + + @JsonProperty("data") + private List data = new ArrayList(); + @JsonProperty("size") + private Integer size; + @JsonProperty("start") + private Integer start; + @JsonProperty("total") + private Integer total; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("data") + public List getData() { + return data; + } + + @JsonProperty("data") + public void setData(List data) { + this.data = data; + } + + public ResultListDataRepresentation withData(List data) { + this.data = data; + return this; + } + + @JsonProperty("size") + public Integer getSize() { + return size; + } + + @JsonProperty("size") + public void setSize(Integer size) { + this.size = size; + } + + public ResultListDataRepresentation withSize(Integer size) { + this.size = size; + return this; + } + + @JsonProperty("start") + public Integer getStart() { + return start; + } + + @JsonProperty("start") + public void setStart(Integer start) { + this.start = start; + } + + public ResultListDataRepresentation withStart(Integer start) { + this.start = start; + return this; + } + + @JsonProperty("total") + public Integer getTotal() { + return total; + } + + @JsonProperty("total") + public void setTotal(Integer total) { + this.total = total; + } + + public ResultListDataRepresentation withTotal(Integer total) { + this.total = total; + return this; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public ResultListDataRepresentation withAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + return this; + } + +} From ca083dbc4297f1e2300b982219b640dc330cd5a1 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 10 Dec 2021 10:08:42 -0500 Subject: [PATCH 2/5] RAML and classifier updates --- pom.xml | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index f122c49..3966921 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,8 @@ - https://activiti.alfresco.com + http://localhost:8080 + aps1 5.7.2 5.2.14.RELEASE @@ -86,6 +87,12 @@ + + maven-jar-plugin + + ${aps.app.tag} + + maven-surefire-plugin 3.0.0-M5 @@ -134,6 +141,7 @@ raml-codegen ${aps.baseUrl}/activiti-app/raml/activiti.raml + com.inteligr8.alfresco.activiti @@ -143,31 +151,13 @@ - src/main/java + src/gen/java - com/inteligr8/alfresco/activiti/raml/**/* + **/* - - - delete-extras - process-sources - clean - - true - - - ${project.build.directory}/ramlgen/java - - com/inteligr8/alfresco/activiti/raml/**/*__*.java - - - - - - com.googlecode.maven-download-plugin @@ -247,22 +237,23 @@ - org.mule.raml.codegen - raml-client-generator-maven-plugin - 0.11 + org.raml.jaxrs + raml-to-jaxrs-maven-plugin + 3.0.7 - raml-aps-codegen + raml-codegen generate-sources - generate-client + generate - com.inteligr8.alfresco.activiti.raml + ${basePackage}.resource + ${basePackage}.model + ${basePackage}.support + jackson ${project.build.directory}/regexed/activiti.raml - false - ${project.build.directory}/ramlgen/java - v2 + ${basedir}/src/gen/java From da7cbdc30e120e500a2b05c6d7f01b7fe51a1f64 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 10 Dec 2021 10:08:48 -0500 Subject: [PATCH 3/5] v1.2.x pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3966921..fbb01c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.inteligr8.alfresco aps-public-rest-api - 1.1-SNAPSHOT + 1.2-SNAPSHOT Alfresco Process Services ReST API Client for Java From 359cb7a97dc3c66c348af5c443d3e8671a4b6e80 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 10 Dec 2021 17:14:13 -0500 Subject: [PATCH 4/5] API corrections --- .../alfresco/activiti/api/AdminApi.java | 6 ++-- .../activiti/api/AppDefinitionsApi.java | 12 +++---- .../activiti/api/AppDefinitionsCxfApi.java | 12 +++---- .../activiti/api/AppDefinitionsJerseyApi.java | 12 +++---- .../alfresco/activiti/api/ModelsApi.java | 8 ++--- .../activiti/ConnectionCxfClientPojoIT.java | 32 +++++++++++++++++++ .../ConnectionJerseyClientPojoIT.java | 31 ++++++++++++++++++ 7 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java create mode 100644 src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java index cba2ee5..26751f9 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java @@ -23,8 +23,8 @@ public interface AdminApi { @Path("/groups") @Produces({ "application/json" }) public List getGroups( - @QueryParam("tenantId") int tenantId, - @QueryParam("functional") boolean functional, - @QueryParam("summary") boolean summary); + @QueryParam("tenantId") Long tenantId, + @QueryParam("functional") Boolean functional, + @QueryParam("summary") Boolean summary); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java index 9202322..ca2166c 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java @@ -25,33 +25,33 @@ public interface AppDefinitionsApi { @Path("{modelId}") @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionRepresentation get( - @PathParam("modelId") String modelId); + @PathParam("modelId") Long appId); @PUT @Path("{modelId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation update( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, AppDefinitionSaveRepresentation updatedModel); @DELETE @Path("{appDefinitionId}") void delete( - @PathParam("appDefinitionId") String appDefinitionId); + @PathParam("appDefinitionId") Long appId); @GET @Path("{modelId}/export") - @Produces({ MediaType.APPLICATION_OCTET_STREAM }) + @Produces({ MediaType.APPLICATION_JSON, "application/zip" }) File export( - @PathParam("modelId") String modelId); + @PathParam("modelId") Long appId); @POST @Path("{modelId}/publish") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation publish( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, AppDefinitionPublishRepresentation publishModel); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java index 882895c..7083ef2 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java @@ -20,32 +20,32 @@ public interface AppDefinitionsCxfApi { @POST @Path("import") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionRepresentation import_( List attachments); @POST @Path("{modelId}/import") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionRepresentation import_( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, List attachments); @POST @Path("publish-app") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation publishApp( List attachments); @POST @Path("{modelId}/publish-app") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation publishApp( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, List attachments); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java index 4cf927c..8ca34a5 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java @@ -21,7 +21,7 @@ public interface AppDefinitionsJerseyApi { @POST @Path("import") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionRepresentation import_( @FormDataParam("file") InputStream filedataStream, @@ -29,16 +29,16 @@ public interface AppDefinitionsJerseyApi { @POST @Path("{modelId}/import") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionRepresentation import_( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, @FormDataParam("file") InputStream filedataStream, @FormDataParam("file") FormDataContentDisposition filedataDisposition); @POST @Path("publish-app") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation publishApp( @FormDataParam("file") InputStream filedataStream, @@ -46,10 +46,10 @@ public interface AppDefinitionsJerseyApi { @POST @Path("{modelId}/publish-app") - @Consumes({ MediaType.APPLICATION_JSON, MediaType.MULTIPART_FORM_DATA }) + @Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Produces({ MediaType.APPLICATION_JSON }) AppDefinitionUpdateResultRepresentation publishApp( - @PathParam("modelId") String modelId, + @PathParam("modelId") Long appId, @FormDataParam("file") InputStream filedataStream, @FormDataParam("file") FormDataContentDisposition filedataDisposition); diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java index 65ca19b..e5d09c9 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java @@ -31,11 +31,7 @@ public interface ModelsApi { public ResultListDataRepresentation get( @QueryParam("filter") String filter, @QueryParam("sort") String sort, - @QueryParam("modelType") int modelType, - @QueryParam("referenceId") int referenceId); - - default ResultListDataRepresentation get(ModelType modelType, String filter, String sort) { - return this.get(filter, sort, modelType.getId(), 0); - } + @QueryParam("modelType") Integer modelType, + @QueryParam("referenceId") Long referenceId); } diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java new file mode 100644 index 0000000..8b584c2 --- /dev/null +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java @@ -0,0 +1,32 @@ +package com.inteligr8.alfresco.activiti; + +import org.junit.jupiter.api.BeforeAll; + +import com.inteligr8.rs.ClientConfiguration; + +public class ConnectionCxfClientPojoIT extends ConnectionClientIT { + + private static ApsPublicRestApi client; + + @BeforeAll + public static void initClient() { + ApsClientConfiguration config = new ApsClientConfiguration(); + config.setBaseUrl("http://localhost:8080/activiti-app"); + config.setBasicAuthUsername("admin"); + config.setBasicAuthPassword("admin"); + + client = new ApsPublicRestApiCxfImpl( + new ApsClientCxfImpl(config)); + } + + @Override + public ApsPublicRestApi getClient() { + return client; + } + + @Override + public ClientConfiguration getConfiguration() { + return client.getConfig(); + } + +} diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java new file mode 100644 index 0000000..cdaf7e2 --- /dev/null +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java @@ -0,0 +1,31 @@ +package com.inteligr8.alfresco.activiti; + +import org.junit.jupiter.api.BeforeAll; + +import com.inteligr8.rs.ClientConfiguration; + +public class ConnectionJerseyClientPojoIT extends ConnectionClientIT { + + private static ApsPublicRestApi client; + + @BeforeAll + public static void initClient() { + ApsClientConfiguration config = new ApsClientConfiguration(); + config.setBaseUrl("http://localhost:8080/activiti-app"); + config.setBasicAuthUsername("admin"); + config.setBasicAuthPassword("admin"); + + client = new ApsPublicRestApiJerseyImpl( + new ApsClientJerseyImpl(config)); + } + + public ApsPublicRestApi getClient() { + return client; + } + + @Override + public ClientConfiguration getConfiguration() { + return client.getConfig(); + } + +} From 2e7f1f771ebb52a9f348ad7f2a9af5bcd397f441 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 10 Dec 2021 17:14:43 -0500 Subject: [PATCH 5/5] build/test improvements --- pom.xml | 1 + ...CxfClientIT.java => ConnectionCxfClientSpringIT.java} | 9 +-------- ...ClientIT.java => ConnectionJerseyClientSpringIT.java} | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) rename src/test/java/com/inteligr8/alfresco/activiti/{ConnectionCxfClientIT.java => ConnectionCxfClientSpringIT.java} (68%) rename src/test/java/com/inteligr8/alfresco/activiti/{ConnectionJerseyClientIT.java => ConnectionJerseyClientSpringIT.java} (91%) diff --git a/pom.xml b/pom.xml index fbb01c7..6832c34 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ utf-8 8 8 + lines,vars,source diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientSpringIT.java similarity index 68% rename from src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java rename to src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientSpringIT.java index 6fe5178..bcf49da 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientSpringIT.java @@ -1,22 +1,15 @@ package com.inteligr8.alfresco.activiti; -import java.util.Arrays; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.inteligr8.alfresco.activiti.model.CreateProcessInstance; -import com.inteligr8.alfresco.activiti.model.ProcessInstance; -import com.inteligr8.alfresco.activiti.model.Variable; import com.inteligr8.rs.ClientConfiguration; @TestPropertySource(locations = {"/local-oauth.properties"}) @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientCxfImpl.class}) -public class ConnectionCxfClientIT extends ConnectionClientIT { +public class ConnectionCxfClientSpringIT extends ConnectionClientIT { @Autowired @Qualifier("aps.api.cxf") diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.java similarity index 91% rename from src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java rename to src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.java index 992caa5..2cde217 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.java @@ -9,7 +9,7 @@ import com.inteligr8.rs.ClientConfiguration; @TestPropertySource(locations = {"/local.properties"}) @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientJerseyImpl.class}) -public class ConnectionJerseyClientIT extends ConnectionClientIT { +public class ConnectionJerseyClientSpringIT extends ConnectionClientIT { @Autowired @Qualifier("aps.api.jersey")