From c5e50203695e322e6668cabf8ea7b2cea6c7668b Mon Sep 17 00:00:00 2001 From: catbref Date: Mon, 25 Mar 2019 15:21:10 +0000 Subject: [PATCH] In API call /assets/balances, change "ordering" to be optional but with default "ASSET_BALANCE_ACCOUNT" --- src/main/java/org/qora/api/resource/AssetsResource.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/qora/api/resource/AssetsResource.java b/src/main/java/org/qora/api/resource/AssetsResource.java index ec266ff4..1bea0c2e 100644 --- a/src/main/java/org/qora/api/resource/AssetsResource.java +++ b/src/main/java/org/qora/api/resource/AssetsResource.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -166,7 +167,7 @@ public class AssetsResource { ApiError.INVALID_ADDRESS, ApiError.INVALID_CRITERIA, ApiError.INVALID_ASSET_ID, ApiError.REPOSITORY_ISSUE }) public List getAssetBalances(@QueryParam("address") List addresses, @QueryParam("assetid") List assetIds, - @Parameter(required = true) @QueryParam("ordering") BalanceOrdering balanceOrdering, + @DefaultValue(value = "ASSET_BALANCE_ACCOUNT") @QueryParam("ordering") BalanceOrdering balanceOrdering, @Parameter( ref = "limit" ) @QueryParam("limit") Integer limit, @Parameter( ref = "offset" ) @QueryParam("offset") Integer offset, @Parameter( ref = "reverse" ) @QueryParam("reverse") Boolean reverse) { @@ -177,6 +178,9 @@ public class AssetsResource { if (!Crypto.isValidAddress(address)) throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_ADDRESS); + if (balanceOrdering == null) + throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA); + try (final Repository repository = RepositoryManager.getRepository()) { for (long assetId : assetIds) if (!repository.getAssetRepository().assetExists(assetId))