refs/remotes/origin/dogfood/tt-jdt-1.8

refs/remotes/origin/master

Author: sonartech

its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1905.json

@@ -1,7 +1,4 @@
 {
-"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java": [
-102
-],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
 279
 ],

its/ruling/src/test/resources/eclipse-jetty/java-S1905.json

@@ -1,7 +1,4 @@
 {
-"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Cookies.java": [
-102
-],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java": [
 279
 ],

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

@@ -228,7 +228,8 @@ <K> K getValue(K s) {
       return s;
     }
     String foo() {
-      return (String) getValue(""); // Noncompliant
+      // FN introduced due to ECJ 3.44
+      return (String) getValue(""); // Compliant
     }
   }
 

java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java

@@ -42,6 +42,8 @@
 import org.sonar.plugins.java.api.tree.Modifier;
 import org.sonar.plugins.java.api.tree.Tree;
 
+import javax.annotation.Nullable;
+
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.sonar.java.checks.helpers.UnitTestUtils.isUnitTest;
 
@@ -104,13 +106,18 @@ private boolean isSpringBootAssertableContext(MethodTree methodTree) {
         // In this case we cannot know if the provided ContextConsumer has the type param <AssertableApplicationContext>, but we want to avoid FPs
         return true;
       }
-      Type contextConsumerType;
+      @Nullable Type contextConsumerType = null;
       if (contextConsumerImplSymbol.isInterface()) {
         contextConsumerType = contextConsumerImplSymbol.type();
       } else {
-        contextConsumerType = contextConsumerImplSymbol.interfaces().get(0);
+        List<Type> interfaces = contextConsumerImplSymbol.interfaces();
+        if (!interfaces.isEmpty()) {
+          contextConsumerType = interfaces.get(0);
+        }
       }
-      return isAssertableApplicationContext(contextConsumerType) && hasDeclaredAssertions(contextConsumerImplSymbol);
+      return contextConsumerType != null
+        && isAssertableApplicationContext(contextConsumerType)
+        && hasDeclaredAssertions(contextConsumerImplSymbol);
     }
     return false;
   }

java-frontend/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jdt-package</artifactId>
-      <version>1.6.0.160</version>
+      <version>1.8.0.1471</version>
     </dependency>
 
     <dependency>

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

@@ -569,7 +569,7 @@ void foo() {}
 
     Token token5 = tokens.get(5);
     assertThat(token5.toString(source)).isEqualTo("/// markdown comment 1\n  /// markdown comment 2");
-    assertThat(token5.isComment()).isFalse(); // JDT issue https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3914
+    assertThat(token5.isComment()).isTrue();
     assertThat(isComment(token5)).isTrue();
     assertThat(convertTokenTypeToCommentKind(token5)).isEqualTo(CommentKind.MARKDOWN);