This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 7566f557c2fa172d7677fcde06514e8a68356f81
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Jun 15 10:11:38 2022 -0400
Refactor commons code
---
.../commons/io/filefilter/AbstractFileFilter.java | 19 +++++++++++++++++++
.../apache/commons/io/filefilter/AndFileFilter.java | 7 +------
.../apache/commons/io/filefilter/NameFileFilter.java | 9 +--------
.../apache/commons/io/filefilter/OrFileFilter.java | 9 +--------
.../commons/io/filefilter/PrefixFileFilter.java | 9 +--------
.../commons/io/filefilter/SuffixFileFilter.java | 9 +--------
.../commons/io/filefilter/WildcardFileFilter.java | 8 +-------
7 files changed, 25 insertions(+), 45 deletions(-)
diff --git
a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
index 06dfbcef..b12aa661 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
+import java.util.List;
import java.util.Objects;
import org.apache.commons.io.file.PathFilter;
@@ -97,6 +98,24 @@ public abstract class AbstractFileFilter implements
IOFileFilter, PathVisitor {
return accept(new File(dir, name));
}
+ void append(final List<?> list, final StringBuilder buffer) {
+ for (int i = 0; i < list.size(); i++) {
+ if (i > 0) {
+ buffer.append(",");
+ }
+ buffer.append(list.get(i));
+ }
+ }
+
+ void append(final Object[] array, final StringBuilder buffer) {
+ for (int i = 0; i < array.length; i++) {
+ if (i > 0) {
+ buffer.append(",");
+ }
+ buffer.append(array[i]);
+ }
+ }
+
/**
* Handles exceptions caught while accepting.
*
diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
index 8a8d030c..56135ac0 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
@@ -215,12 +215,7 @@ public class AndFileFilter
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- for (int i = 0; i < fileFilters.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(fileFilters.get(i));
- }
+ append(fileFilters, buffer);
buffer.append(")");
return buffer.toString();
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
index 08740538..d301a81d 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
@@ -207,14 +207,7 @@ public class NameFileFilter extends AbstractFileFilter
implements Serializable {
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- if (names != null) {
- for (int i = 0; i < names.length; i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(names[i]);
- }
- }
+ append(names, buffer);
buffer.append(")");
return buffer.toString();
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
index 7ac08f49..80a92acd 100644
--- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
@@ -196,14 +196,7 @@ public class OrFileFilter extends AbstractFileFilter
implements ConditionalFileF
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- if (fileFilters != null) {
- for (int i = 0; i < fileFilters.size(); i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(fileFilters.get(i));
- }
- }
+ append(fileFilters, buffer);
buffer.append(")");
return buffer.toString();
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
index 807e3f47..852e82bb 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -209,14 +209,7 @@ public class PrefixFileFilter extends AbstractFileFilter
implements Serializable
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- if (prefixes != null) {
- for (int i = 0; i < prefixes.length; i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(prefixes[i]);
- }
- }
+ append(prefixes, buffer);
buffer.append(")");
return buffer.toString();
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
index def7f1ba..7c417539 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -209,14 +209,7 @@ public class SuffixFileFilter extends AbstractFileFilter
implements Serializable
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- if (suffixes != null) {
- for (int i = 0; i < suffixes.length; i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(suffixes[i]);
- }
- }
+ append(suffixes, buffer);
buffer.append(")");
return buffer.toString();
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
index ff2ef142..aa7c0daf 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
@@ -209,14 +209,8 @@ public class WildcardFileFilter extends AbstractFileFilter
implements Serializab
final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
- for (int i = 0; i < wildcards.length; i++) {
- if (i > 0) {
- buffer.append(",");
- }
- buffer.append(wildcards[i]);
- }
+ append(wildcards, buffer);
buffer.append(")");
return buffer.toString();
}
-
}
