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

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
Brian Long 2022-03-28 14:48:35 -04:00
commit 6853324d2d
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java
View File

@ -1,8 +1,6 @@
package com.inteligr8.alfresco.activiti.api; package com.inteligr8.alfresco.activiti.api;
import java.util.List;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -10,7 +8,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
@ -20,32 +18,32 @@ public interface AppDefinitionsCxfApi {
@POST @POST
@Path("import") @Path("import")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionRepresentation import_( AppDefinitionRepresentation import_(
List<Attachment> attachments); MultipartBody body);
@POST @POST
@Path("{modelId}/import") @Path("{modelId}/import")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionRepresentation import_( AppDefinitionRepresentation import_(
@PathParam("modelId") Long appId, @PathParam("modelId") Long appId,
List<Attachment> attachments); MultipartBody body);
@POST @POST
@Path("publish-app") @Path("publish-app")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionUpdateResultRepresentation publishApp( AppDefinitionUpdateResultRepresentation publishApp(
List<Attachment> attachments); MultipartBody body);
@POST @POST
@Path("{modelId}/publish-app") @Path("{modelId}/publish-app")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionUpdateResultRepresentation publishApp( AppDefinitionUpdateResultRepresentation publishApp(
@PathParam("modelId") Long appId, @PathParam("modelId") Long appId,
List<Attachment> attachments); MultipartBody body);
} }

31
src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java
View File

@ -1,16 +1,15 @@
package com.inteligr8.alfresco.activiti.api; package com.inteligr8.alfresco.activiti.api;
import java.io.InputStream;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.FormDataParam; import org.glassfish.jersey.media.multipart.FormDataParam;
import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
@ -21,36 +20,34 @@ public interface AppDefinitionsJerseyApi {
@POST @POST
@Path("import") @Path("import")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionRepresentation import_( AppDefinitionRepresentation importApp(
@FormDataParam("file") InputStream filedataStream, @FormDataParam("file") FormDataMultiPart file,
@FormDataParam("file") FormDataContentDisposition filedataDisposition); @QueryParam("renewIdmEntries") Boolean renewIdmEntries);
@POST @POST
@Path("{modelId}/import") @Path("{modelId}/import")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionRepresentation import_( AppDefinitionRepresentation importApp(
@PathParam("modelId") Long appId, @PathParam("modelId") Long appId,
@FormDataParam("file") InputStream filedataStream, @FormDataParam("file") FormDataMultiPart file,
@FormDataParam("file") FormDataContentDisposition filedataDisposition); @QueryParam("renewIdmEntries") Boolean renewIdmEntries);
@POST @POST
@Path("publish-app") @Path("publish-app")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionUpdateResultRepresentation publishApp( AppDefinitionUpdateResultRepresentation publishApp(
@FormDataParam("file") InputStream filedataStream, FormDataMultiPart file);
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
@POST @POST
@Path("{modelId}/publish-app") @Path("{modelId}/publish-app")
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA }) @Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
AppDefinitionUpdateResultRepresentation publishApp( AppDefinitionUpdateResultRepresentation publishApp(
@PathParam("modelId") Long appId, @PathParam("modelId") Long appId,
@FormDataParam("file") InputStream filedataStream, FormDataMultiPart file);
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
} }