Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
],
Expand Down
3 changes: 0 additions & 3 deletions its/ruling/src/test/resources/eclipse-jetty/java-S1905.json
Original file line number Diff line number Diff line change
@@ -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
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,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;
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;
}
Expand Down
2 changes: 1 addition & 1 deletion java-frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jdt-package</artifactId>
<version>1.6.0.160</version>
<version>1.8.0.1483</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥳

assertThat(isComment(token5)).isTrue();
assertThat(convertTokenTypeToCommentKind(token5)).isEqualTo(CommentKind.MARKDOWN);

Expand Down
Loading