Fix inefficency in artifactview utils

we do not want to do any dependency resolution preemptively
breskeby · Dec 17, 2024 · 5f507b0 · 5f507b0
1 parent fc8d335
commit 5f507b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java b/...main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java
@@ -12,11 +12,13 @@
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
 import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
+import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.tasks.Copy;
 import org.gradle.api.tasks.TaskProvider;
 
 import java.io.File;
@@ -49,7 +51,6 @@ public TaskProvider<? extends Task> createTask(Project project) {
                 project.getDependencies().add(JDK_JAR_HELL_CONFIG_NAME, elasticsearchCoreProject);
             }
         }
-
         TaskProvider<ExportElasticsearchBuildResourcesTask> resourcesTask = project.getTasks()
             .register("thirdPartyAuditResources", ExportElasticsearchBuildResourcesTask.class);
         Path resourcesDir = project.getBuildDir().toPath().resolve("third-party-audit-config");

diff --git a/...ools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java b/...ools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java
@@ -18,6 +18,7 @@
 import org.gradle.api.artifacts.result.ResolvedComponentResult;
 import org.gradle.api.artifacts.result.ResolvedDependencyResult;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.specs.AndSpec;
 import org.gradle.api.specs.Spec;
 
@@ -32,7 +33,7 @@ public static FileCollection createFileCollectionFromNonTransitiveArtifactsView(
     ) {
         ResolvableDependencies incoming = configuration.getIncoming();
         return incoming.artifactView(viewConfiguration -> {
-            Set<ComponentIdentifier> firstLevelDependencyComponents = incoming.getResolutionResult()
+            Provider<Set<ComponentIdentifier>> firstLevelDependencyComponents = incoming.getResolutionResult()
                 .getRootComponent()
                 .map(
                     rootComponent -> rootComponent.getDependencies()
@@ -42,10 +43,9 @@ public static FileCollection createFileCollectionFromNonTransitiveArtifactsView(
                         .filter(dependency -> dependency.getSelected() instanceof ResolvedComponentResult)
                         .map(dependency -> dependency.getSelected().getId())
                         .collect(Collectors.toSet())
-                )
-                .get();
+                );
             viewConfiguration.componentFilter(
-                new AndSpec<>(identifier -> firstLevelDependencyComponents.contains(identifier), componentFilter)
+                new AndSpec<>(identifier -> firstLevelDependencyComponents.get().contains(identifier), componentFilter)
             );
         }).getFiles();
     }
@@ -59,7 +59,7 @@ public static FileCollection thirdPartyDependenciesView(Configuration configurat
         ResolvableDependencies incoming = configuration.getIncoming();
         return incoming.artifactView(v -> {
             // resolve componentIdentifier for all shadowed project dependencies
-            Set<ComponentIdentifier> shadowedDependencies = incoming.getResolutionResult()
+            Provider<Set<ComponentIdentifier>> shadowedDependencies = incoming.getResolutionResult()
                 .getRootComponent()
                 .map(
                     root -> root.getDependencies()
@@ -70,10 +70,9 @@ public static FileCollection thirdPartyDependenciesView(Configuration configurat
                         .filter(dep -> dep.getSelected() instanceof ResolvedComponentResult)
                         .map(dep -> dep.getSelected().getId())
                         .collect(Collectors.toSet())
-                )
-                .get();
+                );
             // filter out project dependencies if they are not a shadowed dependency
-            v.componentFilter(i -> (i instanceof ProjectComponentIdentifier == false || shadowedDependencies.contains(i)));
+            v.componentFilter(i -> (i instanceof ProjectComponentIdentifier == false || shadowedDependencies.get().contains(i)));
         }).getFiles();
     }
 }