From e2e99cbe8ffd8460b4b1adc304201ff190a15ac1 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@gmail.com>
Date: Sat, 26 Oct 2024 17:36:05 +0100
Subject: [PATCH] feat: Cleanup Portal API from Deprecated items - MEED-7669 -
 Meeds-io/MIPs#165

---
 .../src/test/resources/conf/portal/configuration.xml      | 2 +-
 .../java/org/exoplatform/commons/utils/CommonsUtils.java  | 2 +-
 .../commons/utils/CommonsUtilsMockingTest.java            | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/commons-api/src/test/resources/conf/portal/configuration.xml b/commons-api/src/test/resources/conf/portal/configuration.xml
index 6c7e4c6cc9..ed338b49e1 100644
--- a/commons-api/src/test/resources/conf/portal/configuration.xml
+++ b/commons-api/src/test/resources/conf/portal/configuration.xml
@@ -36,7 +36,7 @@
     <component-plugin>
       <name>DefaultRequestHandler</name>
       <set-method>register</set-method>
-      <type>org.exoplatform.portal.application.DefaultRequestHandler</type>
+      <type>org.exoplatform.web.handler.DefaultRequestHandler</type>
     </component-plugin>
     <component-plugin>
       <name>StaticResourceRequestHandler</name>
diff --git a/commons-component-common/src/main/java/org/exoplatform/commons/utils/CommonsUtils.java b/commons-component-common/src/main/java/org/exoplatform/commons/utils/CommonsUtils.java
index 89c010bb4b..19aa94b8c5 100644
--- a/commons-component-common/src/main/java/org/exoplatform/commons/utils/CommonsUtils.java
+++ b/commons-component-common/src/main/java/org/exoplatform/commons/utils/CommonsUtils.java
@@ -223,7 +223,7 @@ public static SiteKey getCurrentSite() {
         return pContext.getSiteKey();
       } else {
         UserPortalConfigService portalConfig = getService(UserPortalConfigService.class);
-        return portalConfig == null ? null : SiteKey.portal(portalConfig.getDefaultPortal());
+        return portalConfig == null ? null : SiteKey.portal(portalConfig.getMetaPortal());
       }
     }
 
diff --git a/commons-component-common/src/test/java/org/exoplatform/commons/utils/CommonsUtilsMockingTest.java b/commons-component-common/src/test/java/org/exoplatform/commons/utils/CommonsUtilsMockingTest.java
index 5d7d8db20d..a2f4534f5c 100644
--- a/commons-component-common/src/test/java/org/exoplatform/commons/utils/CommonsUtilsMockingTest.java
+++ b/commons-component-common/src/test/java/org/exoplatform/commons/utils/CommonsUtilsMockingTest.java
@@ -62,7 +62,7 @@ public void afterTest() {
   @Test
   public void testShouldReturnDefaultPortalSite() {
     UserPortalConfigService userPortalConfigService = mock(UserPortalConfigService.class);
-    when(userPortalConfigService.getDefaultPortal()).thenReturn("intranet");
+    when(userPortalConfigService.getMetaPortal()).thenReturn("intranet");
 
     COMMONS_UTILS.when(() -> CommonsUtils.getService(UserPortalConfigService.class)).thenReturn(userPortalConfigService);
     COMMONS_UTILS.when(() -> CommonsUtils.getCurrentSite()).thenCallRealMethod();
@@ -75,7 +75,7 @@ public void testShouldReturnDefaultPortalSite() {
   @Test
   public void testShouldReturnCurrentSite() {
     UserPortalConfigService userPortalConfig = mock(UserPortalConfigService.class);
-    when(userPortalConfig.getDefaultPortal()).thenReturn("intranet");
+    when(userPortalConfig.getMetaPortal()).thenReturn("intranet");
 
     PortalRequestContext requestContext = mock(PortalRequestContext.class);
 
@@ -102,7 +102,7 @@ public void testShouldReturnCurrentSite() {
 
   public void testShouldReturnDefaultPortalOwner() {
     UserPortalConfigService userPortalConfig = mock(UserPortalConfigService.class);
-    when(userPortalConfig.getDefaultPortal()).thenReturn("intranet");
+    when(userPortalConfig.getMetaPortal()).thenReturn("intranet");
 
     COMMONS_UTILS.when(() -> CommonsUtils.getService(UserPortalConfigService.class)).thenReturn(userPortalConfig);
     COMMONS_UTILS.when(() -> CommonsUtils.getCurrentSite()).thenCallRealMethod();
@@ -113,7 +113,7 @@ public void testShouldReturnDefaultPortalOwner() {
 
   public void testShouldReturnCurrentPortalOwner() {
     UserPortalConfigService userPortalConfig = mock(UserPortalConfigService.class);
-    when(userPortalConfig.getDefaultPortal()).thenReturn("intranet");
+    when(userPortalConfig.getMetaPortal()).thenReturn("intranet");
 
     PortalRequestContext requestContext = mock(PortalRequestContext.class);