From 207ffbf20ab5a1ae8c2b8302a93be22920e42c14 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:48:28 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124980 gjames: RA-910: Added a "restapi" clientType to alfresco-events git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/rest/api/Activities.java | 4 ++++ source/java/org/alfresco/rest/api/impl/NodesImpl.java | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/rest/api/Activities.java b/source/java/org/alfresco/rest/api/Activities.java index d6d68c8715..41aeb0ff27 100644 --- a/source/java/org/alfresco/rest/api/Activities.java +++ b/source/java/org/alfresco/rest/api/Activities.java @@ -20,6 +20,7 @@ package org.alfresco.rest.api; import java.util.Map; +import org.alfresco.repo.Client; import org.alfresco.repo.domain.activities.ActivityFeedEntity; import org.alfresco.rest.api.model.Activity; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; @@ -28,6 +29,9 @@ import org.json.JSONException; public interface Activities { + static final String APP_TOOL = "API"; + static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi); + public static enum ActivityWho { me, others; diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java index cce991a531..de7e6a3131 100644 --- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -62,6 +62,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.version.VersionModel; import org.alfresco.rest.antlr.WhereClauseParser; +import org.alfresco.rest.api.Activities; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.QuickShareLinks; import org.alfresco.rest.api.model.ContentInfo; @@ -163,7 +164,7 @@ import org.springframework.http.MediaType; public class NodesImpl implements Nodes { private static final Log logger = LogFactory.getLog(NodesImpl.class); - private static final String APP_TOOL = "API"; + private enum Type { @@ -1572,7 +1573,7 @@ public class NodesImpl implements Nodes if (aSync) { ActivitiesTransactionListener txListener = new ActivitiesTransactionListener(activityType, activityInfo, - TenantUtil.getCurrentDomain(), APP_TOOL, Client.asType(Client.ClientType.script), + TenantUtil.getCurrentDomain(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT, poster, retryingTransactionHelper); AlfrescoTransactionSupport.bindListener(txListener); } @@ -1580,7 +1581,7 @@ public class NodesImpl implements Nodes { poster.postFileFolderActivity(activityType, null, TenantUtil.getCurrentDomain(), activityInfo.getSiteId(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(), - activityInfo.getFileName(), APP_TOOL, Client.asType(Client.ClientType.script), + activityInfo.getFileName(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT, activityInfo.getFileInfo()); } }