REPO-1394: Discovery: merge back to 5.2.N (from feature branch)

Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      130980 jkaabimofrad: REPO-224: API for retrieving detailed repository information.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131056 jkaabimofrad: REPO-224: Removed "transformationServerExpiresAt" attribute from the license JSON response as it is not part of AC.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131179 jkaabimofrad: REPO-224: Modified the license's entitlement response to always return "isClusterEnabled" and "isCryptodocEnabled".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2016-10-12 05:14:58 +00:00
parent 4d5b8671fb
commit 3f6a5d9e81
10 changed files with 1135 additions and 96 deletions

View File

@@ -328,6 +328,14 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return getSingle(url, entityId, null, expectedStatus);
}
public HttpResponse get(String url, Map<String, String> params, int expectedStatus) throws IOException
{
HttpResponse response = publicApiClient.get(url, params);
checkStatus(expectedStatus, response.getStatusCode());
return response;
}
protected HttpResponse getSingle(String url, String entityId, Map<String, String> params, int expectedStatus) throws Exception
{
HttpResponse response = publicApiClient.get(getScope(), url, entityId, null, null, params);