From 15f33e613055874af2186fe281243062aaf2f0de Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Fri, 5 Aug 2016 13:49:10 +0000 Subject: [PATCH] Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 128790 mmuller: Fix for REPO-855 + Sanity test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../api/ResourceWebScript.delete.desc.xml | 4 ++ .../api/ResourceWebScript.get.desc.xml | 4 ++ .../api/ResourceWebScript.post.desc.xml | 4 ++ .../api/ResourceWebScript.put.desc.xml | 4 ++ .../api/people/PersonPreferencesRelation.java | 57 +++++++++++-------- .../rest/api/tests/TestUserPreferences.java | 52 +++++++++-------- 6 files changed, 75 insertions(+), 50 deletions(-) diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml index 247b58f32d..522d20453b 100644 --- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml +++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml @@ -12,6 +12,10 @@ /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/ + + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover} + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/ + user argument diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml index 9828e3bf30..9281827c0d 100644 --- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml +++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml @@ -12,6 +12,10 @@ /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/ + + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover} + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/ + user argument diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml index 460eac4aa4..17cadf1213 100644 --- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml +++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml @@ -12,6 +12,10 @@ /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/ + + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover} + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/ + user argument diff --git a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml index 5e531c1c19..d611c14ed7 100644 --- a/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml +++ b/config/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml @@ -12,6 +12,10 @@ /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property} /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/ + + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover} + /{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/ + user argument diff --git a/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java b/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java index 0a2eaf92f1..b5ca948cf2 100644 --- a/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java +++ b/source/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.rest.api.people; import org.alfresco.rest.api.Preferences; @@ -80,6 +80,13 @@ public class PersonPreferencesRelation implements RelationshipResourceAction.Rea @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.") public Preference readById(String personId, String preferenceName, Parameters parameters) { + // fix for REPO-855 + String url = parameters.getRequest().getURL(); + if(url.matches(".*workspace://SpacesStore/.*")){ + preferenceName += url.substring(url.indexOf("//SpacesStore/")); + } + // + return preferences.getPreference(personId, preferenceName); } diff --git a/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java b/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java index e4356d70bb..4bc1d301e0 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestUserPreferences.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.rest.api.tests; import static org.junit.Assert.assertEquals; @@ -95,6 +95,8 @@ public class TestUserPreferences extends EnterpriseTestApi expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true))); expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true))); expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true))); + // new preference name for issue REPO-855 + expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true))); TenantUtil.runAsUserTenant(new TenantRunAsWork() {