Merge pull request ballerina-platform#42894 from Shadow-Devil/use-str…

…eam-tolist Replace `collect(Collectors.toList())` with `toList()`
axewilledge · Jun 11, 2024 · 1cadb9e · 1cadb9e
2 parents 969823f + 4f6d8fc
commit 1cadb9e
Show file tree

Hide file tree

Showing 95 changed files with 150 additions and 202 deletions.
diff --git a/...ell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java b/...ell/modules/shell-core/src/main/java/io/ballerina/shell/invoker/ShellSnippetsInvoker.java
@@ -60,7 +60,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * Invoker that invokes a command to evaluate a list of snippets.
@@ -391,8 +390,8 @@ protected void executeProject(JBallerinaBackend jBallerinaBackend) throws Invoke
             List<String> stacktrace = Arrays.stream(panicError.getCause().getStackTrace())
                     .filter(element -> !(element.toString().contains(MODULE_STATEMENT_METHOD_NAME) ||
                                         element.toString().contains(MODULE_RUN_METHOD_NAME)))
-                    .collect(Collectors.toList())
-                    .stream().map(element -> "at " + element.getMethodName() + "()").collect(Collectors.toList());
+                    .toList()
+                    .stream().map(element -> "at " + element.getMethodName() + "()").toList();
             errorStream.println("panic: " + StringUtils.getErrorStringValue(panicError.getCause()));
             stacktrace.forEach(errorStream::println);
             addErrorDiagnostic("Execution aborted due to unhandled runtime error.");

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java
@@ -93,7 +93,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANY;
 import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA;
