+ * public class Point { + * public Point() { } // ok + * public Point(final int m) { } // ok + * public Point(final int m,int n) { } // violation, n should be final + * public void methodOne(final int x) { } // ok + * public void methodTwo(int x) { } // violation, x should be final + * public static void main(String[] args) { } // violation, args should be final + * } + *

+ * public class Point { + * public Point() { } // ok + * public Point(final int m) { } // ok + * public Point(final int m,int n) { } // violation, n should be final + * public void methodOne(final int x) { } // ok + * public void methodTwo(int x) { } // ok + * public static void main(String[] args) { } // ok + * } + *

+ * public class Point { + * public Point() { } // ok + * public Point(final int m) { } // ok + * public Point(final int m,int n) { } // ok + * public void methodOne(final int x) { } // ok + * public void methodTwo(int x) { } // ok + * public static void main(String[] args) { } // violation, args should be final + * } + *

+ * public class MyClass { + * public int sign(int x) { + * if (x < 0) + * return -1; + * if (x == 0) + * return 1; + * return 0; + * } // OK + * public int badSign(int x) { + * if (x < -2) + * return -2; + * if (x == 0) + * return 0; + * if (x > 2) + * return 2; + * return 1; + * } // violation, more than three return statements + * } + *

+ * public class MyClass { + * public void firstMethod(int x) { + * } // OK + * + * public void badMethod(int x) { + * return; + * } // violation, return statements per void method + * } + *

+ * public class MyClass { + * public void firstMethod() { + * } // OK + * + * public void secondMethod() { + * return; + * } // OK + * + * public void badMethod(int x) { + * if (x == 0) + * return; + * return; + * } // violation, more than one return statements + * + * public int sign(int x) { + * if (x < 0) + * return -1; + * return 0; + * } // OK + * + * public int badSign(int x) { + * if (x < 0) + * return -1; + * if (x == 0) + * return 1; + * return 0; + * } // violation, more than two return statements in methods + * } + *

+ * public class MyClass { + * public int sign(int x) { + * if (x < 0) + * return -1; + * if (x == 0) + * return 1; + * return 0; + * } // OK + * + * public int badSign(int x) { + * if (x < -2) + * return -2; + * if (x == 0) + * return 0; + * if (x > 2) + * return 2; + * return 1; + * } // violation, more than three return statements per method + * } + *

* <module name="ReturnCount"> - * <property name="max" value="0"/> + * <property name="maxForVoid" value="0"/> * <property name="tokens" value="CTOR_DEF"/> * </module> * <module name="ReturnCount"> @@ -137,6 +230,46 @@ * </module> *

+ * import java.util.function.Predicate; + * + * public class Test { + * public Test() { + * } // OK + * + * public Test(int i) { + * return; // violation, max allowed for constructors is 0 + * } + * + * final Predicate<Integer> p = i -> { + * if (i > 5) { + * return true; + * } + * return false; + * }; // violation, max allowed for lambdas is 1 + * + * final Predicate<Integer> q = i -> { + * return i > 5; + * }; // OK + * + * public int sign(int x) { + * if (x > 0) + * return -1; + * return 0; + * } // OK + * + * public int badSign(int x) { + * if (x < 0) + * return -1; + * if (x == 0) + * return 1; + * return 0; + * } // violation, more than two return statements in methods + * } + *

- * if (!collection.isEmpty()) { // This may me omitted. + * if (!collection.isEmpty()) { // This may be omitted. * Object value = doSomeHardJob(); * for (Item item : collection) { * item.accept(value); @@ -603,9 +603,8 @@ public void testCacheWhenFileExternalResourceContentDoesNotChange() throws Excep verify(checkerConfig, filePath, expected); assertWithMessage("External resource is not present in cache") - .that(new String(Files.readAllBytes(cacheFile.toPath()), StandardCharsets.UTF_8) - .contains("InputTreeWalkerSuppressionXpathFilter.xml")) - .isTrue(); + .that(Files.readString(cacheFile.toPath())) + .contains("InputTreeWalkerSuppressionXpathFilter.xml"); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java index 63c6b847734..d6765526cb7 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java @@ -170,7 +170,7 @@ public void testAvoidInstanceCreationWithoutVar() "13:9: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; verifyWithInlineConfigParser( - getNonCompilablePath("InputMatchXpathAvoidInstanceCreationWithoutVar.java"), + getPath("InputMatchXpathAvoidInstanceCreationWithoutVar.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java index e24f2f57ffa..2378963e718 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java @@ -108,7 +108,7 @@ public void testResourceReferenceVariableIgnored() throws Exception { }; verifyWithInlineConfigParser( - getNonCompilablePath("InputOneStatementPerLineTryWithResources.java"), + getPath("InputOneStatementPerLineTryWithResources.java"), expected); } @@ -116,7 +116,7 @@ public void testResourceReferenceVariableIgnored() throws Exception { public void testResourcesIgnored() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath("InputOneStatementPerLineTryWithResourcesIgnore.java"), + getPath("InputOneStatementPerLineTryWithResourcesIgnore.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java index 752d1a46380..929f6565bd3 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheckTest.java @@ -28,7 +28,6 @@ import com.puppycrawl.tools.checkstyle.DetailAstImpl; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil; -import com.puppycrawl.tools.checkstyle.utils.CommonUtil; public class FinalClassCheckTest extends AbstractModuleTestSupport { @@ -41,12 +40,16 @@ protected String getPackageLocation() { @Test public void testGetRequiredTokens() { final FinalClassCheck checkObj = new FinalClassCheck(); - final int[] expected = - {TokenTypes.CLASS_DEF, - TokenTypes.CTOR_DEF, - TokenTypes.PACKAGE_DEF, - TokenTypes.LITERAL_NEW, - }; + final int[] expected = { + TokenTypes.ANNOTATION_DEF, + TokenTypes.CLASS_DEF, + TokenTypes.ENUM_DEF, + TokenTypes.INTERFACE_DEF, + TokenTypes.RECORD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.PACKAGE_DEF, + TokenTypes.LITERAL_NEW, + }; assertWithMessage("Default required tokens are invalid") .that(checkObj.getRequiredTokens()) .isEqualTo(expected); @@ -58,6 +61,8 @@ public void testFinalClass() throws Exception { "11:1: " + getCheckMessage(MSG_KEY, "InputFinalClass"), "19:4: " + getCheckMessage(MSG_KEY, "test4"), "117:5: " + getCheckMessage(MSG_KEY, "someinnerClass"), + "124:5: " + getCheckMessage(MSG_KEY, "SomeClass"), + "130:5: " + getCheckMessage(MSG_KEY, "SomeClass"), "151:1: " + getCheckMessage(MSG_KEY, "TestNewKeyword"), "184:5: " + getCheckMessage(MSG_KEY, "NestedClass"), }; @@ -91,7 +96,9 @@ public void testClassWithPrivateCtorAndNestedExtendingSubclassWithoutPackage() @Test public void testFinalClassConstructorInRecord() throws Exception { - final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + final String[] expected = { + "27:9: " + getCheckMessage(MSG_KEY, "F"), + }; verifyWithInlineConfigParser( getNonCompilablePath("InputFinalClassConstructorInRecord.java"), @@ -116,12 +123,16 @@ public void testImproperToken() { @Test public void testGetAcceptableTokens() { final FinalClassCheck obj = new FinalClassCheck(); - final int[] expected = - {TokenTypes.CLASS_DEF, - TokenTypes.CTOR_DEF, - TokenTypes.PACKAGE_DEF, - TokenTypes.LITERAL_NEW, - }; + final int[] expected = { + TokenTypes.ANNOTATION_DEF, + TokenTypes.CLASS_DEF, + TokenTypes.ENUM_DEF, + TokenTypes.INTERFACE_DEF, + TokenTypes.RECORD_DEF, + TokenTypes.CTOR_DEF, + TokenTypes.PACKAGE_DEF, + TokenTypes.LITERAL_NEW, + }; assertWithMessage("Default acceptable tokens are invalid") .that(obj.getAcceptableTokens()) .isEqualTo(expected); @@ -136,4 +147,55 @@ public void testQualifiedClassName() throws Exception { .isEqualTo("ClassName"); } + @Test + public void testFinalClassInnerAndNestedClasses() throws Exception { + final String[] expected = { + "19:5: " + getCheckMessage(MSG_KEY, "SameName"), + "45:9: " + getCheckMessage(MSG_KEY, "SameName"), + "69:13: " + getCheckMessage(MSG_KEY, "B"), + }; + verifyWithInlineConfigParser(getPath("InputFinalClassInnerAndNestedClass.java"), expected); + } + + @Test + public void testFinalClassStaticNestedClasses() throws Exception { + + final String[] expected = { + "14:17: " + getCheckMessage(MSG_KEY, "C"), + "32:9: " + getCheckMessage(MSG_KEY, "B"), + "43:9: " + getCheckMessage(MSG_KEY, "C"), + "60:13: " + getCheckMessage(MSG_KEY, "Q"), + "76:9: " + getCheckMessage(MSG_KEY, "F"), + "83:9: " + getCheckMessage(MSG_KEY, "c"), + }; + + verifyWithInlineConfigParser( + getNonCompilablePath("InputFinalClassNestedStaticClassInsideInnerClass.java"), + expected); + } + + @Test + public void testFinalClassEnum() throws Exception { + final String[] expected = { + "35:5: " + getCheckMessage(MSG_KEY, "DerivedClass"), + }; + verifyWithInlineConfigParser(getPath("InputFinalClassEnum.java"), expected); + } + + @Test + public void testFinalClassAnnotation() throws Exception { + final String[] expected = { + "15:5: " + getCheckMessage(MSG_KEY, "DerivedClass"), + }; + verifyWithInlineConfigParser(getPath("InputFinalClassAnnotation.java"), expected); + } + + @Test + public void testFinalClassInterface() throws Exception { + final String[] expected = { + "15:5: " + getCheckMessage(MSG_KEY, "DerivedClass"), + }; + verifyWithInlineConfigParser(getPath("InputFinalClassInterface.java"), expected); + } + } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java index 24043c439ac..967145759b6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java @@ -25,7 +25,6 @@ import static com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck.MSG_UNKNOWN_PKG; import java.io.File; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import org.junit.jupiter.api.Test; @@ -121,9 +120,9 @@ public void testUnknown() throws Exception { final String message = getCheckstyleExceptionMessage(ex); final String messageStart = "Unable to find: "; - assertWithMessage("Invalid message, should start with: " + messageStart) - .that(message.startsWith(message)) - .isTrue(); + assertWithMessage("Invalid message, should start with: %s", messageStart) + .that(message) + .startsWith(messageStart); } } @@ -140,9 +139,9 @@ public void testBroken() throws Exception { final String message = getCheckstyleExceptionMessage(ex); final String messageStart = "Unable to load "; - assertWithMessage("Invalid message, should start with: " + messageStart) - .that(message.startsWith(message)) - .isTrue(); + assertWithMessage("Invalid message, should start with: %s", messageStart) + .that(message) + .startsWith(messageStart); } } @@ -292,9 +291,9 @@ public void testResourceUnableToLoad() throws Exception { final String message = getCheckstyleExceptionMessage(ex); final String messageStart = "Unable to find: "; - assertWithMessage("Invalid message, should start with: " + messageStart) - .that(message.startsWith(message)) - .isTrue(); + assertWithMessage("Invalid message, should start with: %s", messageStart) + .that(message) + .startsWith(messageStart); } } @@ -319,9 +318,9 @@ public void testUrlInFilePropertyUnableToLoad() throws Exception { final String message = getCheckstyleExceptionMessage(ex); final String messageStart = "Unable to load "; - assertWithMessage("Invalid message, should start with: " + messageStart) - .that(message.startsWith(message)) - .isTrue(); + assertWithMessage("Invalid message, should start with: %s", messageStart) + .that(message) + .startsWith(messageStart); } } @@ -344,8 +343,7 @@ public void testCacheWhenFileExternalResourceContentDoesNotChange() throws Excep // One more time to use cache. verify(checkerConfig, filePath, expected); - final String contents = new String(Files.readAllBytes(cacheFile.toPath()), - StandardCharsets.UTF_8); + final String contents = Files.readString(cacheFile.toPath()); assertWithMessage("External resource is not present in cache") .that(contents.contains("InputImportControlOneRegExp.xml")) .isTrue(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java index 1c8d9ec31a8..52ed3d6855e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/MissingJavadocMethodCheckTest.java @@ -403,8 +403,7 @@ public void testConstructor() throws Exception { public void testNotPublicInterfaceMethods() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath( - "InputMissingJavadocMethodInterfacePrivateMethod.java"), expected); + getPath("InputMissingJavadocMethodInterfacePrivateMethod.java"), expected); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java index 8bea161e5cb..0df0e065b24 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java @@ -255,7 +255,7 @@ public void testClassFanOutComplexityRecords() throws Exception { public void testClassFanOutComplexityIgnoreVar() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath("InputClassFanOutComplexityVar.java"), expected); + getPath("InputClassFanOutComplexityVar.java"), expected); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java index 85d97366701..5d2dba63018 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/InterfaceMemberImpliedModifierCheckTest.java @@ -358,7 +358,7 @@ public void testPackageScopeInterface() throws Exception { public void testPrivateMethodsOnInterface() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath("InputInterfaceMemberImpliedModifierPrivateMethods.java"), + getPath("InputInterfaceMemberImpliedModifierPrivateMethods.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java index c22b0057365..6190c4b20bf 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheckTest.java @@ -21,10 +21,12 @@ import static com.google.common.truth.Truth.assertWithMessage; import static com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck.MSG_KEY; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport; +import com.puppycrawl.tools.checkstyle.DetailAstImpl; import com.puppycrawl.tools.checkstyle.api.TokenTypes; import com.puppycrawl.tools.checkstyle.utils.CommonUtil; @@ -126,6 +128,7 @@ public void testNestedClassConsInPublicInterfaceHasValidPublicModifier() throws final String[] expected = { "22:17: " + getCheckMessage(MSG_KEY, "public"), + "24:13: " + getCheckMessage(MSG_KEY, "public"), "26:21: " + getCheckMessage(MSG_KEY, "public"), "37:12: " + getCheckMessage(MSG_KEY, "public"), "45:17: " + getCheckMessage(MSG_KEY, "public"), @@ -149,12 +152,28 @@ public void testGetAcceptableTokens() { TokenTypes.CLASS_DEF, TokenTypes.ENUM_DEF, TokenTypes.RESOURCE, + TokenTypes.ANNOTATION_DEF, }; assertWithMessage("Invalid acceptable tokens") .that(actual) .isEqualTo(expected); } + @Test + public void testWrongTokenType() { + final RedundantModifierCheck obj = new RedundantModifierCheck(); + final DetailAstImpl ast = new DetailAstImpl(); + ast.initialize(TokenTypes.LITERAL_NULL, "null"); + + final IllegalStateException exception = assertThrows(IllegalStateException.class, () -> { + obj.visitToken(ast); + }, "IllegalStateException was expected"); + + assertWithMessage("Expected and actual violation messages do not match") + .that(exception.getMessage()) + .isEqualTo("Unexpected token type: " + ast.getType()); + } + @Test public void testGetRequiredTokens() { final RedundantModifierCheck redundantModifierCheckObj = new RedundantModifierCheck(); @@ -259,7 +278,7 @@ public void testTryWithResourcesBlock() throws Exception { "18:19: " + getCheckMessage(MSG_KEY, "final"), }; verifyWithInlineConfigParser( - getNonCompilablePath("InputRedundantModifierTryWithResources.java"), + getPath("InputRedundantModifierTryWithResources.java"), expected); } @@ -273,6 +292,22 @@ public void testNestedDef() throws Exception { "13:5: " + getCheckMessage(MSG_KEY, "static"), "13:12: " + getCheckMessage(MSG_KEY, "public"), "16:9: " + getCheckMessage(MSG_KEY, "public"), + "19:5: " + getCheckMessage(MSG_KEY, "public"), + "19:12: " + getCheckMessage(MSG_KEY, "static"), + "22:5: " + getCheckMessage(MSG_KEY, "public"), + "22:12: " + getCheckMessage(MSG_KEY, "abstract"), + "22:21: " + getCheckMessage(MSG_KEY, "static"), + "26:1: " + getCheckMessage(MSG_KEY, "abstract"), + "28:5: " + getCheckMessage(MSG_KEY, "public"), + "28:12: " + getCheckMessage(MSG_KEY, "static"), + "32:9: " + getCheckMessage(MSG_KEY, "public"), + "32:16: " + getCheckMessage(MSG_KEY, "static"), + "34:13: " + getCheckMessage(MSG_KEY, "public"), + "34:20: " + getCheckMessage(MSG_KEY, "static"), + "37:13: " + getCheckMessage(MSG_KEY, "public"), + "37:20: " + getCheckMessage(MSG_KEY, "static"), + "40:13: " + getCheckMessage(MSG_KEY, "public"), + "40:20: " + getCheckMessage(MSG_KEY, "static"), }; verifyWithInlineConfigParser(getPath( "InputRedundantModifierNestedDef.java"), expected); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java index 053721d615c..3bf46e4103c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheckTest.java @@ -116,8 +116,7 @@ public void testTryWithResourcesJava9() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath( - "InputLocalFinalVariableNameTryResourcesJava9.java"), expected); + getPath("InputLocalFinalVariableNameTryResourcesJava9.java"), expected); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java index c29129f5795..8152f10ffbf 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheckTest.java @@ -162,7 +162,7 @@ public void testInterfacesExcludePublic() throws Exception { }; verifyWithInlineConfigParser( - getNonCompilablePath("InputMethodNamePublicMethodsInInterfaces.java"), + getPath("InputMethodNamePublicMethodsInInterfaces.java"), expected); } @@ -178,7 +178,7 @@ public void testInterfacesExcludePrivate() throws Exception { }; verifyWithInlineConfigParser( - getNonCompilablePath("InputMethodNamePrivateMethodsInInterfaces.java"), + getPath("InputMethodNamePrivateMethodsInInterfaces.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java index 63239857fa6..e00db20dd31 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpMultilineCheckTest.java @@ -229,12 +229,8 @@ public void testMinimumWithCustomMessage() throws Exception { private static CharSequence makeLargeXyString() { // now needs 10'000 or 100'000, as just 1000 is no longer enough today to provoke the // StackOverflowError - final int size = 100000; - final StringBuilder largeString = new StringBuilder(size); - for (int i = 0; i < size / 2; i++) { - largeString.append("xy"); - } - return largeString; + final int size = 100_000; + return "xy".repeat(size / 2); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java index fc5cfa374ee..004d055af36 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java @@ -248,6 +248,35 @@ public void testSingleCommentSeparatedFromPackage() throws Exception { expected); } + @Test + public void testEnumMembers() throws Exception { + final String[] expected = { + "22:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "27:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "28:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + "31:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "CTOR_DEF"), + "36:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "STATIC_INIT"), + "40:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "STATIC_INIT"), + }; + verifyWithInlineConfigParser( + getPath("InputEmptyLineSeparatorEnumMembers.java"), expected + ); + } + + @Test + public void testInterfaceFields() throws Exception { + final String[] expected = { + "21:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "25:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "34:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "38:5: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"), + "45:5: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "VARIABLE_DEF"), + }; + verifyWithInlineConfigParser( + getPath("InputEmptyLineSeparatorInterfaceFields.java"), expected + ); + } + @Test public void testGetAcceptableTokens() { final EmptyLineSeparatorCheck emptyLineSeparatorCheckObj = new EmptyLineSeparatorCheck(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java index 9f70a9cf1e8..bb17d3849d8 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java @@ -160,7 +160,7 @@ public void testGuardedPattern() throws Exception { public void testTryWithResources() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath("InputOperatorWrapTryWithResources.java"), expected); + getPath("InputOperatorWrapTryWithResources.java"), expected); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java index d0194a2787d..10ab8bf44b3 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java @@ -186,4 +186,45 @@ public void testCountUnicodeCorrectly() throws Exception { verifyWithInlineConfigParser( getPath("InputWhitespaceAfterCountUnicodeCorrectly.java"), expected); } + + @Test + public void testVarargs() throws Exception { + final String[] expected = { + "14:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "..."), + "17:67: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "..."), + "20:42: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "..."), + "27:45: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "..."), + "36:19: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "..."), + }; + verifyWithInlineConfigParser(getPath("InputWhitespaceAfterVarargs.java"), expected); + } + + @Test + public void testSwitchStatements() throws Exception { + final String[] expected = { + "18:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "switch"), + "30:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "switch"), + "32:21: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "39:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "switch"), + "40:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "41:28: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "48:9: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "switch"), + }; + + verifyWithInlineConfigParser( + getNonCompilablePath("InputWhitespaceAfterSwitchStatements.java"), + expected); + } + + @Test + public void testLambdaExpressions() throws Exception { + final String[] expected = { + "17:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "19:29: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + "27:49: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "->"), + }; + + verifyWithInlineConfigParser(getPath("InputWhitespaceAfterLambdaExpressions.java"), + expected); + } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java index ed34838f136..f0b5896658e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java @@ -60,9 +60,9 @@ public void testNoSuppressions() throws Exception { @Test public void testLoadFromUrl() throws Exception { final String[] urlCandidates = { - "https://checkstyle.org/files/suppressions_none.xml", "https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/site/resources/" + "files/suppressions_none.xml", + "https://checkstyle.org/files/suppressions_none.xml", }; FilterSet actualFilterSet = null; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java index 53aa8e9c822..ff3a73f8c1d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/AstRegressionTest.java @@ -66,13 +66,13 @@ public void testJava8ClassAstTree2() throws Exception { @Test public void testJava9TryWithResourcesAstTree() throws Exception { verifyAst(getPath("ExpectedJava9TryWithResources.txt"), - getNonCompilablePath("/java9/InputJava9TryWithResources.java")); + getPath("/java9/InputJava9TryWithResources.java")); } @Test public void testAdvanceJava9TryWithResourcesAstTree() throws Exception { verifyAst(getPath("ExpectedAdvanceJava9TryWithResources.txt"), - getNonCompilablePath("/java9/InputAdvanceJava9TryWithResources.java")); + getPath("/java9/InputAdvanceJava9TryWithResources.java")); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java index 55ce07cc061..1d2a6f734e6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/Java9TryWithResourcesTest.java @@ -38,7 +38,7 @@ protected String getPackageLocation() { public void testCanParse() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; verifyWithInlineConfigParser( - getNonCompilablePath("InputJava9TryWithResources.java"), expected); + getPath("InputJava9TryWithResources.java"), expected); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java index 42e4c402f8a..689bf6245c2 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java @@ -552,9 +552,7 @@ public void testAllCheckstyleMessages() throws Exception { .isEqualTo(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL); // below is required for package/private classes - if (!message.isAccessible()) { - message.setAccessible(true); - } + message.trySetAccessible(); if (!INTERNAL_MODULES.contains(module.getSimpleName())) { verifyCheckstyleMessage(usedMessages, module, message); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java index bd3d86c1276..d5e3fb569fc 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CliOptionsXdocsSyncTest.java @@ -20,8 +20,6 @@ package com.puppycrawl.tools.checkstyle.internal; import static com.google.common.truth.Truth.assertWithMessage; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.assertTrue; import java.nio.file.Files; import java.nio.file.Path; @@ -79,8 +77,10 @@ public void validateCliDocSections() throws Exception { .isEqualTo(descXdoc); cmdDesc.remove(option); } - assertTrue("CLI Options: " + cmdDesc + " present in " - + "cmdline.xml.vm, not documented in Main.java", cmdDesc.isEmpty()); + assertWithMessage("CLI Options: %s present in cmdline.xml.vm, not documented in Main.java", + cmdDesc) + .that(cmdDesc) + .isEmpty(); } @Test @@ -127,7 +127,7 @@ private static Set getParameters(String text, String regex) { private static NodeList getSectionsFromXdoc(String xdocPath) throws Exception { final Path path = Paths.get(xdocPath); - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(path.getFileName().toString(), input, input); return document.getElementsByTagName("section"); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java index ddbf2852f7d..c11c14aabfd 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java @@ -20,7 +20,6 @@ package com.puppycrawl.tools.checkstyle.internal; import static com.google.common.truth.Truth.assertWithMessage; -import static java.nio.charset.StandardCharsets.UTF_8; import java.io.File; import java.net.URI; @@ -150,7 +149,7 @@ public void testAllCheckSectionJavaDocs() throws Exception { continue; } - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java index df1643dd222..bf88341cd6b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java @@ -20,7 +20,6 @@ package com.puppycrawl.tools.checkstyle.internal; import static com.google.common.truth.Truth.assertWithMessage; -import static java.nio.charset.StandardCharsets.UTF_8; import java.io.File; import java.nio.file.Files; @@ -55,7 +54,7 @@ public void testAllCheckSectionMobileWrapper() throws Exception { final File file = path.toFile(); final String fileName = file.getName(); - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); assertWithMessage(fileName + ": input file cannot be empty") .that(input) .isNotEmpty(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java index 68cd5482f3d..4f92f595037 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertWithMessage; import static java.lang.Integer.parseInt; -import static java.nio.charset.StandardCharsets.UTF_8; import java.beans.PropertyDescriptor; import java.io.File; @@ -93,7 +92,7 @@ public class XdocsPagesTest { private static final Pattern DESCRIPTION_VERSION = Pattern .compile("^Since Checkstyle \\d+\\.\\d+(\\.\\d+)?"); - private static final List XML_FILESET_LIST = Arrays.asList( + private static final List XML_FILESET_LIST = List.of( "TreeWalker", "name=\"Checker\"", "name=\"Header\"", @@ -122,7 +121,7 @@ public class XdocsPagesTest { getProperties(AbstractJavadocCheck.class); private static final Set FILESET_PROPERTIES = getProperties(AbstractFileSetCheck.class); - private static final List UNDOCUMENTED_PROPERTIES = Arrays.asList( + private static final List UNDOCUMENTED_PROPERTIES = List.of( "Checker.classLoader", "Checker.classloader", "Checker.moduleClassLoader", @@ -135,7 +134,7 @@ public class XdocsPagesTest { "SuppressionCommentFilter.fileContents" ); - private static final List PROPERTIES_ALLOWED_GET_TYPES_FROM_METHOD = Arrays.asList( + private static final List PROPERTIES_ALLOWED_GET_TYPES_FROM_METHOD = List.of( // static field (all upper case) "SuppressWarningsHolder.aliasList", // loads string into memory similar to file @@ -152,11 +151,11 @@ public class XdocsPagesTest { ); private static final Set SUN_MODULES = Collections.unmodifiableSet( - new HashSet<>(CheckUtil.getConfigSunStyleModules())); + CheckUtil.getConfigSunStyleModules()); // ignore the not yet properly covered modules while testing newly added ones // add proper sections to the coverage report and integration tests // and then remove this list eventually - private static final List IGNORED_SUN_MODULES = Arrays.asList( + private static final List IGNORED_SUN_MODULES = List.of( "ArrayTypeStyle", "AvoidNestedBlocks", "AvoidStarImport", @@ -221,11 +220,11 @@ public class XdocsPagesTest { "WhitespaceAround" ); private static final Set GOOGLE_MODULES = Collections.unmodifiableSet( - new HashSet<>(CheckUtil.getConfigGoogleStyleModules())); + CheckUtil.getConfigGoogleStyleModules()); @Test public void testAllChecksPresentOnAvailableChecksPage() throws Exception { - final String availableChecks = new String(Files.readAllBytes(AVAILABLE_CHECKS_PATH), UTF_8); + final String availableChecks = Files.readString(AVAILABLE_CHECKS_PATH); CheckUtil.getSimpleNames(CheckUtil.getCheckstyleChecks()) .stream() @@ -257,7 +256,7 @@ public void testAllChecksPageInSyncWithChecksSummaries() throws Exception { continue; } - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("subsection"); @@ -288,7 +287,7 @@ public void testAllChecksPageInSyncWithChecksSummaries() throws Exception { private static Map readSummaries() throws Exception { final String fileName = AVAILABLE_CHECKS_PATH.getFileName().toString(); - final String input = new String(Files.readAllBytes(AVAILABLE_CHECKS_PATH), UTF_8); + final String input = Files.readString(AVAILABLE_CHECKS_PATH); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList rows = document.getElementsByTagName("tr"); final Map result = new HashMap<>(); @@ -308,7 +307,7 @@ private static Map readSummaries() throws Exception { @Test public void testAllSubSections() throws Exception { for (Path path : XdocUtil.getXdocsFilePaths()) { - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final String fileName = path.getFileName().toString(); final Document document = XmlUtil.getRawXml(fileName, input, input); @@ -354,7 +353,7 @@ else if ("sun_style.xml".equals(fileName)) { @Test public void testAllXmlExamples() throws Exception { for (Path path : XdocUtil.getXdocsFilePaths()) { - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final String fileName = path.getFileName().toString(); final Document document = XmlUtil.getRawXml(fileName, input, input); @@ -471,7 +470,7 @@ public void testAllCheckSections() throws Exception { continue; } - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); String lastSectionName = null; @@ -518,7 +517,7 @@ public void testAllCheckSectionsEx() throws Exception { final Path path = Paths.get(XdocUtil.DIRECTORY_PATH + "/config.xml"); final String fileName = path.getFileName().toString(); - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); @@ -1284,7 +1283,7 @@ private static Field getField(Class fieldClass, String propertyName) { while (!Object.class.equals(currentClass)) { try { result = currentClass.getDeclaredField(propertyName); - result.setAccessible(true); + result.trySetAccessible(); break; } catch (NoSuchFieldException ignored) { @@ -1360,9 +1359,7 @@ private static void validateViolationSection(String fileName, String sectionName for (Field field : fields) { // below is required for package/private classes - if (!field.isAccessible()) { - field.setAccessible(true); - } + field.trySetAccessible(); list.add(field.get(null).toString()); } @@ -1539,7 +1536,7 @@ public void testAllStyleRules() throws Exception { for (Path path : XdocUtil.getXdocsStyleFilePaths(XdocUtil.getXdocsFilePaths())) { final String fileName = path.getFileName().toString(); final String styleName = fileName.substring(0, fileName.lastIndexOf('_')); - final String input = new String(Files.readAllBytes(path), UTF_8); + final String input = Files.readString(path); final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("tr"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java index 702765727ca..61f7d48f294 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -26,8 +26,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.Locale; import java.util.Map; @@ -52,19 +50,17 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { // Checks that not compatible with SuppressionXpathFilter - public static final Set INCOMPATIBLE_CHECK_NAMES = - Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + public static final Set INCOMPATIBLE_CHECK_NAMES = Set.of( "NoCodeInFile (reason is that AST is not generated for a file not containing code)", "Regexp (reason is at #7759)", "RegexpSinglelineJava (reason is at #7759)" - ))); + ); // Javadoc checks are not compatible with SuppressionXpathFilter // till https://github.com/checkstyle/checkstyle/issues/5770 // then all of them should be added to the list of incompatible checks // and this field should be removed - public static final Set INCOMPATIBLE_JAVADOC_CHECK_NAMES = - Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + public static final Set INCOMPATIBLE_JAVADOC_CHECK_NAMES = Set.of( "AtclauseOrder", "JavadocBlockTagLocation", "JavadocMethod", @@ -80,21 +76,20 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "SingleLineJavadoc", "SummaryJavadoc", "WriteTag" - ))); + ); // Older regex-based checks that are under INCOMPATIBLE_JAVADOC_CHECK_NAMES // but not subclasses of AbstractJavadocCheck. - private static final Set> REGEXP_JAVADOC_CHECKS = - Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + private static final Set> REGEXP_JAVADOC_CHECKS = Set.of( JavadocStyleCheck.class, JavadocMethodCheck.class, JavadocTypeCheck.class, WriteTagCheck.class - ))); + ); // Checks that allowed to have no XPath IT Regression Testing // till https://github.com/checkstyle/checkstyle/issues/6207 - private static final Set MISSING_CHECK_NAMES = new HashSet<>(Arrays.asList( + private static final Set MISSING_CHECK_NAMES = Set.of( "BooleanExpressionComplexity", "CatchParameterName", "ClassDataAbstractionCoupling", @@ -134,7 +129,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "ParameterAssignment", "ParameterName", "ParameterNumber", - "RedundantImport", "RedundantModifier", "ReturnCount", "SeparatorWrap", @@ -148,12 +142,12 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "ThrowsCount", "TypeName", "VisibilityModifier" - )); + ); // Modules that will never have xpath support ever because they not report violations - private static final Set NO_VIOLATION_MODULES = new HashSet<>(Collections.singletonList( + private static final Set NO_VIOLATION_MODULES = Set.of( "SuppressWarningsHolder" - )); + ); private static Set simpleCheckNames; private static Map allowedDirectoryAndChecks; @@ -256,7 +250,7 @@ public void validateIntegrationTestClassNames() throws Exception { final Set allChecks = new HashSet<>(simpleCheckNames); allChecks.removeAll(INCOMPATIBLE_JAVADOC_CHECK_NAMES); allChecks.removeAll(INCOMPATIBLE_CHECK_NAMES); - allChecks.removeAll(Arrays.asList("Regexp", "RegexpSinglelineJava", "NoCodeInFile")); + allChecks.removeAll(Set.of("Regexp", "RegexpSinglelineJava", "NoCodeInFile")); allChecks.removeAll(MISSING_CHECK_NAMES); allChecks.removeAll(NO_VIOLATION_MODULES); allChecks.removeAll(compatibleChecks); diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java index 364ebada11d..e866794b3b0 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassConstructorInRecord.java @@ -14,4 +14,20 @@ public record InputFinalClassConstructorInRecord(String string) { // ok public InputFinalClassConstructorInRecord(int x) { this(String.valueOf(x)); } + + class F { + private F() { + } + } + + class K extends F { + } + + class X { + class F { // violation + private F() { + } + } + } + } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java new file mode 100644 index 00000000000..057674640e2 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassNestedStaticClassInsideInnerClass.java @@ -0,0 +1,98 @@ +/* +FinalClass + + +*/ + +//non-compiled with javac: Compilable with Java16 +package com.puppycrawl.tools.checkstyle.checks.design.finalclass; + +public class InputFinalClassNestedStaticClassInsideInnerClass { + class M { + class A { + static class B { + static class C { // violation + private C() { + } + } + } + } + } + + class Mw { + static class B { + static class C { // ok + private C() { + } + } + } + } + + class A { + class B { // violation + class C { // ok + private C() {} + } + class D extends C { + } + private B() {} + } + } + + class B { + class C { // violation + private C() {} + class D extends Mw.B.C { + } + } + } + + class P extends Q { + } + + class Q { // ok + private Q() { + } + } + + class PR { + static class P { + static class Q { // violation + private Q() { + } + } + } + } + + class F { + private F() { + } + } + + class K extends F { + } + + class X { + class F { // violation + private F() { + } + } + } + + class a { + static class c { // violation + private c() { + } + } + } + + class d { + class e extends c { + } + } + + class c { + private c() { + } + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java new file mode 100644 index 00000000000..440c21d3619 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterSwitchStatements.java @@ -0,0 +1,58 @@ +/* +WhitespaceAfter +tokens = LITERAL_SWITCH, LAMBDA + +*/ + +//non-compiled with javac: Compilable with Java17 +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter; + +public class InputWhitespaceAfterSwitchStatements { + enum Day { + NONE, SAT, SUN, MON, + TUS, WED, THU, FRI + } + + String whatIsToday(Day day) { + String today; + switch(day) { // violation + case SAT, SUN: + today = "Weekend day"; + break; + default: + throw new IllegalArgumentException("Invalid day: " + day.name()); + } + return today; + } + + String whatIsToday2(Day day) { + var today = ""; + switch(day) { // violation + case MON, TUS, WED, THU, FRI -> today = "Working day"; + default ->throw new IllegalArgumentException(); // violation + } + return today; + } + + void switchWithPatternMatching() { + Object o = ""; + switch(o) { // violation + case String s ->s.trim(); // violation + case Integer a ->a.intValue(); // violation + default -> throw new IllegalArgumentException(); // ok + } + } + + void normalSwitch() { + final int a = 12; + switch(a) { // violation + case 1: + break; + case 2: + case 3: + break; + default: + break; + } + } +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java similarity index 88% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java index d920fa09afe..a5b3422a19a 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java @@ -5,7 +5,7 @@ */ -//non-compiled with javac: Compilable with Java10 + package com.puppycrawl.tools.checkstyle.checks.coding.matchxpath; public class InputMatchXpathAvoidInstanceCreationWithoutVar { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java similarity index 97% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java index d4492710458..3477cd53ea2 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResources.java @@ -5,7 +5,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline; import java.io.IOException; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java similarity index 97% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java index 1f0bb359dfc..4a8d28fd96f 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineTryWithResourcesIgnore.java @@ -5,7 +5,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline; import java.io.IOException; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java index ab99b2da5fe..7812f133dd7 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClass.java @@ -121,13 +121,13 @@ private someinnerClass() {} } interface TestInterface { - class SomeClass { + class SomeClass { // violation private SomeClass() {} } } @interface SomeAnnotation { - class SomeClass { + class SomeClass { // violation private SomeClass() {} } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java new file mode 100644 index 00000000000..2af8408cc54 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassAnnotation.java @@ -0,0 +1,24 @@ +/* +FinalClass + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.design.finalclass; + +public @interface InputFinalClassAnnotation { + + final class FinalClass { // ok + private FinalClass() {} + } + + class DerivedClass extends SuperClass { // violation + private DerivedClass() {} + } + + class SuperClass { // ok + private SuperClass() {} + } + +} + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java new file mode 100644 index 00000000000..2055dbc270b --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassEnum.java @@ -0,0 +1,44 @@ +/* +FinalClass + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.design.finalclass; + +public enum InputFinalClassEnum { + + FINAL("Final", new FinalClass()), + DERIVED("Derived", new DerivedClass()), + ; + + private final String initial; + private final Object object; + + private InputFinalClassEnum(String initial, Object object) { + this.initial = initial; + this.object = object; + } + + public String getName() { + return name(); + } + + public String getInitial() { + return initial; + } + + static final class FinalClass { // ok + private FinalClass() {} + } + + static class DerivedClass extends SuperClass { // violation + private DerivedClass() {} + } + + static class SuperClass { // ok + private SuperClass() {} + } + +} + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java new file mode 100644 index 00000000000..99b04c18a09 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInnerAndNestedClass.java @@ -0,0 +1,76 @@ +/* +FinalClass + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.design.finalclass; + +public class InputFinalClassInnerAndNestedClass { + + private class SuperClass { // ok + private SuperClass() { + } + } + + private class SubClass extends SuperClass { + } + + class SameName { // violation + private SameName() { + } + } + + static class Test { + static class SameName { // ok + private SameName() { + } + class Test3 { + } + } + } + + class TestInnerClass { + class SameName { // ok + class Test3 { + class Test4 extends SameName { + } + } + private SameName() { + } + } + } + + class TestNestedClasses { + class SameName { // violation + private SameName() { + } + class Test3 { + class Test4 extends Test.SameName { + } + } + } + } +} + +enum foo { + VALUE_1, VALUE_2; + + class A { + class B { // ok + private B() { + } + } + + class c extends B { + } + + class D { + class B { // violation + private B() { + } + } + } + } +} + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java new file mode 100644 index 00000000000..a434be80b82 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/finalclass/InputFinalClassInterface.java @@ -0,0 +1,24 @@ +/* +FinalClass + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.design.finalclass; + +public interface InputFinalClassInterface { + + final class FinalClass { // ok + private FinalClass() {} + } + + class DerivedClass extends SuperClass { // violation + private DerivedClass() {} + } + + class SuperClass { // ok + private SuperClass() {} + } + +} + diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java similarity index 91% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java index 961f908dee0..e7bb197e336 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/missingjavadocmethod/InputMissingJavadocMethodInterfacePrivateMethod.java @@ -11,7 +11,6 @@ */ -//non-compiled with javac: Compilable with Java9 // private method in interface package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java similarity index 96% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java index e8d20286a29..161f1e246d5 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityVar.java @@ -18,7 +18,6 @@ */ -//non-compiled with javac: Compilable with Java10 package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity; import javax.naming.NamingException; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java similarity index 93% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java index 3c6032599bc..601c2c259fb 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/interfacememberimpliedmodifier/InputInterfaceMemberImpliedModifierPrivateMethods.java @@ -11,7 +11,6 @@ */ -//non-compiled with javac: Compilable with Java9 package com.puppycrawl.tools.checkstyle.checks.modifier.interfacememberimpliedmodifier; /** diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java index a2cb3c0c0eb..03a0cb906b3 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedClassInPublicInterfaceRedundantModifiers.java @@ -21,7 +21,7 @@ private interface PrivateNestedInterface { class ClassInPrivateNestedInterface { public ClassInPrivateNestedInterface() { } // violation } - public interface PrivateNestedInterfaceWithPublicModifier { + public interface PrivateNestedInterfaceWithPublicModifier { // violation class ClassInPrivateNestedInterface { public ClassInPrivateNestedInterface() { } // violation } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedDef.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedDef.java index 193e6451089..130f86d2bfd 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedDef.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierNestedDef.java @@ -15,4 +15,30 @@ static public enum MyInnerEnum4 {} // 2 violations interface MyInnerInterface { public strictfp class MyInnerClass {} // violation } + + public static class testClass { // 2 violations + } + + public abstract static @interface testAnnotatedInterface { // 3 violations + } +} + +abstract @interface testAnnotatedInterface { // violation + + public static enum testEnum { // 2 violations + } + + interface testInterface { + public static interface nestedInterface { // 2 violations + + public static class nestedClass { // 2 violations + } + + public static @interface nestedAnnInterface { // 2 violations + } + + public static enum nestedEnum { // 2 violations + } + } + } } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java similarity index 92% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java index 0e49b993da5..73717e9775e 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/redundantmodifier/InputRedundantModifierTryWithResources.java @@ -6,7 +6,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier; import java.io.IOException; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java similarity index 91% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java index 049cbd1b21e..751a1326c4b 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/localfinalvariablename/InputLocalFinalVariableNameTryResourcesJava9.java @@ -6,7 +6,6 @@ */ -//non-compiled with javac: Compilable with Java9 package com.puppycrawl.tools.checkstyle.checks.naming.localfinalvariablename; public class InputLocalFinalVariableNameTryResourcesJava9 { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java similarity index 92% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java index e1d3086a642..9a717fcdf30 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePrivateMethodsInInterfaces.java @@ -10,7 +10,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.checks.naming.methodname; public interface InputMethodNamePrivateMethodsInInterfaces { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java similarity index 92% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java index 569eb68ca6c..21795ba3429 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNamePublicMethodsInInterfaces.java @@ -10,7 +10,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.checks.naming.methodname; public interface InputMethodNamePublicMethodsInInterfaces { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java new file mode 100644 index 00000000000..93aa0806526 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorEnumMembers.java @@ -0,0 +1,47 @@ +/* +EmptyLineSeparator +allowNoEmptyLineBetweenFields = (default)false +allowMultipleEmptyLines = false +allowMultipleEmptyLinesInsideClassMembers = false +tokens = (default)PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, \ + STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, \ + COMPACT_CTOR_DEF + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +public class InputEmptyLineSeparatorEnumMembers {} + +enum A { + ONE("one"), + TWO("two"); + + + private final String str; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + private String otherString; // ok + + + private String thirdString; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + private String fourth; // violation ''VARIABLE_DEF' should be separated from previous line.' + + + A(String s) { // violation ''CTOR_DEF' has more than 1 empty lines before.' + this.str = s; + } + + private String fifth; + static { // violation ''STATIC_INIT' should be separated from previous line.' + } + + + static { // violation ''STATIC_INIT' has more than 1 empty lines before.' + + } + + public String getStr() { + return str; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java new file mode 100644 index 00000000000..d9c6cb29fc9 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorInterfaceFields.java @@ -0,0 +1,46 @@ +/* +EmptyLineSeparator +allowNoEmptyLineBetweenFields = (default)false +allowMultipleEmptyLines = false +allowMultipleEmptyLinesInsideClassMembers = false +tokens = (default)PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, \ + STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, \ + COMPACT_CTOR_DEF + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.emptylineseparator; + +public interface InputEmptyLineSeparatorInterfaceFields { + int a = 45; // ok + + int b = 45; // ok + + + int c = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + + + int d = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' +} + +@interface Ann { + int a = 45; // ok + + int b = 45; // ok + + + int c = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' + + + + int d = 45; // violation ''VARIABLE_DEF' has more than 1 empty lines before.' +} + +interface Abc { + Object apply(Object array, int index); + + Abc A = (o, i) -> new Object(); + Abc B = (o, i) -> o; // violation ''VARIABLE_DEF' should be separated from previous line.' +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java similarity index 97% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java index 2603ba9f993..08fd6d3680e 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapTryWithResources.java @@ -7,7 +7,6 @@ */ -//non-compiled with javac: Compilable with Java9 package com.puppycrawl.tools.checkstyle.checks.whitespace.operatorwrap; public class InputOperatorWrapTryWithResources implements AutoCloseable diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLambdaExpressions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLambdaExpressions.java new file mode 100644 index 00000000000..569bc9b1d02 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterLambdaExpressions.java @@ -0,0 +1,29 @@ +/* +WhitespaceAfter +tokens = LAMBDA + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter; + +import java.util.function.Function; + +public class InputWhitespaceAfterLambdaExpressions { + + static Runnable r1 = () -> { // ok + String.valueOf("Hello world one!"); + }; + + static Runnable r2 = () ->String.valueOf("Hello world two!"); // violation + + static Runnable r3 = () ->{String.valueOf("Hello world two!");}; // violation + + static Runnable r4 = () -> // ok + { + String.valueOf("Hello world one!"); + }; + + public void foo() { + Function function = (o) ->o.toString(); // violation + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterVarargs.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterVarargs.java new file mode 100644 index 00000000000..30a258b3e4c --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespaceafter/InputWhitespaceAfterVarargs.java @@ -0,0 +1,37 @@ +/* +WhitespaceAfter +tokens = ELLIPSIS + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespaceafter; + +import java.util.List; + +public class InputWhitespaceAfterVarargs { + + public void method(int...obj) { // violation + } + + public InputWhitespaceAfterVarargs(String first, List...second) { // violation + } + + public void anotherMethod(List...args) { // violation + } + + public static String multipleArguments(int l, String format, Object ... args) { // ok + return format; + } + + private void noWhitespaceBefore(boolean ...args) { // violation + } + + testInterface obj = (Integer... i) -> { // ok + }; +} + +@FunctionalInterface +interface testInterface { + void method(T ...args); // violation +} diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java similarity index 96% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java index 885af6e5d08..5f63179ddb2 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputAdvanceJava9TryWithResources.java @@ -1,4 +1,4 @@ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.grammar.java9; /** diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java similarity index 94% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java index e9fbfb375f4..5035ae9c50c 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammar/java9/InputJava9TryWithResources.java @@ -9,7 +9,7 @@ */ -//non-compiled with javac: Compilable with Java9 + package com.puppycrawl.tools.checkstyle.grammar.java9; /** diff --git a/src/xdocs/beginning_development.xml b/src/xdocs/beginning_development.xml index 90411efaf16..add44e5b21f 100644 --- a/src/xdocs/beginning_development.xml +++ b/src/xdocs/beginning_development.xml @@ -17,7 +17,7 @@

- 1. Ensure that Git, Java JDK >= 8 until JDK 17, maven >= 3.0.1 are installed.
+ 1. Ensure that Git, Java JDK >= 11 until JDK 17, maven >= 3.0.1 are installed.
You can find information about development environment preparation here: Prepare development environment in Ubuntu.
diff --git a/src/xdocs/checks.xml b/src/xdocs/checks.xml index 51a1e168193..a092fc5bc60 100644 --- a/src/xdocs/checks.xml +++ b/src/xdocs/checks.xml @@ -263,8 +263,9 @@ FinalClass - Checks that a class which has only private constructors - is declared as final. + Checks that a class that has only private constructors and + has no descendant classes is declared as final. + FinalLocalVariable diff --git a/src/xdocs/config_coding.xml b/src/xdocs/config_coding.xml index 4e59149aeb7..9ff5c710e9f 100644 --- a/src/xdocs/config_coding.xml +++ b/src/xdocs/config_coding.xml @@ -6391,6 +6391,30 @@ public class D { <property name="max" value="3"/> </module> +

+ Example: +

+ +public class MyClass { + public int sign(int x) { + if (x < 0) + return -1; + if (x == 0) + return 1; + return 0; + } // OK + + public int badSign(int x) { + if (x < -2) + return -2; + if (x == 0) + return 0; + if (x > 2) + return 2; + return 1; + } // violation, more than three return statements +} +

To configure the check so that it doesn't allow any @@ -6401,6 +6425,19 @@ public class D { <property name="maxForVoid" value="0"/> </module> +

+ Example: +

+ +public class MyClass { + public void firstMethod(int x) { + } // OK + + public void badMethod(int x) { + return; + } // violation, return statements per void method +} +

To configure the check so that it doesn't allow more than 2 @@ -6413,6 +6450,39 @@ public class D { <property name="maxForVoid" value="1"/> </module> +

+ Example: +

+ +public class MyClass { + public void firstMethod() { + } // OK + + public void secondMethod() { + return; + } // OK + + public void badMethod(int x) { + if (x == 0) + return; + return; + } // violation, more than one return statements + + public int sign(int x) { + if (x < 0) + return -1; + return 0; + } // OK + + public int badSign(int x) { + if (x < 0) + return -1; + if (x == 0) + return 1; + return 0; + } // violation, more than two return statements in methods +} +

To configure the check so that it doesn't allow more than three @@ -6424,6 +6494,30 @@ public class D { <property name="format" value="^$"/> </module> +

+ Example: +

To configure the check so that it doesn't allow any return statements @@ -6432,7 +6526,7 @@ public class D {

<module name="ReturnCount"> - <property name="max" value="0"/> + <property name="maxForVoid" value="0"/> <property name="tokens" value="CTOR_DEF"/> </module> <module name="ReturnCount"> @@ -6444,6 +6538,46 @@ public class D { <property name="tokens" value="METHOD_DEF"/> </module> +

+ Example: +

+ +import java.util.function.Predicate; + +public class Test { + public Test() { + } // OK + + public Test(int i) { + return; // violation, max allowed for constructors is 0 + } + + final Predicate<Integer> p = i -> { + if (i > 5) { + return true; + } + return false; + }; // violation, max allowed for lambdas is 1 + + final Predicate<Integer> q = i -> { + return i > 5; + }; // OK + + public int sign(int x) { + if (x > 0) + return -1; + return 0; + } // OK + + public int badSign(int x) { + if (x < 0) + return -1; + if (x == 0) + return 1; + return 0; + } // violation, more than two return statements in methods +} + diff --git a/src/xdocs/config_design.xml b/src/xdocs/config_design.xml index 1df3dfac41e..2003e9f9e39 100644 --- a/src/xdocs/config_design.xml +++ b/src/xdocs/config_design.xml @@ -319,9 +319,8 @@ public class A {

Since Checkstyle 3.1

- Checks that a class which has only private constructors is declared - as final. Doesn't check for classes nested in interfaces - or annotations, as they are always final there. + Checks that a class that has only private constructors and + has no descendant classes is declared as final.

@@ -357,21 +356,6 @@ class MyClass { // OK, since it has a public constructor } } -interface CheckInterface -{ - class MyClass { // OK, nested class in interface is always final - private MyClass() {} - } -} - -public @interface Test { - public boolean enabled() - default true; - class MyClass { // OK, class nested in an annotation is always final - private MyClass() { } - } -} - class TestAnonymousInnerClasses { // OK, class has an anonymous inner class. public static final TestAnonymousInnerClasses ONE = new TestAnonymousInnerClasses() { diff --git a/src/xdocs/config_misc.xml b/src/xdocs/config_misc.xml index 88b3882655a..910639e1536 100644 --- a/src/xdocs/config_misc.xml +++ b/src/xdocs/config_misc.xml @@ -1032,7 +1032,19 @@ return '\ufeff' + content; // OK, non-printable escape character. <module name="FinalParameters"/> - +

+ Example: +

+ +public class Point { + public Point() { } // ok + public Point(final int m) { } // ok + public Point(final int m,int n) { } // violation, n should be final + public void methodOne(final int x) { } // ok + public void methodTwo(int x) { } // violation, x should be final + public static void main(String[] args) { } // violation, args should be final +} +

To configure the check to enforce final parameters only for constructors: @@ -1041,6 +1053,19 @@ return '\ufeff' + content; // OK, non-printable escape character. <module name="FinalParameters"> <property name="tokens" value="CTOR_DEF"/> </module> + +

+ Example: +

+ +public class Point { + public Point() { } // ok + public Point(final int m) { } // ok + public Point(final int m,int n) { } // violation, n should be final + public void methodOne(final int x) { } // ok + public void methodTwo(int x) { } // ok + public static void main(String[] args) { } // ok +}

To configure the check to allow ignoring @@ -1052,6 +1077,19 @@ return '\ufeff' + content; // OK, non-printable escape character. <property name="ignorePrimitiveTypes" value="true"/> </module> +

+ Example: +

+ +public class Point { + public Point() { } // ok + public Point(final int m) { } // ok + public Point(final int m,int n) { } // ok + public void methodOne(final int x) { } // ok + public void methodTwo(int x) { } // ok + public static void main(String[] args) { } // violation, args should be final +} + diff --git a/src/xdocs/config_modifier.xml b/src/xdocs/config_modifier.xml index d70dfe017c6..ddc9dfa4f8a 100644 --- a/src/xdocs/config_modifier.xml +++ b/src/xdocs/config_modifier.xml @@ -548,8 +548,8 @@ public interface RoadFeature {

Interface and annotation definitions.

Final modifier on methods of final and anonymous classes.

- Inner interface declarations that are declared - as static. + Type declarations nested under interfaces that are declared as public + or static.

Class constructors.

@@ -559,16 +559,15 @@ public interface RoadFeature {

- Interfaces by definition are abstract so the abstract - modifier on the interface is redundant. + interfaces by definition are abstract so the abstract modifier is + redundant on them.

- Classes inside of interfaces by definition are public and static, - so the public and static modifiers - on the inner classes are redundant. On the other hand, classes - inside of interfaces can be abstract or non abstract. - So, abstract modifier is allowed. + Type declarations nested under interfaces by definition are public and static, + so the public and static modifiers on nested type + declarations are redundant. On the other hand, classes inside of interfaces can + be abstract or non abstract. So, abstract modifier is allowed.

@@ -689,6 +688,8 @@ public class ClassExtending extends ClassExample { ENUM_DEF , RESOURCE + , + ANNOTATION_DEF . @@ -708,6 +709,8 @@ public class ClassExtending extends ClassExample { ENUM_DEF , RESOURCE + , + ANNOTATION_DEF . 3.0 diff --git a/src/xdocs/config_whitespace.xml b/src/xdocs/config_whitespace.xml index 3a562a7d158..4592b10e4fd 100644 --- a/src/xdocs/config_whitespace.xml +++ b/src/xdocs/config_whitespace.xml @@ -2902,6 +2902,12 @@ class Bar { LITERAL_FOR , DO_WHILE + , + ELLIPSIS + , + LITERAL_SWITCH + , + LAMBDA . @@ -2924,6 +2930,12 @@ class Bar { LITERAL_FOR , DO_WHILE + , + ELLIPSIS + , + LITERAL_SWITCH + , + LAMBDA . 3.0 diff --git a/src/xdocs/index.xml.vm b/src/xdocs/index.xml.vm index 31bb3f3cb71..8f1c275d9ab 100644 --- a/src/xdocs/index.xml.vm +++ b/src/xdocs/index.xml.vm @@ -90,18 +90,47 @@

Since Checkstyle 7, some users have been unable to continue upgrading to newer versions - of the utility because of the new JDK 1.8 compile requirement. The development team doesn't + of the utility because of the new JDK compile requirements. The development team doesn't have the resources to keep updating the utility for older JDKs for those that can't work with the latest version.

However, some members of the community have created an unofficial backport of the latest - Checkstyle releases to be run with JDKs as old as 1.6. If you wish to continue using new - Checkstyle versions on older JDKs, we recommend you either checkout the - github site or the - documentation site on how - to use the backport version of the utility, in place of the official Checkstyle version. + Checkstyle releases to be run with older JDKs. It is not always an easy process and provided + at the same release time as Checkstyle, but it tries to maintain a functional equivalent + alternative.

+ + + + + + + + + + + + + + + + +

Backport version	Min. JRE version	Link
+ 10.0+ +	+ 8 +	+ github site +
+ 7.0 - 8.45 +	+ 6 +	+ github site +

@@ -129,6 +158,14 @@ Checkstyle version JRE version + + + 10.x + + + 11 and above + + 7.x, 8.x, 9.x diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml index 018b1dbb216..3d2e6286846 100644 --- a/src/xdocs/releasenotes.xml +++ b/src/xdocs/releasenotes.xml @@ -10,6 +10,101 @@ +

27.02.2022

Breaking backward compatibility:

+ upgrade minimal required jdk version to 11. + Author: rnveach, pbludov + #9146 +

New:

+ WhitespaceAfter does not work on 'switch' and lambda statements. + Author: Vyom-Yadav + #11298 +
+ WhitespaceAfter should support `ELLIPSIS` token. + Author: Vyom-Yadav + #11116 +

Bug fixes:

+ FinalClass should exempt private-only constructor classes that are + extended by another class in the same compilation unit. + Author: pbludov + #10859 +
+ False Negative: RedundantModifierCheck. + Author: Vyom-Yadav + #11268 +
+ EmptyLineSeparator: false negative in Enum and interface fields. + Author: Andrei Paikin + #11241 +
+ NPE in gui.MainFrameModel#getLastDirectory. + Author: pbludov + #11294 +

Notes:

+ Pitest: add new mutator REMOVE_CONDITIONALS. + Author: rnveach + #6320 +
+ Update doc for FinalParameters. + Author: Taniya + #7588 +
+ Expand XPath IT Regression Testing. + Author: Binita Kumari + #6207 +
+ Replace usages of deprecated method AccessibleObject.isAccessible. + Author: Nick Mancuso + #11309 +
+ Update doc for ReturnCount. + Author: Binita Kumari + #7657 +
+ Add icon to the GUI window. + Author: pbludov + #11292 +
+ Add 'since' property to '@Deprecated' annotation. + Author: pbludov + #11289 +
+ doc: update requirements to jdk 11. + Author: pbludov +
+ remove extra checkstyle build in no-exception-test.sh. + Author: Vyom-Yadav + #11281 +

30.01.2022

New:

diff --git a/wercker.yml b/wercker.yml index 68ffa0a15d7..692d924c692 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,5 +1,5 @@ box: - id: maven:3.8.1-jdk-11 + id: maven:3.8.4-jdk-11 username: $DOCKERHUB_USER password: $DOCKERHUB_TOKEN