From c7ec8a137df2185113000c26f6116e7bc5263ab6 Mon Sep 17 00:00:00 2001 From: yangzl Date: Tue, 10 Dec 2024 12:33:17 +0800 Subject: [PATCH] refactor: Use an empty collection instead of null return value --- .../component/ApolloAuditLogApiNoOpImpl.java | 11 ++++++----- .../biz/utils/ReleaseMessageKeyGenerator.java | 3 ++- ...aSourceScriptDatabaseInitializerFactory.java | 3 ++- .../DefaultRolePermissionService.java | 2 +- .../spi/defaultimpl/DefaultUserService.java | 17 ++++++++++++----- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/component/ApolloAuditLogApiNoOpImpl.java b/apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/component/ApolloAuditLogApiNoOpImpl.java index 6de5f0a018e..e12e780939b 100644 --- a/apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/component/ApolloAuditLogApiNoOpImpl.java +++ b/apollo-audit/apollo-audit-impl/src/main/java/com/ctrip/framework/apollo/audit/component/ApolloAuditLogApiNoOpImpl.java @@ -21,6 +21,7 @@ import com.ctrip.framework.apollo.audit.dto.ApolloAuditLogDataInfluenceDTO; import com.ctrip.framework.apollo.audit.dto.ApolloAuditLogDetailsDTO; import com.ctrip.framework.apollo.audit.dto.ApolloAuditLogDTO; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -50,28 +51,28 @@ public void appendDataInfluences(List entities, Class beanDefinition) @Override public List queryLogs(int page, int size) { - return null; + return Collections.emptyList(); } @Override public List queryLogsByOpName(String opName, Date startDate, Date endDate, int page, int size) { - return null; + return Collections.emptyList(); } @Override public List queryTraceDetails(String traceId) { - return null; + return Collections.emptyList(); } @Override public List queryDataInfluencesByField(String entityName, String entityId, String fieldName, int page, int size) { - return null; + return Collections.emptyList(); } @Override public List searchLogByNameOrTypeOrOperator(String query, int page, int size) { - return null; + return Collections.emptyList(); } } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseMessageKeyGenerator.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseMessageKeyGenerator.java index b3f7cc22ca6..640ad4ee2e2 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseMessageKeyGenerator.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseMessageKeyGenerator.java @@ -21,6 +21,7 @@ import com.ctrip.framework.apollo.core.ConfigConsts; import com.google.common.base.Splitter; +import java.util.Collections; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,7 @@ public static List messageToList(String message) { //message should be appId+cluster+namespace if (keys.size() != 3) { logger.error("message format invalid - {}", message); - return null; + return Collections.emptyList(); } return keys; } diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/ApolloDataSourceScriptDatabaseInitializerFactory.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/ApolloDataSourceScriptDatabaseInitializerFactory.java index 74106334df7..ad3a1b8cbef 100644 --- a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/ApolloDataSourceScriptDatabaseInitializerFactory.java +++ b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/ApolloDataSourceScriptDatabaseInitializerFactory.java @@ -20,6 +20,7 @@ import java.security.CodeSource; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.sql.DataSource; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -101,7 +102,7 @@ private static List resolveLocations(Collection locations, private static Collection convertRepositoryLocations(Collection locations, DataSource dataSource) { if (CollectionUtils.isEmpty(locations)) { - return null; + return Collections.emptyList(); } String repositoryDir = findRepositoryDirectory(); String suffix = findSuffix(dataSource); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java index 746d98e633b..dfa057ef36e 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java @@ -183,7 +183,7 @@ public Set queryUsersWithRole(String roleName) { List userRoles = userRoleRepository.findByRoleId(role.getId()); List userInfos = userService.findByUserIds(userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList())); - if(userInfos == null){ + if (CollectionUtils.isEmpty(userInfos)) { return Collections.emptySet(); } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java index f13cf934da2..b5b95374e8b 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java @@ -24,12 +24,15 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import org.springframework.util.CollectionUtils; /** * @author Jason Song(song_s@ctrip.com) */ public class DefaultUserService implements UserService { + private static final String DEFAULT_USER_ID = "apollo"; + @Override public List searchUsers(String keyword, int offset, int limit, boolean includeInactiveUsers) { return Collections.singletonList(assembleDefaultUser()); @@ -37,7 +40,7 @@ public List searchUsers(String keyword, int offset, int limit, boolean @Override public UserInfo findByUserId(String userId) { - if (Objects.equals(userId, "apollo")) { + if (Objects.equals(userId, DEFAULT_USER_ID)) { return assembleDefaultUser(); } return null; @@ -45,16 +48,20 @@ public UserInfo findByUserId(String userId) { @Override public List findByUserIds(List userIds) { - if (userIds.contains("apollo")) { + if (CollectionUtils.isEmpty(userIds)) { + return Collections.emptyList(); + } + + if (userIds.contains(DEFAULT_USER_ID)) { return Lists.newArrayList(assembleDefaultUser()); } - return null; + return Collections.emptyList(); } private UserInfo assembleDefaultUser() { UserInfo defaultUser = new UserInfo(); - defaultUser.setUserId("apollo"); - defaultUser.setName("apollo"); + defaultUser.setUserId(DEFAULT_USER_ID); + defaultUser.setName(DEFAULT_USER_ID); defaultUser.setEmail("apollo@acme.com"); return defaultUser;