Commit 359cb7a9 authored by Brian Long's avatar Brian Long
Browse files

API corrections

parent da7cbdc3

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

+3 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ public interface AdminApi { 
    @Path("/groups")

    @Produces({ "application/json" })

    public List<Group> 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);



}

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

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



}

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

+6 −6
Original line number Diff line number Diff line
@@ -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<Attachment> 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<Attachment> 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<Attachment> 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<Attachment> attachments);



}

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

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

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

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



}