diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1905.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1905.json index 44035d69c69..dec3357e7c2 100644 --- a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1905.json +++ b/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 ], diff --git a/its/ruling/src/test/resources/eclipse-jetty/java-S1905.json b/its/ruling/src/test/resources/eclipse-jetty/java-S1905.json index 191e36c67e3..7b49b5e597d 100644 --- a/its/ruling/src/test/resources/eclipse-jetty/java-S1905.json +++ b/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 ], diff --git a/java-checks-test-sources/default/src/main/java/checks/RedundantTypeCastCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/RedundantTypeCastCheckSample.java index 27d9f2af0c9..603b1851ffc 100644 --- a/java-checks-test-sources/default/src/main/java/checks/RedundantTypeCastCheckSample.java +++ b/java-checks-test-sources/default/src/main/java/checks/RedundantTypeCastCheckSample.java @@ -228,7 +228,8 @@ K getValue(K s) { return s; } String foo() { - return (String) getValue(""); // Noncompliant + // FN introduced due to ECJ 3.44 + return (String) getValue(""); // Compliant } } diff --git a/java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java index 8617e3fda12..6640153b905 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java @@ -104,13 +104,18 @@ private boolean isSpringBootAssertableContext(MethodTree methodTree) { // In this case we cannot know if the provided ContextConsumer has the type param , but we want to avoid FPs return true; } - Type contextConsumerType; + Type contextConsumerType = null; if (contextConsumerImplSymbol.isInterface()) { contextConsumerType = contextConsumerImplSymbol.type(); } else { - contextConsumerType = contextConsumerImplSymbol.interfaces().get(0); + List interfaces = contextConsumerImplSymbol.interfaces(); + if (!interfaces.isEmpty()) { + contextConsumerType = interfaces.get(0); + } } - return isAssertableApplicationContext(contextConsumerType) && hasDeclaredAssertions(contextConsumerImplSymbol); + return contextConsumerType != null + && isAssertableApplicationContext(contextConsumerType) + && hasDeclaredAssertions(contextConsumerImplSymbol); } return false; } diff --git a/java-frontend/pom.xml b/java-frontend/pom.xml index 8f7f080b967..3c82dafd07e 100644 --- a/java-frontend/pom.xml +++ b/java-frontend/pom.xml @@ -17,7 +17,7 @@ ${project.groupId} jdt-package - 1.6.0.160 + 1.8.0.1483 diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java index 64c7e5b84db..09e5207c402 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java +++ b/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);