[type:feat]The sync-data-http method adapts to the namespace transformation

shenyu-admin/src/main/java/org/apache/shenyu/admin/config/HttpLongPollingSyncConfiguration.java

@@ -18,7 +18,9 @@
 package org.apache.shenyu.admin.config;
 
 import org.apache.shenyu.admin.config.properties.HttpSyncProperties;
+import org.apache.shenyu.admin.controller.ConfigController;
 import org.apache.shenyu.admin.listener.http.HttpLongPollingDataChangedListener;
+import org.apache.shenyu.admin.service.NamespaceService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -43,4 +45,16 @@ public HttpLongPollingDataChangedListener httpLongPollingDataChangedListener(fin
         return new HttpLongPollingDataChangedListener(httpSyncProperties);
     }
 
+    /**
+     * configController.
+     *
+     * @param httpLongPollingDataChangedListener httpLongPollingDataChangedListener
+     * @param namespaceService namespaceService
+     * @return {@link ConfigController}
+     */
+    @Bean
+    @ConditionalOnMissingBean(ConfigController.class)
+    public ConfigController configController(final HttpLongPollingDataChangedListener httpLongPollingDataChangedListener, final NamespaceService namespaceService) {
+        return new ConfigController(httpLongPollingDataChangedListener, namespaceService);
+    }
 }

shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ConfigController.java

@@ -18,8 +18,13 @@
 package org.apache.shenyu.admin.controller;
 
 import com.google.common.collect.Maps;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shenyu.admin.exception.ShenyuAdminException;
 import org.apache.shenyu.admin.listener.http.HttpLongPollingDataChangedListener;
 import org.apache.shenyu.admin.model.result.ShenyuAdminResult;
+import org.apache.shenyu.admin.model.vo.NamespaceVO;
+import org.apache.shenyu.admin.service.NamespaceService;
 import org.apache.shenyu.admin.utils.ShenyuResultMessage;
 import org.apache.shenyu.common.dto.ConfigData;
 import org.apache.shenyu.common.enums.ConfigGroupEnum;
@@ -35,36 +40,50 @@
 
 import java.util.Map;
 
+import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
+
 /**
  * This Controller only when HttpLongPollingDataChangedListener exist, will take effect.
  */
 @ResponseBody
 @RequestMapping("/configs")
 @RestController
 public class ConfigController {
-    
+
     private final HttpLongPollingDataChangedListener longPollingListener;
-
-    public ConfigController(final HttpLongPollingDataChangedListener longPollingListener) {
+
+    private final NamespaceService namespaceService;
+
+    public ConfigController(final HttpLongPollingDataChangedListener longPollingListener, final NamespaceService namespaceService) {
         this.longPollingListener = longPollingListener;
+        this.namespaceService = namespaceService;
     }
-    
+
     /**
      * Fetch configs shenyu result.
      *
      * @param groupKeys the group keys
+     * @param namespaceIdParams namespaceIdParams
      * @return the shenyu result
      */
     @GetMapping("/fetch")
-    public ShenyuAdminResult fetchConfigs(@NotNull final String[] groupKeys) {
+    public ShenyuAdminResult fetchConfigs(@NotNull final String[] groupKeys, final String namespaceIdParams) {
+        String namespaceId = namespaceIdParams;
+        NamespaceVO existNamespace = namespaceService.findById(namespaceId);
+        if (StringUtils.isNotEmpty(namespaceId) && ObjectUtils.isEmpty(existNamespace)) {
+            throw new ShenyuAdminException("namespaceId is not exist");
+        }
+        if (StringUtils.isEmpty(namespaceId)) {
+            namespaceId = SYS_DEFAULT_NAMESPACE_ID;
+        }
         Map<String, ConfigData<?>> result = Maps.newHashMap();
         for (String groupKey : groupKeys) {
-            ConfigData<?> data = longPollingListener.fetchConfig(ConfigGroupEnum.valueOf(groupKey));
+            ConfigData<?> data = longPollingListener.fetchConfig(ConfigGroupEnum.valueOf(groupKey), namespaceId);
             result.put(groupKey, data);
         }
         return ShenyuAdminResult.success(ShenyuResultMessage.SUCCESS, result);
     }
-    
+
     /**
      * Listener.
      *
@@ -75,5 +94,5 @@ public ShenyuAdminResult fetchConfigs(@NotNull final String[] groupKeys) {
     public void listener(final HttpServletRequest request, final HttpServletResponse response) {
         longPollingListener.doLongPolling(request, response);
     }
-    
+
 }

shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/LocalDiscoveryProcessor.java

@@ -88,6 +88,7 @@ public void changeUpstream(final ProxySelectorDTO proxySelectorDTO, final List<D
         discoverySyncData.setSelectorName(proxySelectorDTO.getName());
         List<DiscoveryUpstreamData> upstreamDataList = upstreamDTOS.stream().map(DiscoveryTransfer.INSTANCE::mapToData).collect(Collectors.toList());
         discoverySyncData.setUpstreamDataList(upstreamDataList);
+        discoverySyncData.setNamespaceId(proxySelectorDTO.getNamespaceId());
         DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE, Collections.singletonList(discoverySyncData));
         eventPublisher.publishEvent(dataChangedEvent);
         DiscoveryStreamUpdatedEvent discoveryStreamUpdatedEvent = new DiscoveryStreamUpdatedEvent(discoverySyncData, LOCAL_DISCOVERY_UPSTREAM_UPDATE);
@@ -108,6 +109,7 @@ public void fetchAll(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxyS
         discoverySyncData.setSelectorName(proxySelectorDTO.getName());
         List<DiscoveryUpstreamData> upstreamDataList = discoveryUpstreamDOS.stream().map(DiscoveryTransfer.INSTANCE::mapToData).collect(Collectors.toList());
         discoverySyncData.setUpstreamDataList(upstreamDataList);
+        discoverySyncData.setNamespaceId(proxySelectorDTO.getNamespaceId());
         DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE, Collections.singletonList(discoverySyncData));
         eventPublisher.publishEvent(dataChangedEvent);
     }