WIP

breskeby · breskeby · commit b4bba12e1ca6 · 2025-04-09T23:52:20.000+02:00
diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersPrecommitPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/LicenseHeadersPrecommitPlugin.java
@@ -18,7 +18,6 @@
 import org.gradle.api.tasks.TaskProvider;
 
 import javax.inject.Inject;
-import java.util.stream.Collectors;
 
 public class LicenseHeadersPrecommitPlugin extends PrecommitPlugin {
     @Inject
@@ -31,8 +30,7 @@ public TaskProvider<? extends Task> createTask(Project project) {
         return project.getTasks().register("licenseHeaders", LicenseHeadersTask.class, licenseHeadersTask -> {
             project.getPlugins().withType(JavaBasePlugin.class, javaBasePlugin -> {
                 final SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
-                licenseHeadersTask.getSourceFolders()
-                    .addAll(providerFactory.provider(() -> sourceSets.stream().map(s -> s.getAllJava()).collect(Collectors.toList())));
+                sourceSets.configureEach(sourceSet -> { licenseHeadersTask.getSourceFolders().add(sourceSet.getAllJava()); });
             });
         });
     }
diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/PrecommitTaskPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/PrecommitTaskPlugin.java
@@ -34,7 +34,7 @@ public void apply(Project project) {
                 );
         project.getPluginManager().withPlugin("java-base", p -> {
             // run compilation as part of precommit
-            project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().all(sourceSet ->
+            project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().configureEach(sourceSet ->
                     precommit.configure(t -> t.dependsOn(sourceSet.getClassesTaskName()))
             );
             // make sure tests run after all precommit tasks
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java
@@ -99,7 +99,7 @@ public static void configureConfigurations(Project project) {
             return;
         }
         // fail on any conflicting dependency versions
-        project.getConfigurations().all(configuration -> {
+        project.getConfigurations().configureEach(configuration -> {
             if (configuration.getName().endsWith("Fixture")) {
                 // just a self contained test-fixture configuration, likely transitive and hellacious
                 return;
@@ -109,17 +109,17 @@ public static void configureConfigurations(Project project) {
 
         // disable transitive dependency management
         SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-        sourceSets.all(sourceSet -> disableTransitiveDependenciesForSourceSet(project, sourceSet));
+        sourceSets.configureEach(sourceSet -> disableTransitiveDependenciesForSourceSet(project, sourceSet));
     }
 
     private static void disableTransitiveDependenciesForSourceSet(Project project, SourceSet sourceSet) {
+
         List<String> sourceSetConfigurationNames = List.of(
             sourceSet.getApiConfigurationName(),
             sourceSet.getImplementationConfigurationName(),
             sourceSet.getCompileOnlyConfigurationName(),
             sourceSet.getRuntimeOnlyConfigurationName()
         );
-
         project.getConfigurations()
             .matching(c -> sourceSetConfigurationNames.contains(c.getName()))
             .configureEach(GradleUtils::disableTransitiveDependencies);
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java
@@ -78,11 +78,11 @@ public void execute(Task task) {
 
     private void configureJavadocForConfiguration(Project project, boolean shadow, Configuration configuration) {
         configuration.getAllDependencies()
-            .stream()
-            .sorted(Comparator.comparing(Dependency::getGroup))
-            .filter(d -> d instanceof ProjectDependency)
-            .map(d -> (ProjectDependency) d)
-            .forEach(projectDependency -> configureDependency(project, shadow, projectDependency));
+            .configureEach(dependency -> {
+                if(dependency instanceof ProjectDependency) {
+                    configureDependency(project, shadow, (ProjectDependency) dependency);
+                }
+            });
     }
 
     private void configureDependency(Project project, boolean shadowed, ProjectDependency dep) {
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactPlugin.java
@@ -24,7 +24,7 @@ public class InternalTestArtifactPlugin implements Plugin<Project> {
     public void apply(Project project) {
         project.getPlugins().apply(InternalTestArtifactBasePlugin.class);
         InternalTestArtifactExtension testArtifactExtension = project.getExtensions().getByType(InternalTestArtifactExtension.class);
-        project.getExtensions().getByType(SourceSetContainer.class).all(sourceSet -> {
+        project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {
             if (sourceSet.getName().equals(SourceSet.MAIN_SOURCE_SET_NAME) == false) {
                 testArtifactExtension.registerTestArtifactFromSourceSet(sourceSet);
             }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java
@@ -115,7 +115,7 @@ public void execute(Task task) {
                 JavaBasePlugin.class,
                 javaBasePlugin -> project.getExtensions()
                     .getByType(SourceSetContainer.class)
-                    .all(
+                    .configureEach(
                         sourceSet -> project.getTasks()
                             .withType(Checkstyle.class)
                             .named(sourceSet.getTaskName("checkstyle", null))
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java
@@ -16,8 +16,6 @@
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.tasks.TaskProvider;
 
-import java.util.stream.Collectors;
-
 import javax.inject.Inject;
 
 public class FilePermissionsPrecommitPlugin extends PrecommitPlugin {
@@ -33,18 +31,10 @@ public FilePermissionsPrecommitPlugin(ProviderFactory providerFactory) {
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {
         return project.getTasks().register(FILEPERMISSIONS_TASK_NAME, FilePermissionsTask.class, t -> {
-            t.getSources()
-                .addAll(
-                    providerFactory.provider(
-                        () -> GradleUtils.getJavaSourceSets(project).stream().map(s -> s.getAllSource()).collect(Collectors.toList())
-                    )
-                );
-            t.dependsOn(
-                GradleUtils.getJavaSourceSets(project)
-                    .stream()
-                    .map(sourceSet -> sourceSet.getProcessResourcesTaskName())
-                    .collect(Collectors.toList())
-            );
+            GradleUtils.getJavaSourceSets(project).configureEach(sourceSet -> {
+                t.getSources().add(sourceSet.getAllSource());
+                t.dependsOn(sourceSet.getProcessResourcesTaskName());
+            });
         });
     }
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java
@@ -33,17 +33,11 @@ public ForbiddenPatternsPrecommitPlugin(ProviderFactory providerFactory) {
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {
         return project.getTasks().register(FORBIDDEN_PATTERNS_TASK_NAME, ForbiddenPatternsTask.class, forbiddenPatternsTask -> {
-            forbiddenPatternsTask.getSourceFolders()
-                .addAll(
-                    providerFactory.provider(
-                        () -> GradleUtils.getJavaSourceSets(project).stream().map(s -> s.getAllSource()).collect(Collectors.toList())
-                    )
-                );
-            forbiddenPatternsTask.dependsOn(
-                GradleUtils.getJavaSourceSets(project)
-                    .stream()
-                    .map(sourceSet -> sourceSet.getProcessResourcesTaskName())
-                    .collect(Collectors.toList())
+            GradleUtils.getJavaSourceSets(project).configureEach(
+                sourceSet -> {
+                    forbiddenPatternsTask.getSourceFolders().add(sourceSet.getAllSource());
+                    forbiddenPatternsTask.dependsOn(sourceSet.getProcessResourcesTaskName());
+                }
             );
             forbiddenPatternsTask.getRootDir().set(project.getRootDir());
         });
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JavaModulePrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JavaModulePrecommitPlugin.java
@@ -11,6 +11,7 @@
 
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
+import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.plugins.JavaPlugin;
@@ -25,12 +26,13 @@ public class JavaModulePrecommitPlugin extends PrecommitPlugin {
     public TaskProvider<? extends Task> createTask(Project project) {
         TaskProvider<JavaModulePrecommitTask> task = project.getTasks().register(TASK_NAME, JavaModulePrecommitTask.class);
         task.configure(t -> {
-            SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            t.dependsOn(mainSourceSet.getClassesTaskName());
-            t.getSrcDirs().set(project.provider(() -> mainSourceSet.getAllSource().getSrcDirs()));
-            t.setClasspath(project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
-            t.setClassesDirs(mainSourceSet.getOutput().getClassesDirs());
-            t.setResourcesDirs(mainSourceSet.getOutput().getResourcesDir());
+            GradleUtils.getJavaSourceSets(project).named(SourceSet.MAIN_SOURCE_SET_NAME).configure(sourceSet -> {
+                t.dependsOn(sourceSet.getClassesTaskName());
+                t.getSrcDirs().set(project.provider(() -> sourceSet.getAllSource().getSrcDirs()));
+                t.setClasspath(project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
+                t.setClassesDirs(sourceSet.getOutput().getClassesDirs());
+                t.setResourcesDirs(sourceSet.getOutput().getResourcesDir());
+            });
         });
         return task;
     }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsagePrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsagePrecommitPlugin.java
@@ -33,7 +33,7 @@ public TaskProvider<? extends Task> createTask(Project project) {
         sourceSets.matching(
             sourceSet -> sourceSet.getName().equals(SourceSet.MAIN_SOURCE_SET_NAME)
                 || sourceSet.getName().equals(SourceSet.TEST_SOURCE_SET_NAME)
-        ).all(sourceSet -> loggerUsage.configure(t -> t.addSourceSet(sourceSet)));
+        ).configureEach(sourceSet -> loggerUsage.configure(t -> t.addSourceSet(sourceSet)));
 
         loggerUsage.configure(
             t -> t.setClasspath(loggerUsageConfig)
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/SplitPackagesAuditPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/SplitPackagesAuditPrecommitPlugin.java
@@ -30,9 +30,11 @@ public TaskProvider<? extends Task> createTask(Project project) {
         task.configure(t -> {
             t.setProjectBuildDirs(getProjectBuildDirs(project));
             t.setClasspath(project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
-            SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            t.dependsOn(mainSourceSet.getJava().getSourceDirectories());
-            t.getSrcDirs().set(project.provider(() -> mainSourceSet.getAllSource().getSrcDirs()));
+            GradleUtils.getJavaSourceSets(project).named(SourceSet.MAIN_SOURCE_SET_NAME).configure(sourceSet -> {
+                t.dependsOn(sourceSet.getJava().getSourceDirectories());
+                t.getSrcDirs().set(project.provider(() -> sourceSet.getAllSource().getSrcDirs()));
+            });
+
         });
         return task;
     }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/InternalClusterTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/InternalClusterTestPlugin.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.dsl.DependencyCollector;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JvmTestSuitePlugin;
 import org.gradle.api.plugins.jvm.JvmTestSuite;
@@ -32,7 +33,8 @@ public void apply(Project project) {
 
         testing.getSuites().register(SOURCE_SET_NAME, JvmTestSuite.class, suite -> {
             suite.useJUnit();
-            suite.getDependencies().getImplementation().add(suite.getDependencies().project());
+            DependencyCollector implementation = suite.getDependencies().getImplementation();
+            implementation.add(suite.getDependencies().project());
             suite.getTargets().configureEach(target -> { target.getTestTask().configure(test -> { test.jvmArgs("-XX:+UseG1GC"); }); });
         });
 
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java
@@ -47,7 +47,7 @@ public void apply(final Project project) {
         }
 
         Configuration testImplementationConfig = project.getConfigurations().getByName("testImplementation");
-        testImplementationConfig.getDependencies().all(dep -> {
+        testImplementationConfig.getDependencies().configureEach(dep -> {
             if (dep instanceof ProjectDependency && dep.getGroup().contains("plugin")) {
                 addPluginResources(project, ((ProjectDependency) dep));
             }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesDeployPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesDeployPlugin.java
@@ -42,7 +42,7 @@ private static void registerDeployTaskPerFixture(
         NamedDomainObjectContainer<TestFixtureDeployment> fixtures,
         boolean isCi
     ) {
-        fixtures.all(
+        fixtures.configureEach(
             fixture -> project.getTasks()
                 .register("deploy" + StringUtils.capitalize(fixture.getName()) + "DockerImage", DockerBuildTask.class, task -> {
                     task.getDockerContext().fileValue(fixture.getDockerContext().get());
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java b/build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java
@@ -196,7 +196,6 @@ public static boolean isModuleProject(String projectPath) {
     }
 
     public static void disableTransitiveDependencies(Configuration config) {
-        System.out.println("config = " + config);
         config.getDependencies().configureEach(dep -> {
             if (dep instanceof ModuleDependency
                 && dep instanceof ProjectDependency == false
diff --git a/build.gradle b/build.gradle
@@ -396,19 +396,6 @@ allprojects {
     tasks.matching { it.name.equals('integTest') }.configureEach { integTestTask ->
       integTestTask.mustRunAfter tasks.matching { it.name.equals("test") }
     }
-
-/*    configurations.matching { it.canBeResolved }.all { Configuration configuration ->
-      dependencies.matching { it instanceof ProjectDependency }.all { ProjectDependency dep ->
-        Project upstreamProject = dep.dependencyProject
-        if (project.path != upstreamProject?.path) {
-          for (String taskName : ['test', 'integTest']) {
-            project.tasks.matching { it.name == taskName }.configureEach { task ->
-              task.shouldRunAfter(upstreamProject.tasks.matching { upStreamTask -> upStreamTask.name == taskName })
-            }
-          }
-        }
-      }
-    }*/
   }
 
   apply plugin: 'elasticsearch.formatting'
diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle
@@ -47,6 +47,13 @@ tasks.named('check') {
 
 testing {
   suites {
+    configureEach {
+      dependencies {
+        implementation project(':test:framework')
+        implementation project(':test:fixtures:s3-fixture')
+        runtimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
+      }
+    }
     internalClusterTest {
       dependencies {
         implementation project(':test:fixtures:minio-fixture')
@@ -72,13 +79,7 @@ testing {
         implementation project(':test:fixtures:testcontainer-utils')
       }
     }
-    configureEach {
-      dependencies {
-        implementation project(':test:framework')
-        implementation project(':test:fixtures:s3-fixture')
-        runtimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
-      }
-    }
+
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class InternalTestArtifactPlugin implements Plugin<Project> {`
`24`	`24`	`public void apply(Project project) {`
`25`	`25`	`project.getPlugins().apply(InternalTestArtifactBasePlugin.class);`
`26`	`26`	`InternalTestArtifactExtension testArtifactExtension = project.getExtensions().getByType(InternalTestArtifactExtension.class);`
`27`		`- project.getExtensions().getByType(SourceSetContainer.class).all(sourceSet -> {`
	`27`	`+ project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> {`
`28`	`28`	`if (sourceSet.getName().equals(SourceSet.MAIN_SOURCE_SET_NAME) == false) {`
`29`	`29`	`testArtifactExtension.registerTestArtifactFromSourceSet(sourceSet);`
`30`	`30`	`}`