Small improvements

[signal-cli] / src / main / java / org / asamk / signal / util / Hex.java

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 696ca62b9aa4407d1266399787f81d80cea5e136..f7a870ca13ff940fdc2db00eec3a4fc01296f380 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.util;
 
 public class Hex {
 
@@ -6,10 +6,27 @@ public class Hex {
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
+    private Hex() {
+    }
+
+    public static String toString(byte[] bytes) {
+        if (bytes.length == 0) {
+            return "";
+        }
+
+        var buf = new StringBuffer();
+        for (final var aByte : bytes) {
+            appendHexChar(buf, aByte);
+            buf.append(" ");
+        }
+        buf.deleteCharAt(buf.length() - 1);
+        return buf.toString();
+    }
+
     public static String toStringCondensed(byte[] bytes) {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < bytes.length; i++) {
-            appendHexChar(buf, bytes[i]);
+        var buf = new StringBuffer();
+        for (final var aByte : bytes) {
+            appendHexChar(buf, aByte);
         }
         return buf.toString();
     }
@@ -17,13 +34,12 @@ public class Hex {
     private static void appendHexChar(StringBuffer buf, int b) {
         buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
         buf.append(HEX_DIGITS[b & 0xf]);
-        buf.append(" ");
     }
 
     public static byte[] toByteArray(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
+        var len = s.length();
+        var data = new byte[len / 2];
+        for (var i = 0; i < len; i += 2) {
             data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
         }
         return data;