From 13a298708bb46b40a630c89bd07fb0a87bd9e934 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 14 Oct 2024 14:15:46 +0100 Subject: [PATCH 1/5] feat: Rename Social Web Archive to social - Meeds-io/MIPs#150 (#351) This change will rename the Social Web Archive from social-portlet to social. --- perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml index 83380ba5a..029665826 100644 --- a/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml @@ -33,7 +33,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - social-portlet + social Search Enterprise perkstore From f8d84336d2431ba72ec954ceabea62c3f8efc72e Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Sat, 19 Oct 2024 06:23:19 +0100 Subject: [PATCH 2/5] feat: Adapt Space Service - MEED-7638 - Meeds-io/MIPs#150 --- .../org/exoplatform/perkstore/test/mock/SpaceServiceMock.java | 1 - 1 file changed, 1 deletion(-) diff --git a/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java b/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java index ce100a5bc..dcbd4d270 100644 --- a/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java +++ b/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java @@ -22,7 +22,6 @@ import org.exoplatform.services.security.MembershipEntry; import org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin; import org.exoplatform.social.core.identity.model.Identity; -import org.exoplatform.social.core.space.SpaceApplicationConfigPlugin; import org.exoplatform.social.core.space.SpaceException; import org.exoplatform.social.core.space.SpaceFilter; import org.exoplatform.social.core.space.SpaceListAccess; From d817d5057c3a7a88e72b110e1e1e1083211e3861 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 21 Oct 2024 10:03:55 +0100 Subject: [PATCH 3/5] feat: Delete SpaceService.getSpaceByUrl API - Meeds-io/MIPs#150 This change will delete the usage of SpaceService.getSpaceByUrl which is deleted from Social API. --- .../java/org/exoplatform/perkstore/service/utils/Utils.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java b/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java index 5e431e6bb..92b816d1a 100644 --- a/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java +++ b/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java @@ -261,9 +261,6 @@ public static Space getSpace(String id) { space = spaceService.getSpaceByGroupId("/spaces/" + id); if (space == null) { space = spaceService.getSpaceByDisplayName(id); - if (space == null) { - space = spaceService.getSpaceByUrl(id); - } } } } From 181183ddd1e8210013df2c2d0e99f7e46cdab693 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 21 Oct 2024 10:36:11 +0100 Subject: [PATCH 4/5] feat: Delete Space.getSpaceByDisplayName API - Meeds-io/MIPs#150 This change will delete the usage of getSpaceByDisplayName API since it's not unique anymore --- .../java/org/exoplatform/perkstore/service/utils/Utils.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java b/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java index 92b816d1a..1f757268a 100644 --- a/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java +++ b/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java @@ -259,9 +259,6 @@ public static Space getSpace(String id) { space = spaceService.getSpaceByPrettyName(id); if (space == null) { space = spaceService.getSpaceByGroupId("/spaces/" + id); - if (space == null) { - space = spaceService.getSpaceByDisplayName(id); - } } } return space; From f7b0ea4871f62f59b57456b701afd59748c902d6 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 21 Oct 2024 15:20:31 +0100 Subject: [PATCH 5/5] feat: Replace StringUtils package name - Meeds-io/MIPs#150 --- .../exoplatform/perkstore/test/mock/IdentityManagerMock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java b/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java index d308825ad..702f17434 100644 --- a/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java +++ b/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.codec.binary.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.social.core.identity.IdentityProvider;