You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2023/02/08 06:11:15 UTC
[shenyu] branch master updated: optimize shenyu-admin (#4355)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 9e3c075d0 optimize shenyu-admin (#4355)
9e3c075d0 is described below
commit 9e3c075d0e74e682825d71d1c5837dcfa79629f8
Author: balloon72 <96...@users.noreply.github.com>
AuthorDate: Wed Feb 8 14:11:05 2023 +0800
optimize shenyu-admin (#4355)
* optimize shenyu-admin
* Optimize code for shenyu-admin
---------
Co-authored-by: hanmo1 <ISFA-9844>
Co-authored-by: xiaoyu <xi...@apache.org>
---
.../shenyu/admin/controller/PlatformController.java | 2 +-
.../shenyu/admin/service/impl/PermissionServiceImpl.java | 2 +-
.../shenyu/admin/service/impl/SandboxServiceImpl.java | 3 +--
.../shenyu/admin/service/impl/SyncDataServiceImpl.java | 16 +++++++---------
.../shenyu/admin/service/impl/UpstreamCheckService.java | 1 -
.../admin/service/manager/impl/DocManagerImpl.java | 8 ++------
.../register/FallbackShenyuClientRegisterService.java | 2 +-
.../shenyu/admin/spring/LocalDataSourceLoader.java | 9 +++++----
8 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PlatformController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PlatformController.java
index 638bfb982..bf60929a6 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PlatformController.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PlatformController.java
@@ -56,7 +56,7 @@ public class PlatformController {
LoginDashboardUserVO loginVO = dashboardUserService.login(userName, password);
return Optional.ofNullable(loginVO)
.map(loginStatus -> {
- if (loginStatus.getEnabled()) {
+ if (Boolean.TRUE.equals(loginStatus.getEnabled())) {
return ShenyuAdminResult.success(ShenyuResultMessage.PLATFORM_LOGIN_SUCCESS, loginVO);
}
return ShenyuAdminResult.error(ShenyuResultMessage.LOGIN_USER_DISABLE_ERROR);
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
index 6fcd58463..477c6912a 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
@@ -247,7 +247,7 @@ public class PermissionServiceImpl implements PermissionService {
*/
private List<String> getListDiff(final List<String> preList, final List<String> lastList) {
if (CollectionUtils.isEmpty(lastList)) {
- return null;
+ return Collections.emptyList();
}
if (CollectionUtils.isEmpty(preList)) {
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SandboxServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SandboxServiceImpl.java
index 8f96e1fc8..93c4496df 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SandboxServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SandboxServiceImpl.java
@@ -138,7 +138,7 @@ public class SandboxServiceImpl implements SandboxService {
private List<HttpUtils.UploadFile> uploadFiles(final HttpServletRequest request) {
Collection<MultipartFile> uploadFiles = UploadUtils.getUploadFiles(request);
- List<HttpUtils.UploadFile> files = uploadFiles.stream()
+ return uploadFiles.stream()
.map(multipartFile -> {
try {
return new HttpUtils.UploadFile(multipartFile.getName(), multipartFile.getOriginalFilename(), multipartFile.getBytes());
@@ -149,7 +149,6 @@ public class SandboxServiceImpl implements SandboxService {
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
- return files;
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SyncDataServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SyncDataServiceImpl.java
index c1c5cd27c..bd2f9621c 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SyncDataServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SyncDataServiceImpl.java
@@ -105,18 +105,16 @@ public class SyncDataServiceImpl implements SyncDataService {
Collections.singletonList(PluginTransfer.INSTANCE.mapDataTOVO(pluginVO))));
List<SelectorData> selectorDataList = selectorService.findByPluginId(pluginId);
- if (CollectionUtils.isEmpty(selectorDataList)) {
- return true;
- }
-
- eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.SELECTOR, DataEventTypeEnum.REFRESH, selectorDataList));
- List<String> selectorIdList = selectorDataList.stream().map(SelectorData::getId)
- .collect(Collectors.toList());
- List<RuleData> allRuleDataList = ruleService.findBySelectorIdList(selectorIdList);
+ if (!CollectionUtils.isEmpty(selectorDataList)) {
+ eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.SELECTOR, DataEventTypeEnum.REFRESH, selectorDataList));
- eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.RULE, DataEventTypeEnum.REFRESH, allRuleDataList));
+ List<String> selectorIdList = selectorDataList.stream().map(SelectorData::getId)
+ .collect(Collectors.toList());
+ List<RuleData> allRuleDataList = ruleService.findBySelectorIdList(selectorIdList);
+ eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.RULE, DataEventTypeEnum.REFRESH, allRuleDataList));
+ }
return true;
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
index f512654c9..4ecb0b5b5 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
@@ -136,7 +136,6 @@ public class UpstreamCheckService {
this.zombieCheckTimes = Integer.parseInt(props.getProperty(Constants.ZOMBIE_CHECK_TIMES, Constants.ZOMBIE_CHECK_TIMES_VALUE));
this.scheduledTime = Integer.parseInt(props.getProperty(Constants.SCHEDULED_TIME, Constants.SCHEDULED_TIME_VALUE));
this.registerType = shenyuRegisterCenterConfig.getRegisterType();
- zombieRemovalTimes = Integer.parseInt(props.getProperty(Constants.ZOMBIE_REMOVAL_TIMES, Constants.ZOMBIE_REMOVAL_TIMES_VALUE));
if (REGISTER_TYPE_HTTP.equalsIgnoreCase(registerType)) {
setup();
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/manager/impl/DocManagerImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/manager/impl/DocManagerImpl.java
index 3cf538342..beb8107c1 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/manager/impl/DocManagerImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/manager/impl/DocManagerImpl.java
@@ -88,11 +88,7 @@ public class DocManagerImpl implements DocManager {
}
List<DocModule> docModules = docInfo.getDocModuleList();
DOC_DEFINITION_MAP.put(docInfo.getTitle(), docInfo);
- docModules.forEach(docModule -> {
- docModule.getDocItems().forEach(docItem -> {
- ITEM_DOC_MAP.put(docItem.getId(), docItem);
- });
- });
+ docModules.forEach(docModule -> docModule.getDocItems().forEach(docItem -> ITEM_DOC_MAP.put(docItem.getId(), docItem)));
callback.accept(docInfo);
}
@@ -104,7 +100,7 @@ public class DocManagerImpl implements DocManager {
docInfo.setClusterName(clusterName);
return docInfo;
} catch (Exception e) {
- LOG.error("getDocInfo error={}", e);
+ LOG.error("getDocInfo error= ", e);
return null;
}
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
index 4221e06c8..93b9f9d54 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
@@ -46,7 +46,7 @@ public abstract class FallbackShenyuClientRegisterService implements ShenyuClien
/**
* Instantiates a new Fallback shenyu client register service.
*/
- public FallbackShenyuClientRegisterService() {
+ protected FallbackShenyuClientRegisterService() {
timer = WheelTimerFactory.getSharedTimer();
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/spring/LocalDataSourceLoader.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/spring/LocalDataSourceLoader.java
index abaf2506b..9fde3c68f 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/spring/LocalDataSourceLoader.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/spring/LocalDataSourceLoader.java
@@ -33,11 +33,12 @@ import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.DriverManager;
import java.util.List;
@@ -57,8 +58,8 @@ public class LocalDataSourceLoader implements InstantiationAwareBeanPostProcesso
private DataBaseProperties dataBaseProperties;
@Override
- public Object postProcessAfterInitialization(@NonNull final Object bean, final String beanName) throws BeansException {
- if ((bean instanceof DataSourceProperties) && dataBaseProperties.getInitEnable()) {
+ public Object postProcessAfterInitialization(@NonNull final Object bean, @NonNull final String beanName) throws BeansException {
+ if ((bean instanceof DataSourceProperties) && Boolean.TRUE.equals(dataBaseProperties.getInitEnable())) {
this.init((DataSourceProperties) bean);
}
return bean;
@@ -109,6 +110,6 @@ public class LocalDataSourceLoader implements InstantiationAwareBeanPostProcesso
}
private static Reader getResourceAsReader(final String resource) throws IOException {
- return new InputStreamReader(new FileInputStream(resource), StandardCharsets.UTF_8);
+ return new InputStreamReader(Files.newInputStream(Paths.get(resource)), StandardCharsets.UTF_8);
}
}