You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/04/19 12:25:55 UTC

(commons-codec) 04/04: Internal refactoring

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-codec.git

commit 86d10456047e21f7135f5de7f96e8adfc941cd39
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Apr 19 08:24:40 2024 -0400

    Internal refactoring
---
 src/main/java/org/apache/commons/codec/binary/Hex.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/binary/Hex.java b/src/main/java/org/apache/commons/codec/binary/Hex.java
index 754e7445..dc6d0806 100644
--- a/src/main/java/org/apache/commons/codec/binary/Hex.java
+++ b/src/main/java/org/apache/commons/codec/binary/Hex.java
@@ -145,7 +145,7 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
      * @since 1.4
      */
     public static char[] encodeHex(final byte[] data, final boolean toLowerCase) {
-        return encodeHex(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
+        return encodeHex(data, toAlphabet(toLowerCase));
     }
 
     /**
@@ -176,7 +176,7 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
      * @since 1.15
      */
     public static char[] encodeHex(final byte[] data, final int dataOffset, final int dataLen, final boolean toLowerCase) {
-        return encodeHex(data, dataOffset, dataLen, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER, new char[dataLen << 1], 0);
+        return encodeHex(data, dataOffset, dataLen, toAlphabet(toLowerCase), new char[dataLen << 1], 0);
     }
 
     /**
@@ -191,7 +191,7 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
      * @since 1.15
      */
     public static void encodeHex(final byte[] data, final int dataOffset, final int dataLen, final boolean toLowerCase, final char[] out, final int outOffset) {
-        encodeHex(data, dataOffset, dataLen, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER, out, outOffset);
+        encodeHex(data, dataOffset, dataLen, toAlphabet(toLowerCase), out, outOffset);
     }
 
     /**
@@ -244,7 +244,7 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
      * @since 1.11
      */
     public static char[] encodeHex(final ByteBuffer data, final boolean toLowerCase) {
-        return encodeHex(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
+        return encodeHex(data, toAlphabet(toLowerCase));
     }
 
     /**
@@ -321,6 +321,16 @@ public class Hex implements BinaryEncoder, BinaryDecoder {
         return new String(encodeHex(data, toLowerCase));
     }
 
+    /**
+     * Converts a boolean to an alphabet.
+     *
+     * @param toLowerCase true for lowercase, false for uppercase.
+     * @return an alphabet.
+     */
+    private static char[] toAlphabet(final boolean toLowerCase) {
+        return toLowerCase ? DIGITS_LOWER : DIGITS_UPPER;
+    }
+
     /**
      * Convert the byte buffer to a byte array. All bytes identified by
      * {@link ByteBuffer#remaining()} will be used.