inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126353 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118880 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:46:55 +00:00
parent 08f750ae65
commit b774ad0ac4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
View File

@@ -79,7 +79,7 @@ public class PublicApiHttpClient
private static final String OLD_BASE_URL = "{0}://{1}:{2}{3}{4}{5}/api/";
private static final String INDEX_URL = "{0}://{1}:{2}{3}{4}";
private static final String BASE_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/{7}/versions/{8}/";
private static final String BASE_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/{7}/versions/{8}";
private static final String PUBLICAPI_CMIS_SERVICE_URL = "{0}://{1}:{2}{3}{4}cmis/versions/{5}/{6}";
private static final String PUBLICAPI_CMIS_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/cmis/versions/{7}/{8}";
private static final String PUBLICAPI_CMIS_URL_SUFFIX = "{0}/{1}/cmis/versions/{2}/{3}";
@@ -624,20 +624,21 @@ public class PublicApiHttpClient
String relationEntityIdString = encodeToString(relationEntityId);
String collectionEntityIdString = encodeToString(collectionEntityId);
sb.append('/');
sb.append(entityCollectionName);
sb.append("/");
sb.append('/');
if (collectionEntityIdString != null)
{
sb.append(collectionEntityIdString);
sb.append("/");
sb.append('/');
}
sb.append(relationshipCollectionName);
sb.append("/");
sb.append('/');
if (relationEntityIdString != null)
{
sb.append(relationEntityIdString);
sb.append("/");
sb.append('/');
}
}
else
@@ -647,12 +648,13 @@ public class PublicApiHttpClient
{
String collectionEntityIdString = encodeToString(collectionEntityId);
sb.append('/');
sb.append(entityCollectionName);
sb.append("/");
sb.append('/');
if (collectionEntityIdString != null)
{
sb.append(collectionEntityIdString);
sb.append("/");
sb.append('/');
}
}
else
@@ -698,6 +700,7 @@ public class PublicApiHttpClient
if (collectionName != null)
{
sb.append('/');
sb.append(collectionName);
if (collectionEntityId != null)
{
@@ -708,10 +711,7 @@ public class PublicApiHttpClient
if (relationName != null)
{
if (!sb.toString().endsWith("/"))
{
sb.append('/');
}
sb.append('/');
sb.append(relationName);
if (relationEntityId != null)
{