Replace usage of Apache commons-lang3

- Introduce compact custom implementations - Avoid dependency on commons-lang3 completely - More toString refinements to follow soon (do away with reflectionToString etc.)
spannm · Feb 15, 2024 · d064f6a · d064f6a
1 parent 3b26380
commit d064f6a
Show file tree

Hide file tree

Showing 33 changed files with 564 additions and 418 deletions.
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,6 @@
 
         <developerId>spannm</developerId>
 
-        <dep.commons-lang3.version>3.14.0</dep.commons-lang3.version>
         <dep.commons-logging.version>1.3.0</dep.commons-logging.version>
         <dep.poi.version>4.1.2</dep.poi.version>
 
@@ -116,11 +115,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${dep.commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>

diff --git a/src/main/java/io/github/spannm/jackcess/impl/ColumnImpl.java b/src/main/java/io/github/spannm/jackcess/impl/ColumnImpl.java
@@ -25,7 +25,7 @@
 import io.github.spannm.jackcess.impl.expr.NumberFormatter;
 import io.github.spannm.jackcess.util.ColumnValidator;
 import io.github.spannm.jackcess.util.SimpleColumnValidator;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.github.spannm.jackcess.util.ToStringBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -1624,21 +1624,18 @@ private static byte getColumnBitFlags(ColumnBuilder col) {
 
     @Override
     public String toString() {
-        ToStringBuilder sb = CustomToStringStyle.builder(this)
-            .append("name", "(" + _table.getName() + ") " + _name);
-        byte typeValue = getOriginalDataType();
-        sb.append("type", "0x" + Integer.toHexString(typeValue) + " (" + _type + ")")
-          .append("number", _columnNumber)
-          .append("length", _columnLength)
-          .append("variableLength", _variableLength);
+        ToStringBuilder sb = ToStringBuilder.builder(this)
+            .append("name", "(" + _table.getName() + ") " + _name)
+            .append("type", "0x" + Integer.toHexString(getOriginalDataType()) + " (" + _type + ")")
+            .append("number", _columnNumber)
+            .append("length", _columnLength)
+            .append("variableLength", _variableLength);
         if (_calculated) {
             sb.append("calculated", _calculated)
-                .append("expression",
-                    CustomToStringStyle.ignoreNull(getCalculationContext()));
+              .appendIgnoreNull("expression", getCalculationContext());
         }
         if (_type.isTextual()) {
-            sb.append("compressedUnicode", isCompressedUnicode())
-                .append("textSortOrder", getTextSortOrder());
+            sb.append("compressedUnicode", isCompressedUnicode()).append("textSortOrder", getTextSortOrder());
             if (getTextCodePage() > 0) {
                 sb.append("textCodePage", getTextCodePage());
             }
@@ -1651,16 +1648,16 @@ public String toString() {
         }
         if (_type.getHasScalePrecision()) {
             sb.append("precision", getPrecision())
-                .append("scale", getScale());
+              .append("scale", getScale());
         }
         if (_autoNumber) {
             sb.append("lastAutoNumber", _autoNumberGenerator.getLast());
         }
-        sb.append("complexInfo", CustomToStringStyle.ignoreNull(getComplexInfo()))
-            .append("validator", CustomToStringStyle.ignoreNull(
-                _validator != SimpleColumnValidator.INSTANCE ? _validator : null))
-            .append("defaultValue", CustomToStringStyle.ignoreNull(_defValue));
-        return sb.toString();
+        return sb
+          .appendIgnoreNull("complexInfo", getComplexInfo())
+          .appendIgnoreNull("validator", _validator != SimpleColumnValidator.INSTANCE ? _validator : null)
+          .appendIgnoreNull("defaultValue", _defValue)
+          .toString();
     }
 
     /**
@@ -2217,7 +2214,7 @@ public byte[] getBytes() {
 
         @Override
         public String toString() {
-            return CustomToStringStyle.valueBuilder(this)
+            return ToStringBuilder.valueBuilder(this)
                 .append(null, getBytes())
                 .toString();
         }
@@ -2490,7 +2487,7 @@ public boolean equals(Object o) {
 
         @Override
         public String toString() {
-            return CustomToStringStyle.valueBuilder(this)
+            return ToStringBuilder.valueBuilder(this)
                 .append(null, _value + "(" + _version + ")")
                 .toString();
         }

diff --git a/src/main/java/io/github/spannm/jackcess/impl/CompoundOleUtil.java b/src/main/java/io/github/spannm/jackcess/impl/CompoundOleUtil.java
@@ -23,7 +23,7 @@
 import io.github.spannm.jackcess.util.MemFileChannel;
 import io.github.spannm.jackcess.util.OleBlob.CompoundContent;
 import io.github.spannm.jackcess.util.OleBlob.ContentType;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.github.spannm.jackcess.util.ToStringBuilder;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.DocumentInputStream;
@@ -185,7 +185,7 @@ private List<Entry> getEntries(List<Entry> entries, DirectoryEntry dir,
                     // .. recurse into this directory
                     getEntries(entries, (DirectoryEntry) entry, prefix + ENTRY_SEPARATOR);
                 } else if (entry instanceof DocumentEntry) {
-                    // grab the entry name/detils
+                    // grab the entry name/details
                     DocumentEntry de = (DocumentEntry) entry;
                     String entryName = prefix + encodeEntryName(entry.getName());
                     entries.add(new EntryImpl(entryName, de));
@@ -203,13 +203,11 @@ public void close() {
 
         @Override
         public String toString() {
-            ToStringBuilder sb = toString(CustomToStringStyle.builder(this));
+            ToStringBuilder sb = toString(ToStringBuilder.builder(this));
 
             try {
-                sb.append("hasContentsEntry", hasContentsEntry());
-                sb.append("entries", getEntries(new ArrayList<>(),
-                    getFileSystem().getRoot(),
-                    ENTRY_SEPARATOR));
+                sb.append("hasContentsEntry", hasContentsEntry())
+                  .append("entries", getEntries(new ArrayList<Entry>(), getFileSystem().getRoot(), ENTRY_SEPARATOR));
             } catch (IOException e) {
                 sb.append("entries", "<" + e + ">");
             }
@@ -265,7 +263,7 @@ public void writeTo(OutputStream out) throws IOException {
 
             @Override
             public String toString() {
-                return CustomToStringStyle.valueBuilder(this)
+                return ToStringBuilder.valueBuilder(this)
                     .append("name", _name)
                     .append("length", length())
                     .toString();

diff --git a/src/main/java/io/github/spannm/jackcess/impl/CustomToStringStyle.java b/src/main/java/io/github/spannm/jackcess/impl/CustomToStringStyle.java