From 23516599ce59e6263b0357bf37df29f1061aa9f2 Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Sun, 9 Apr 2017 11:52:58 +0300 Subject: [PATCH] Some refactoring, moving the methods from classification API to security groups API where they should have been from the start. Trying to make the old classes behave, changing their names. --- .../alfresco/rest/core/oldAPI/{BaseApi.java => Base.java} | 4 ++-- .../rest/{core/oldAPI/SearchApi.java => oldAPI/Search.java} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/{BaseApi.java => Base.java} (99%) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/{core/oldAPI/SearchApi.java => oldAPI/Search.java} (97%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java similarity index 99% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java index 2d0616248f..8ac6329aa2 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java @@ -58,10 +58,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -public abstract class BaseApi +public abstract class Base { // logger - private static final Logger LOGGER = LoggerFactory.getLogger(BaseApi.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Base.class); /** exception key in JSON response body */ private static final String EXCEPTION_KEY = "exception"; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java similarity index 97% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java index 9ef67f0302..d7f510ac3e 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.core.oldAPI; +package org.alfresco.rest.oldAPI; import java.text.MessageFormat; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.List; import org.alfresco.dataprep.AlfrescoHttpClientFactory; -import org.alfresco.rest.core.oldAPI.BaseApi; +import org.alfresco.rest.core.oldAPI.Base; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.message.BasicNameValuePair; @@ -46,7 +46,7 @@ import org.springframework.stereotype.Component; * @since 2.5 */ @Component -public class SearchApi extends BaseApi +public class Search extends Base { /** http client factory */ @Autowired private AlfrescoHttpClientFactory alfrescoHttpClientFactory;