fixed javadoc

apache · Feb 3, 2025 · e140777 · e140777
1 parent cc5724b
commit e140777
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java b/apache-rat-core/src/main/java/org/apache/rat/config/exclusion/ExclusionProcessor.java
@@ -209,15 +209,12 @@ public DocumentNameMatcher getNameMatcher(final DocumentName basedir) {
     private List<MatcherSet> extractFileProcessors(final DocumentName basedir) {
         final List<MatcherSet> fileProcessorList = new ArrayList<>();
         for (StandardCollection sc : fileProcessors) {
-            final Set<String> names = new HashSet<>();
-            sc.fileProcessor().map(fp -> fp.apply(basedir)).forEachRemaining(n -> n.forEach(names::add));
-            MatcherSet.Builder builder = new MatcherSet.Builder();
-            Set<String> matching = new HashSet<>();
-            Set<String> notMatching = new HashSet<>();
-            MatcherSet.Builder.segregateList(matching, notMatching, names);
-            builder.addIncluded(basedir.resolve(sc.name()), notMatching);
-            builder.addExcluded(basedir.resolve(sc.name()), matching);
-            fileProcessorList.add(builder.build());
+            ExtendedIterator<List<MatcherSet>> iter =  sc.fileProcessorBuilder().map(builder -> builder.build(basedir));
+            if (iter.hasNext()) {
+                iter.forEachRemaining(fileProcessorList::addAll);
+            } else {
+                DefaultLog.getInstance().debug(String.format("%s does not have a fileProcessor.", sc));
+            }
         }
         return fileProcessorList;
     }

diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java b/apache-rat-core/src/main/java/org/apache/rat/document/DocumentName.java
@@ -241,7 +241,7 @@ public String getDirectorySeparator() {
 
     /**
      * Determines if the candidate starts with the root or separator strings.
-     * @param candidate the candidate ot check. If blank method will return {@code false}.
+     * @param candidate the candidate to check. If blank method will return {@code false}.
      * @param root the root to check. If blank the root check is skipped.
      * @param separator the separator to check. If blank the check is skipped.
      * @return true if either the root or separator check returned {@code true}.

diff --git a/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java b/apache-rat-core/src/test/java/org/apache/rat/test/AbstractOptionsProvider.java
@@ -247,7 +247,7 @@ protected DocumentName mkDocName(String name) {
     /* Tests to be implemented */
     protected abstract void helpTest();
 
-    /* Display the option and value under test */
+    /** Display the option and value under test */
     private String displayArgAndName(Option option, String fname) {
         return String.format("%s %s", option.getLongOpt(), fname);
     }