From c3121c18bd19c1e500c4edb1d858e108e7a017f3 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Wed, 18 Jul 2018 11:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BBCollections=E5=8C=96=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/authorization/simple/SimplePermission.java | 4 ++-- .../authorization/token/DefaultUserTokenManager.java | 4 ++-- .../basic/web/SessionIdUserTokenGenerator.java | 2 +- .../client/simple/SimpleOAuth2RequestService.java | 4 ++-- .../hswebframework/web/excel/DefaultExcelImporter.java | 2 +- .../dao/mybatis/mapper/dict/DictInTermTypeMapper.java | 3 ++- .../dao/mybatis/mapper/dict/DictTermTypeMapper.java | 3 ++- .../hswebframework/web/commons/entity/PagerResult.java | 4 ++-- .../web/service/AbstractTreeSortService.java | 4 ++-- .../web/service/DefaultLogicPrimaryKeyValidator.java | 2 +- .../web/service/DefaultQueryByEntityService.java | 2 +- .../FixUseSupperClassFallbackCacheOperationSource.java | 2 +- .../web/bean/DefaultToStringOperator.java | 6 +++--- .../org/hswebframework/web/bean/FastBeanCopier.java | 2 +- .../org/hswebframework/web/bean/ToStringOperator.java | 2 +- .../web/dict/defaults/DefaultDictDefineRepository.java | 7 +++++-- .../web/validate/ValidationException.java | 2 +- .../authorize/SessionIdWebSocketTokenParser.java | 2 +- .../web/starter/entity/EntityProperties.java | 4 ++-- .../simple/SimpleAuthorizationSettingService.java | 8 ++++---- .../authorization/simple/SimpleUserService.java | 2 +- .../controller/model/FieldAccessModel.java | 2 +- .../controller/model/SimplePermissionRoleModel.java | 4 ++-- .../dev/tools/web/FileManagerDevToolsController.java | 2 +- .../dictionary/simple/SimpleDictionaryItemService.java | 2 +- .../simple/parser/SimpleDictParserFormatter.java | 2 +- .../controller/dictionary/DictionaryController.java | 2 +- .../service/form/simple/SimpleDynamicFormService.java | 4 ++-- .../dict/DictionaryOptionalConvertBuilderStrategy.java | 2 +- .../simple/validator/DynamicBeanValidatorFactory.java | 2 +- .../simple/SimplePersonnelAuthentication.java | 8 ++++---- .../handler/DepartmentScopeDataAccessHandler.java | 2 +- .../simple/handler/DistrictScopeDataAccessHandler.java | 2 +- .../simple/handler/OrgScopeDataAccessHandler.java | 2 +- .../simple/handler/PersonScopeDataAccessHandler.java | 2 +- .../simple/handler/PositionScopeDataAccessHandler.java | 2 +- .../organizational/simple/SimpleDepartmentService.java | 2 +- .../organizational/simple/SimplePersonService.java | 10 +++++----- .../simple/relations/DefaultDepartmentRelations.java | 6 +++--- .../parser/ScriptCandiateDimensionParserStrategy.java | 4 ++-- .../flowable/utils/CustomUserEntityManager.java | 2 +- .../workflow/service/imp/BpmActivityServiceImpl.java | 2 +- .../service/imp/ProcessConfigurationServiceImpl.java | 2 +- 43 files changed, 72 insertions(+), 67 deletions(-) diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimplePermission.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimplePermission.java index a7350686e..eb950b7aa 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimplePermission.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimplePermission.java @@ -29,14 +29,14 @@ public class SimplePermission implements Permission { public Set getActions() { if (actions == null) { - actions = Collections.emptySet(); + actions = new java.util.HashSet<>(); } return actions; } public Set getDataAccesses() { if (dataAccesses == null) { - dataAccesses = Collections.emptySet(); + dataAccesses = new java.util.HashSet<>(); } return dataAccesses; } diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/DefaultUserTokenManager.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/DefaultUserTokenManager.java index 67359103e..a1249cf3e 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/DefaultUserTokenManager.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/DefaultUserTokenManager.java @@ -115,12 +115,12 @@ public class DefaultUserTokenManager implements UserTokenManager { @Override public List getByUserId(String userId) { if (userId == null) { - return Collections.emptyList(); + return new ArrayList(); } Set tokens = getUserToken(userId); if (tokens.isEmpty()) { userStorage.remove(userId); - return Collections.emptyList(); + return new ArrayList(); } return tokens .stream() diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/SessionIdUserTokenGenerator.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/SessionIdUserTokenGenerator.java index ba06fb27c..f5b3c5b2d 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/SessionIdUserTokenGenerator.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/SessionIdUserTokenGenerator.java @@ -36,7 +36,7 @@ public class SessionIdUserTokenGenerator implements UserTokenGenerator, Serializ @Override public Map getResponse() { - return Collections.emptyMap(); + return new java.util.HashMap<>(); } @Override diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/SimpleOAuth2RequestService.java b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/SimpleOAuth2RequestService.java index 47bf390e1..065225505 100644 --- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/SimpleOAuth2RequestService.java +++ b/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/SimpleOAuth2RequestService.java @@ -88,8 +88,8 @@ public class SimpleOAuth2RequestService implements OAuth2RequestService { @Override @SuppressWarnings("unchecked") public void doEvent(String serverId, OAuth2Event event, Class eventType) { - listenerStore.getOrDefault(serverId, Collections.emptyMap()) - .getOrDefault(eventType, Collections.emptyList()) + listenerStore.getOrDefault(serverId, new java.util.HashMap<>()) + .getOrDefault(eventType, new ArrayList<>()) .forEach(listener -> listener.on(event)); } diff --git a/hsweb-boost/hsweb-boost-excel/src/main/java/org/hswebframework/web/excel/DefaultExcelImporter.java b/hsweb-boost/hsweb-boost-excel/src/main/java/org/hswebframework/web/excel/DefaultExcelImporter.java index 6e59ad8f6..3c3adb49a 100644 --- a/hsweb-boost/hsweb-boost-excel/src/main/java/org/hswebframework/web/excel/DefaultExcelImporter.java +++ b/hsweb-boost/hsweb-boost-excel/src/main/java/org/hswebframework/web/excel/DefaultExcelImporter.java @@ -55,7 +55,7 @@ public class DefaultExcelImporter implements ExcelImporter { || type.isEnum() || type.isArray() || Date.class.isAssignableFrom(type)) { - return Collections.emptyMap(); + return new java.util.HashMap<>(); } AtomicInteger index = new AtomicInteger(0); Map headerMapperMap = new HashMap<>(); diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java index 5565fe3df..2f67e5b3b 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java @@ -14,6 +14,7 @@ import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue; import org.hswebframework.web.dict.EnumDict; import java.sql.JDBCType; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -64,7 +65,7 @@ public class DictInTermTypeMapper extends AbstractSqlTermCustomer { OptionConverter converter = column.getOptionConverter(); if (converter == null) { - return Collections.emptyList(); + return new ArrayList<>(); } return (List) converter.getOptions(); diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java index 40ff0b415..fbe359c9d 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java @@ -14,6 +14,7 @@ import org.hswebframework.web.dao.mybatis.mapper.ChangedTermValue; import org.hswebframework.web.dict.EnumDict; import java.sql.JDBCType; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -63,7 +64,7 @@ public class DictTermTypeMapper extends AbstractSqlTermCustomer { OptionConverter converter = column.getOptionConverter(); if (converter == null) { - return Collections.emptyList(); + return new ArrayList<>(); } return (List) converter.getOptions(); diff --git a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/PagerResult.java b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/PagerResult.java index effb618d1..8c67531a1 100644 --- a/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/PagerResult.java +++ b/hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/PagerResult.java @@ -22,7 +22,7 @@ package org.hswebframework.web.commons.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; @ApiModel(description = "分页结果") @@ -30,7 +30,7 @@ public class PagerResult implements Entity { private static final long serialVersionUID = -6171751136953308027L; public static PagerResult empty(){ - return new PagerResult<>(0, Collections.emptyList()); + return new PagerResult<>(0, new ArrayList<>()); } public static PagerResult of(int total,List list){ diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java index eba3203ad..45b62b043 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java @@ -45,7 +45,7 @@ public abstract class AbstractTreeSortService(); } return keys.entrySet() .stream() diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java index 62c840c3d..97d45f0b5 100644 --- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java +++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultQueryByEntityService.java @@ -54,7 +54,7 @@ public interface DefaultQueryByEntityService int total = getDao().count(param); pagerResult.setTotal(total); if (total == 0) { - pagerResult.setData(Collections.emptyList()); + pagerResult.setData(new java.util.ArrayList<>()); } else { //根据实际记录数量重新指定分页参数 if (param instanceof QueryParamEntity) { diff --git a/hsweb-concurrent/hsweb-concurrent-cache/src/main/java/org/hswebframework/web/cache/spring/fix/FixUseSupperClassFallbackCacheOperationSource.java b/hsweb-concurrent/hsweb-concurrent-cache/src/main/java/org/hswebframework/web/cache/spring/fix/FixUseSupperClassFallbackCacheOperationSource.java index 688f38d25..df3757f46 100644 --- a/hsweb-concurrent/hsweb-concurrent-cache/src/main/java/org/hswebframework/web/cache/spring/fix/FixUseSupperClassFallbackCacheOperationSource.java +++ b/hsweb-concurrent/hsweb-concurrent-cache/src/main/java/org/hswebframework/web/cache/spring/fix/FixUseSupperClassFallbackCacheOperationSource.java @@ -58,7 +58,7 @@ public abstract class FixUseSupperClassFallbackCacheOperationSource implements C * Canonical value held in cache to indicate no caching attribute was * found for this method and we don't need to look again. */ - private final static Collection NULL_CACHING_ATTRIBUTE = Collections.emptyList(); + private final static Collection NULL_CACHING_ATTRIBUTE = new java.util.ArrayList<>(); /** diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/DefaultToStringOperator.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/DefaultToStringOperator.java index 35f228192..54d010bc5 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/DefaultToStringOperator.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/DefaultToStringOperator.java @@ -97,7 +97,7 @@ public class DefaultToStringOperator implements ToStringOperator { defaultFeatures = ToString.DEFAULT_FEATURE; } defaultIgnoreProperties = classIgnore == null ? - new HashSet<>(Collections.emptySet()) + new HashSet<>(new java.util.HashSet<>()) : new HashSet<>(Arrays.asList(classIgnore.value())); //是否打码 @@ -303,9 +303,9 @@ public class DefaultToStringOperator implements ToStringOperator { if (isSimpleType || propertyType == null) { entry.setValue(""); } else if (propertyType.isArray() || Collection.class.isAssignableFrom(propertyType)) { - entry.setValue(Collections.emptyList()); + entry.setValue(new java.util.ArrayList<>()); } else { - entry.setValue(Collections.emptyMap()); + entry.setValue(new java.util.HashMap<>()); } } continue; diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java index 9add27b76..5c2f4278c 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java @@ -100,7 +100,7 @@ public final class FastBeanCopier { } public static T copy(S source, T target, Converter converter, String... ignore) { - return copy(source, target, converter, (ignore == null || ignore.length == 0) ? Collections.emptySet() : new HashSet<>(Arrays.asList(ignore))); + return copy(source, target, converter, (ignore == null || ignore.length == 0) ? new java.util.HashSet<>() : new HashSet<>(Arrays.asList(ignore))); } public static T copy(S source, T target, Set ignore) { diff --git a/hsweb-core/src/main/java/org/hswebframework/web/bean/ToStringOperator.java b/hsweb-core/src/main/java/org/hswebframework/web/bean/ToStringOperator.java index 90b08780d..878d3796b 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/bean/ToStringOperator.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/bean/ToStringOperator.java @@ -10,7 +10,7 @@ import java.util.*; public interface ToStringOperator { default String toString(T target, String... ignoreProperty) { - return toString(target, -1, ignoreProperty == null ? Collections.emptySet() : new HashSet<>(Arrays.asList(ignoreProperty))); + return toString(target, -1, ignoreProperty == null ? new java.util.HashSet<>() : new HashSet<>(Arrays.asList(ignoreProperty))); } String toString(T target, long features, Set ignoreProperty); diff --git a/hsweb-core/src/main/java/org/hswebframework/web/dict/defaults/DefaultDictDefineRepository.java b/hsweb-core/src/main/java/org/hswebframework/web/dict/defaults/DefaultDictDefineRepository.java index 5b1b6e988..16e4d8fd0 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/dict/defaults/DefaultDictDefineRepository.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/dict/defaults/DefaultDictDefineRepository.java @@ -25,6 +25,7 @@ public class DefaultDictDefineRepository implements DictDefineRepository { parsedDict.put(define.getId(), define); } + @SuppressWarnings("all") public static ClassDictDefine parseEnumDict(Class type) { log.debug("parse enum dict :{}", type); @@ -43,7 +44,9 @@ public class DefaultDictDefineRepository implements DictDefineRepository { define.setComments(type.getSimpleName()); } - define.setItems(Arrays.asList(type.getEnumConstants())); + List dicts = Arrays.asList(type.getEnumConstants()); + + define.setItems(new ArrayList<>(dicts)); return define; @@ -61,7 +64,7 @@ public class DefaultDictDefineRepository implements DictDefineRepository { @Override public List getDefine(Class type) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } diff --git a/hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java b/hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java index b7e7ce834..c6093f355 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java @@ -44,7 +44,7 @@ public class ValidationException extends BusinessException { public List getResults() { if (results == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return results.getResults(); } diff --git a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/authorize/SessionIdWebSocketTokenParser.java b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/authorize/SessionIdWebSocketTokenParser.java index 6d004e710..a7b21c0b8 100644 --- a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/authorize/SessionIdWebSocketTokenParser.java +++ b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/authorize/SessionIdWebSocketTokenParser.java @@ -22,6 +22,6 @@ public class SessionIdWebSocketTokenParser implements WebSocketTokenParser { .add(tmp[1].trim()); } } - return sessionId.getOrDefault("JSESSIONID", sessionId.getOrDefault("SESSIONID", Collections.emptySet())).stream().findFirst().orElse(null); + return sessionId.getOrDefault("JSESSIONID", sessionId.getOrDefault("SESSIONID", new java.util.HashSet<>())).stream().findFirst().orElse(null); } } diff --git a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityProperties.java b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityProperties.java index 93e0f638b..a3d7536d0 100644 --- a/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityProperties.java +++ b/hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityProperties.java @@ -53,7 +53,7 @@ public class EntityProperties { public Map, MapperEntityFactory.Mapper> createMappers() { if (mappings == null || mappings.isEmpty()) { - return Collections.emptyMap(); + return new java.util.HashMap<>(); } return mappings.stream() .map(Mapping::create) @@ -68,7 +68,7 @@ public class EntityProperties { Map, MapperEntityFactory.Mapper> create() { if (mapping == null || mapping.isEmpty()) { - return Collections.emptyMap(); + return new java.util.HashMap<>(); } return mapping.entrySet().stream() .collect(Collectors.toMap( diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 29d36f6af..a10a3b58e 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -204,15 +204,15 @@ public class SimpleAuthorizationSettingService extends GenericEntityService getUserMenuAsList(String userId) { if (null == userId) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } UserEntity userEntity = userService.selectByPk(userId); if (userEntity == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } List entities = getUserSetting(userId); if (entities.isEmpty()) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } //用户持有的权限设置id集合 List settingIdList = entities.stream() @@ -357,7 +357,7 @@ public class SimpleAuthorizationSettingService extends GenericEntityService()); } else if (isNotEmpty(detail.getDataAccesses()) && !entity.getSupportDataAccessTypes().contains("*")) { //重构为权限支持的数据权限控制方式,防止越权设置权限 detail.setDataAccesses(detail diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java index 1efcc841c..d79454df2 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java @@ -289,7 +289,7 @@ public class SimpleUserService extends AbstractService @Override public List selectByUserByRole(List roleIdList) { if (CollectionUtils.isEmpty(roleIdList)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return createQuery() .where("id", "user-in-role", roleIdList) diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/FieldAccessModel.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/FieldAccessModel.java index 8b38a5a29..6839b9565 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/FieldAccessModel.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/FieldAccessModel.java @@ -59,7 +59,7 @@ public class FieldAccessModel implements Model { required = true, dataType = "ActionModel") public List getActions() { if (actions == null) { - actions = Collections.emptyList(); + actions = new java.util.ArrayList<>(); } return actions; } diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/SimplePermissionRoleModel.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/SimplePermissionRoleModel.java index 7cf05cd0e..fef09987c 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/SimplePermissionRoleModel.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/src/main/java/org/hswebframework/web/authorization/controller/model/SimplePermissionRoleModel.java @@ -48,7 +48,7 @@ public class SimplePermissionRoleModel implements PermissionRoleModel { @Override public List getActions() { if (this.actions == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return actions; } @@ -61,7 +61,7 @@ public class SimplePermissionRoleModel implements PermissionRoleModel { @Override public List getDataAccesses() { if (this.dataAccesses == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return this.dataAccesses; } diff --git a/hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/web/FileManagerDevToolsController.java b/hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/web/FileManagerDevToolsController.java index f0a74c234..66de1403b 100644 --- a/hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/web/FileManagerDevToolsController.java +++ b/hsweb-system/hsweb-system-dev-tools/src/main/java/org/hswebframework/web/dev/tools/web/FileManagerDevToolsController.java @@ -54,7 +54,7 @@ public class FileManagerDevToolsController { if (file.isDirectory()) { File[] files = file.listFiles(); if (files == null) { - list = Collections.emptyList(); + list = new java.util.ArrayList<>(); } else { list = Stream.of(files) .map(FileInfo::from) diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java index dc54156f3..4acbd748d 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java @@ -78,7 +78,7 @@ public class SimpleDictionaryItemService extends AbstractTreeSortService selectByDictId(String dictId) { if (StringUtils.isNullOrEmpty(dictId)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return createQuery() .where(DictionaryItemEntity.dictId, dictId) diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java index 5c752719d..b87272629 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java @@ -37,7 +37,7 @@ public class SimpleDictParserFormatter implements DictParserFormatter { , Object value , BiFunction mapping) { if (value == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } String stringValue = String.valueOf(value); if (!needParse(stringValue, format)) { diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java index 9be186a0d..81fbf8d92 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java @@ -88,7 +88,7 @@ public class DictionaryController implements SimpleGenericEntityController>> getItemDefineById(@PathVariable String id) { return ok(Optional.ofNullable(repository.getDefine(id)) .map(DictDefine::getItems) - .orElse(Collections.emptyList())); + .orElse(new java.util.ArrayList<>())); } } diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java index f918f36bd..f8b0f90bd 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormService.java @@ -315,7 +315,7 @@ public class SimpleDynamicFormService extends GenericEntityService deleteColumn(List ids) { Objects.requireNonNull(ids); if (ids.isEmpty()) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } List oldColumns = DefaultDSLQueryService .createQuery(formColumnDao) @@ -601,7 +601,7 @@ public class SimpleDynamicFormService extends GenericEntityService(() -> (List) Arrays.asList(javaType.getEnumConstants())); + return new EnumDictValueConverter(() -> new Arr); } switch (jdbcType) { case BLOB: diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java index 25e3f31b0..6fc61b8ae 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java @@ -47,7 +47,7 @@ public class DictionaryOptionalConvertBuilderStrategy implements OptionalConvert converter.setWriteObject(!"false".equalsIgnoreCase(writeObject)); if (!StringUtils.isEmpty(sppliter)) { - converter.setSplitter(str -> Arrays.asList(str.split(sppliter))); + converter.setSplitter(str -> new Arr); } return converter; diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/validator/DynamicBeanValidatorFactory.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/validator/DynamicBeanValidatorFactory.java index 62342233d..392a5a6d6 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/validator/DynamicBeanValidatorFactory.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/validator/DynamicBeanValidatorFactory.java @@ -90,7 +90,7 @@ public class DynamicBeanValidatorFactory implements ValidatorFactory { protected List createValidatorAnnotation(Set config) { if (CollectionUtils.isEmpty(config)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return config.stream() diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnelAuthentication.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnelAuthentication.java index 9743ab797..aef7f70db 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnelAuthentication.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/SimplePersonnelAuthentication.java @@ -40,7 +40,7 @@ public class SimplePersonnelAuthentication implements PersonnelAuthentication { @Override public Set> getDistrictIds() { if (districtIds == null) { - districtIds = Collections.emptySet(); + districtIds = new java.util.HashSet<>(); } return districtIds; } @@ -61,7 +61,7 @@ public class SimplePersonnelAuthentication implements PersonnelAuthentication { @Override public Set> getOrgIds() { if (orgIds == null) { - orgIds = Collections.emptySet(); + orgIds = new java.util.HashSet<>(); } return orgIds; } @@ -73,7 +73,7 @@ public class SimplePersonnelAuthentication implements PersonnelAuthentication { @Override public Set> getPositionIds() { if (positionIds == null) { - positionIds = Collections.emptySet(); + positionIds = new java.util.HashSet<>(); } return positionIds; } @@ -85,7 +85,7 @@ public class SimplePersonnelAuthentication implements PersonnelAuthentication { @Override public Set> getDepartmentIds() { if (departmentIds == null) { - departmentIds = Collections.emptySet(); + departmentIds = new java.util.HashSet<>(); } return departmentIds; } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java index 10eae13db..1ec4c5712 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DepartmentScopeDataAccessHandler.java @@ -45,7 +45,7 @@ public class DepartmentScopeDataAccessHandler extends AbstractScopeDataAccessHan case SCOPE_TYPE_ONLY_SELF: return authorization.getRootDepartmentId(); default: - return Collections.emptySet(); + return new java.util.HashSet<>(); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java index 99e12a0f1..751758402 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/DistrictScopeDataAccessHandler.java @@ -43,7 +43,7 @@ public class DistrictScopeDataAccessHandler extends AbstractScopeDataAccessHandl case SCOPE_TYPE_ONLY_SELF: return authorization.getRootDistrictId(); default: - return Collections.emptySet(); + return new java.util.HashSet<>(); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java index 88d85e699..ccc714fcb 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/OrgScopeDataAccessHandler.java @@ -40,7 +40,7 @@ public class OrgScopeDataAccessHandler extends AbstractScopeDataAccessHandler(); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java index 58482c6a0..8fe5c9841 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PersonScopeDataAccessHandler.java @@ -37,7 +37,7 @@ public class PersonScopeDataAccessHandler extends AbstractScopeDataAccessHandler case SCOPE_TYPE_ONLY_SELF: return Collections.singleton(authorization.getPersonnel().getId()); default: - return Collections.emptySet(); + return new java.util.HashSet<>(); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java index 0775193f7..aa42d2a20 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/handler/PositionScopeDataAccessHandler.java @@ -35,7 +35,7 @@ public class PositionScopeDataAccessHandler extends AbstractScopeDataAccessHandl case SCOPE_TYPE_ONLY_SELF: return authorization.getRootPositionId(); default: - return Collections.emptySet(); + return new java.util.HashSet<>(); } } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleDepartmentService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleDepartmentService.java index dd2dde9ed..b2a382a4e 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleDepartmentService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleDepartmentService.java @@ -83,7 +83,7 @@ public class SimpleDepartmentService @Cacheable(key = "'org-ids:'+#orgId==null?0:orgId.hashCode()+'_'+#children+'_'+#parent") public List selectByOrgIds(List orgId, boolean children, boolean parent) { if (CollectionUtils.isEmpty(orgId)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } Set allOrgId = new HashSet<>(orgId); diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java index dc3b00881..5e694bba5 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java @@ -218,7 +218,7 @@ public class SimplePersonService extends GenericEntityService selectAllDepartmentId(List personId) { if (CollectionUtils.isEmpty(personId)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } //所有的机构 List positionId = DefaultDSLQueryService.createQuery(personPositionDao) @@ -231,7 +231,7 @@ public class SimplePersonService extends GenericEntityService(); } return DefaultDSLQueryService.createQuery(positionDao) .where() @@ -248,7 +248,7 @@ public class SimplePersonService extends GenericEntityService selectAllOrgId(List personId) { List departmentId = this.selectAllDepartmentId(personId); if (CollectionUtils.isEmpty(departmentId)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return DefaultDSLQueryService.createQuery(departmentDao) .where() @@ -466,7 +466,7 @@ public class SimplePersonService extends GenericEntityService> childAccepter, Consumer> rootConsumer) { if (CollectionUtils.isEmpty(rootIds)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } //获取根节点 List root = DefaultDSLQueryService.createQuery(dao) @@ -488,7 +488,7 @@ public class SimplePersonService extends GenericEntityService(); } public static > Set> transformationTreeNode(V parent, List data) { diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/relations/DefaultDepartmentRelations.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/relations/DefaultDepartmentRelations.java index 6699ce887..aa41349e1 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/relations/DefaultDepartmentRelations.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-local/src/main/java/org/hswebframework/web/service/organizational/simple/relations/DefaultDepartmentRelations.java @@ -139,7 +139,7 @@ public class DefaultDepartmentRelations extends DefaultLinkedRelations> positionSupplier = Lazy.val(() -> { List departmentId = getAllDepartmentId(); if (CollectionUtils.isEmpty(departmentId)) { - return (Supplier) () -> Collections.emptyList(); + return (Supplier) () -> new java.util.ArrayList<>(); } QueryParamEntity positionQueryParam = positionQuery.end() .in(PositionEntity.departmentId, departmentId) @@ -157,7 +157,7 @@ public class DefaultDepartmentRelations extends DefaultLinkedRelations> allDepartmentId = createLazyIdSupplier(() -> { Set departmentId = new HashSet<>(targetIdSupplier.get()); if (CollectionUtils.isEmpty(departmentId)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } Set allParent = null, allChildren = null; //包含父级 @@ -204,7 +204,7 @@ public class DefaultDepartmentRelations extends DefaultLinkedRelations positionEntities = positionSupplier.get(); if (CollectionUtils.isEmpty(positionEntities)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return serviceContext diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dimension/parser/ScriptCandiateDimensionParserStrategy.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dimension/parser/ScriptCandiateDimensionParserStrategy.java index b6e9124b0..f9383715f 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dimension/parser/ScriptCandiateDimensionParserStrategy.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/dimension/parser/ScriptCandiateDimensionParserStrategy.java @@ -47,7 +47,7 @@ public class ScriptCandiateDimensionParserStrategy implements CandidateDimension String expressionLanguage = config.getStringConfig("expressionLanguage").orElse(null); if (StringUtils.isEmpty(expression)) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } String creatorId = context.getCreatorId(); @@ -99,7 +99,7 @@ public class ScriptCandiateDimensionParserStrategy implements CandidateDimension } else { String result = userIdConverter.apply(obj); if (result == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return Collections.singletonList(result); } diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java index 791efdebd..c8b62ac7c 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java @@ -36,7 +36,7 @@ public class CustomUserEntityManager extends UserEntityManager { @Override public List findGroupsByUser(final String userId) { if (userId == null) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } List sysRoles = userService.getUserRole(userId); diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmActivityServiceImpl.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmActivityServiceImpl.java index 0a52004b4..22163833e 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmActivityServiceImpl.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmActivityServiceImpl.java @@ -55,7 +55,7 @@ public class BpmActivityServiceImpl extends AbstractFlowableService implements B } else { ActivityImpl activity = pde.findActivity(activityId); if (null == activity) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } return Collections.singletonList(activity); } diff --git a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/ProcessConfigurationServiceImpl.java b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/ProcessConfigurationServiceImpl.java index 3cfc9e45e..5b539cd80 100644 --- a/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/ProcessConfigurationServiceImpl.java +++ b/hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/ProcessConfigurationServiceImpl.java @@ -151,7 +151,7 @@ public class ProcessConfigurationServiceImpl implements ProcessConfigurationServ @Override public List getCandidateInfo(Task task) { - return Collections.emptyList(); + return new java.util.ArrayList<>(); } @Override