SONARJAVA-4685 Remove FP on invocation of non-bean methods (#4610)

java-checks-test-sources/default/src/main/java/checks/spring/DirectBeanMethodInvocationWithoutProxyCheckSample.java

@@ -103,6 +103,18 @@ public CompositeBean compositeBean() {
     }
   }
 
+  @Configuration(proxyBeanMethods = false)
+  static class InvokeNonBeanMethod {
+    public SimpleBean simpleBean() {
+      return new SimpleBean();
+    }
+
+    @Bean
+    public CompositeBean compositeBean() {
+      return new CompositeBean(simpleBean()); // Compliant, call to a method that is not a bean
+    }
+  }
+
 
   static class SimpleBean {
     // ...

java-checks/src/main/java/org/sonar/java/checks/spring/DirectBeanMethodInvocationWithoutProxyCheck.java

@@ -38,6 +38,7 @@
 
 @Rule(key = "S6838")
 public class DirectBeanMethodInvocationWithoutProxyCheck extends IssuableSubscriptionVisitor {
+  private static final String BEAN_ANNOTATION = "org.springframework.context.annotation.Bean";
   private static final String CONFIGURATION_ANNOTATION = "org.springframework.context.annotation.Configuration";
   private static final String SCOPE_ANNOTATION = "org.springframework.context.annotation.Scope";
 
@@ -59,7 +60,7 @@ public void visitNode(Tree tree) {
 
   private static Optional<AnnotationTree> getConfigurationAnnotation(ClassTree tree) {
     return tree.modifiers().annotations().stream()
-      .filter(annotationInstance -> annotationInstance.symbolType().is(CONFIGURATION_ANNOTATION))
+      .filter(annotation -> annotation.symbolType().is(CONFIGURATION_ANNOTATION))
       .findFirst();
   }
 
@@ -88,7 +89,7 @@ public NonProxiedMethodInvocationVisitor(ClassTree parentClass) {
     public void visitMethodInvocation(MethodInvocationTree tree) {
       super.visitMethodInvocation(tree);
       MethodTree declaration = tree.methodSymbol().declaration();
-      if (declaration == null || hasPrototypeScope(declaration)) {
+      if (declaration == null || !isBeanMethod(declaration) || hasPrototypeScope(declaration)) {
         return;
       }
       Tree parent = declaration.parent();
@@ -97,6 +98,11 @@ public void visitMethodInvocation(MethodInvocationTree tree) {
       }
     }
 
+    private static boolean isBeanMethod(MethodTree tree) {
+      return tree.modifiers().annotations().stream()
+        .anyMatch(annotation -> annotation.symbolType().is(BEAN_ANNOTATION));
+    }
+
     /*
      * A method with the prototype scope is meant to return a new instance on every call.
      */