Merge branch 'master' into RAT-98_report_skipped_files

apache · Feb 8, 2025 · fedd682 · fedd682
2 parents 30576c4 + f5b80da
commit fedd682
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/DocumentNameMatcher.java b/apache-rat-core/src/main/java/org/apache/rat/document/DocumentNameMatcher.java
@@ -302,7 +302,7 @@ public static DocumentNameMatcher matcherSet(final DocumentNameMatcher includes,
         }
         List<DocumentNameMatcher> workingSet = Arrays.asList(includes, excludes);
         return new DocumentNameMatcher(format("matcherSet(%s)", join(workingSet)),
-                new CollectionPredicateImpl(workingSet) {
+                new DefaultCollectionPredicate(workingSet) {
                     @Override
                     public boolean test(final DocumentName documentName) {
                         if (includes.matches(documentName)) {
@@ -400,17 +400,17 @@ interface CollectionPredicate extends Predicate<DocumentName> {
         Iterable<DocumentNameMatcher> getMatchers();
     }
     /**
-     * CollectionPredicate implementation.
+     * A {@link CollectionPredicate} implementation.
      */
-    abstract static class CollectionPredicateImpl implements CollectionPredicate {
+    abstract static class DefaultCollectionPredicate implements CollectionPredicate {
         /** The collection for matchers that make up this predicate */
         private final Iterable<DocumentNameMatcher> matchers;
 
         /**
          * Constructs a collection predicate from the collection of matchers.
          * @param matchers the collection of matchers to use.
          */
-        protected CollectionPredicateImpl(final Iterable<DocumentNameMatcher> matchers) {
+        protected DefaultCollectionPredicate(final Iterable<DocumentNameMatcher> matchers) {
             this.matchers = matchers;
         }
 
@@ -436,7 +436,7 @@ public String toString() {
      * An implementation of "and" logic across a collection of DocumentNameMatchers.
      */
     // package private for testing access
-    static class And extends CollectionPredicateImpl {
+    static class And extends DefaultCollectionPredicate {
         And(final Iterable<DocumentNameMatcher> matchers) {
             super(matchers);
         }
@@ -456,7 +456,7 @@ public boolean test(final DocumentName documentName) {
      * An implementation of "or" logic across a collection of DocumentNameMatchers.
      */
     // package private for testing access
-    static class Or extends CollectionPredicateImpl {
+    static class Or extends DefaultCollectionPredicate {
         Or(final Iterable<DocumentNameMatcher> matchers) {
             super(matchers);
         }