Merge branch 'master' into issue1264

Author: IlyaPechersky

.github/workflows/mvn.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2022, ubuntu-22.04, macos-12]
-        java: [11, 20]
+        java: [11, 21]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

INSTALL.txt

@@ -32,7 +32,7 @@ Just add this plugin to your `pom.xml`:
     <plugin>
       <groupId>com.qulice</groupId>
       <artifactId>qulice-maven-plugin</artifactId>
-      <version>0.22.2</version>
+      <version>0.23.0</version>
       <configuration>
         <license>file:${basedir}/LICENSE.txt</license>
       </configuration>

README.md

@@ -230,7 +230,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.22.2</version>
+            <version>0.23.0</version>
           </plugin>
         </plugins>
       </build>

pom.xml

@@ -189,7 +189,7 @@ private static DetailAST secondChild(final DetailAST node) {
      * @return True if node contains angle brackets only
      */
     private static boolean isDiamondOperatorUsed(final DetailAST node) {
-        return node.getChildCount() == 2
+        return node != null && node.getChildCount() == 2
             && node.getFirstChild().getType() == TokenTypes.GENERIC_START
             && node.getLastChild().getType() == TokenTypes.GENERIC_END;
     }

qulice-checkstyle/src/main/java/com/qulice/checkstyle/DiamondOperatorCheck.java

@@ -67,6 +67,7 @@ public int[] getDefaultTokens() {
         return new int[] {
             TokenTypes.METHOD_DEF,
             TokenTypes.CTOR_DEF,
+            TokenTypes.PACKAGE_DEF,
         };
     }
 

qulice-checkstyle/src/main/java/com/qulice/checkstyle/MultilineJavadocTagsCheck.java

@@ -445,23 +445,44 @@ void allowsOnlyProperlyOrderedAtClauses() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Test
-    @Disabled
     void passesWindowsEndsOfLineWithoutException() throws Exception {
-        this.common.validate("WindowsEol.java", false, "LICENSE found:");
+        final String file = "WindowsEol.java";
+        final Collection<Violation> results = this.common.runValidation(file, false);
+        MatcherAssert.assertThat(
+            "violation should be reported correctly",
+            results,
+            Matchers.contains(
+                new ViolationMatcher(
+                    "Line does not match expected header line of ' */'.",
+                    file,
+                    "3",
+                    "HeaderCheck"
+                )
+            )
+        );
     }
 
     /**
      * Fail validation with Windows-style formatting of the license and
      * Linux-style formatting of the sources.
      * @throws Exception If something wrong happens inside
-     * @todo #61:30min This test and passesWindowsEndsOfLineWithoutException
-     *  should be refactored to gather log4j logs and validate that they work
-     *  correctly. (see changes done in #61)
      */
     @Test
-    @Disabled
     void testWindowsEndsOfLineWithLinuxSources() throws Exception {
-        this.common.runValidation("WindowsEolLinux.java", false);
+        final String file = "WindowsEolLinux.java";
+        final Collection<Violation> results = this.common.runValidation(file, false);
+        MatcherAssert.assertThat(
+            "violation should be reported correctly",
+            results,
+            Matchers.contains(
+                new ViolationMatcher(
+                    "Line does not match expected header line of ' * Hello.'.",
+                    file,
+                    "2",
+                    "HeaderCheck"
+                )
+            )
+        );
     }
 
     /**

qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java

@@ -1,3 +1,11 @@
+/**
+ * @deprecated text Some text, which description
+ * takes a few lines (incorrect formatting)
+ * takes a few lines (incorrect formatting)
+ */
+package does.not.matter;
+
+
 /*
  * This is not a real Java class. It won't be compiled ever. It is used
  * only as a text resource in integration.ChecksIT.

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/MultilineJavadocTagsCheck/Invalid.java

@@ -1,6 +1,12 @@
 /*
  * LICENSE.
  */
+/**
+ * Some text.
+ * sadsdada
+ * @param text Some text, which description
+ *  takes a few lines
+ */
 package foo;
 
 import java.util.List;

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/MultilineJavadocTagsCheck/Valid.java

@@ -1,14 +1,16 @@
-10:Should contain one indentation space
-12:Should contain one indentation space
-19:Should contain one indentation space
+3:Should contain one indentation space
+4:Should contain one indentation space
+18:Should contain one indentation space
 20:Should contain one indentation space
-23:Should contain one indentation space
-25:Should contain one indentation space
-29:Should contain one indentation space
-39:Should contain one indentation space
-41:Should contain one indentation space
-48:Should contain one indentation space
+27:Should contain one indentation space
+28:Should contain one indentation space
+31:Should contain one indentation space
+33:Should contain one indentation space
+37:Should contain one indentation space
+47:Should contain one indentation space
 49:Should contain one indentation space
-52:Should contain one indentation space
-54:Should contain one indentation space
-58:Should contain one indentation space
+56:Should contain one indentation space
+57:Should contain one indentation space
+60:Should contain one indentation space
+62:Should contain one indentation space
+66:Should contain one indentation space