This is an automated email from the ASF dual-hosted git repository.
chenwenkang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new fc35d904ec refactor some code (#5568)
fc35d904ec is described below
commit fc35d904ec2376c1218c652d3f631ddc67127172
Author: xiaoyu <xia...@apache.org>
AuthorDate: Tue Jun 11 15:52:05 2024 +0800
refactor some code (#5568)
* refactor some code
* refactor some code
* refactor some code
* refactor some code
* refactor some code
---------
Co-authored-by: xiaoyu <xia...@modelbest.cn>
---
.../shenyu/admin/config/RegisterCenterConfiguration.java | 2 +-
.../shenyu/admin/controller/DiscoveryUpstreamController.java | 2 --
.../org/apache/shenyu/admin/controller/SelectorController.java | 3 +--
.../admin/controller/ShenyuClientHttpRegistryController.java | 10 ++--------
.../disruptor/RegisterClientServerDisruptorPublisher.java | 2 +-
.../server/api => }/ShenyuClientServerRegisterPublisher.java | 2 +-
.../server/api => }/ShenyuClientServerRegisterRepository.java | 2 +-
...shenyu.admin.register.ShenyuClientServerRegisterRepository} | 0
.../shenyu/admin/config/RegisterCenterConfigurationTest.java | 2 +-
.../admin/controller/ShenyuHttpRegistryControllerTest.java | 2 +-
10 files changed, 9 insertions(+), 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
index 1ed6a7d8e2..79b06c15d8 100644
---
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.disruptor.RegisterClientServerDisruptorPublisher;
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/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java
index 8bf0e80b4d..1249e11297 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DiscoveryUpstreamController.java
@@ -53,7 +53,6 @@ public class DiscoveryUpstreamController {
*/
@PostMapping("")
public ShenyuAdminResult createDiscoveryUpstream(@Valid @RequestBody final
DiscoveryUpstreamDTO discoveryUpstreamDTO) {
-
return
ShenyuAdminResult.success(discoveryUpstreamService.createOrUpdate(discoveryUpstreamDTO));
}
@@ -97,7 +96,6 @@ public class DiscoveryUpstreamController {
*/
@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
index 891c1c770c..cc820e7dd2 100644
---
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 class SelectorController implements
PagedController<SelectorQueryConditio
*/
@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/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
index e1b7125e3f..b8f13c8f96 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
+++
b/shenyu-admin/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.RequestBody;
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/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java
index c4b259d472..06990988c1 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/RegisterClientServerDisruptorPublisher.java
@@ -22,7 +22,7 @@ import
org.apache.shenyu.admin.disruptor.subscriber.ApiDocExecutorSubscriber;
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/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterPublisher.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/ShenyuClientServerRegisterPublisher.java
similarity index 95%
rename from
shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterPublisher.java
rename to
shenyu-admin/src/main/java/org/apache/shenyu/admin/register/ShenyuClientServerRegisterPublisher.java
index f2d99717d7..3f654de6e7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterPublisher.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/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/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterRepository.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/ShenyuClientServerRegisterRepository.java
similarity index 96%
rename from
shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterRepository.java
rename to
shenyu-admin/src/main/java/org/apache/shenyu/admin/register/ShenyuClientServerRegisterRepository.java
index ded64b679c..1f7cbab20b 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/client/server/api/ShenyuClientServerRegisterRepository.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/register/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/shenyu-admin/src/main/resources/META-INF/shenyu/org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterRepository
b/shenyu-admin/src/main/resources/META-INF/shenyu/org.apache.shenyu.admin.register.ShenyuClientServerRegisterRepository
similarity index 100%
rename from
shenyu-admin/src/main/resources/META-INF/shenyu/org.apache.shenyu.admin.register.client.server.api.ShenyuClientServerRegisterRepository
rename to
shenyu-admin/src/main/resources/META-INF/shenyu/org.apache.shenyu.admin.register.ShenyuClientServerRegisterRepository
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/RegisterCenterConfigurationTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/RegisterCenterConfigurationTest.java
index 71f66e0826..8f9cc34233 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/RegisterCenterConfigurationTest.java
+++
b/shenyu-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/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/ShenyuHttpRegistryControllerTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/ShenyuHttpRegistryControllerTest.java
index 1f9851db0d..ce4376582d 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/ShenyuHttpRegistryControllerTest.java
+++
b/shenyu-admin/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;
