Merge pull request #142 from sghill/fix/applied-to-multiple-projects

Share copyCount AtomicInteger to avoid duplicate configurations

Author: rpalcolea

src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java

@@ -45,11 +45,13 @@
 
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class DependencyRecommendationsPlugin implements Plugin<Project> {
     public static final String NEBULA_RECOMMENDER_BOM = "nebulaRecommenderBom";
     public static final boolean CORE_BOM_SUPPORT_ENABLED = Boolean.getBoolean("nebula.features.coreBomSupport");
     private static final GradleVersion GRADLE_9_0 = GradleVersion.version("9.0");
+    private static final AtomicInteger COPY_COUNT = new AtomicInteger();
     private Logger logger = Logging.getLogger(DependencyRecommendationsPlugin.class);
     private RecommendationProviderContainer recommendationProviderContainer;
     //TODO: remove this exclusion once https://github.com/gradle/gradle/issues/6750 is resolved
@@ -84,15 +86,15 @@ public void execute(Project p) {
                     BomResolutionUtil.eagerlyResolveBoms(p, recommendationProviderContainer, NEBULA_RECOMMENDER_BOM);
                 }
 
-                p.getConfigurations().all(new ExtendRecommenderConfigurationAction(bomConfiguration, p, recommendationProviderContainer));
+                p.getConfigurations().all(new ExtendRecommenderConfigurationAction(bomConfiguration, p, recommendationProviderContainer, COPY_COUNT));
                 p.subprojects(new Action<Project>() {
                     @Override
                     public void execute(Project sub) {
                         // Also eagerly resolve BOMs for subprojects if using build service
                         if (shouldUseBuildService(sub) && BomResolutionUtil.shouldEagerlyResolveBoms(sub, recommendationProviderContainer)) {
                             BomResolutionUtil.eagerlyResolveBoms(sub, recommendationProviderContainer, NEBULA_RECOMMENDER_BOM);
                         }
-                        sub.getConfigurations().all(new ExtendRecommenderConfigurationAction(bomConfiguration, sub, recommendationProviderContainer));
+                        sub.getConfigurations().all(new ExtendRecommenderConfigurationAction(bomConfiguration, sub, recommendationProviderContainer, COPY_COUNT));
                     }
                 });
             }

src/main/groovy/netflix/nebula/dependency/recommender/ExtendRecommenderConfigurationAction.java

@@ -24,13 +24,18 @@ public class ExtendRecommenderConfigurationAction implements Action<Configuratio
     private final Configuration bom;
     private final Project project;
     private final RecommendationProviderContainer container;
+    private final AtomicInteger copyCount;
 
-    private final AtomicInteger copyCount = new AtomicInteger();
-
-    public ExtendRecommenderConfigurationAction(Configuration bom, Project project, RecommendationProviderContainer container) {
+    public ExtendRecommenderConfigurationAction(Configuration bom, Project project, RecommendationProviderContainer container, AtomicInteger copyCount) {
         this.bom = bom;
         this.project = project;
         this.container = container;
+        this.copyCount = copyCount;
+    }
+
+
+    public ExtendRecommenderConfigurationAction(Configuration bom, Project project, RecommendationProviderContainer container) {
+        this(bom, project, container, new AtomicInteger());
     }
 
     @Override

src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy

@@ -85,4 +85,41 @@ class DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec extends Inte
         then:
         results.output.contains("+--- test.nebula:foo -> 1.0.0")
     }
+
+    def 'can use recommender applied to multiple projects'() {
+        def a = addSubproject('a', '''\
+                dependencies {
+                    implementation 'test.nebula:foo'
+                }
+            '''.stripIndent())
+        writeHelloWorld('a', a)
+        def b = addSubproject('b', '''\
+                dependencies {
+                    implementation project(':a')
+                }
+            '''.stripIndent())
+        writeHelloWorld('b', b)
+        buildFile << """\
+            allprojects {
+                apply plugin: 'com.netflix.nebula.dependency-recommender'
+            }
+            dependencyRecommendations {
+                mavenBom module: 'test.nebula.bom:testbom:latest.release'
+            }
+
+            allprojects {
+                apply plugin: 'java'
+
+                repositories {
+                    maven { url = '${repo.root.absoluteFile.toURI()}' }
+                    ${generator.mavenRepositoryBlock}
+                }
+            }
+            """.stripIndent()
+        when:
+        def results = runTasks(':a:dependencies', '--configuration', 'compileClasspath')
+
+        then:
+        results.output.contains("+--- test.nebula:foo -> 1.0.0")
+    }
 }