SONARJAVA-1589 fix validation of substitution

Author: Wohops

its/ruling/src/test/resources/java-squid/squid-S2698.json

@@ -1647,6 +1647,9 @@
 57,
 58,
 59,
+64,
+65,
+66,
 ],
 'org.sonarsource.java:java-squid:src/test/java/org/sonar/java/resolve/ImportResolutionTest.java':[
 48,

java-checks/src/test/files/checks/EnumSetCheck.java

@@ -31,6 +31,6 @@ public void doSomething(Set<COLOR> param) { // compliant, we ignore parameters.
     Set<Integer> ports2 = new HashSet<>();
     Set<COLOR> ports = new HashSet<>(); // Noncompliant [[sc=24;ec=39]] {{Convert this Set to an EnumSet.}}
     SetColor ports3 = new HashSet<>();
-    Set<COLOR> ports4 = Sets.immutableEnumSet(COLOR.RED); // compliant because of bad type substitution : immutable set of E is not detected as a set of enum.
+    Set<COLOR> ports4 = Sets.immutableEnumSet(COLOR.RED); // Noncompliant
   }
 }

java-frontend/src/main/java/org/sonar/java/resolve/TypeSubstitutionSolver.java

@@ -267,7 +267,7 @@ private void completeSubstitution(TypeSubstitution currentSubstitution, JavaType
     }
   }
 
-  private static boolean isValidSubtitution(TypeSubstitution substitutions, JavaType site) {
+  private boolean isValidSubtitution(TypeSubstitution substitutions, JavaType site) {
     for (Map.Entry<JavaType.TypeVariableJavaType, JavaType> substitution : substitutions.substitutionEntries()) {
       if (!isValidSubstitution(substitutions, substitution.getKey(), substitution.getValue(), site)) {
         return false;
@@ -276,9 +276,9 @@ private static boolean isValidSubtitution(TypeSubstitution substitutions, JavaTy
     return true;
   }
 
-  private static boolean isValidSubstitution(TypeSubstitution candidate, JavaType.TypeVariableJavaType typeVar, JavaType typeParam, JavaType site) {
+  private boolean isValidSubstitution(TypeSubstitution candidate, JavaType.TypeVariableJavaType typeVar, JavaType typeParam, JavaType site) {
     for (JavaType bound : typeVar.bounds) {
-      JavaType currentBound = bound;
+      JavaType currentBound = applySubstitution(bound, candidate);
       while (currentBound.isTagged(JavaType.TYPEVAR)) {
         JavaType newBound = candidate.substitutedType(currentBound);
         if (newBound == null && isParametrizedType(site)) {

java-frontend/src/test/files/sym/references/MethodCall.java

@@ -238,4 +238,34 @@ void test() {
     varargs6(null);
     varargs6("");
   }
+}
+
+class HidingOfStaticMethod {
+  static class A<T> {
+    static <E> void of(E e1, E e2) { }
+    static void by(Object o1, Object o2) { }
+  }
+
+  static class B<T> extends A<T> {
+    static <E extends Comparable<? super E>> void of(E e1, E e2) { }
+    static void by(Object o1, Object o2) { }
+
+    void tstFromB() {
+      B.by("hello", "world"); // call to B.by(), as A.by() is hidden
+
+      B.of("hello", "world"); // explicit call to B.of()
+      B.of(new C(), new C()); // call to inherited method A.of() through B
+    }
+  }
+
+  static class C {}
+
+  void tstFromOutsideHierarchy() {
+    A.by("hello", "world"); // explicit call to A.of()
+    B.by("hello", "world"); // explicit call to B.of()
+
+    A.of("hello", "world"); // explicit call to A.of()
+    B.of("hello", "world"); // explicit call to B.of()
+    B.of(new C(), new C()); // call to inherited method A.of() through B
+  }
 }

java-frontend/src/test/java/org/sonar/java/resolve/SymbolTableTest.java

@@ -20,6 +20,7 @@
 package org.sonar.java.resolve;
 
 import com.google.common.collect.Iterables;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -641,7 +642,15 @@ public void MethodCall() {
     assertThat(result.reference(238, 5)).isSameAs(result.symbol("varargs6", 233));
     assertThat(result.reference(239, 5)).isSameAs(result.symbol("varargs6", 233));
 
+    assertThat(result.reference(254, 9)).isSameAs(result.symbol("by", 251));
+    assertThat(result.reference(264, 7)).isSameAs(result.symbol("by", 246));
+    assertThat(result.reference(265, 7)).isSameAs(result.symbol("by", 251));
 
+    assertThat(result.reference(256, 9)).isSameAs(result.symbol("of", 250));
+    assertThat(result.reference(257, 9)).isSameAs(result.symbol("of", 245));
+    assertThat(result.reference(267, 7)).isSameAs(result.symbol("of", 245));
+    assertThat(result.reference(268, 7)).isSameAs(result.symbol("of", 250));
+    assertThat(result.reference(269, 7)).isSameAs(result.symbol("of", 245));
   }
 
   @Test