From 54725a1de86fd5958253af1d6e178a2586b7839f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:26:10 -0400 Subject: [PATCH 1/3] Regenerate code from specification file (#387) Co-authored-by: Algorand Generation Bot --- .../algosdk/v2/client/indexer/SearchForAccounts.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/algorand/algosdk/v2/client/indexer/SearchForAccounts.java b/src/main/java/com/algorand/algosdk/v2/client/indexer/SearchForAccounts.java index 13b069ece..d67db48a1 100644 --- a/src/main/java/com/algorand/algosdk/v2/client/indexer/SearchForAccounts.java +++ b/src/main/java/com/algorand/algosdk/v2/client/indexer/SearchForAccounts.java @@ -105,7 +105,10 @@ public SearchForAccounts next(String next) { /** * Include results for the specified round. For performance reasons, this parameter - * may be disabled on some configurations. + * may be disabled on some configurations. Using application-id or asset-id filters + * will return both creator and opt-in accounts. Filtering by include-all will + * return creator and opt-in accounts for deleted assets and accounts. Non-opt-in + * managers are not included in the results when asset-id is used. */ public SearchForAccounts round(Long round) { addQuery("round", String.valueOf(round)); From e4efd9832357b068f083d716185c9cdc09cff389 Mon Sep 17 00:00:00 2001 From: algochoi <86622919+algochoi@users.noreply.github.com> Date: Thu, 15 Sep 2022 09:04:08 -0400 Subject: [PATCH 2/3] Deprecation: Add deprecation tags to v1 `algod` API (#388) --- src/main/java/com/algorand/algosdk/abi/Contract.java | 1 - src/main/java/com/algorand/algosdk/abi/Interface.java | 1 - src/main/java/com/algorand/algosdk/abi/Method.java | 7 ++++--- src/main/java/com/algorand/algosdk/abi/TypeTuple.java | 5 +++-- .../com/algorand/algosdk/algod/client/AlgodClient.java | 1 + .../com/algorand/algosdk/algod/client/ApiCallback.java | 2 ++ .../java/com/algorand/algosdk/algod/client/ApiClient.java | 2 +- .../com/algorand/algosdk/algod/client/ApiException.java | 2 +- .../com/algorand/algosdk/algod/client/ApiResponse.java | 2 ++ .../com/algorand/algosdk/algod/client/Configuration.java | 2 +- .../algosdk/algod/client/GzipRequestInterceptor.java | 1 + src/main/java/com/algorand/algosdk/algod/client/JSON.java | 1 + .../algorand/algosdk/algod/client/ProgressRequestBody.java | 1 + .../algosdk/algod/client/ProgressResponseBody.java | 1 + .../java/com/algorand/algosdk/algod/client/StringUtil.java | 2 +- .../com/algorand/algosdk/algod/client/api/AlgodApi.java | 4 ++++ .../com/algorand/algosdk/algod/client/api/DefaultApi.java | 4 ++++ .../com/algorand/algosdk/algod/client/auth/ApiKeyAuth.java | 2 +- .../algorand/algosdk/algod/client/auth/Authentication.java | 1 + .../algorand/algosdk/algod/client/auth/HttpBasicAuth.java | 1 + .../java/com/algorand/algosdk/algod/client/auth/OAuth.java | 2 +- .../com/algorand/algosdk/algod/client/auth/OAuthFlow.java | 1 + .../java/com/algorand/algosdk/algod/client/lib/Pair.java | 2 +- .../com/algorand/algosdk/algod/client/model/Account.java | 1 + .../algorand/algosdk/algod/client/model/AssetHolding.java | 1 + .../algorand/algosdk/algod/client/model/AssetParams.java | 1 + .../com/algorand/algosdk/algod/client/model/Block.java | 2 +- .../algorand/algosdk/algod/client/model/NodeStatus.java | 2 +- .../algorand/algosdk/algod/client/model/Participation.java | 2 +- .../algosdk/algod/client/model/PaymentTransactionType.java | 2 +- .../algosdk/algod/client/model/PendingTransactions.java | 2 +- .../com/algorand/algosdk/algod/client/model/Supply.java | 2 +- .../algorand/algosdk/algod/client/model/Transaction.java | 2 +- .../algosdk/algod/client/model/TransactionFee.java | 2 +- .../algorand/algosdk/algod/client/model/TransactionID.java | 2 +- .../algosdk/algod/client/model/TransactionList.java | 2 +- .../algosdk/algod/client/model/TransactionParams.java | 2 +- .../algosdk/algod/client/model/TransactionResults.java | 2 +- .../com/algorand/algosdk/algod/client/model/Version.java | 2 +- 39 files changed, 50 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/algorand/algosdk/abi/Contract.java b/src/main/java/com/algorand/algosdk/abi/Contract.java index 2690f1eb5..b44d52830 100644 --- a/src/main/java/com/algorand/algosdk/abi/Contract.java +++ b/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; diff --git a/src/main/java/com/algorand/algosdk/abi/Interface.java b/src/main/java/com/algorand/algosdk/abi/Interface.java index a00ea4387..324afd63a 100644 --- a/src/main/java/com/algorand/algosdk/abi/Interface.java +++ b/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; diff --git a/src/main/java/com/algorand/algosdk/abi/Method.java b/src/main/java/com/algorand/algosdk/abi/Method.java index 0d1f78c24..0ef62c323 100644 --- a/src/main/java/com/algorand/algosdk/abi/Method.java +++ b/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 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 methods, String name) { for(int idx=0;idx childTypes; @@ -23,7 +24,7 @@ public String toString() { List 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 diff --git a/src/main/java/com/algorand/algosdk/algod/client/AlgodClient.java b/src/main/java/com/algorand/algosdk/algod/client/AlgodClient.java index f9dbf434c..7a9864ff1 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/AlgodClient.java +++ b/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 { } diff --git a/src/main/java/com/algorand/algosdk/algod/client/ApiCallback.java b/src/main/java/com/algorand/algosdk/algod/client/ApiCallback.java index 3d0610afb..2c9ca7ec8 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ApiCallback.java +++ b/src/main/java/com/algorand/algosdk/algod/client/ApiCallback.java @@ -22,7 +22,9 @@ * Callback for asynchronous API call. * * @param The return type + * @deprecated Use the equivalent in v2 algod client */ +@Deprecated public interface ApiCallback { /** * This is called when the API call fails. diff --git a/src/main/java/com/algorand/algosdk/algod/client/ApiClient.java b/src/main/java/com/algorand/algosdk/algod/client/ApiClient.java index d4645cb3f..da2cf99b9 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ApiClient.java +++ b/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"; diff --git a/src/main/java/com/algorand/algosdk/algod/client/ApiException.java b/src/main/java/com/algorand/algosdk/algod/client/ApiException.java index 4c66399ba..887ce32e7 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ApiException.java +++ b/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> responseHeaders = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/ApiResponse.java b/src/main/java/com/algorand/algosdk/algod/client/ApiResponse.java index 13e8330ab..a6d0c839f 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ApiResponse.java +++ b/src/main/java/com/algorand/algosdk/algod/client/ApiResponse.java @@ -20,7 +20,9 @@ * API response returned by API call. * * @param The type of data that is deserialized from response body + * @deprecated Use the equivalent in v2 algod client */ +@Deprecated public class ApiResponse { final private int statusCode; final private Map> headers; diff --git a/src/main/java/com/algorand/algosdk/algod/client/Configuration.java b/src/main/java/com/algorand/algosdk/algod/client/Configuration.java index f5be88fd3..d6f969014 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/Configuration.java +++ b/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(); diff --git a/src/main/java/com/algorand/algosdk/algod/client/GzipRequestInterceptor.java b/src/main/java/com/algorand/algosdk/algod/client/GzipRequestInterceptor.java index 926402cac..b048ed735 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/GzipRequestInterceptor.java +++ b/src/main/java/com/algorand/algosdk/algod/client/GzipRequestInterceptor.java @@ -26,6 +26,7 @@ * * Taken from https://github.com/square/okhttp/issues/350 */ +@Deprecated class GzipRequestInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { Request originalRequest = chain.request(); diff --git a/src/main/java/com/algorand/algosdk/algod/client/JSON.java b/src/main/java/com/algorand/algosdk/algod/client/JSON.java index df46c09d8..1591623cc 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/JSON.java +++ b/src/main/java/com/algorand/algosdk/algod/client/JSON.java @@ -32,6 +32,7 @@ import java.util.Date; import java.util.Map; +@Deprecated public class JSON { private Gson gson; private boolean isLenientOnJson = false; diff --git a/src/main/java/com/algorand/algosdk/algod/client/ProgressRequestBody.java b/src/main/java/com/algorand/algosdk/algod/client/ProgressRequestBody.java index 26ffb4c63..ee41e3e8c 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ProgressRequestBody.java +++ b/src/main/java/com/algorand/algosdk/algod/client/ProgressRequestBody.java @@ -24,6 +24,7 @@ import okio.Okio; import okio.Sink; +@Deprecated public class ProgressRequestBody extends RequestBody { public interface ProgressRequestListener { diff --git a/src/main/java/com/algorand/algosdk/algod/client/ProgressResponseBody.java b/src/main/java/com/algorand/algosdk/algod/client/ProgressResponseBody.java index 1404cbecb..354c94ca5 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/ProgressResponseBody.java +++ b/src/main/java/com/algorand/algosdk/algod/client/ProgressResponseBody.java @@ -24,6 +24,7 @@ import okio.Okio; import okio.Source; +@Deprecated public class ProgressResponseBody extends ResponseBody { public interface ProgressListener { diff --git a/src/main/java/com/algorand/algosdk/algod/client/StringUtil.java b/src/main/java/com/algorand/algosdk/algod/client/StringUtil.java index c76af87ad..f296916b6 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/StringUtil.java +++ b/src/main/java/com/algorand/algosdk/algod/client/StringUtil.java @@ -13,7 +13,7 @@ package com.algorand.algosdk.algod.client; - +@Deprecated public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/src/main/java/com/algorand/algosdk/algod/client/api/AlgodApi.java b/src/main/java/com/algorand/algosdk/algod/client/api/AlgodApi.java index f1d079f67..02342465b 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/api/AlgodApi.java +++ b/src/main/java/com/algorand/algosdk/algod/client/api/AlgodApi.java @@ -4,6 +4,10 @@ import com.algorand.algosdk.algod.client.ApiClient; import com.algorand.algosdk.algod.client.Configuration; +/** + * @deprecated Use the equivalent in v2 algod client + */ +@Deprecated public class AlgodApi extends DefaultApi { public AlgodApi() { diff --git a/src/main/java/com/algorand/algosdk/algod/client/api/DefaultApi.java b/src/main/java/com/algorand/algosdk/algod/client/api/DefaultApi.java index 33f2b61a6..40c8471ae 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/api/DefaultApi.java +++ b/src/main/java/com/algorand/algosdk/algod/client/api/DefaultApi.java @@ -26,6 +26,10 @@ import java.util.List; import java.util.Map; +/** + * @deprecated Use the equivalent in v2 algod client + */ +@Deprecated public class DefaultApi { private ApiClient apiClient; diff --git a/src/main/java/com/algorand/algosdk/algod/client/auth/ApiKeyAuth.java b/src/main/java/com/algorand/algosdk/algod/client/auth/ApiKeyAuth.java index 23dba9f65..d11d0dfaa 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/auth/ApiKeyAuth.java +++ b/src/main/java/com/algorand/algosdk/algod/client/auth/ApiKeyAuth.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; - +@Deprecated public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/src/main/java/com/algorand/algosdk/algod/client/auth/Authentication.java b/src/main/java/com/algorand/algosdk/algod/client/auth/Authentication.java index a7b2c1fdc..a9b916404 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/auth/Authentication.java +++ b/src/main/java/com/algorand/algosdk/algod/client/auth/Authentication.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; +@Deprecated public interface Authentication { /** * Apply authentication settings to header and query params. diff --git a/src/main/java/com/algorand/algosdk/algod/client/auth/HttpBasicAuth.java b/src/main/java/com/algorand/algosdk/algod/client/auth/HttpBasicAuth.java index 46d7da0b6..6e72de595 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/auth/HttpBasicAuth.java +++ b/src/main/java/com/algorand/algosdk/algod/client/auth/HttpBasicAuth.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; +@Deprecated public class HttpBasicAuth implements Authentication { private String username; private String password; diff --git a/src/main/java/com/algorand/algosdk/algod/client/auth/OAuth.java b/src/main/java/com/algorand/algosdk/algod/client/auth/OAuth.java index 51be628fc..4e7678c2b 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/auth/OAuth.java +++ b/src/main/java/com/algorand/algosdk/algod/client/auth/OAuth.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; - +@Deprecated public class OAuth implements Authentication { private String accessToken; diff --git a/src/main/java/com/algorand/algosdk/algod/client/auth/OAuthFlow.java b/src/main/java/com/algorand/algosdk/algod/client/auth/OAuthFlow.java index 34fdccb0f..f7a56a0e1 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/auth/OAuthFlow.java +++ b/src/main/java/com/algorand/algosdk/algod/client/auth/OAuthFlow.java @@ -13,6 +13,7 @@ package com.algorand.algosdk.algod.client.auth; +@Deprecated public enum OAuthFlow { accessCode, implicit, password, application } diff --git a/src/main/java/com/algorand/algosdk/algod/client/lib/Pair.java b/src/main/java/com/algorand/algosdk/algod/client/lib/Pair.java index dce90feee..31189fb43 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/lib/Pair.java +++ b/src/main/java/com/algorand/algosdk/algod/client/lib/Pair.java @@ -13,7 +13,7 @@ package com.algorand.algosdk.algod.client.lib; - +@Deprecated public class Pair { private String name = ""; private String value = ""; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Account.java b/src/main/java/com/algorand/algosdk/algod/client/model/Account.java index 65a9d1aa4..3e8b60460 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Account.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Account.java @@ -26,6 +26,7 @@ */ @ApiModel(description = "Account Description") +@Deprecated public class Account { @SerializedName("address") private String address = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/AssetHolding.java b/src/main/java/com/algorand/algosdk/algod/client/model/AssetHolding.java index 8dc1fa6be..2417055fc 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/AssetHolding.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/AssetHolding.java @@ -15,6 +15,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(description = "AssetParams specifies the holdings of a particular asset.") +@Deprecated public class AssetHolding { @SerializedName("creator") private String creator = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/AssetParams.java b/src/main/java/com/algorand/algosdk/algod/client/model/AssetParams.java index 10d91b95d..27fd76eee 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/AssetParams.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/AssetParams.java @@ -21,6 +21,7 @@ */ @ApiModel(description = "AssetParams specifies the parameters for an asset") +@Deprecated public class AssetParams { @SerializedName("assetname") private String assetname = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Block.java b/src/main/java/com/algorand/algosdk/algod/client/model/Block.java index 0a0939684..16aeeddea 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Block.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Block.java @@ -22,7 +22,7 @@ * Block contains a block information */ @ApiModel(description = "Block contains a block information") - +@Deprecated public class Block { @SerializedName("currentProtocol") private String currentProtocol = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/NodeStatus.java b/src/main/java/com/algorand/algosdk/algod/client/model/NodeStatus.java index 45809b763..32f76c808 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/NodeStatus.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/NodeStatus.java @@ -22,7 +22,7 @@ * NodeStatus contains the information about a node status */ @ApiModel(description = "NodeStatus contains the information about a node status") - +@Deprecated public class NodeStatus { @SerializedName("catchupTime") private java.math.BigInteger catchupTime = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Participation.java b/src/main/java/com/algorand/algosdk/algod/client/model/Participation.java index 58e25bce6..867597e8c 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Participation.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Participation.java @@ -27,7 +27,7 @@ * Participation Description */ @ApiModel(description = "Participation Description") - +@Deprecated public class Participation { @SerializedName("partpkb64") private byte[] partpkb64 = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/PaymentTransactionType.java b/src/main/java/com/algorand/algosdk/algod/client/model/PaymentTransactionType.java index c9e736330..34f59bb4a 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/PaymentTransactionType.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/PaymentTransactionType.java @@ -22,7 +22,7 @@ * PaymentTransactionType contains the additional fields for a payment Transaction */ @ApiModel(description = "PaymentTransactionType contains the additional fields for a payment Transaction") - +@Deprecated public class PaymentTransactionType { @SerializedName("amount") private java.math.BigInteger amount = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/PendingTransactions.java b/src/main/java/com/algorand/algosdk/algod/client/model/PendingTransactions.java index 58fa9406d..29c35bffd 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/PendingTransactions.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/PendingTransactions.java @@ -22,7 +22,7 @@ * PendingTransactions represents a potentially truncated list of transactions currently in the node's transaction pool. */ @ApiModel(description = "PendingTransactions represents a potentially truncated list of transactions currently in the node's transaction pool.") - +@Deprecated public class PendingTransactions { @SerializedName("totalTxns") private java.math.BigInteger totalTxns = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Supply.java b/src/main/java/com/algorand/algosdk/algod/client/model/Supply.java index c9b0bfa0b..c740c5313 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Supply.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Supply.java @@ -22,7 +22,7 @@ * Supply represents the current supply of MicroAlgos in the system */ @ApiModel(description = "Supply represents the current supply of MicroAlgos in the system") - +@Deprecated public class Supply { @SerializedName("onlineMoney") private java.math.BigInteger onlineMoney = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Transaction.java b/src/main/java/com/algorand/algosdk/algod/client/model/Transaction.java index 5591c0bf8..499e4053a 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Transaction.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Transaction.java @@ -24,7 +24,7 @@ * Transaction contains all fields common to all transactions and serves as an envelope to all transactions type */ @ApiModel(description = "Transaction contains all fields common to all transactions and serves as an envelope to all transactions type") - +@Deprecated public class Transaction { @SerializedName("fee") private java.math.BigInteger fee = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionFee.java b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionFee.java index f04588d91..788dd13ad 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionFee.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionFee.java @@ -22,7 +22,7 @@ * TransactionFee contains the suggested fee */ @ApiModel(description = "TransactionFee contains the suggested fee") - +@Deprecated public class TransactionFee { @SerializedName("fee") private java.math.BigInteger fee = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionID.java b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionID.java index 9e097d404..b93448950 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionID.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionID.java @@ -22,7 +22,7 @@ * TransactionID Description */ @ApiModel(description = "TransactionID Description") - +@Deprecated public class TransactionID { @SerializedName("txId") private String txId = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionList.java b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionList.java index 035c83d30..d9c5fe413 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionList.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionList.java @@ -25,7 +25,7 @@ * TransactionList contains a list of transactions */ @ApiModel(description = "TransactionList contains a list of transactions") - +@Deprecated public class TransactionList { @SerializedName("transactions") private List transactions = new ArrayList(); diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionParams.java b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionParams.java index 58c4b5fce..e83f3f562 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionParams.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionParams.java @@ -22,7 +22,7 @@ * TransactionParams contains the parameters that help a client construct a new transaction. */ @ApiModel(description = "TransactionParams contains the parameters that help a client construct a new transaction.") - +@Deprecated public class TransactionParams { @SerializedName("consensusVersion") private String consensusVersion = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionResults.java b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionResults.java index 244eacfea..f206f6a2b 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/TransactionResults.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/TransactionResults.java @@ -27,7 +27,7 @@ * TransactionResults contains information about the side effects of a transaction */ @ApiModel(description = "TransactionResults contains information about the side effects of a transaction") - +@Deprecated public class TransactionResults { @SerializedName("createdasset") private java.math.BigInteger createdasset = null; diff --git a/src/main/java/com/algorand/algosdk/algod/client/model/Version.java b/src/main/java/com/algorand/algosdk/algod/client/model/Version.java index 0218c1ae3..ab1334182 100644 --- a/src/main/java/com/algorand/algosdk/algod/client/model/Version.java +++ b/src/main/java/com/algorand/algosdk/algod/client/model/Version.java @@ -25,7 +25,7 @@ * Note that we annotate this as a model so that legacy clients can directly import a swagger generated Version model. */ @ApiModel(description = "Note that we annotate this as a model so that legacy clients can directly import a swagger generated Version model.") - +@Deprecated public class Version { @SerializedName("genesis_hash_b64") private byte[] genesisHashB64 = null; From c88678db5ca0761456af4fb3c586a72516a271f6 Mon Sep 17 00:00:00 2001 From: Barbara Poon Date: Thu, 22 Sep 2022 14:18:19 -0400 Subject: [PATCH 3/3] bump to 1.19.0 --- CHANGELOG.md | 12 ++++++++++++ README.md | 2 +- pom.xml | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2784a93e..01b89e70e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# 1.19.0 + +### Enhancements +* Deprecation: Add deprecation tags to v1 `algod` API by @algochoi in https://github.com/algorand/java-algorand-sdk/pull/388 +### Other +* Regenerate code with the latest specification file (b243e19e) by @github-actions in https://github.com/algorand/java-algorand-sdk/pull/387 + +## New Contributors +* @github-actions made their first contribution in https://github.com/algorand/java-algorand-sdk/pull/387 + +**Full Changelog**: https://github.com/algorand/java-algorand-sdk/compare/1.18.0...1.19.0 + # 1.18.0 ## What's Changed diff --git a/README.md b/README.md index 5e5d913e1..66b0fdff8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Maven: com.algorand algosdk - 1.18.0 + 1.19.0 ``` diff --git a/pom.xml b/pom.xml index 4ef3c145b..0f6585109 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.algorand algosdk - 1.18.0 + 1.19.0 jar ${project.groupId}:${project.artifactId}