fix cr

apache · Sep 15, 2024 · 8088148 · 8088148
1 parent 523236f
commit 8088148
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ConfigController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ConfigController.java
@@ -39,7 +39,7 @@
 
 import java.util.Map;
 
-import static org.apache.shenyu.common.constant.AdminConstants.SYS_DEFAULT_NAMESPACE_NAMESPACE_ID;
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
 
 /**
  * This Controller only when HttpLongPollingDataChangedListener exist, will take effect.
@@ -72,7 +72,7 @@ public ShenyuAdminResult fetchConfigs(@NotNull final String[] groupKeys, final S
             throw new ShenyuAdminException("namespaceId is not exist");
         }
         if (StringUtils.isEmpty(namespaceId)) {
-            namespaceId = SYS_DEFAULT_NAMESPACE_NAMESPACE_ID;
+            namespaceId = SYS_DEFAULT_NAMESPACE_ID;
         }
         Map<String, ConfigData<?>> result = Maps.newHashMap();
         for (String groupKey : groupKeys) {

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractDataChangedListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractDataChangedListener.java
@@ -50,6 +50,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
+
 
 /**
  * Abstract class for ConfigEventListener.
@@ -178,9 +180,9 @@ public void onPluginChanged(final List<PluginData> changed, final DataEventTypeE
         if (CollectionUtils.isEmpty(changed)) {
             return;
         }
-        Optional<String> namespaceId = changed.stream().map(PluginData::getNamespaceId).findFirst();
-        this.updatePluginCache(namespaceId.get());
-        this.afterPluginChanged(changed, eventType, namespaceId.get());
+        String namespaceId = changed.stream().map(PluginData::getNamespaceId).findFirst().orElse(SYS_DEFAULT_NAMESPACE_ID);
+        this.updatePluginCache(namespaceId);
+        this.afterPluginChanged(changed, eventType, namespaceId);
     }
 
     /**

diff --git a/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java b/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java
@@ -62,7 +62,7 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import static org.apache.shenyu.common.constant.AdminConstants.SYS_DEFAULT_NAMESPACE_NAMESPACE_ID;
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
 
 /**
  * HTTP long polling, which blocks the client's request thread
@@ -292,7 +292,7 @@ private static String getRemoteIp(final HttpServletRequest request) {
      * @return the namespaceId
      */
     private static String getNamespaceId(final HttpServletRequest request) {
-        String namespaceId = SYS_DEFAULT_NAMESPACE_NAMESPACE_ID;
+        String namespaceId = SYS_DEFAULT_NAMESPACE_ID;
         if (StringUtils.isNotEmpty(request.getParameter("namespaceId"))) {
             namespaceId = request.getParameter("namespaceId");
         }

diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/ConfigControllerTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/ConfigControllerTest.java
@@ -38,6 +38,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.Collections;
 
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.mockito.ArgumentMatchers.any;
@@ -71,7 +72,7 @@ public void setUp() {
     public void testFetchConfigs() throws Exception {
         // Configure HttpLongPollingDataChangedListener.fetchConfig(...).
         final ConfigData<?> configData = new ConfigData<>("md5-value1", 0L, Collections.emptyList());
-        doReturn(configData).when(mockLongPollingListener).fetchConfig(ConfigGroupEnum.APP_AUTH, "649330b6-c2d7-4edc-be8e-8a54df9eb385");
+        doReturn(configData).when(mockLongPollingListener).fetchConfig(ConfigGroupEnum.APP_AUTH, SYS_DEFAULT_NAMESPACE_ID);
 
         // Run the test
         final MockHttpServletResponse response = mockMvc.perform(get("/configs/fetch")

diff --git a/...admin/src/test/java/org/apache/shenyu/admin/listener/AbstractDataChangedListenerTest.java b/...admin/src/test/java/org/apache/shenyu/admin/listener/AbstractDataChangedListenerTest.java
@@ -35,8 +35,6 @@
 import org.apache.shenyu.common.dto.ProxySelectorData;
 import org.apache.shenyu.common.dto.RuleData;
 import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.dto.ProxySelectorData;
-import org.apache.shenyu.common.dto.DiscoverySyncData;
 import org.apache.shenyu.common.enums.ConfigGroupEnum;
 import org.apache.shenyu.common.enums.DataEventTypeEnum;
 import org.junit.jupiter.api.AfterEach;
@@ -48,6 +46,7 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -74,9 +73,7 @@ public final class AbstractDataChangedListenerTest {
     private ProxySelectorService proxySelectorService;
 
     private DiscoveryUpstreamService discoveryUpstreamService;
-
-    private final String namespaceId = "649330b6-c2d7-4edc-be8e-8a54df9eb385";
-
+
     private NamespaceService namespaceService;
 
     @BeforeEach
@@ -120,7 +117,7 @@ public void setUp() throws Exception {
         List<AppAuthData> appAuthDatas = Lists.newArrayList(mock(AppAuthData.class));
         when(appAuthService.listAll()).thenReturn(appAuthDatas);
         List<PluginData> pluginDatas = Lists.newArrayList(mock(PluginData.class));
-        when(namespacePluginService.listAll(namespaceId)).thenReturn(pluginDatas);
+        when(namespacePluginService.listAll(SYS_DEFAULT_NAMESPACE_ID)).thenReturn(pluginDatas);
         List<RuleData> ruleDatas = Lists.newArrayList(mock(RuleData.class));
         when(ruleService.listAll()).thenReturn(ruleDatas);
         List<SelectorData> selectorDatas = Lists.newArrayList(mock(SelectorData.class));
@@ -133,7 +130,7 @@ public void setUp() throws Exception {
         when(discoveryUpstreamService.listAll()).thenReturn(discoverySyncDatas);
         List<NamespaceVO> list = new ArrayList<>();
         NamespaceVO namespaceVO = new NamespaceVO();
-        namespaceVO.setNamespaceId(namespaceId);
+        namespaceVO.setNamespaceId(SYS_DEFAULT_NAMESPACE_ID);
         list.add(namespaceVO);
         when(namespaceService.list()).thenReturn(list);
 
@@ -149,28 +146,28 @@ public void cleanUp() {
     @Test
     public void testFetchConfig() {
         List<AppAuthData> appAuthDatas = Lists.newArrayList(mock(AppAuthData.class));
-        listener.updateCache(ConfigGroupEnum.APP_AUTH, appAuthDatas, namespaceId);
-        ConfigData<?> result1 = listener.fetchConfig(ConfigGroupEnum.APP_AUTH, namespaceId);
+        listener.updateCache(ConfigGroupEnum.APP_AUTH, appAuthDatas, SYS_DEFAULT_NAMESPACE_ID);
+        ConfigData<?> result1 = listener.fetchConfig(ConfigGroupEnum.APP_AUTH, SYS_DEFAULT_NAMESPACE_ID);
         assertNotNull(result1);
 
         List<PluginData> pluginDatas = Lists.newArrayList(mock(PluginData.class));
-        listener.updateCache(ConfigGroupEnum.PLUGIN, pluginDatas, namespaceId);
-        ConfigData<?> result2 = listener.fetchConfig(ConfigGroupEnum.PLUGIN, namespaceId);
+        listener.updateCache(ConfigGroupEnum.PLUGIN, pluginDatas, SYS_DEFAULT_NAMESPACE_ID);
+        ConfigData<?> result2 = listener.fetchConfig(ConfigGroupEnum.PLUGIN, SYS_DEFAULT_NAMESPACE_ID);
         assertNotNull(result2);
 
         List<RuleData> ruleDatas = Lists.newArrayList(mock(RuleData.class));
-        listener.updateCache(ConfigGroupEnum.RULE, ruleDatas, namespaceId);
-        ConfigData<?> result3 = listener.fetchConfig(ConfigGroupEnum.RULE, namespaceId);
+        listener.updateCache(ConfigGroupEnum.RULE, ruleDatas, SYS_DEFAULT_NAMESPACE_ID);
+        ConfigData<?> result3 = listener.fetchConfig(ConfigGroupEnum.RULE, SYS_DEFAULT_NAMESPACE_ID);
         assertNotNull(result3);
 
         List<SelectorData> selectorDatas = Lists.newArrayList(mock(SelectorData.class));
-        listener.updateCache(ConfigGroupEnum.SELECTOR, selectorDatas, namespaceId);
-        ConfigData<?> result4 = listener.fetchConfig(ConfigGroupEnum.SELECTOR, namespaceId);
+        listener.updateCache(ConfigGroupEnum.SELECTOR, selectorDatas, SYS_DEFAULT_NAMESPACE_ID);
+        ConfigData<?> result4 = listener.fetchConfig(ConfigGroupEnum.SELECTOR, SYS_DEFAULT_NAMESPACE_ID);
         assertNotNull(result4);
 
         List<MetaData> metaDatas = Lists.newArrayList(mock(MetaData.class));
-        listener.updateCache(ConfigGroupEnum.META_DATA, metaDatas, namespaceId);
-        ConfigData<?> result5 = listener.fetchConfig(ConfigGroupEnum.META_DATA, namespaceId);
+        listener.updateCache(ConfigGroupEnum.META_DATA, metaDatas, SYS_DEFAULT_NAMESPACE_ID);
+        ConfigData<?> result5 = listener.fetchConfig(ConfigGroupEnum.META_DATA, SYS_DEFAULT_NAMESPACE_ID);
         assertNotNull(result5);
     }
 
@@ -204,10 +201,10 @@ public void testOnPluginChanged() {
         assertFalse(listener.getCache().containsKey(ConfigGroupEnum.PLUGIN.name()));
         List<PluginData> pluginDatas = Lists.newArrayList(mock(PluginData.class));
         PluginData pluginData = new PluginData();
-        pluginData.setNamespaceId(namespaceId);
+        pluginData.setNamespaceId(SYS_DEFAULT_NAMESPACE_ID);
         pluginDatas.set(0, pluginData);
         listener.onPluginChanged(pluginDatas, eventType);
-        assertTrue(listener.getCache().containsKey(namespaceId + ConfigGroupEnum.PLUGIN.name()));
+        assertTrue(listener.getCache().containsKey(SYS_DEFAULT_NAMESPACE_ID + ConfigGroupEnum.PLUGIN.name()));
     }
 
     @Test
@@ -236,7 +233,7 @@ public void testOnSelectorChanged() {
     public void testAfterPropertiesSet() {
         listener.afterPropertiesSet();
         assertTrue(listener.getCache().containsKey(ConfigGroupEnum.APP_AUTH.name()));
-        assertTrue(listener.getCache().containsKey(namespaceId + ConfigGroupEnum.PLUGIN.name()));
+        assertTrue(listener.getCache().containsKey(SYS_DEFAULT_NAMESPACE_ID + ConfigGroupEnum.PLUGIN.name()));
         assertTrue(listener.getCache().containsKey(ConfigGroupEnum.RULE.name()));
         assertTrue(listener.getCache().containsKey(ConfigGroupEnum.SELECTOR.name()));
         assertTrue(listener.getCache().containsKey(ConfigGroupEnum.META_DATA.name()));
@@ -245,7 +242,7 @@ public void testAfterPropertiesSet() {
     @Test
     public void testUpdateCache() {
         List<AppAuthData> appAuthDatas = Lists.newArrayList(mock(AppAuthData.class));
-        listener.updateCache(ConfigGroupEnum.APP_AUTH, appAuthDatas, namespaceId);
+        listener.updateCache(ConfigGroupEnum.APP_AUTH, appAuthDatas, SYS_DEFAULT_NAMESPACE_ID);
         assertTrue(listener.getCache().containsKey(ConfigGroupEnum.APP_AUTH.name()));
     }