zhou-hao 6 anos atrás
pai
commit
8ab353ba93

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

+ 2 - 2
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 new ArrayList();
+            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 new ArrayList();
+            return new ArrayList<>();
         }
         return createQuery()
                 .where()

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

@@ -468,11 +468,11 @@ public final class FastBeanCopier {
         public Collection newCollection(Class targetClass) {
 
             if (targetClass == List.class) {
-                return new ArrayList();
+                return new ArrayList<>();
             } else if (targetClass == Set.class) {
-                return new HashSet();
+                return new HashSet<>();
             } else if (targetClass == Queue.class) {
-                return new LinkedList();
+                return new LinkedList<>();
             } else {
                 try {
                     return (Collection) targetClass.newInstance();