Commit 6596bf16 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents df7c4162 ef89e478

pom.xml

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
		<maven.compiler.target>8</maven.compiler.target>

		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>



		<!-- If you want to build for your specific version, point to your own 

			installation -->

		<aps.app.tag>aps1</aps.app.tag>



		<jersey.version>2.35</jersey.version>

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

+32 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 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.ShareApi;

import com.inteligr8.alfresco.activiti.api.TasksApi;



/**
@@ -16,18 +17,42 @@ import com.inteligr8.alfresco.activiti.api.TasksApi; 
 */

public interface ApsPublicRestApi {

	

	AdminApi getAdminApi();

	<T> T getApi(Class<T> apiClass);

	

	AppDefinitionsApi getAppDefinitionsApi();

	default AdminApi getAdminApi() {

		return this.getApi(AdminApi.class);

	}

	

	AppVersionApi getAppVersionApi();

	default AppDefinitionsApi getAppDefinitionsApi() {

		return this.getApi(AppDefinitionsApi.class);

	}

	

	ModelsApi getModelsApi();

	default AppVersionApi getAppVersionApi() {

		return this.getApi(AppVersionApi.class);

	}

	

	ProcessInstancesApi getProcessInstancesApi();

	default ModelsApi getModelsApi() {

		return this.getApi(ModelsApi.class);

	}

	

	ProfileApi getProfileApi();

	default ProcessInstancesApi getProcessInstancesApi() {

		return this.getApi(ProcessInstancesApi.class);

	}

	

	default ProfileApi getProfileApi() {

		return this.getApi(ProfileApi.class);

	}

	

	TasksApi getTasksApi();

	default TasksApi getTasksApi() {

		return this.getApi(TasksApi.class);

	}

	

	

	/**

	 * The following are not part of the official open source or enterprise APIs

	 */

	default ShareApi getShareApi() {

		return this.getApi(ShareApi.class);

	}



}

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

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi; 
 */

public interface ApsPublicRestCxfApi extends ApsPublicRestApi {

	

	AppDefinitionsCxfApi getAppDefinitionsCxfApi();

	default AppDefinitionsCxfApi getAppDefinitionsCxfApi() {

		return this.getApi(AppDefinitionsCxfApi.class);

	}



}

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

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi; 
 */

public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {

	

	AppDefinitionsJerseyApi getAppDefinitionsJerseyApi();

	default AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {

		return this.getApi(AppDefinitionsJerseyApi.class);

	}



}

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 


package com.inteligr8.alfresco.activiti.api;



import javax.ws.rs.Consumes;

import javax.ws.rs.GET;

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.ResultList;

import com.inteligr8.alfresco.activiti.model.ShareInfoRequest;

import com.inteligr8.alfresco.activiti.model.SharePermission;



/**

 * This is an undocumented API.

 * 

 * @author brian@inteligr8.com

 */

@Path("/app/rest/models")

public interface ShareApi {



    @GET

    @Path("/{modelId}/share-info")

    @Produces({ MediaType.APPLICATION_JSON })

    public ResultList<SharePermission> getShareInfo(

    		@PathParam("modelId") String modelId);



    @PUT

    @Path("/{modelId}/share-info")

    @Consumes({ MediaType.APPLICATION_JSON })

    public void setShareInfo(

    		@PathParam("modelId") String modelId,

    		ShareInfoRequest request);



}