refactor some code (#5568)

* refactor some code * refactor some code * refactor some code * refactor some code * refactor some code --------- Co-authored-by: xiaoyu <[email protected]>
apache · Jun 11, 2024 · fc35d90 · fc35d90
1 parent 4eddead
commit fc35d90
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 18 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/RegisterCenterConfiguration.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/RegisterCenterConfiguration.java
@@ -21,7 +21,7 @@
 import org.apache.shenyu.admin.lock.RegisterExecutionRepository;
 import org.apache.shenyu.admin.lock.impl.PlatformTransactionRegisterExecutionRepository;
 import org.apache.shenyu.admin.mapper.PluginMapper;
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterRepository;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterRepository;
 import org.apache.shenyu.admin.service.register.ShenyuClientRegisterService;
 import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
 import org.apache.shenyu.spi.ExtensionLoader;

diff --git a/...u-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java b/...u-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java
@@ -53,7 +53,6 @@ public DiscoveryUpstreamController(final DiscoveryUpstreamService discoveryUpstr
      */
     @PostMapping("")
     public ShenyuAdminResult createDiscoveryUpstream(@Valid @RequestBody final DiscoveryUpstreamDTO discoveryUpstreamDTO) {
-
         return ShenyuAdminResult.success(discoveryUpstreamService.createOrUpdate(discoveryUpstreamDTO));
     }
 
@@ -97,7 +96,6 @@ public ShenyuAdminResult updateDiscoveryUpstream(@PathVariable("discoveryHandler
      */
     @DeleteMapping("/batch")
     public ShenyuAdminResult deleteDiscoveryUpstream(@NotEmpty @RequestBody final List<@NotBlank String> ids) {
-
         return ShenyuAdminResult.success(discoveryUpstreamService.delete(ids));
     }
 }
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
@@ -87,8 +87,7 @@ public AdminResult<CommonPager<SelectorVO>> querySelectors(final String pluginId
      */
     @GetMapping("/{id}")
     public ShenyuAdminResult detailSelector(@PathVariable("id") @Valid
-                                            @Existed(provider = SelectorMapper.class,
-                                                    message = "selector is not existed") final String id) {
+                                            @Existed(provider = SelectorMapper.class, message = "selector is not existed") final String id) {
         SelectorVO selectorVO = selectorService.findById(id);
         return ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, selectorVO);
     }

diff --git a/.../src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java b/.../src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
@@ -17,9 +17,8 @@
 
 package org.apache.shenyu.admin.controller;
 
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterPublisher;
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterRepository;
-import org.apache.shenyu.admin.service.DiscoveryService;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterPublisher;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterRepository;
 import org.apache.shenyu.admin.utils.ShenyuResultMessage;
 import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
 import org.apache.shenyu.register.common.dto.ApiDocRegisterDTO;
@@ -32,8 +31,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-
 /**
  * The type shenyu client controller.
  */
@@ -43,9 +40,6 @@ public class ShenyuClientHttpRegistryController implements ShenyuClientServerReg
 
     private ShenyuClientServerRegisterPublisher publisher;
 
-    @Resource
-    private DiscoveryService discoveryService;
-
     @Override
     public void init(final ShenyuClientServerRegisterPublisher publisher, final ShenyuRegisterCenterConfig config) {
         this.publisher = publisher;

diff --git a/...c/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java b/...c/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java
@@ -22,7 +22,7 @@
 import org.apache.shenyu.admin.disruptor.subscriber.DiscoveryConfigRegisterExecutorSubscriber;
 import org.apache.shenyu.admin.disruptor.subscriber.MetadataExecutorSubscriber;
 import org.apache.shenyu.admin.disruptor.subscriber.URIRegisterExecutorSubscriber;
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterPublisher;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterPublisher;
 import org.apache.shenyu.admin.service.DiscoveryService;
 import org.apache.shenyu.admin.service.register.ShenyuClientRegisterService;
 import org.apache.shenyu.admin.spring.SpringBeanUtils;

diff --git a/.../ShenyuClientServerRegisterPublisher.java → .../ShenyuClientServerRegisterPublisher.java b/.../ShenyuClientServerRegisterPublisher.java → .../ShenyuClientServerRegisterPublisher.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.admin.register.client.server.api;
+package org.apache.shenyu.admin.register;
 
 import org.apache.shenyu.register.common.type.DataTypeParent;
 

diff --git a/...ShenyuClientServerRegisterRepository.java → ...ShenyuClientServerRegisterRepository.java b/...ShenyuClientServerRegisterRepository.java → ...ShenyuClientServerRegisterRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.admin.register.client.server.api;
+package org.apache.shenyu.admin.register;
 
 import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
 import org.apache.shenyu.spi.SPI;

diff --git a/....api.ShenyuClientServerRegisterRepository → ...ster.ShenyuClientServerRegisterRepository b/....api.ShenyuClientServerRegisterRepository → ...ster.ShenyuClientServerRegisterRepository
diff --git a/...u-admin/src/test/java/org/apache/shenyu/admin/config/RegisterCenterConfigurationTest.java b/...u-admin/src/test/java/org/apache/shenyu/admin/config/RegisterCenterConfigurationTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shenyu.admin.config;
 
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterRepository;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterRepository;
 import org.apache.shenyu.admin.service.register.ShenyuClientRegisterService;
 import org.apache.shenyu.admin.spring.SpringBeanUtils;
 import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;

diff --git a/...in/src/test/java/org/apache/shenyu/admin/controller/ShenyuHttpRegistryControllerTest.java b/...in/src/test/java/org/apache/shenyu/admin/controller/ShenyuHttpRegistryControllerTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.shenyu.admin.controller;
 
-import org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterPublisher;
+import org.apache.shenyu.admin.register.ShenyuClientServerRegisterPublisher;
 import org.apache.shenyu.admin.utils.ShenyuResultMessage;
 import org.apache.shenyu.common.enums.RpcTypeEnum;
 import org.apache.shenyu.common.utils.GsonUtils;