mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merge remote-tracking branch 'remotes/origin/master' into feature/RM-5391_UI_Test_Classifcation_Mark_Indicator
# Conflicts: # rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
This commit is contained in:
@@ -83,12 +83,13 @@ 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 +407,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 +621,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
|
||||||
|
Reference in New Issue
Block a user