diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java index 2fea34a088a..a569c39b94d 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java @@ -31,7 +31,7 @@ public String getMessage() { @Override public Object visit(ASTUserClass clazz, Object ctx) { - if (clazz.getSimpleName().equalsIgnoreCase("bar")) { + if ("bar".equalsIgnoreCase(clazz.getSimpleName())) { asCtx(ctx).addViolation(clazz); } return super.visit(clazz, ctx); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/internal/NodeStreamBlanketTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/internal/NodeStreamBlanketTest.java index 755f948c7c2..83be8001b3c 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/internal/NodeStreamBlanketTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/internal/NodeStreamBlanketTest.java @@ -236,7 +236,7 @@ static Collection> allNodeStreamVariants() { stream.precedingSiblings(), stream.descendantsOrSelf(), stream.children(), - stream.children().filter(c -> c.getImage().equals("0")), + stream.children().filter(c -> "0".equals(c.getImage())), stream.children(DummyNode.class) ) ).flatMap( diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java index 1670e9307c7..df237b9d6d7 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java @@ -207,7 +207,7 @@ void testFilterOnChain() { void testTransitiveSucc() { LatticeRelation> lattice = - stringLattice(s -> s.equals("c") || s.equals("bc")); + stringLattice(s -> "c".equals(s) || "bc".equals(s)); lattice.put("abc", "val"); lattice.put("bc", "v2"); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/IteratorUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/IteratorUtilTest.java index c58f39afc06..4be176e648d 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/util/IteratorUtilTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/IteratorUtilTest.java @@ -149,7 +149,7 @@ void testFlatmapEmpty2() { void testFlatmapIsLazy() { Iterator iter = iterOf("a", "b"); Function> fun = s -> { - if (s.equals("a")) { + if ("a".equals(s)) { return iterOf("a"); } else { throw new AssertionError("This statement shouldn't be reached"); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java index 49986694c60..10380a0c6cf 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java @@ -130,7 +130,7 @@ void testRenderFilterAttributes() throws IOException { XmlRenderingConfig strategy = new XmlRenderingConfig() { @Override public boolean takeAttribute(Node node, Attribute attribute) { - return attribute.getName().equals("ohio"); + return "ohio".equals(attribute.getName()); } }.lineSeparator("\n"); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/internal/TypeAnnotTestUtil.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/internal/TypeAnnotTestUtil.java index 05ad17dba8d..37f0364fb7d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/internal/TypeAnnotTestUtil.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/internal/TypeAnnotTestUtil.java @@ -84,13 +84,13 @@ public static A createAnnotationInstance(Class annotat @SuppressWarnings("unchecked") public static A createAnnotationInstance(Class annotationClass, Map attributes) { return (A) Proxy.newProxyInstance(annotationClass.getClassLoader(), new Class[] { annotationClass }, (proxy, method, args) -> { - if (method.getName().equals("annotationType") && args == null) { + if ("annotationType".equals(method.getName()) && args == null) { return annotationClass; - } else if (method.getName().equals("toString") && args == null) { + } else if ("toString".equals(method.getName()) && args == null) { return AnnotationUtils.toString((Annotation) proxy); - } else if (method.getName().equals("hashCode") && args == null) { + } else if ("hashCode".equals(method.getName()) && args == null) { return AnnotationUtils.hashCode((Annotation) proxy); - } else if (method.getName().equals("equals") && args.length == 1) { + } else if ("equals".equals(method.getName()) && args.length == 1) { if (args[0] instanceof Annotation) { return AnnotationUtils.equals((Annotation) proxy, (Annotation) args[0]); } diff --git a/pom.xml b/pom.xml index 0bd94455b02..99aecfb3555 100644 --- a/pom.xml +++ b/pom.xml @@ -483,38 +483,18 @@ **Chars.java - **Jep441_PatternMatchingForSwitch.java + **Dummy**.java + **FooRule.java + **jdkversiontests** + **missingoverride** + **private_method_in_inner_class_interface*.java **testdata** + **unnecessaryimport** + **uselessoverridingmethod** - org.openrewrite.java.RemoveUnusedImports org.openrewrite.staticanalysis.EqualsAvoidsNull org.openrewrite.staticanalysis.ModifierOrder - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods - org.openrewrite.text.EndOfLineAtEndOfFile - - - - - - - - - - - - - - - - - - - - - - - true ${rewrite.skip} @@ -531,12 +511,7 @@ org.openrewrite.recipe rewrite-static-analysis - 2.11.0 - - - org.openrewrite.recipe - rewrite-testing-frameworks - 3.12.0 + 2.12.0