#1198 filter out non-java files

yegor256 · Mar 7, 2024 · af89497 · af89497
1 parent cbc8b1c
commit af89497
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 142 deletions.
diff --git a/qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java b/qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java
@@ -144,9 +144,13 @@ public List<File> getNonExcludedFiles(final Collection<File> files) {
             final String name = file.getPath().substring(
                 this.env.basedir().toString().length()
             );
-            if (!this.env.exclude("checkstyle", name)) {
-                relevant.add(file);
+            if (this.env.exclude("checkstyle", name)) {
+                continue;
             }
+            if (!name.matches("^.*\\.java$")) {
+                continue;
+            }
+            relevant.add(file);
         }
         return relevant;
     }

diff --git a/qulice-maven-plugin/src/it/checkstyle-locale/LICENSE.txt b/qulice-maven-plugin/src/it/checkstyle-locale/LICENSE.txt
diff --git a/qulice-maven-plugin/src/it/checkstyle-locale/invoker.properties b/qulice-maven-plugin/src/it/checkstyle-locale/invoker.properties
diff --git a/qulice-maven-plugin/src/it/checkstyle-locale/pom.xml b/qulice-maven-plugin/src/it/checkstyle-locale/pom.xml
diff --git a/qulice-maven-plugin/src/it/checkstyle-locale/src/main/resources/tabs.txt b/qulice-maven-plugin/src/it/checkstyle-locale/src/main/resources/tabs.txt
diff --git a/qulice-maven-plugin/src/it/checkstyle-locale/verify.groovy b/qulice-maven-plugin/src/it/checkstyle-locale/verify.groovy
diff --git a/qulice-maven-plugin/src/it/checkstyle-violations/verify.groovy b/qulice-maven-plugin/src/it/checkstyle-violations/verify.groovy
@@ -36,14 +36,12 @@
 def log = new File(basedir, 'build.log')
 assert log.text.findAll('.*Brackets.java.*BracketsStructureCheck').size() == 4
 assert log.text.contains('Tabs.java[4]: Line contains a tab character. (FileTabCharacterCheck)')
-assert log.text.contains('tabs.txt[1]: Line contains a tab character. (FileTabCharacterCheck)')
 assert log.text.findAll('Brackets.java.*(HeaderCheck)').empty
 //assert log.text.contains('Violations.java[6]: This method must be static, because it does not refer to "this"')
 assert log.text.contains('Brackets.java[54]: Closing bracket should be on a new line (BracketsStructureCheck)')
 assert log.text.contains('Violations.java[14]: Parameter txt should be final. (FinalParametersCheck)')
 assert log.text.contains('Violations.java[25]: Parameter ex should be final. (FinalParametersCheck)')
 assert log.text.contains('NewLines.java[4]: Lines in file should end with Unix-like end of line')
-assert log.text.contains('newlines.txt[3]: Lines in file should end with Unix-like end of line')
 assert log.text.contains('Violations.java[33]: ArrayList should be initialized with a size parameter')
 assert log.text.contains('Violations.java[34]: ArrayList should be initialized with a size parameter')
 assert !log.text.contains('Got an exception - java.lang.NullPointerException')

diff --git a/qulice-pmd/src/main/java/com/qulice/pmd/PmdValidator.java b/qulice-pmd/src/main/java/com/qulice/pmd/PmdValidator.java
@@ -98,9 +98,13 @@ public Collection<DataSource> getNonExcludedFiles(final Collection<File> files)
             final String name = file.getPath().substring(
                 this.env.basedir().toString().length()
             );
-            if (!this.env.exclude("pmd", name)) {
-                sources.add(new FileDataSource(file));
+            if (this.env.exclude("pmd", name)) {
+                continue;
             }
+            if (!name.matches("^.*\\.java$")) {
+                continue;
+            }
+            sources.add(new FileDataSource(file));
         }
         return sources;
     }