Fix/abi dir position

src/main/java/com/algorand/algosdk/util/abi/Type.java → src/main/java/com/algorand/algosdk/abi/Type.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import java.lang.reflect.Array;
 import java.util.*;
@@ -139,7 +139,7 @@ else if (str.charAt(i) == ')') {
         return Arrays.asList(tupleSeg);
     }
 
-    static int findBoolLR(Type[] typeArray, int index, int delta) {
+    protected static int findBoolLR(Type[] typeArray, int index, int delta) {
         int until = 0;
         while (true) {
             int currentIndex = index + delta * until;
@@ -158,7 +158,13 @@ else if (currentIndex != 0 && delta < 0)
         return until;
     }
 
-    static Object[] unifyToArrayOfObjects(Object val) {
+    /**
+     * Given an array/list-like object, infer an array of objects
+     * @param val an array/list-like object
+     * @return inferred array of objects
+     * @throws IllegalArgumentException if it cannot infer if the object is list or array
+     */
+    protected static Object[] unifyToArrayOfObjects(Object val) {
         if (val.getClass().isArray()) {
             if (val instanceof Object[])
                 return (Object[]) val;
@@ -180,7 +186,7 @@ static Object[] unifyToArrayOfObjects(Object val) {
      * @return the first 2 bytes of the ABI encoding byte array
      * @throws IllegalArgumentException if the encoded byte array has length < 2
      */
-    public static byte[] getLengthEncoded(byte[] encoded) {
+    protected static byte[] getLengthEncoded(byte[] encoded) {
         if (encoded.length < ABI_DYNAMIC_HEAD_BYTE_LEN)
             throw new IllegalArgumentException("encode byte size too small, less than 2 bytes");
         byte[] encodedLength = new byte[ABI_DYNAMIC_HEAD_BYTE_LEN];
@@ -195,7 +201,7 @@ public static byte[] getLengthEncoded(byte[] encoded) {
      * @return the tailing bytes after the first 2 bytes of the ABI encoding byte array
      * @throws IllegalArgumentException if the encoded byte array has length < 2
      */
-    public static byte[] getContentEncoded(byte[] encoded) {
+    protected static byte[] getContentEncoded(byte[] encoded) {
         if (encoded.length < ABI_DYNAMIC_HEAD_BYTE_LEN)
             throw new IllegalArgumentException("encode byte size too small, less than 2 bytes");
         byte[] encodedString = new byte[encoded.length - ABI_DYNAMIC_HEAD_BYTE_LEN];
@@ -209,7 +215,7 @@ public static byte[] getContentEncoded(byte[] encoded) {
      * @param t ABI type of the element of the ABI array
      * @return a type-cast from ABI array to an ABI tuple type
      */
-    public static TypeTuple castToTupleType(int size, Type t) {
+    protected static TypeTuple castToTupleType(int size, Type t) {
         List<Type> tupleTypes = new ArrayList<>();
         for (int i = 0; i < size; i++)
             tupleTypes.add(t);

src/main/java/com/algorand/algosdk/util/abi/TypeAddress.java → src/main/java/com/algorand/algosdk/abi/TypeAddress.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.crypto.Address;
 import org.apache.commons.lang3.ArrayUtils;

src/main/java/com/algorand/algosdk/util/abi/TypeArrayDynamic.java → src/main/java/com/algorand/algosdk/abi/TypeArrayDynamic.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.util.Encoder;
 

src/main/java/com/algorand/algosdk/util/abi/TypeArrayStatic.java → src/main/java/com/algorand/algosdk/abi/TypeArrayStatic.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 public class TypeArrayStatic extends Type {
     public final Type elemType;

src/main/java/com/algorand/algosdk/util/abi/TypeBool.java → src/main/java/com/algorand/algosdk/abi/TypeBool.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 public class TypeBool extends Type {
     public TypeBool() {

src/main/java/com/algorand/algosdk/util/abi/TypeByte.java → src/main/java/com/algorand/algosdk/abi/TypeByte.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 public class TypeByte extends Type {
     public TypeByte() {

src/main/java/com/algorand/algosdk/util/abi/TypeString.java → src/main/java/com/algorand/algosdk/abi/TypeString.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.util.Encoder;
 import org.apache.commons.lang3.ArrayUtils;

src/main/java/com/algorand/algosdk/util/abi/TypeTuple.java → src/main/java/com/algorand/algosdk/abi/TypeTuple.java

@@ -1,9 +1,8 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.algod.client.StringUtil;
 import com.algorand.algosdk.util.Encoder;
 
-import java.lang.reflect.Array;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

src/main/java/com/algorand/algosdk/util/abi/TypeUfixed.java → src/main/java/com/algorand/algosdk/abi/TypeUfixed.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.util.Encoder;
 

src/main/java/com/algorand/algosdk/util/abi/TypeUint.java → src/main/java/com/algorand/algosdk/abi/TypeUint.java

@@ -1,9 +1,8 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.util.Encoder;
 
 import java.math.BigInteger;
-import java.nio.ByteBuffer;
 
 public class TypeUint extends Type {
     public final int bitSize;

src/test/java/com/algorand/algosdk/util/abi/TestDecode.java → src/test/java/com/algorand/algosdk/abi/TestDecode.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.crypto.Address;
 import com.algorand.algosdk.util.Encoder;

src/test/java/com/algorand/algosdk/util/abi/TestDecodeInvalid.java → src/test/java/com/algorand/algosdk/abi/TestDecodeInvalid.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/test/java/com/algorand/algosdk/util/abi/TestEncode.java → src/test/java/com/algorand/algosdk/abi/TestEncode.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.util.Encoder;
 import org.assertj.core.util.Arrays;

src/test/java/com/algorand/algosdk/util/abi/TestRandomValues.java → src/test/java/com/algorand/algosdk/abi/TestRandomValues.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import com.algorand.algosdk.crypto.Address;
 import com.algorand.algosdk.util.Encoder;

src/test/java/com/algorand/algosdk/util/abi/TestTypes.java → src/test/java/com/algorand/algosdk/abi/TestTypes.java

@@ -1,4 +1,4 @@
-package com.algorand.algosdk.util.abi;
+package com.algorand.algosdk.abi;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;