@@ -1013,7 +1012,7 @@ static BField getTableConstraintField(Type constraintType, String fieldName) {
                 BUnionType unionType = (BUnionType) constraintType;
                 List<Type> memTypes = unionType.getMemberTypes();
                 List<BField> fields = memTypes.stream().map(type -> getTableConstraintField(type, fieldName))
-                        .filter(Objects::nonNull).collect(Collectors.toList());
+                        .filter(Objects::nonNull).toList();
 
                 if (fields.size() != memTypes.size()) {
                     return null;

diff --git a/...rina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/MetricRegistry.java b/...rina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/MetricRegistry.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
 import java.util.function.ToDoubleFunction;
-import java.util.stream.Collectors;
 
 /**
  * Registry for keeping metrics by name.
@@ -191,7 +190,7 @@ private <M extends Metric> void unregister(Metric registerMetric, Class<M> metri
      */
     public void remove(String name) {
         List<MetricId> ids = metrics.keySet().stream()
-                .filter(id -> id.getName().equals(name)).collect(Collectors.toList());
+                .filter(id -> id.getName().equals(name)).toList();
         ids.forEach(metrics::remove);
     }
 

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/CommandUtil.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/CommandUtil.java
@@ -294,7 +294,7 @@ private static void addModules(Path balaPath, Path projectPath, String packageNa
         Path moduleMdDirRoot = balaPath.resolve("docs").resolve(ProjectConstants.MODULES_ROOT);
         List<Path> modulesList;
         try (Stream<Path> pathStream = Files.list(modulesRoot)) {
-            modulesList = pathStream.collect(Collectors.toList());
+            modulesList = pathStream.toList();
         }
         for (Path moduleRoot : modulesList) {
             Path moduleDir = Optional.of(moduleRoot.getFileName()).get();
@@ -326,7 +326,7 @@ private static void copyIcon(Path balaPath, Path projectPath) {
         try (Stream<Path> pathStream = Files.walk(docsPath, 1)) {
             List<Path> icon = pathStream
                     .filter(FileSystems.getDefault().getPathMatcher("glob:**.png")::matches)
-                    .collect(Collectors.toList());
+                    .toList();
             if (!icon.isEmpty()) {
                 Path projectDocsDir = projectPath.resolve(ProjectConstants.BALA_DOCS_DIR);
                 Files.createDirectory(projectDocsDir);
@@ -485,7 +485,7 @@ public static void writeBallerinaToml(Path balTomlPath, PackageJson packageJson,
         Files.writeString(balTomlPath, "\nversion = \"" + packageJson.getVersion() + "\"",
                 StandardOpenOption.APPEND);
         List<String> newModuleNames = packageJson.getExport().stream().map(module ->
-                module.replaceFirst(packageJson.getName(), packageName)).collect(Collectors.toList());
+                module.replaceFirst(packageJson.getName(), packageName)).toList();
 
         StringJoiner stringJoiner = new StringJoiner(",");
         for (String newModuleName : newModuleNames) {
@@ -1036,7 +1036,7 @@ public static List<PackageVersion> getPackageVersions(Path balaPackagePath) {
             } catch (IOException e) {
                 throw new RuntimeException("Error while accessing Distribution cache: " + e.getMessage());
             }
-            versions.addAll(collectVersions.collect(Collectors.toList()));
+            versions.addAll(collectVersions.toList());
         }
         return pathToVersions(versions);
     }
@@ -1091,7 +1091,7 @@ public static String checkTemplateFilesExists(String template, Path packagePath)
             IOException {
         Path templateDir = getTemplatePath().resolve(template);
         Stream<Path> paths = Files.list(templateDir);
-        List<Path> templateFilePathList = paths.collect(Collectors.toList());
+        List<Path> templateFilePathList = paths.toList();
         StringBuilder existingFiles = new StringBuilder();
         for (Path path : templateFilePathList) {
             Optional<String> fileNameOptional = Optional.ofNullable(path.getFileName()).map(path1 -> path1.toString());

diff --git a/cli/central-client/src/main/java/org/ballerinalang/central/client/Utils.java b/cli/central-client/src/main/java/org/ballerinalang/central/client/Utils.java
@@ -60,7 +60,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static org.ballerinalang.central.client.CentralClientConstants.APPLICATION_JSON;
 import static org.ballerinalang.central.client.CentralClientConstants.BALLERINA_DEV_CENTRAL;
@@ -457,7 +456,7 @@ private static void extractBala(Path balaFilePath, Path balaFileDestPath, String
 
         try (FileSystem zipFileSystem = FileSystems.newFileSystem(zipURI, new HashMap<>())) {
             Path packageRoot = zipFileSystem.getPath("/");
-            List<Path> paths = Files.walk(packageRoot).filter(path -> path != packageRoot).collect(Collectors.toList());
+            List<Path> paths = Files.walk(packageRoot).filter(path -> path != packageRoot).toList();
             for (Path path : paths) {
                 Path destPath = balaFileDestPath.resolve(packageRoot.relativize(path).toString());
                 // Handle overwriting existing bala

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ExpectedTypeFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ExpectedTypeFinder.java
@@ -885,7 +885,7 @@ public Optional<TypeSymbol> transform(ClientResourceAccessActionNode clientResou
             //`params` contains path params and path rest params as well. We need to skip those
             List<BVarSymbol> params = symbol.params.stream().filter(param ->
                     param.getKind() != SymbolKind.PATH_PARAMETER
-                            && param.getKind() != SymbolKind.PATH_REST_PARAMETER).collect(Collectors.toList());
+                            && param.getKind() != SymbolKind.PATH_REST_PARAMETER).toList();
             BVarSymbol restPram = ((BInvokableSymbol) bLangInvocation.symbol).restParam;
             TypeSymbol restParamMemberType = null;
 

diff --git a/...er/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/LangLibFunctionBinder.java b/...er/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/LangLibFunctionBinder.java
@@ -31,7 +31,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * A util class for creating type param resolved version of the lang lib functions.
@@ -126,7 +125,7 @@ private BInvokableType duplicateType(BInvokableType original, List<BVarSymbol> n
 
         List<BType> paramTypes = new ArrayList<>();
         if (newParams.size() == original.paramTypes.size()) {
-            paramTypes.addAll(newParams.stream().map(BSymbol::getType).collect(Collectors.toList()));
+            paramTypes.addAll(newParams.stream().map(BSymbol::getType).toList());
         } else {
             paramTypes.addAll(original.paramTypes);
         }

diff --git a/.../ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java b/.../ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java
@@ -46,7 +46,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static org.ballerinalang.model.symbols.SymbolOrigin.BUILTIN;
 import static org.ballerinalang.model.symbols.SymbolOrigin.COMPILED_SOURCE;
@@ -136,7 +135,7 @@ public List<TypeDefinitionSymbol> typeDefinitions() {
             this.typeDefs = this.allSymbols().stream()
                     .filter(symbol -> symbol.kind() == SymbolKind.TYPE_DEFINITION)
                     .map(symbol -> (TypeDefinitionSymbol) symbol)
-                    .collect(Collectors.toUnmodifiableList());
+                    .toList();
         }
 
         return this.typeDefs;

diff --git a/...in/java/io/ballerina/compiler/api/impl/symbols/resourcepath/BallerinaPathSegmentList.java b/...in/java/io/ballerina/compiler/api/impl/symbols/resourcepath/BallerinaPathSegmentList.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Represents an implementation of a path segment list.
@@ -69,7 +68,7 @@ public List<PathParameterSymbol> pathParameters() {
         List<PathParameterSymbol> pathParams = new ArrayList<>();
 
         int internalPathParamCount = 0;
-        List<Name> segments = this.internalPathSegmentSymbols.stream().map(s -> s.name).collect(Collectors.toList());
+        List<Name> segments = this.internalPathSegmentSymbols.stream().map(s -> s.name).toList();
         for (int i = 0; i < segments.size(); i++) {
             Name internalSegment = segments.get(i);
             BResourcePathSegmentSymbol pathSegSymbol = this.internalPathSegmentSymbols.get(i);

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java
@@ -503,7 +503,7 @@ private void sortAndCopyJars(Collection<JarLibrary> jarLibraries, ZipArchiveOutp
 
         List<JarLibrary> sortedJarLibraries = jarLibraries.stream()
                 .sorted(Comparator.comparing(jarLibrary -> jarLibrary.path().getFileName()))
-                .collect(Collectors.toList());
+                .toList();
 
         // Copy all the jars
         for (JarLibrary library : sortedJarLibraries) {

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ResolutionEngine.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ResolutionEngine.java
@@ -45,7 +45,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Responsible for creating the dependency graph with automatic version updates.
@@ -163,7 +162,7 @@ private Collection<DependencyNode> resolvePackages(Collection<ModuleLoadRequest>
 
     private void populateStaticDependencyGraph(Collection<DependencyNode> directDependencies) {
         List<DependencyNode> errorNodes = directDependencies.stream()
-                .filter(DependencyNode::errorNode).collect(Collectors.toList());
+                .filter(DependencyNode::errorNode).toList();
         for (DependencyNode errorNode : errorNodes) {
             graphBuilder.addErroneousDependency(
                     rootPkgDesc, errorNode.pkgDesc, errorNode.scope, errorNode.resolutionType);

diff --git a/...llerina-lang/src/main/java/io/ballerina/projects/internal/TransactionImportValidator.java b/...llerina-lang/src/main/java/io/ballerina/projects/internal/TransactionImportValidator.java
@@ -31,7 +31,6 @@
 import io.ballerina.compiler.syntax.tree.TransactionalExpressionNode;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * This class will check whether an import statement to internal transaction repo is needed or not.
@@ -72,7 +71,7 @@ public void visit(RetryStatementNode retryStatementNode) {
     @Override
     public void visit(FunctionDefinitionNode functionDefinitionNode) {
         List<String> qualifiers = functionDefinitionNode.qualifierList().stream().map(Token::text)
-                .collect(Collectors.toList());
+                .toList();
         if (qualifiers.contains(SyntaxKind.TRANSACTIONAL_KEYWORD.stringValue()) &&
                 qualifiers.contains(SyntaxKind.RESOURCE_KEYWORD.stringValue())) {
             importTransactionPackage = true;

diff --git a/.../src/main/java/io/ballerina/projects/internal/repositories/AbstractPackageRepository.java b/.../src/main/java/io/ballerina/projects/internal/repositories/AbstractPackageRepository.java
@@ -128,10 +128,10 @@ private ImportModuleResponse getImportModuleLoadResponse(ImportModuleRequest imp
         // If the module is not found in the possible packages locked in the Dependencies.toml
         // we continue looking for the module in the remaining possible packages.
         List<PackageName> existing = importModuleRequest.possiblePackages().stream().map(PackageDescriptor::name)
-                .collect(Collectors.toList());
+                .toList();
         List<PackageName> remainingPackageNames = ProjectUtils.getPossiblePackageNames(
                 importModuleRequest.packageOrg(), importModuleRequest.moduleName()).stream()
-                .filter(o -> !existing.contains(o)).collect(Collectors.toList());
+                .filter(o -> !existing.contains(o)).toList();
 
         for (PackageName possiblePackageName : remainingPackageNames) {
             List<PackageVersion> packageVersions = getPackageVersions(importModuleRequest.packageOrg(),

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java
@@ -42,7 +42,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static io.ballerina.projects.util.ProjectConstants.BALLERINA_TOML;
@@ -170,7 +169,7 @@ public static void deletePath(Path path) throws IOException {
         }
 
         if (Files.isDirectory(path)) {
-            for (Path dir : Files.list(path).collect(Collectors.toList())) {
+            for (Path dir : Files.list(path).toList()) {
                 deletePath(dir);
             }
         }

diff --git a/...lerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java b/...lerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java
@@ -236,7 +236,7 @@ public List<String> getEntryNames() {
                 try {
                     List<Path> files = Files.walk(this.pkgPath, 1).filter(
                             Files::isRegularFile).filter(e -> e.getFileName().toString().endsWith(BAL_SOURCE_EXT)).
-                            collect(Collectors.toList());
+                            toList();
                     this.cachedEntryNames = new ArrayList<>(files.size());
                     files.stream().forEach(e -> this.cachedEntryNames.add(e.getFileName().toString()));
                 } catch (IOException e) {

diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java
@@ -108,7 +108,7 @@ public String getTargetPlatform(String moduleName) {
             List<Library> deps = platform.libraries.stream().filter(library -> {
                 return library.getModules() == null ||
                         Arrays.stream(library.getModules()).anyMatch(moduleName::equals);
-            }).collect(Collectors.toList());
+            }).toList();
             // If not return any
             if (!deps.isEmpty()) {
                 return platform.target;

diff --git a/...lerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRBinaryWriter.java b/...lerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRBinaryWriter.java
@@ -38,7 +38,6 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.wso2.ballerinalang.compiler.bir.writer.BIRWriterUtils.writeConstValue;
 
@@ -132,7 +131,7 @@ private void writeTypeDefs(ByteBuf buf, BIRTypeWriter typeWriter,
     private void writeTypeDefBodies(ByteBuf buf, BIRTypeWriter typeWriter,
                                     List<BIRTypeDefinition> birTypeDefList) {
         List<BIRTypeDefinition> filtered = birTypeDefList.stream().filter(t -> t.type.tag == TypeTags.OBJECT
-                || t.type.tag == TypeTags.RECORD).collect(Collectors.toList());
+                || t.type.tag == TypeTags.RECORD).toList();
         buf.writeInt(filtered.size());
         filtered.forEach(typeDef -> {
             writeFunctions(buf, typeWriter, typeDef.attachedFuncs);

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java
@@ -7015,7 +7015,7 @@ private BLangInvocation createInvocationForPathParams(
         if (pathSegmentCount > 0 && lastPathSegmentSym.kind != SymbolKind.RESOURCE_ROOT_PATH_SEGMENT) {
             invocationParams.addAll(pathSegmentSymbols.subList(0, pathSegmentCount).stream()
                     .map(s -> new BVarSymbol(0, Names.EMPTY, this.env.scope.owner.pkgID, s.type,
-                            this.env.scope.owner, s.pos, VIRTUAL)).collect(Collectors.toList()));
+                            this.env.scope.owner, s.pos, VIRTUAL)).toList());
         }
 
         invokableSymbol.params = invocationParams;

diff --git a/...ang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java b/...ang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java
@@ -38,7 +38,6 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -89,7 +88,7 @@ public Stream<Path> getLatestVersion(Path path, PackageID packageID) {
                             .sorted(Comparator.reverseOrder())
                             .limit(1)
                             .map(SortablePath::getPath)
-                            .collect(Collectors.toList());
+                            .toList();
                 }
                 if (packageID != null) {
                     if (packageID.version.value.isEmpty() && !packageID.orgName.equals(Names.BUILTIN_ORG)

diff --git a/...lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/ZipConverter.java b/...lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/ZipConverter.java
@@ -40,7 +40,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipError;
 
@@ -114,7 +113,7 @@ public Stream<Path> getLatestVersion(Path path, PackageID packageID) {
                             .sorted(Comparator.reverseOrder())
                             .limit(1)
                             .map(SortablePath::getPath)
-                            .collect(Collectors.toList());
+                            .toList();
                 }
                 if (packageID.version.value.isEmpty() && !packageID.orgName.equals(Names.BUILTIN_ORG)
                         && !packageID.orgName.equals(Names.ANON_ORG) && !pathList.isEmpty()) {

diff --git a/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java b/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java
@@ -1908,7 +1908,7 @@ private List<BLangExpression> getVarRefs(BLangErrorVarRef varRef) {
         if (varRef.cause != null) {
             varRefs.add(varRef.cause);
         }
-        varRefs.addAll(varRef.detail.stream().map(e -> e.expr).collect(Collectors.toList()));
+        varRefs.addAll(varRef.detail.stream().map(e -> e.expr).toList());
         if (varRef.restVar != null) {
             varRefs.add(varRef.restVar);
         }

diff --git a/...rc/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java b/...rc/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java
@@ -974,7 +974,7 @@ private List<BLangExpression> getVarRefs(BLangErrorVarRef varRef) {
         if (varRef.cause != null) {
             varRefs.add(varRef.cause);
         }
-        varRefs.addAll(varRef.detail.stream().map(e -> e.expr).collect(Collectors.toList()));
+        varRefs.addAll(varRef.detail.stream().map(e -> e.expr).toList());
         varRefs.add(varRef.restVar);
         return varRefs;
     }

diff --git a/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java b/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SemanticAnalyzer.java
@@ -1752,7 +1752,7 @@ public void visit(BLangErrorVariable varNode, AnalyzerData data) {
                 List<BErrorType> errorMembers = members.stream()
                         .filter(m -> Types.getImpliedType(m).tag == TypeTags.ERROR)
                         .map(m -> (BErrorType) Types.getImpliedType(m))
-                        .collect(Collectors.toList());
+                        .toList();
 
                 if (errorMembers.isEmpty()) {
                     dlog.error(varNode.pos, DiagnosticErrorCode.INVALID_ERROR_MATCH_PATTERN);
@@ -2470,7 +2470,7 @@ private void checkRecordVarRefEquivalency(Location pos, BLangRecordVarRef lhsVar
         for (BField rhsField : rhsRecordType.fields.values()) {
             List<BLangRecordVarRefKeyValue> expField = lhsVarRef.recordRefFields.stream()
                     .filter(field -> field.variableName.value.equals(rhsField.name.toString()))
-                    .collect(Collectors.toList());
+                    .toList();
 
             if (expField.isEmpty()) {
                 continue;