Merge pull request #36 from schierlm/patch-2

Fix ambiguous utility method call - thx @schierlm

Author: adrianziser

src/main/java/jota/utils/Converter.java

@@ -107,16 +107,7 @@ public static int[] convertToIntArray(List<Integer> integers) {
      */
     public static int[] trits(final String trytes, int length) {
         int[] trits = trits(trytes);
-
-        List<Integer> tritsList = new LinkedList<>();
-
-        for (int i : trits)
-            tritsList.add(i);
-
-        while (tritsList.size() < length)
-            tritsList.add(0);
-
-        return convertToIntArray(tritsList);
+        return Arrays.copyOf(trits, length);
     }
 
     /**
@@ -127,17 +118,8 @@ public static int[] trits(final String trytes, int length) {
      * @return A trits array.
      */
     public static int[] trits(final long trytes, int length) {
-        int[] trits = trits(String.valueOf(trytes));
-
-        List<Integer> tritsList = new LinkedList<>();
-
-        for (int i : trits)
-            tritsList.add(i);
-
-        while (tritsList.size() < length)
-            tritsList.add(0);
-
-        return convertToIntArray(tritsList);
+        int[] trits = trits(trytes);
+        return Arrays.copyOf(trits, length);
     }
 
     /**
@@ -146,12 +128,9 @@ public static int[] trits(final long trytes, int length) {
      * @param trytes The trytes.
      * @return A trits array.
      */
+    @Deprecated
     public static int[] tritsString(final String trytes) {
-        int[] d = new int[3 * trytes.length()];
-        for (int i = 0; i < trytes.length(); i++) {
-            System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
-        }
-        return d;
+        return trits(trytes);
     }
 
     /**
@@ -160,43 +139,46 @@ public static int[] tritsString(final String trytes) {
      * @param trytes The trytes to be converted.
      * @return Array of trits.
      **/
-    public static int[] trits(final String trytes) {
+    public static int[] trits(final long trytes) {
         final List<Integer> trits = new LinkedList<>();
-        if (InputValidator.isValue(trytes)) {
-
-            long value = Long.parseLong(trytes);
-
-            long absoluteValue = value < 0 ? -value : value;
-
-            int position = 0;
+        long absoluteValue = trytes < 0 ? -trytes : trytes;
 
-            while (absoluteValue > 0) {
+        int position = 0;
 
-                int remainder = (int) (absoluteValue % RADIX);
-                absoluteValue /= RADIX;
+        while (absoluteValue > 0) {
 
-                if (remainder > MAX_TRIT_VALUE) {
-                    remainder = MIN_TRIT_VALUE;
-                    absoluteValue++;
-                }
+            int remainder = (int) (absoluteValue % RADIX);
+            absoluteValue /= RADIX;
 
-                trits.add(position++, remainder);
+            if (remainder > MAX_TRIT_VALUE) {
+                remainder = MIN_TRIT_VALUE;
+                absoluteValue++;
             }
-            if (value < 0) {
-                for (int i = 0; i < trits.size(); i++) {
-                    trits.set(i, -trits.get(i));
-                }
-            }
-        } else {
-            int[] d = new int[3 * trytes.length()];
-            for (int i = 0; i < trytes.length(); i++) {
-                System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
+
+            trits.add(position++, remainder);
+        }
+        if (trytes < 0) {
+            for (int i = 0; i < trits.size(); i++) {
+                trits.set(i, -trits.get(i));
             }
-            return d;
         }
         return convertToIntArray(trits);
     }
 
+    /**
+     * Converts trytes into trits.
+     *
+     * @param trytes The trytes to be converted.
+     * @return Array of trits.
+     **/
+    public static int[] trits(final String trytes) {
+        int[] d = new int[3 * trytes.length()];
+        for (int i = 0; i < trytes.length(); i++) {
+            System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
+        }
+        return d;
+    }
+
     /**
      * Copies the trits from the input string into the destination array
      *
@@ -299,4 +281,4 @@ public static void increment(final int[] trits, final int size) {
         }
     }
 
-}
+}