Replace all List.of() calls with new ArrayList().

Replace all toList() stream calls with Collectors.
ldtteam · Feb 15, 2025 · a05dd0c · a05dd0c
1 parent d73f884
commit a05dd0c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 18 deletions.
diff --git a/modules/git/src/main/java/com/ldtteam/tableau/git/extensions/GitExtension.java b/modules/git/src/main/java/com/ldtteam/tableau/git/extensions/GitExtension.java
@@ -11,6 +11,7 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.Charset;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * The Git extension for the Tableau project.
@@ -256,7 +257,7 @@ public List<Developer> obtain() {
                 final int count = Integer.parseInt(line.substring(0, nameStart).trim());
 
                 return new Developer(count, name, email);
-            }).toList();
+            }).collect(Collectors.toList());
         }
     }
 

diff --git a/...etadata/src/main/java/com/ldtteam/tableau/neoforge/metadata/utils/DependencyResolver.java b/...etadata/src/main/java/com/ldtteam/tableau/neoforge/metadata/utils/DependencyResolver.java
@@ -98,7 +98,7 @@ private static List<ModDependency> getModInfos(final Project project, final Prob
         try (final FileSystem fileSystem = FileSystems.newFileSystem(data.file().toPath())) {
             final Path path = fileSystem.getPath("META-INF/neoforge.mods.toml");
             if (!Files.exists(path)) {
-                return List.of();
+                return new ArrayList<>();
             }
 
             final FileConfig fileConfig = FileConfig.builder(path).build();

diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
@@ -11,6 +11,7 @@
 import org.gradle.api.tasks.bundling.Jar;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -80,7 +81,7 @@ public NeoGradleExtension(final Project project) {
         });
 
         //Default to no additional data gen mods.
-        getAdditionalDataGenMods().convention(List.of());
+        getAdditionalDataGenMods().convention(new ArrayList<>());
     }
 
     /**

diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -3,9 +3,11 @@
  */
 package com.ldtteam.tableau.neogradle;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.inject.Inject;
@@ -186,13 +188,15 @@ private void configureRuns(@NotNull Project target) {
         runManager.named("client", run -> {
             run.getArguments().addAll(
                     extension.getUseRandomPlayerNames().map(useRandomPlayerNames -> {
+                        final List<String> randomPlayerNames = new ArrayList<>();
+
                         if (useRandomPlayerNames) {
                             final String randomAppendix = String.valueOf((Math.abs(new Random().nextInt() % 600) + 1));
-                            return List.of("--username", "Dev%s".formatted(randomAppendix));
-                        } else {
-                            //When not using random player names, we don't need to add any arguments.
-                            return List.of();
+                            randomPlayerNames.add("--username");
+                            randomPlayerNames.add("Dev%s".formatted(randomAppendix));
                         }
+
+                        return randomPlayerNames;
                     })
             );
         });
@@ -208,27 +212,32 @@ private void configureRuns(@NotNull Project target) {
             //Add the arguments for the data gen run.
             //By default, these are the arguments for the main mod, its output directory, and the default existing resources' directory.
             run.getArguments().addAll(
-                    projectExtension.getModId().map(modId -> List.of(
-                            "--mod", modId,
-                            "--all",
-                            "--output", target.file("src/datagen/generated/%s".formatted(modId)).getAbsolutePath(),
-                            "--existing", target.file("src/main/resources/").getAbsolutePath()
-                    ))
+                    projectExtension.getModId().map(modId -> {
+                        List<String> dataRunArguments = new ArrayList<>();
+                        dataRunArguments.add("--mod");
+                        dataRunArguments.add(modId);
+                        dataRunArguments.add("--all");
+                        dataRunArguments.add("--output");
+                        dataRunArguments.add(target.file("src/datagen/generated/%s".formatted(modId)).getAbsolutePath());
+                        dataRunArguments.add("--existing");
+                        dataRunArguments.add(target.file("src/main/resources/").getAbsolutePath());
+                        return dataRunArguments;
+                    })
             );
 
             //Add the arguments for the additional data gen mods.
             run.getArguments().addAll(
                     extension.getAdditionalDataGenMods().map(mods -> {
                         if (mods.isEmpty()) {
                             //When no additional data gen mods are set, we don't need to add any arguments.
-                            return List.of();
+                            return new ArrayList<>();
                         }
 
                         //When additional data gen mods are set, we need to add the arguments for each mod.
                         //Per mod, we need to add the "--existing-mod" argument followed by the mod id.
                         return mods.stream()
                                 .flatMap(modId -> Stream.of("--existing-mod", modId))
-                                .toList();
+                                .collect(Collectors.toList());
                     })
             );
         });
@@ -257,7 +266,7 @@ private void configureRuns(@NotNull Project target) {
                                 .stream()
                                 .filter(sourceSet -> NeoGradleSourceSetConfigurationExtension.get(sourceSet).getIsModSource().get())
                                 .map(sourceSet -> sourceSetContainer.getByName(sourceSet.getName()))
-                                .toList();
+                                .collect(Collectors.toList());
 
                         final Multimap<String, SourceSet> modSources = HashMultimap.create();
                         modSources.putAll(modId, sourceSets);

diff --git a/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java b/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
@@ -15,12 +15,14 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.dsl.DependencyCollector;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.bundling.Jar;
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -121,7 +123,9 @@ private void configureShadowJarTask(Project project) {
                 shadowJar.from(sourceSet.getOutput());
             });
 
-            shadowJar.setConfigurations(List.of(project.getConfigurations().getByName(CONTAINED_CONFIGURATION_NAME)));
+            List<FileCollection> configurations = new ArrayList<>();
+            configurations.add(project.getConfigurations().getByName(CONTAINED_CONFIGURATION_NAME));
+            shadowJar.setConfigurations(configurations);
 
             shadowing.getRenamedNamespaces().get().forEach(shadowJar::relocate);
         });

diff --git a/...src/main/java/com/ldtteam/tableau/sourceset/management/extensions/SourceSetExtension.java b/...src/main/java/com/ldtteam/tableau/sourceset/management/extensions/SourceSetExtension.java
@@ -1,5 +1,6 @@
 package com.ldtteam.tableau.sourceset.management.extensions;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -124,7 +125,9 @@ public SourceSetExtension(final Project project) {
 
         final SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
         getUniversalJarSourceSets().add(sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME));
-        getPublishedSourceSets().convention(List.of(sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)));
+        List<SourceSet> elements = new ArrayList<>();
+        elements.add(sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME));
+        getPublishedSourceSets().convention(elements);
 
         project.afterEvaluate(p -> {
             //Run this in an afterEval, because we need a group configured, which is not available at apply and construction time.