[type:refactor] refactor springcloud plugin register divide.

apache · Nov 11, 2024 · aba8a1b · aba8a1b
1 parent 8b8c940
commit aba8a1b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/...c/main/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientEventListener.java b/...c/main/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientEventListener.java
@@ -118,7 +118,7 @@ protected Sextet<String[], String, String, ApiHttpMethodEnum[], RpcTypeEnum, Str
         List<ApiHttpMethodEnum> collect = Stream.of(requestMethods).map(item -> ApiHttpMethodEnum.of(item.name())).collect(Collectors.toList());
         ApiHttpMethodEnum[] apiHttpMethodEnums = collect.toArray(new ApiHttpMethodEnum[]{});
         String version = "v0.01";
-        return Sextet.with(values, consume, produce, apiHttpMethodEnums, RpcTypeEnum.SPRING_CLOUD, version);
+        return Sextet.with(values, consume, produce, apiHttpMethodEnums, RpcTypeEnum.HTTP, version);
     }
 
     @Override
@@ -132,7 +132,7 @@ protected Map<String, Object> getBeans(final ApplicationContext context) {
                         .contextPath(getContextPath())
                         .appName(getAppName())
                         .path(UriComponentsBuilder.fromUriString(PathUtils.decoratorPathWithSlash(getContextPath()) + EVERY_PATH).build().encode().toUriString())
-                        .rpcType(RpcTypeEnum.SPRING_CLOUD.getName())
+                        .rpcType(RpcTypeEnum.HTTP.getName())
                         .enabled(true)
                         .ruleName(getContextPath())
                         .namespaceId(namespaceId)
@@ -152,7 +152,7 @@ protected URIRegisterDTO buildURIRegisterDTO(final ApplicationContext context, f
                     .appName(getAppName())
                     .host(super.getHost())
                     .port(Integer.valueOf(getPort()))
-                    .rpcType(RpcTypeEnum.SPRING_CLOUD.getName())
+                    .rpcType(RpcTypeEnum.HTTP.getName())
                     .eventType(EventType.REGISTER)
                     .namespaceId(namespaceId)
                     .build();
@@ -163,7 +163,7 @@ protected URIRegisterDTO buildURIRegisterDTO(final ApplicationContext context, f
 
     @Override
     protected String getClientName() {
-        return RpcTypeEnum.SPRING_CLOUD.getName();
+        return RpcTypeEnum.HTTP.getName();
     }
 
     @Override
@@ -262,7 +262,7 @@ protected MetaDataRegisterDTO buildMetaDataDTO(final Object bean,
                                 .map(Class::getName)
                                 .collect(Collectors.joining(","))
                                 ).orElse(null))
-                .rpcType(RpcTypeEnum.SPRING_CLOUD.getName())
+                .rpcType(RpcTypeEnum.HTTP.getName())
                 .enabled(shenyuClient.enabled())
                 .ruleName(StringUtils.defaultIfBlank(shenyuClient.ruleName(), path))
                 .namespaceId(namespaceId)

diff --git a/...java/org/apache/shenyu/client/springcloud/proceeor/extractor/RequestMappingProcessor.java b/...java/org/apache/shenyu/client/springcloud/proceeor/extractor/RequestMappingProcessor.java
@@ -36,7 +36,7 @@ public class RequestMappingProcessor implements ApiAnnotationProcessor<RequestMa
 
     @Override
     public List<String> supportedClient() {
-        return ListUtil.of(RpcTypeEnum.SPRING_CLOUD.getName());
+        return ListUtil.of(RpcTypeEnum.HTTP.getName());
     }
 
     @Override

diff --git a/...main/java/org/apache/shenyu/client/springcloud/register/SpringCloudApiBeansExtractor.java b/...main/java/org/apache/shenyu/client/springcloud/register/SpringCloudApiBeansExtractor.java
@@ -36,7 +36,7 @@ public SpringCloudApiBeansExtractor() {
 
     @Override
     public String clientName() {
-        return RpcTypeEnum.SPRING_CLOUD.getName();
+        return RpcTypeEnum.HTTP.getName();
     }
 
     /**

diff --git a/...c/main/java/org/apache/shenyu/client/springcloud/register/SpringCloudApiMetaRegister.java b/...c/main/java/org/apache/shenyu/client/springcloud/register/SpringCloudApiMetaRegister.java
@@ -86,7 +86,7 @@ protected MetaDataRegisterDTO preParse(final ApiBean apiBean) {
                 .path(apiPath)
                 .pathDesc(annotation.desc())
                 .parameterTypes(null)
-                .rpcType(RpcTypeEnum.SPRING_CLOUD.getName())
+                .rpcType(RpcTypeEnum.HTTP.getName())
                 .enabled(annotation.enabled())
                 .ruleName(StringUtils.defaultIfBlank(annotation.ruleName(), apiPath))
                 .build();
@@ -144,7 +144,7 @@ protected List<MetaDataRegisterDTO> parse(final ApiBean.ApiDefinition apiDefinit
                 .path(apiPath)
                 .pathDesc(pathDesc)
                 .parameterTypes(apiDefinition.getParameterTypes())
-                .rpcType(RpcTypeEnum.SPRING_CLOUD.getName())
+                .rpcType(RpcTypeEnum.HTTP.getName())
                 .enabled(enabled)
                 .ruleName(ruleName)
                 .build());

diff --git a/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml b/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml
@@ -62,7 +62,7 @@ shenyu:
       password: 123456
       nacosNameSpace: ShenyuRegisterCenter
   client:
-    springCloud:
+    http:
       props:
         contextPath: /springcloud
         addPrefixed: false

diff --git a/...he/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java b/...he/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java
@@ -74,6 +74,6 @@ public SpringCloudClientEventListener springCloudClientEventListener(final Sheny
     public ClientRegisterConfig clientRegisterConfig(final ShenyuClientConfig shenyuClientConfig,
                                                      final ApplicationContext applicationContext,
                                                      final Environment env) {
-        return new ClientRegisterConfigImpl(shenyuClientConfig, RpcTypeEnum.SPRING_CLOUD, applicationContext, env);
+        return new ClientRegisterConfigImpl(shenyuClientConfig, RpcTypeEnum.HTTP, applicationContext, env);
     }
 }
diff --git a/...shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java b/...shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java
@@ -63,7 +63,7 @@ public ClientDiscoveryConfigRefreshedEventListener clientDiscoveryConfigRefreshe
                                                                                                    final HttpClientRegisterRepository httpClientRegisterRepository,
                                                                                                    final ClientRegisterConfig clientRegisterConfig,
                                                                                                    final ShenyuClientConfig shenyuClientConfig) {
-        return new ClientDiscoveryConfigRefreshedEventListener(shenyuDiscoveryConfig, httpClientRegisterRepository, clientRegisterConfig, PluginEnum.SPRING_CLOUD, shenyuClientConfig);
+        return new ClientDiscoveryConfigRefreshedEventListener(shenyuDiscoveryConfig, httpClientRegisterRepository, clientRegisterConfig, PluginEnum.DIVIDE, shenyuClientConfig);
     }
 
     /**