Merge branch 'release/1.19.0'

Author: algobarb

src/main/java/com/algorand/algosdk/abi/Contract.java

@@ -1,6 +1,5 @@
 package com.algorand.algosdk.abi;
 
-import com.algorand.algosdk.algod.client.StringUtil;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/algorand/algosdk/abi/Interface.java

@@ -1,6 +1,5 @@
 package com.algorand.algosdk.abi;
 
-import com.algorand.algosdk.algod.client.StringUtil;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/algorand/algosdk/abi/Method.java

@@ -1,6 +1,5 @@
 package com.algorand.algosdk.abi;
 
-import com.algorand.algosdk.algod.client.StringUtil;
 import com.algorand.algosdk.transaction.Transaction;
 import com.algorand.algosdk.util.CryptoProvider;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -20,6 +19,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.apache.commons.lang3.StringUtils;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Method {
     @JsonIgnore
@@ -150,7 +151,7 @@ else if (method.charAt(i) == ')') {
     public String getSignature() {
         List<String> argStringList = new ArrayList<>();
         for (Arg value : this.args) argStringList.add(value.type);
-        return this.name + "(" + StringUtil.join(argStringList.toArray(new String[0]), ",") + ")" + this.returns.type;
+        return this.name + "(" + StringUtils.join(argStringList.toArray(new String[0]), ",") + ")" + this.returns.type;
     }
 
     @JsonIgnore
@@ -195,7 +196,7 @@ public static Method getMethodByName(List<Method> methods,  String name) {
             for(int idx=0;idx<filteredMethods.size();idx++){
                sigs[idx] = filteredMethods.get(idx).getSignature();
             }
-            String found = StringUtil.join(sigs, ",");
+            String found = StringUtils.join(sigs, ",");
             throw new IllegalArgumentException(String.format("found %d methods with the same name: %s", filteredMethods.size(), found));
         }
 

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

@@ -1,6 +1,5 @@
 package com.algorand.algosdk.abi;
 
-import com.algorand.algosdk.algod.client.StringUtil;
 import com.algorand.algosdk.util.Encoder;
 import com.algorand.algosdk.util.GenericObjToArray;
 
@@ -11,6 +10,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class TypeTuple extends ABIType {
     public final List<ABIType> childTypes;
 
@@ -23,7 +24,7 @@ public String toString() {
         List<String> childStrs = new ArrayList<>();
         for (ABIType t : this.childTypes)
             childStrs.add(t.toString());
-        return "(" + StringUtil.join(childStrs.toArray(new String[0]), ",") + ")";
+        return "(" + StringUtils.join(childStrs.toArray(new String[0]), ",") + ")";
     }
 
     @Override

src/main/java/com/algorand/algosdk/algod/client/AlgodClient.java

@@ -1,4 +1,5 @@
 package com.algorand.algosdk.algod.client;
 
+@Deprecated
 public class AlgodClient extends ApiClient {
 }

src/main/java/com/algorand/algosdk/algod/client/ApiCallback.java

@@ -22,7 +22,9 @@
  * Callback for asynchronous API call.
  *
  * @param <T> The return type
+ * @deprecated Use the equivalent in v2 algod client
  */
+@Deprecated
 public interface ApiCallback<T> {
     /**
      * This is called when the API call fails.

src/main/java/com/algorand/algosdk/algod/client/ApiClient.java

@@ -50,7 +50,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
+@Deprecated
 public class ApiClient {
 
     private String basePath = "http://localhost";

src/main/java/com/algorand/algosdk/algod/client/ApiException.java

@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-
+@Deprecated
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;

src/main/java/com/algorand/algosdk/algod/client/ApiResponse.java

@@ -20,7 +20,9 @@
  * API response returned by API call.
  *
  * @param <T> The type of data that is deserialized from response body
+ * @deprecated Use the equivalent in v2 algod client
  */
+@Deprecated
 public class ApiResponse<T> {
     final private int statusCode;
     final private Map<String, List<String>> headers;

src/main/java/com/algorand/algosdk/algod/client/Configuration.java

@@ -13,7 +13,7 @@
 
 package com.algorand.algosdk.algod.client;
 
-
+@Deprecated
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();