SONARJAVA-5338 Revert Fix variable owner in the case of lambdas (#5079)

This reverts PR #5058, commit 724caf8.
This commit caused a regression on Peach. Some issues with S2325 were lost.

Author: romainbrenguier

java-checks-test-sources/default/src/main/java/checks/VarCanBeUsedCheck.java

@@ -4,7 +4,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -147,23 +146,6 @@ Object objectToObject2(Object o) {
   }
 }
 
-class VarCanBeUsedInLambdas {
-  public static final Comparator<Integer> COMPARATOR = (e1, e2) -> {
-    int compare = Integer.compare(e1, e2); // Noncompliant {{Declare this local variable with "var" instead.}}
-    return compare != 0 ? compare : Integer.compare(e2, e1);
-  };
-
-  public static int foo() {
-    java.util.function.IntSupplier supplier = () -> {
-      var sum = 0;
-      for (int i = 0; i < 10; i++) { // Noncompliant {{Declare this local variable with "var" instead.}}
-        sum += i;
-      }
-      return sum;
-    };
-    return supplier.getAsInt();
-  }
-}
 
 class Abc {
   static Abc getAbc() {

java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java

@@ -71,10 +71,6 @@ IMethodBinding methodBinding() {
     return (IMethodBinding) binding;
   }
 
-  public boolean isLambda() {
-    return methodBinding().getDeclaringMember() != null;
-  }
-
   @Override
   public List<Type> parameterTypes() {
     if (parameterTypes == null) {
@@ -212,10 +208,4 @@ public MethodTree declaration() {
   public boolean isNativeMethod() {
     return !isUnknown() && Modifier.isNative(binding.getModifiers());
   }
-
-  /** This is for debugging and doesn't follow a guaranteed format. */
-  @Override
-  public String toString() {
-    return binding.getKey();
-  }
 }

java-frontend/src/main/java/org/sonar/java/model/JSymbol.java

@@ -17,6 +17,7 @@
 package org.sonar.java.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -102,7 +103,11 @@ private static boolean areEqualVariables(JSymbol thisVariableSymbol, JSymbol oth
   private static boolean areEqualMethods(JSymbol thisMethodSymbol, JSymbol otherMethodSymbol) {
     IMethodBinding thisBinding = (IMethodBinding) thisMethodSymbol.binding;
     IMethodBinding otherBinding = (IMethodBinding) otherMethodSymbol.binding;
-    return Objects.equals(thisBinding.getKey(), otherBinding.getKey());
+    return thisMethodSymbol.name().equals(otherMethodSymbol.name())
+      && thisMethodSymbol.owner().equals(otherMethodSymbol.owner())
+      && Arrays.equals(thisBinding.getParameterTypes(), otherBinding.getParameterTypes())
+      && Arrays.equals(thisBinding.getTypeParameters(), otherBinding.getTypeParameters())
+      && Arrays.equals(thisBinding.getTypeArguments(), otherBinding.getTypeArguments());
   }
 
   @Override
@@ -189,6 +194,7 @@ private Symbol variableOwner(IVariableBinding variableBinding) {
     if (!variableBinding.isRecordComponent()) {
       IMethodBinding declaringMethod = variableBinding.getDeclaringMethod();
       if (declaringMethod != null) {
+        // local variable
         return sema.methodSymbol(declaringMethod);
       }
       ITypeBinding declaringClass = variableBinding.getDeclaringClass();
@@ -197,10 +203,6 @@ private Symbol variableOwner(IVariableBinding variableBinding) {
         return sema.typeSymbol(declaringClass);
       }
     }
-    return ownerOfRecordComponentConstant(variableBinding);
-  }
-
-  private Symbol ownerOfRecordComponentConstant(IVariableBinding variableBinding) {
     Tree node = sema.declarations.get(variableBinding);
     if (node == null) {
       // array.length

java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java

@@ -39,15 +39,11 @@
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.semantic.Type;
 import org.sonar.plugins.java.api.tree.ExpressionStatementTree;
-import org.sonar.plugins.java.api.tree.LambdaExpressionTree;
 import org.sonar.plugins.java.api.tree.MethodInvocationTree;
 import org.sonar.plugins.java.api.tree.StatementTree;
-import org.sonar.plugins.java.api.tree.VariableTree;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -502,25 +498,4 @@ void unknown_method_is_not_native() {
     }
   }
 
-  @Test
-  void isLambda() {
-    JavaTree.CompilationUnitTreeImpl cu = test("""
-        class A {
-          void foo() { }
-          java.util.function.IntConsumer bar = i -> { };
-        }
-        """);
-    ClassTreeImpl a = firstClass(cu);
-
-    MethodTreeImpl foo = firstMethod(a);
-    var fooSymbol = (JMethodSymbol) foo.symbol();
-    assertFalse(fooSymbol.isLambda());
-    assertThat(fooSymbol.toString()).isNotEmpty();
-
-    var barAssignement = (VariableTree) a.members().get(1);
-    var initializer = (LambdaExpressionTree) barAssignement.initializer();
-    var lambdaSymbol = (JMethodSymbol) initializer.symbol();
-    assertTrue(lambdaSymbol.isLambda());
-    assertThat(lambdaSymbol.toString()).isNotEmpty();
-  }
 }