去Collections化第一步

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<String> getActions() {
         if (actions == null) {
-            actions = Collections.emptySet();
+            actions = new java.util.HashSet<>();
         }
         return actions;
     }
 
     public Set<DataAccessConfig> getDataAccesses() {
         if (dataAccesses == null) {
-            dataAccesses = Collections.emptySet();
+            dataAccesses = new java.util.HashSet<>();
         }
         return dataAccesses;
     }

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<UserToken> getByUserId(String userId) {
         if (userId == null) {
-            return Collections.emptyList();
+            return new ArrayList();
         }
         Set<String> tokens = getUserToken(userId);
         if (tokens.isEmpty()) {
             userStorage.remove(userId);
-            return Collections.emptyList();
+            return new ArrayList();
         }
         return tokens
                 .stream()

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<String, Object> getResponse() {
-                return Collections.emptyMap();
+                return new java.util.HashMap<>();
             }
 
             @Override

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<? extends OAuth2Event> 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));
     }
 

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<Class, DefaultHeaderMapper> headerMapperMap = new HashMap<>();

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();

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();

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<E> implements Entity {
     private static final long serialVersionUID = -6171751136953308027L;
 
     public static <E> PagerResult<E> empty(){
-        return new PagerResult<>(0, Collections.emptyList());
+        return new PagerResult<>(0, new ArrayList<>());
     }
 
     public static <E> PagerResult<E> of(int total,List<E> list){

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<E extends TreeSortSupportEntity<PK
         assertNotNull(childId);
         E old = selectByPk(childId);
         if (null == old) {
-            return Collections.emptyList();
+            return new ArrayList();
         }
         return createQuery()
                 .where()
@@ -60,7 +60,7 @@ public abstract class AbstractTreeSortService<E extends TreeSortSupportEntity<PK
         assertNotNull(parentId);
         E old = selectByPk(parentId);
         if (null == old) {
-            return Collections.emptyList();
+            return new ArrayList();
         }
         return createQuery()
                 .where()

hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/DefaultLogicPrimaryKeyValidator.java

@@ -117,7 +117,7 @@ public class DefaultLogicPrimaryKeyValidator implements LogicPrimaryKeyValidator
         }
 
         if (keys.isEmpty()) {
-            return Collections.emptyMap();
+            return new java.util.HashMap<>();
         }
         return keys.entrySet()
                 .stream()

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<E>
         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) {

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<CacheOperation> NULL_CACHING_ATTRIBUTE = Collections.emptyList();
+    private final static Collection<CacheOperation> NULL_CACHING_ATTRIBUTE = new java.util.ArrayList<>();
 
 
     /**

hsweb-core/src/main/java/org/hswebframework/web/bean/DefaultToStringOperator.java

@@ -97,7 +97,7 @@ public class DefaultToStringOperator<T> implements ToStringOperator<T> {
             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<T> implements ToStringOperator<T> {
                     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;

hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java

@@ -100,7 +100,7 @@ public final class FastBeanCopier {
     }
 
     public static <T, S> 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, S> T copy(S source, T target, Set<String> ignore) {

hsweb-core/src/main/java/org/hswebframework/web/bean/ToStringOperator.java

@@ -10,7 +10,7 @@ import java.util.*;
 public interface ToStringOperator<T> {
 
     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<String> ignoreProperty);

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 <T extends Enum & EnumDict> ClassDictDefine parseEnumDict(Class<T> 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<ClassDictDefine> getDefine(Class type) {
-        return Collections.emptyList();
+        return new java.util.ArrayList<>();
     }
 
 

hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java

@@ -44,7 +44,7 @@ public class ValidationException extends BusinessException {
 
     public List<ValidateResults.Result> getResults() {
         if (results == null) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         return results.getResults();
     }

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);
     }
 }

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<Class<Entity>, 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<Class<Entity>, MapperEntityFactory.Mapper> create() {
             if (mapping == null || mapping.isEmpty()) {
-                return Collections.emptyMap();
+                return new java.util.HashMap<>();
             }
             return mapping.entrySet().stream()
                     .collect(Collectors.toMap(

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<Auth
     @Cacheable(cacheNames = USER_MENU_CACHE_NAME, key = "'user-menu-list:'+#userId")
     public List<UserMenuEntity> 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<AuthorizationSettingEntity> entities = getUserSetting(userId);
         if (entities.isEmpty()) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         //用户持有的权限设置id集合
         List<String> settingIdList = entities.stream()
@@ -357,7 +357,7 @@ public class SimpleAuthorizationSettingService extends GenericEntityService<Auth
                 detail.setActions(detail.getActions().stream().filter(allActions::contains).collect(Collectors.toSet()));
             }
             if (isEmpty(entity.getSupportDataAccessTypes())) {
-                detail.setDataAccesses(Collections.emptyList());
+                detail.setDataAccesses(new java.util.ArrayList<>());
             } else if (isNotEmpty(detail.getDataAccesses()) && !entity.getSupportDataAccessTypes().contains("*")) {
                 //重构为权限支持的数据权限控制方式,防止越权设置权限
                 detail.setDataAccesses(detail

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<UserEntity, String>
     @Override
     public List<UserEntity> selectByUserByRole(List<String> roleIdList) {
         if (CollectionUtils.isEmpty(roleIdList)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         return createQuery()
                 .where("id", "user-in-role", roleIdList)

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<ActionModel> getActions() {
         if (actions == null) {
-            actions = Collections.emptyList();
+            actions = new java.util.ArrayList<>();
         }
         return actions;
     }

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<String> 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<DataAccessModel> getDataAccesses() {
         if (this.dataAccesses == null) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         return this.dataAccesses;
     }

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)

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<Diction
     @Override
     public List<DictionaryItemEntity> selectByDictId(String dictId) {
         if (StringUtils.isNullOrEmpty(dictId)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         return createQuery()
                 .where(DictionaryItemEntity.dictId, dictId)

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<String, String, T> mapping) {
         if (value == null) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         String stringValue = String.valueOf(value);
         if (!needParse(stringValue, format)) {

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<Dicti
     public ResponseMessage<List<EnumDict<Object>>> getItemDefineById(@PathVariable String id) {
         return ok(Optional.ofNullable(repository.getDefine(id))
                 .map(DictDefine::getItems)
-                .orElse(Collections.emptyList()));
+                .orElse(new java.util.ArrayList<>()));
     }
 
 }

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<DynamicFormEn
     public List<DynamicFormColumnEntity> deleteColumn(List<String> ids) {
         Objects.requireNonNull(ids);
         if (ids.isEmpty()) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         List<DynamicFormColumnEntity> oldColumns = DefaultDSLQueryService
                 .createQuery(formColumnDao)
@@ -601,7 +601,7 @@ public class SimpleDynamicFormService extends GenericEntityService<DynamicFormEn
                 .contains(javaType) || javaType != Map.class || javaType != List.class;
 
         if (javaType.isEnum() && EnumDict.class.isAssignableFrom(javaType)) {
-            return new EnumDictValueConverter<EnumDict>(() -> (List) Arrays.asList(javaType.getEnumConstants()));
+            return new EnumDictValueConverter<EnumDict>(() -> new Arr);
         }
         switch (jdbcType) {
             case BLOB:

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;

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<JSR303AnnotationInfo> createValidatorAnnotation(Set<String> config) {
         if (CollectionUtils.isEmpty(config)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
 
         return config.stream()

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<TreeNode<String>> 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<TreeNode<String>> 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<TreeNode<String>> 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<TreeNode<String>> getDepartmentIds() {
         if (departmentIds == null) {
-            departmentIds = Collections.emptySet();
+            departmentIds = new java.util.HashSet<>();
         }
         return departmentIds;
     }

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<>();
         }
     }
 

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<>();
         }
     }
 

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<Or
             case SCOPE_TYPE_ONLY_SELF:
                 return authorization.getRootOrgId();
             default:
-                return Collections.emptySet();
+                return new java.util.HashSet<>();
         }
     }
 

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<>();
         }
     }
 

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<>();
         }
     }
 

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<DepartmentEntity> selectByOrgIds(List<String> orgId, boolean children, boolean parent) {
         if (CollectionUtils.isEmpty(orgId)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         Set<String> allOrgId = new HashSet<>(orgId);
 

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<PersonEntity, Stri
     @Override
     public List<String> selectAllDepartmentId(List<String> personId) {
         if (CollectionUtils.isEmpty(personId)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         //所有的机构
         List<String> positionId = DefaultDSLQueryService.createQuery(personPositionDao)
@@ -231,7 +231,7 @@ public class SimplePersonService extends GenericEntityService<PersonEntity, Stri
                 .collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(positionId)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         return DefaultDSLQueryService.createQuery(positionDao)
                 .where()
@@ -248,7 +248,7 @@ public class SimplePersonService extends GenericEntityService<PersonEntity, Stri
     public List<String> selectAllOrgId(List<String> personId) {
         List<String> 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<PersonEntity, Stri
                                                                                             BiConsumer<T, List<T>> childAccepter,
                                                                                             Consumer<List<T>> rootConsumer) {
         if (CollectionUtils.isEmpty(rootIds)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         //获取根节点
         List<T> root = DefaultDSLQueryService.createQuery(dao)
@@ -488,7 +488,7 @@ public class SimplePersonService extends GenericEntityService<PersonEntity, Stri
             rootConsumer.accept(root);
             return tree;
         }
-        return Collections.emptyList();
+        return new java.util.ArrayList<>();
     }
 
     public static <V extends TreeSupportEntity<String>> Set<TreeNode<String>> transformationTreeNode(V parent, List<V> data) {

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<Departmen
     private Supplier<List<PositionEntity>> positionSupplier = Lazy.val(() -> {
         List<String> 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<Departmen
     private Supplier<List<String>> allDepartmentId = createLazyIdSupplier(() -> {
         Set<String> departmentId = new HashSet<>(targetIdSupplier.get());
         if (CollectionUtils.isEmpty(departmentId)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
         Set<String> allParent = null, allChildren = null;
         //包含父级
@@ -204,7 +204,7 @@ public class DefaultDepartmentRelations extends DefaultLinkedRelations<Departmen
         List<PositionEntity> positionEntities = positionSupplier.get();
 
         if (CollectionUtils.isEmpty(positionEntities)) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
 
         return serviceContext

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);
         }

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<Group> findGroupsByUser(final String userId) {
         if (userId == null) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
 
         List<RoleEntity> sysRoles = userService.getUserRole(userId);

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);
         }

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<CandidateInfo> getCandidateInfo(Task task) {
-            return Collections.emptyList();
+            return new java.util.ArrayList<>();
         }
 
         @Override