From ac2d01e6fb3ac66e79484a0c1875e9b2f6f44997 Mon Sep 17 00:00:00 2001 From: sun Date: Tue, 12 Sep 2023 13:56:51 +0800 Subject: [PATCH] perf[stream]: stream.toList() replaces collect(Collectors.toList()) --- .../balancer/ConsistentHashConsumerLoadBalancer.java | 3 +-- .../java/com/zfoo/net/consumer/registry/RegisterVO.java | 9 ++++----- .../zfoo/net/consumer/registry/ZookeeperRegistry.java | 2 +- net/src/main/java/com/zfoo/net/core/HostAndPort.java | 3 +-- net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java | 3 +-- .../main/java/com/zfoo/orm/accessor/MongodbAccessor.java | 5 ++--- orm/src/main/java/com/zfoo/orm/cache/EntityCache.java | 6 +++--- orm/src/main/java/com/zfoo/orm/manager/OrmManager.java | 7 +++---- .../com/zfoo/protocol/generate/GenerateProtocolFile.java | 7 +++---- .../com/zfoo/protocol/generate/GenerateProtocolPath.java | 5 ++--- .../com/zfoo/protocol/registration/EnhanceUtils.java | 3 +-- .../com/zfoo/protocol/registration/ProtocolAnalysis.java | 9 ++++----- .../zfoo/protocol/serializer/cpp/GenerateCppUtils.java | 3 +-- .../zfoo/protocol/serializer/csharp/GenerateCsUtils.java | 3 +-- .../protocol/serializer/javascript/GenerateJsUtils.java | 3 +-- .../zfoo/protocol/serializer/lua/GenerateLuaUtils.java | 3 +-- .../java/com/zfoo/protocol/util/ReflectionUtils.java | 3 +-- .../zfoo/storage/interpreter/ResourceInterpreter.java | 3 +-- .../src/main/java/com/zfoo/storage/util/ExportUtils.java | 4 ++-- 19 files changed, 34 insertions(+), 50 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java index 82db63d1..c00842ef 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java @@ -26,7 +26,6 @@ import org.springframework.lang.Nullable; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.stream.Collectors; /** * 一致性hash负载均衡器，同一个session总是发到同一提供者 @@ -104,7 +103,7 @@ public class ConsistentHashConsumerLoadBalancer extends AbstractConsumerLoadBala var sessionStringList = getSessionsByModule(module).stream() .map(session -> new Pair<>(session.getConsumerAttribute().toString(), session.getSid())) .sorted((a, b) -> a.getKey().compareTo(b.getKey())) - .collect(Collectors.toList()); + .toList();; var consistentHash = new ConsistentHash<>(sessionStringList, VIRTUAL_NODE_NUMS); var virtualNodeTreeMap = consistentHash.getVirtualNodeTreeMap(); diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/RegisterVO.java b/net/src/main/java/com/zfoo/net/consumer/registry/RegisterVO.java index a212e91b..964c92cf 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/RegisterVO.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/RegisterVO.java @@ -29,7 +29,6 @@ import org.springframework.lang.Nullable; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** * @author godotg @@ -109,7 +108,7 @@ public class RegisterVO { .map(it -> it.trim()) .map(it -> it.split(StringUtils.HYPHEN)) .map(it -> new ProviderModule(new ProtocolModule(Byte.parseByte(it[0]), it[1]), it[2])) - .collect(Collectors.toList()); + .toList();; return modules; } @@ -122,7 +121,7 @@ public class RegisterVO { .map(it -> it.trim()) .map(it -> it.split(StringUtils.HYPHEN)) .map(it -> new ConsumerModule(new ProtocolModule(Byte.parseByte(it[0]), it[1]), it[2], it[3])) - .collect(Collectors.toList()); + .toList();; return modules; } @@ -156,7 +155,7 @@ public class RegisterVO { builder.append(StringUtils.SPACE).append(StringUtils.VERTICAL_BAR).append(StringUtils.SPACE); var providerModules = providerConfig.getProviders().stream() .map(it -> StringUtils.joinWith(StringUtils.HYPHEN, it.getProtocolModule().getId(), it.getProtocolModule().getName(), it.getProvider())) - .collect(Collectors.toList()); + .toList();; // 服务提供者模块信息列表 builder.append(StringUtils.format("provider:[{}]" @@ -169,7 +168,7 @@ public class RegisterVO { var consumerModules = consumerConfig.getConsumers().stream() .map(it -> StringUtils.joinWith(StringUtils.HYPHEN, it.getProtocolModule().getId(), it.getProtocolModule().getName(), it.getLoadBalancer(), it.getConsumer())) - .collect(Collectors.toList()); + .toList();; // 服务消费者模块信息列表 builder.append(StringUtils.format("consumer:[{}]" diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java index 2424a6b0..ad9009b3 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java @@ -596,7 +596,7 @@ public class ZookeeperRegistry implements IRegistry { try { var children = curator.getChildren().forPath(path).stream() .filter(it -> StringUtils.isNotBlank(it) && !"null".equals(it)) - .collect(Collectors.toList()); + .toList();; return children; } catch (Exception e) { logger.error("unknown exception", e); diff --git a/net/src/main/java/com/zfoo/net/core/HostAndPort.java b/net/src/main/java/com/zfoo/net/core/HostAndPort.java index c7e43c63..a6968cdc 100644 --- a/net/src/main/java/com/zfoo/net/core/HostAndPort.java +++ b/net/src/main/java/com/zfoo/net/core/HostAndPort.java @@ -16,7 +16,6 @@ import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.StringUtils; import java.util.*; -import java.util.stream.Collectors; /** * @author godotg @@ -70,7 +69,7 @@ public class HostAndPort { public static String toHostAndPortListStr(Collection list) { var urlList = list.stream() .map(it -> it.toHostAndPortStr()) - .collect(Collectors.toList()); + .toList();; return StringUtils.joinWith(StringUtils.COMMA, urlList.toArray()); } diff --git a/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java b/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java index cf91ea50..fda1d8ff 100644 --- a/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java +++ b/net/src/test/java/com/zfoo/net/util/SimpleCacheTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; /** * @author godotg @@ -34,7 +33,7 @@ public class SimpleCacheTest { var cache = SimpleCache.build(3000, 6000, 100, new Function, List>>() { @Override public List> apply(List keyList) { - return keyList.stream().map(it -> new Pair<>(it, "new-" + it + "-value")).collect(Collectors.toList()); + return keyList.stream().map(it -> new Pair<>(it, "new-" + it + "-value")).toList();; } }, key -> "empty"); diff --git a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java index 07bf0628..ed8b1a49 100644 --- a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java +++ b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java @@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import static com.mongodb.client.model.Filters.eq; import static com.mongodb.client.model.Filters.in; @@ -92,7 +91,7 @@ public class MongodbAccessor implements IAccessor { var batchList = entities.stream() .map(it -> new ReplaceOneModel(Filters.eq("_id", it.id()), it)) - .collect(Collectors.toList()); + .toList(); var result = collection.bulkWrite(batchList, new BulkWriteOptions().ordered(false)); if (result.getModifiedCount() != entities.size()) { @@ -128,7 +127,7 @@ public class MongodbAccessor implements IAccessor { @SuppressWarnings("unchecked") var entityClazz = (Class) entities.get(0).getClass(); var collection = OrmContext.getOrmManager().getCollection(entityClazz); - var ids = entities.stream().map(it -> (it).id()).collect(Collectors.toList()); + var ids = entities.stream().map(it -> (it).id()).toList();; collection.deleteMany(in("_id", ids)); } diff --git a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java index 52bae755..afed0ee8 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java @@ -230,7 +230,7 @@ public class EntityCache, E extends IEntity> imple return new ReplaceOneModel<>(filter, it); }) - .collect(Collectors.toList()); + .toList();; var result = collection.bulkWrite(batchList, new BulkWriteOptions().ordered(false)); if (result.getModifiedCount() == batchList.size()) { @@ -261,7 +261,7 @@ public class EntityCache, E extends IEntity> imple return; } - var ids = updateList.stream().map(it -> it.id()).collect(Collectors.toList()); + var ids = updateList.stream().map(it -> it.id()).toList();; try { @SuppressWarnings("unchecked") @@ -314,7 +314,7 @@ public class EntityCache, E extends IEntity> imple if (allPnodes.isEmpty()) { return Collections.emptyList(); } - return allPnodes.stream().map(it -> it.getEntity()).collect(Collectors.toList()); + return allPnodes.stream().map(it -> it.getEntity()).toList();; } @Override diff --git a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java index 835f571f..6905831b 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -53,7 +53,6 @@ import java.lang.reflect.Type; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; /** @@ -110,11 +109,11 @@ public class OrmManager implements IOrmManager { .stream() .map(it -> it.split(StringUtils.COMMA_REGEX)) .flatMap(it -> Arrays.stream(it)) - .map(it -> StringUtils.trim(it)) .filter(it -> StringUtils.isNotBlank(it)) + .map(it -> StringUtils.trim(it)) .map(it -> it.split(StringUtils.COLON_REGEX)) .map(it -> new ServerAddress(it[0], Integer.parseInt(it[1]))) - .collect(Collectors.toList()); + .toList(); mongoBuilder.applyToClusterSettings(builder -> builder.hosts(hostList)); } @@ -271,7 +270,7 @@ public class OrmManager implements IOrmManager { .values() .stream() .map(it -> it.getClass()) - .collect(Collectors.toList()); + .toList(); classSet.addAll(classes); } else { var classes = scanEntityCacheAnno(); diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java index 0d3c65b0..7c1d7b03 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java @@ -35,7 +35,6 @@ import java.util.HashSet; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; -import java.util.stream.Collectors; import static com.zfoo.protocol.util.StringUtils.TAB; import static com.zfoo.protocol.util.StringUtils.TAB_ASCII; @@ -85,7 +84,7 @@ public abstract class GenerateProtocolFile { var outsideGenerateProtocols = Arrays.stream(protocols) .filter(it -> Objects.nonNull(it)) .filter(it -> generateProtocolFilter.test(it)) - .collect(Collectors.toList()); + .toList();; // 需要生成的子协议，因为外层协议的内部有其它协议 var insideGenerateProtocols = outsideGenerateProtocols.stream() @@ -93,7 +92,7 @@ public abstract class GenerateProtocolFile { .flatMap(it -> it.stream()) .map(it -> protocols[it]) .distinct() - .collect(Collectors.toList()); + .toList();; var allGenerateProtocols = new HashSet(); allGenerateProtocols.addAll(outsideGenerateProtocols); @@ -102,7 +101,7 @@ public abstract class GenerateProtocolFile { // 通过协议号，从小到大排序 var allSortedGenerateProtocols = allGenerateProtocols.stream() .sorted((a, b) -> a.protocolId() - b.protocolId()) - .collect(Collectors.toList()); + .toList();; // 解析协议的文档注释 GenerateProtocolNote.initProtocolNote(allSortedGenerateProtocols); diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java index 39fc1e92..bab36a8b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolPath.java @@ -22,7 +22,6 @@ import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; import java.util.*; -import java.util.stream.Collectors; /** * EN: When generating a protocol, the final generation path of the protocol will use this class. @@ -117,7 +116,7 @@ public abstract class GenerateProtocolPath { for (var i = splits.length; i > 0; i--) { builder.append("../"); - var path = StringUtils.joinWith(StringUtils.PERIOD, Arrays.stream(splits).limit(i).collect(Collectors.toList()).toArray()); + var path = StringUtils.joinWith(StringUtils.PERIOD, Arrays.stream(splits).limit(i).toList();.toArray()); if (relativePath.startsWith(path)) { builder.append(StringUtils.substringAfterFirst(relativePath, path).replaceAll(StringUtils.PERIOD_REGEX, StringUtils.SLASH)); return builder.toString(); @@ -181,7 +180,7 @@ public abstract class GenerateProtocolPath { var allChildren = protocolTreeNode.flatTreeNodes() .stream() .filter(it -> it.getData() != null) - .collect(Collectors.toList()); + .toList();; var pathBefore = StringUtils.substringBeforeLast(protocolTreeNode.fullName(), StringUtils.PERIOD); for (var child : allChildren) { var protocolSimpleName = child.getData().protocolConstructor().getDeclaringClass().getSimpleName(); diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java b/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java index c1f8f9de..ea9e8410 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/EnhanceUtils.java @@ -30,7 +30,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; import java.util.*; -import java.util.stream.Collectors; /** * 对应于ProtocolRegistration @@ -127,7 +126,7 @@ public abstract class EnhanceUtils { var allSubProtocolIds = ProtocolAnalysis.getAllSubProtocolIds(protocolId) .stream() .sorted((a, b) -> Short.compare(a, b)) - .collect(Collectors.toList()); + .toList();; for (var subProtocolId : allSubProtocolIds) { var protocolRegistrationField = new CtField(classPool.get(IProtocolRegistration.class.getCanonicalName()), getProtocolRegistrationFieldNameByProtocolId(subProtocolId), enhanceClazz); diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index 4addb316..7203a2c7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -42,7 +42,6 @@ import javassist.NotFoundException; import java.io.IOException; import java.lang.reflect.*; import java.util.*; -import java.util.stream.Collectors; import static com.zfoo.protocol.ProtocolManager.*; @@ -108,7 +107,7 @@ public class ProtocolAnalysis { } // 通过指定类注册的协议，全部使用字节码增强 - var enhanceList = Arrays.stream(protocols).filter(Objects::nonNull).collect(Collectors.toList()); + var enhanceList = Arrays.stream(protocols).filter(Objects::nonNull).toList();; enhance(generateOperation, enhanceList); } @@ -122,7 +121,7 @@ public class ProtocolAnalysis { var relevantClassList = relevantClassSet.stream() .sorted((a, b) -> a.getCanonicalName().compareTo(b.getCanonicalName())) - .collect(Collectors.toList()); + .toList();; // 检查协议类是否合法 var noProtocolIds = new ArrayList>(); @@ -149,7 +148,7 @@ public class ProtocolAnalysis { } // 通过指定类注册的协议，全部使用字节码增强 - var enhanceList = Arrays.stream(protocols).filter(Objects::nonNull).collect(Collectors.toList()); + var enhanceList = Arrays.stream(protocols).filter(Objects::nonNull).toList();; enhance(generateOperation, enhanceList); } @@ -415,7 +414,7 @@ public class ProtocolAnalysis { .stream() .sorted((a, b) -> a.getKey() - b.getKey()) .map(Map.Entry::getValue) - .collect(Collectors.toList()); + .toList();; notCompatibleFields.addAll(compatibleFields); return notCompatibleFields; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java index 0da861e1..fb99d27e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java @@ -39,7 +39,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.zfoo.protocol.util.FileUtils.LS; import static com.zfoo.protocol.util.StringUtils.TAB; @@ -211,7 +210,7 @@ public abstract class GenerateCppUtils { // ValueOf()方法 var valueOfParams = filedList.stream() .map(it -> StringUtils.format("{} {}", it.getKey(), it.getValue())) - .collect(Collectors.toList()); + .toList();; var valueOfParamsStr = StringUtils.joinWith(StringUtils.COMMA + " ", valueOfParams.toArray()); var cppBuilder = new StringBuilder(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java index cb4118b5..b3c7f4e3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/csharp/GenerateCsUtils.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.zfoo.protocol.util.FileUtils.LS; import static com.zfoo.protocol.util.StringUtils.TAB; @@ -160,7 +159,7 @@ public abstract class GenerateCsUtils { } // ValueOf()方法 - var valueOfParams = filedList.stream().map(it -> StringUtils.format("{} {}", it.getKey(), it.getValue())).collect(Collectors.toList()); + var valueOfParams = filedList.stream().map(it -> StringUtils.format("{} {}", it.getKey(), it.getValue())).toList(); var valueOfParamsStr = StringUtils.joinWith(StringUtils.COMMA + " ", valueOfParams.toArray()); var csBuilder = new StringBuilder(); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java index 169b0a7f..c0d69f7e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java @@ -33,7 +33,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.zfoo.protocol.util.FileUtils.LS; import static com.zfoo.protocol.util.StringUtils.TAB; @@ -133,7 +132,7 @@ public abstract class GenerateJsUtils { var protocolId = registration.getId(); var fields = registration.getFields(); - var fieldValueOf = StringUtils.joinWith(", ", Arrays.stream(fields).map(it -> it.getName()).collect(Collectors.toList()).toArray()); + var fieldValueOf = StringUtils.joinWith(", ", Arrays.stream(fields).map(it -> it.getName()).toList();.toArray()); var fieldDefinitionBuilder = new StringBuilder(); for (var field : fields) { diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java index 5e8e33a7..5d64be0a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java @@ -33,7 +33,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.zfoo.protocol.util.FileUtils.LS; import static com.zfoo.protocol.util.StringUtils.TAB; @@ -136,7 +135,7 @@ public abstract class GenerateLuaUtils { var protocolId = registration.getId(); var fields = registration.getFields(); - var valueOfParams = StringUtils.joinWith(", ", Arrays.stream(fields).map(it -> it.getName()).collect(Collectors.toList()).toArray()); + var valueOfParams = StringUtils.joinWith(", ", Arrays.stream(fields).map(it -> it.getName()).toList();.toArray()); var luaBuilder = new StringBuilder(); for (var i = 0; i < fields.length; i++) { diff --git a/protocol/src/main/java/com/zfoo/protocol/util/ReflectionUtils.java b/protocol/src/main/java/com/zfoo/protocol/util/ReflectionUtils.java index 3191f494..b7b5f6bf 100644 --- a/protocol/src/main/java/com/zfoo/protocol/util/ReflectionUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/util/ReflectionUtils.java @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.stream.Collectors; /** @@ -319,7 +318,7 @@ public abstract class ReflectionUtils { .filter(it -> !Modifier.isStatic(it.getModifiers())) .filter(it -> !Modifier.isTransient(it.getModifiers())) .filter(it -> !it.isAnnotationPresent(Transient.class)) - .collect(Collectors.toList()); + .toList();; } public static String fieldToGetMethod(Class clazz, Field field) { diff --git a/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java b/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java index 9b79749a..cbfb921e 100644 --- a/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java +++ b/storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; import java.util.*; -import java.util.stream.Collectors; /** * @author godotg @@ -120,7 +119,7 @@ public class ResourceInterpreter { } } } - return fieldList.stream().map(it -> new FieldInfo(cellFieldMap.get(getExcelFieldName(it)), it)).collect(Collectors.toList()); + return fieldList.stream().map(it -> new FieldInfo(cellFieldMap.get(getExcelFieldName(it)), it)).toList();; } private static class FieldInfo { diff --git a/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java b/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java index 0b34bd92..a0d8615e 100644 --- a/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java +++ b/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java @@ -83,14 +83,14 @@ public abstract class ExportUtils { return FileUtils.getAllReadableFiles(new File(inputDir)) .stream() .filter(it -> StorageEnum.isExcel(FileUtils.fileExtName(it.getName()))) - .collect(Collectors.toList()); + .toList();; } public static List scanCsvFiles(String inputDir) { return FileUtils.getAllReadableFiles(new File(inputDir)) .stream() .filter(it -> StorageEnum.getResourceEnumByType(FileUtils.fileExtName(it.getName())) == StorageEnum.CSV) - .collect(Collectors.toList()); + .toList();; } // 将class里的map自动赋值storage