SONARJAVA-6421 Implement S9352: Bean autowiring ambiguity should be resolved using "@Qualifier" or "@Primary"

its/scanner-integration-tests/src/test/java/org/sonar/java/it/ScannerIntegrationAbstractTest.java

@@ -53,7 +53,7 @@
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.sonar.java.test.classpath.TestClasspathUtils;
 
-@Execution(ExecutionMode.CONCURRENT)
+@Execution(ExecutionMode.SAME_THREAD)
 public abstract class ScannerIntegrationAbstractTest {
 
   private static FileLocation javaPluginLocation;

its/scanner-integration-tests/src/test/java/org/sonar/java/it/spring/AmbiguousDependencyCrossModuleTest.java

@@ -0,0 +1,61 @@
+/*
+ * SonarQube Java
+ * Copyright (C) SonarSource Sàrl
+ * mailto:info AT sonarsource DOT com
+ *
+ * You can redistribute and/or modify this program under the terms of
+ * the Sonar Source-Available License Version 1, as published by SonarSource Sàrl.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
+ *
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
+ */
+package org.sonar.java.it.spring;
+
+import com.sonarsource.scanner.integrationtester.dsl.issue.TextRange;
+import com.sonarsource.scanner.integrationtester.dsl.issue.TextRangeIssue;
+import org.junit.jupiter.api.Test;
+import org.sonar.java.it.ScannerIntegrationAbstractTest;
+
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class AmbiguousDependencyCrossModuleTest extends ScannerIntegrationAbstractTest {
+
+  @Test
+  void test() {
+    var issues = analyze(Path.of("ambiguous-dependencies-should-be-resolved"), "S9352");
+    assertThat(issues)
+      .hasSize(5)
+      .contains(new TextRangeIssue(
+        "app/src/main/java/com/example/app/ReportingConsumer.java",
+        "java:S9352",
+        "Multiple beans match this dependency (excelReportingService, pdfReportingService); disambiguate it with \"@Qualifier\" or mark one bean as \"@Primary\".",
+        new TextRange(16, 16, 29, 45)),
+        new TextRangeIssue(
+          "app/src/main/java/com/example/app/CacheConsumer.java",
+          "java:S9352",
+          "Multiple beans match this dependency (diskCacheProvider, inMemoryCacheProvider, redisCacheProvider); disambiguate it with \"@Qualifier\" or mark one bean as \"@Primary\".",
+          new TextRange(12, 12, 26, 39)),
+        new TextRangeIssue(
+          "app/src/main/java/com/example/app/PaymentConsumer.java",
+          "java:S9352",
+          "Multiple beans match this dependency (creditCardPaymentGateway, digitalWalletPaymentGateway); disambiguate it with \"@Qualifier\" or mark one bean as \"@Primary\".",
+          new TextRange(15, 15, 27, 41)),
+        new TextRangeIssue(
+          "app/src/main/java/com/example/app/NotificationConsumer.java",
+          "java:S9352",
+          "Multiple beans match this dependency (emailNotificationService, smsNotificationService); disambiguate it with \"@Qualifier\" or mark one bean as \"@Primary\".",
+          new TextRange(16, 16, 32, 51)),
+        new TextRangeIssue(
+          "app/src/main/java/com/example/app/InventoryConsumer.java",
+          "java:S9352",
+          "Multiple beans match this dependency (storeInventoryService, warehouseInventoryService); disambiguate it with \"@Qualifier\" or mark one bean as \"@Primary\".",
+          new TextRange(12, 12, 29, 45)));
+  }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.example</groupId>
+    <artifactId>ambiguous-dependencies-should-be-resolved</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>app</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.example</groupId>
+      <artifactId>module-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.example</groupId>
+      <artifactId>module-a</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.example</groupId>
+      <artifactId>module-b</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+    </dependency>
+  </dependencies>
+</project>

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/CacheConsumer.java

@@ -0,0 +1,13 @@
+package com.example.app;
+
+import com.example.common.CacheProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+// CASE: ambiguity between three @Bean-method-declared beans (not @Component), same module.
+@Component
+public class CacheConsumer {
+
+    @Autowired
+    private CacheProvider cacheProvider;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/CarrierConsumer.java

@@ -0,0 +1,16 @@
+package com.example.app;
+
+import com.example.common.ShippingCarrier;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * CASE: ambiguity resolved via @Primary, cross-module.
+ * PrimaryCarrier (@Primary) lives in module-a, SecondaryCarrier in module-b.
+ */
+@Component
+public class CarrierConsumer {
+
+    @Autowired
+    private ShippingCarrier shippingCarrier;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/DiscountConsumer.java

@@ -0,0 +1,19 @@
+package com.example.app;
+
+import com.example.common.DiscountService;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+/**
+ * CASE: ambiguity resolved via @Qualifier on a constructor parameter, cross-module.
+ * StandardDiscountService lives in module-a, PremiumDiscountService in module-b.
+ */
+@Component
+public class DiscountConsumer {
+
+    private final DiscountService discountService;
+
+    public DiscountConsumer(@Qualifier("premiumDiscountService") DiscountService discountService) {
+        this.discountService = discountService;
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/InventoryConsumer.java

@@ -0,0 +1,13 @@
+package com.example.app;
+
+import com.example.common.InventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+// CASE: ambiguity between two @Bean-method-declared beans, each in its own @Configuration class, cross-module.
+@Component
+public class InventoryConsumer {
+
+    @Autowired
+    private InventoryService inventoryService;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/NotificationConsumer.java

@@ -0,0 +1,17 @@
+package com.example.app;
+
+import com.example.common.NotificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * CASE: unresolved ambiguity, same module.
+ * EmailNotificationService and SmsNotificationService (module-a) are both
+ * plain beans with no @Primary/@Qualifier - ambiguous.
+ */
+@Component
+public class NotificationConsumer {
+
+    @Autowired
+    private NotificationService notificationService;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/NotificationQualifiedConsumer.java

@@ -0,0 +1,15 @@
+package com.example.app;
+
+import com.example.common.NotificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+// CASE: ambiguity resolved via @Qualifier, same module.
+@Component
+public class NotificationQualifiedConsumer {
+
+    @Autowired
+    @Qualifier("smsNotificationService")
+    private NotificationService notificationService;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/PaymentConsumer.java

@@ -0,0 +1,16 @@
+package com.example.app;
+
+import com.example.common.PaymentGateway;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * CASE: unresolved ambiguity, cross-module.
+ * CreditCardPaymentGateway lives in module-a, DigitalWalletPaymentGateway in module-b.
+ */
+@Component
+public class PaymentConsumer {
+
+    @Autowired
+    private PaymentGateway paymentGateway;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/PricingConsumer.java

@@ -0,0 +1,13 @@
+package com.example.app;
+
+import com.example.common.PricingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+// CASE: ambiguity resolved via @Primary, same module.
+@Component
+public class PricingConsumer {
+
+    @Autowired
+    private PricingService pricingService;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/ReportingConsumer.java

@@ -0,0 +1,17 @@
+package com.example.app;
+
+import com.example.common.ReportingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * CASE: two beans both marked @Primary, same module - still ambiguous.
+ * Having more than one "primary" candidate is itself unresolved: Spring
+ * throws NoUniqueBeanDefinitionException rather than picking either one.
+ */
+@Component
+public class ReportingConsumer {
+
+    @Autowired
+    private ReportingService reportingService;
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/app/src/main/java/com/example/app/SpringExampleApplication.java

@@ -0,0 +1,11 @@
+package com.example.app;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackages = "com.example")
+public class SpringExampleApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(SpringExampleApplication.class, args);
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.example</groupId>
+    <artifactId>ambiguous-dependencies-should-be-resolved</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>module-a</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.example</groupId>
+      <artifactId>module-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+  </dependencies>
+</project>

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/CacheConfig.java

@@ -0,0 +1,24 @@
+package com.example.modulea;
+
+import com.example.common.CacheProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CacheConfig {
+
+    @Bean
+    public CacheProvider redisCacheProvider() {
+        return key -> "redis:" + key;
+    }
+
+    @Bean
+    public CacheProvider inMemoryCacheProvider() {
+        return key -> "memory:" + key;
+    }
+
+    @Bean
+    public CacheProvider diskCacheProvider() {
+        return key -> "disk:" + key;
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/CreditCardPaymentGateway.java

@@ -0,0 +1,12 @@
+package com.example.modulea;
+
+import com.example.common.PaymentGateway;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CreditCardPaymentGateway implements PaymentGateway {
+    @Override
+    public void charge(double amount) {
+        System.out.println("Charging credit card: " + amount);
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/EmailNotificationService.java

@@ -0,0 +1,12 @@
+package com.example.modulea;
+
+import com.example.common.NotificationService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EmailNotificationService implements NotificationService {
+    @Override
+    public void send(String message) {
+        System.out.println("Email: " + message);
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/ExcelReportingService.java

@@ -0,0 +1,14 @@
+package com.example.modulea;
+
+import com.example.common.ReportingService;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Primary
+@Component
+public class ExcelReportingService implements ReportingService {
+    @Override
+    public String generate() {
+        return "excel-report";
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/PdfReportingService.java

@@ -0,0 +1,14 @@
+package com.example.modulea;
+
+import com.example.common.ReportingService;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Primary
+@Component
+public class PdfReportingService implements ReportingService {
+    @Override
+    public String generate() {
+        return "pdf-report";
+    }
+}

its/scanner-integration-tests/src/test/resources/ambiguous-dependencies-should-be-resolved/module-a/src/main/java/com/example/modulea/PrimaryCarrier.java

@@ -0,0 +1,14 @@
+package com.example.modulea;
+
+import com.example.common.ShippingCarrier;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Primary
+@Component
+public class PrimaryCarrier implements ShippingCarrier {
+    @Override
+    public String track(String trackingId) {
+        return "primary:" + trackingId;
+    }
+}