inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-5611_UITestsEditGuidedClassif_cg' into 'master'

Browse Source 
Feature/rm 5611 ui tests edit guided classif cg

See merge request !524
This commit is contained in:
Tom Page
2017-09-08 15:27:43 +01:00
parent 4a99806458 d8f16a990c
commit 6a01f6510d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
View File

@@ -83,12 +83,12 @@ public abstract class BaseAPI
@Autowired @Autowired
private AlfrescoHttpClientFactory alfrescoHttpClientFactory; private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
@Autowired @Autowired
private ContentService contentService; private ContentService contentService;
private static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/"; private static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/";
private static final String FILE_PLAN_PATH = "Sites/rm/documentLibrary"; private static final String FILE_PLAN_PATH = "Sites/rm/documentLibrary";
/** /**
* Helper method to extract list of properties values from result. * Helper method to extract list of properties values from result.
* *
@@ -406,9 +406,13 @@ public abstract class BaseAPI
{ {
responseBody = new JSONObject(EntityUtils.toString(response.getEntity())); responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
} }
catch (ParseException | IOException | JSONException error) catch (JSONException error)
{ {
LOGGER.error("Parsing message body failed", error); LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
}
catch (ParseException | IOException error)
{
LOGGER.error("Parsing message body failed.", error);
} }
switch (response.getStatusLine().getStatusCode()) switch (response.getStatusLine().getStatusCode())
@@ -616,7 +620,7 @@ public abstract class BaseAPI
return getObjectByPath(username, password, itemPath) == null; return getObjectByPath(username, password, itemPath) == null;
} }
/** /**
* Retrieve the node ref spaces store value * Retrieve the node ref spaces store value
* *
* @return node ref spaces store * @return node ref spaces store