From b34bbcfcccdba74c8d1f115596c88b91af887b26 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 3 Nov 2016 13:19:56 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130783 jvonka: REPO-1058: REST API - list sites that person is member of ... - fix orderBy tests and backward compatibility - REPO-1242, / REPO-1244 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/impl/SitesImpl.java | 3 +++ .../rest/api/tests/TestPersonSites.java | 24 +++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/SitesImpl.java b/source/java/org/alfresco/rest/api/impl/SitesImpl.java index 90b3a50241..51b40722b0 100644 --- a/source/java/org/alfresco/rest/api/impl/SitesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/SitesImpl.java @@ -130,8 +130,11 @@ public class SitesImpl implements Sites { Map aMap = new HashMap<>(3); aMap.put(PARAM_SITE_TITLE, SiteService.SortFields.SiteTitle); + aMap.put(SiteService.SortFields.SiteTitle.toString(), SiteService.SortFields.SiteTitle); // for backwards compat' aMap.put(PARAM_SITE_ID, SiteService.SortFields.SiteShortName); + aMap.put(SiteService.SortFields.SiteShortName.toString(), SiteService.SortFields.SiteShortName); // for backwards compat' aMap.put(PARAM_SITE_ROLE, SiteService.SortFields.Role); + aMap.put(SiteService.SortFields.Role.toString(), SiteService.SortFields.Role); // for backwards compat' SORT_SITE_MEMBERSHIP = Collections.unmodifiableMap(aMap); } diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java b/source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java index f82a2a23b9..d347ca7cd0 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java @@ -522,7 +522,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Title ASC skip = 1, count = 2 + * to a user orderBy = title ASC skip = 1, count = 2 * * @throws Exception */ @@ -535,7 +535,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "SiteTitle", true); + ListResponse resp = getSiteMembershipsForPerson32(paging, "title", true); // check results List expectedList = new LinkedList<>(); @@ -548,7 +548,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Title DESC skip = 1, count = 2 + * to a user orderBy = title DESC skip = 1, count = 2 * * @throws Exception */ @@ -561,7 +561,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "SiteTitle", false); + ListResponse resp = getSiteMembershipsForPerson32(paging, "title", false); // check results List expectedList = new LinkedList<>(); @@ -573,7 +573,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Role ASC skip = 1, count = 2 + * to a user orderBy = role ASC skip = 1, count = 2 * * @throws Exception */ @@ -586,7 +586,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "Role", true); + ListResponse resp = getSiteMembershipsForPerson32(paging, "role", true); // check results List expectedList = new LinkedList<>(); @@ -598,7 +598,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Role DESC skip = 1, count = 2 + * to a user orderBy = role DESC skip = 1, count = 2 * * @throws Exception */ @@ -611,7 +611,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "Role", false); + ListResponse resp = getSiteMembershipsForPerson32(paging, "role", false); // check results List expectedList = new LinkedList<>(); @@ -623,7 +623,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Site Name ASC skip = 1, count = 2 + * to a user orderBy = id ASC skip = 1, count = 2 * * @throws Exception */ @@ -636,7 +636,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "SiteShortName", true); + ListResponse resp = getSiteMembershipsForPerson32(paging, "id", true); // check results List expectedList = new LinkedList<>(); @@ -648,7 +648,7 @@ public class TestPersonSites extends EnterpriseTestApi /** * Tests the capability to sort and paginate the site memberships associated - * to a user order = Site Name DESC skip = 1, count = 2 + * to a user orderBy = id DESC skip = 1, count = 2 * * @throws Exception */ @@ -661,7 +661,7 @@ public class TestPersonSites extends EnterpriseTestApi Paging paging = getPaging(skipCount, maxItems, totalResults, null); // get memberships - ListResponse resp = getSiteMembershipsForPerson32(paging, "SiteShortName", false); + ListResponse resp = getSiteMembershipsForPerson32(paging, "id", false); // check results List expectedList = new LinkedList<>();