Add Exception throw on error query response (#20)

* add Exception throw on error query response Signed-off-by: Alexey Chernyshov <[email protected]> * fix PR issues Signed-off-by: Alexey Chernyshov <[email protected]> * Fix PR issues Signed-off-by: Alexey Chernyshov <[email protected]>
hyperledger-iroha · Apr 25, 2019 · 5b16f7f · 5b16f7f
1 parent 97b4bfe
commit 5b16f7f
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 2 deletions.
diff --git a/client/src/main/java/jp/co/soramitsu/iroha/java/ErrorResponseException.java b/client/src/main/java/jp/co/soramitsu/iroha/java/ErrorResponseException.java
@@ -0,0 +1,18 @@
+package jp.co.soramitsu.iroha.java;
+
+import iroha.protocol.QryResponses.ErrorResponse;
+import lombok.Getter;
+import lombok.NonNull;
+
+@Getter
+public class ErrorResponseException extends RuntimeException {
+
+  @NonNull
+  private ErrorResponse errorResponse;
+
+  public ErrorResponseException(ErrorResponse errorResponse) {
+    super("Error code: " + errorResponse.getErrorCode() + ". Reason: " + errorResponse.getReason()
+        + ". Message: " + errorResponse.getMessage());
+    this.errorResponse = errorResponse;
+  }
+}
diff --git a/client/src/main/java/jp/co/soramitsu/iroha/java/QueryAPI.java b/client/src/main/java/jp/co/soramitsu/iroha/java/QueryAPI.java
@@ -4,6 +4,8 @@
 import iroha.protocol.QryResponses.AccountResponse;
 import iroha.protocol.QryResponses.AssetResponse;
 import iroha.protocol.QryResponses.BlockResponse;
+import iroha.protocol.QryResponses.ErrorResponse;
+import iroha.protocol.QryResponses.QueryResponse;
 import iroha.protocol.QryResponses.TransactionsPageResponse;
 import iroha.protocol.QryResponses.TransactionsResponse;
 import java.security.KeyPair;
@@ -39,6 +41,13 @@ public QueryAPI(IrohaAPI api, Account account) {
 
   private AtomicInteger counter = new AtomicInteger(1);
 
+  private void checkErrorResponse(QueryResponse response) {
+    if (response.hasErrorResponse()) {
+      ErrorResponse errorResponse = response.getErrorResponse();
+      throw new ErrorResponseException(errorResponse);
+    }
+  }
+
   public String getAccountDetails(
       String accountId,
       String writer,
@@ -50,6 +59,8 @@ public String getAccountDetails(
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     val adr = res.getAccountDetailResponse();
 
     return adr.getDetail();
@@ -62,6 +73,8 @@ public AccountResponse getAccount(String accountId) {
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getAccountResponse();
   }
 
@@ -70,7 +83,11 @@ public BlockResponse getBlock(Long height) {
         .getBlock(height)
         .buildSigned(keyPair);
 
-    return api.query(q).getBlockResponse();
+    val res = api.query(q);
+
+    checkErrorResponse(res);
+
+    return res.getBlockResponse();
   }
 
   public TransactionsPageResponse getAccountTransactions(String accountId, Integer pageSize,
@@ -81,6 +98,8 @@ public TransactionsPageResponse getAccountTransactions(String accountId, Integer
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getTransactionsPageResponse();
   }
 
@@ -96,6 +115,8 @@ public TransactionsPageResponse getAccountAssetTransactions(String accountId, St
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getTransactionsPageResponse();
   }
 
@@ -119,6 +140,8 @@ public TransactionsResponse getTransactions(Iterable<String> hashes) {
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getTransactionsResponse();
   }
 
@@ -129,6 +152,8 @@ public AssetResponse getAssetInfo(String assetId) {
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getAssetResponse();
   }
 
@@ -139,6 +164,8 @@ public AccountAssetResponse getAccountAssets(String accountId) {
 
     val res = api.query(q);
 
+    checkErrorResponse(res);
+
     return res.getAccountAssetsResponse();
   }
 }
diff --git a/client/src/test/groovy/jp/co/soramitsu/iroha/java/QueryApiTest.groovy b/client/src/test/groovy/jp/co/soramitsu/iroha/java/QueryApiTest.groovy
@@ -1,6 +1,5 @@
 package jp.co.soramitsu.iroha.java
 
-
 import jp.co.soramitsu.iroha.java.debug.Account
 import jp.co.soramitsu.iroha.testcontainers.IrohaContainer
 import jp.co.soramitsu.iroha.testcontainers.PeerConfig
@@ -92,4 +91,37 @@ class QueryApiTest extends Specification {
         A      | B.id      | A.id   | "key2" | "{\"a@test\" : {\"key2\" : null}}"
     }
 
+    @Unroll
+    def "exception in getAccountDetails"(Account issuer, String accountId, String writer, String key) {
+        given:
+        def qapi = new QueryAPI(api, issuer)
+
+        when:
+        qapi.getAccountDetails(accountId, writer, key)
+
+        then:
+        thrown ErrorResponseException
+
+        where:
+        issuer | accountId            | writer      | key
+        A      | "nonexistent@domain" | null        | null
+    }
+
+    @Unroll
+    def "exception in getAccount"(Account issuer, String accountId) {
+        given:
+        def qapi = new QueryAPI(api, issuer)
+
+        when:
+        qapi.getAccount(accountId)
+
+        then:
+        thrown ErrorResponseException
+
+        where:
+        issuer | accountId
+        A      | "nonexistent@domain"
+        A      | "invalid"
+    }
+
 }