From 420d26a67964e660ee1456875ad904fbea53ee5b Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Thu, 22 Oct 2020 01:12:20 +0200
Subject: [PATCH] Minor: CallSubject.hasHttpStatus() throws unchecked
 CallFailedRuntimeException

---
 .../org/apache/fineract/client/util/Calls.java    | 15 +++++++++------
 .../org/apache/fineract/client/util/Parts.java    |  2 +-
 .../fineract/client/testutil/CallSubject.java     |  6 +++---
 .../integrationtests/newstyle/DocumentTest.java   |  6 +++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/fineract-client/src/main/java/org/apache/fineract/client/util/Calls.java b/fineract-client/src/main/java/org/apache/fineract/client/util/Calls.java
index c07cddd72..50f82ef7f 100644
--- a/fineract-client/src/main/java/org/apache/fineract/client/util/Calls.java
+++ b/fineract-client/src/main/java/org/apache/fineract/client/util/Calls.java
@@ -42,15 +42,18 @@ public final class Calls {
      *             [200..300) successful
      */
     public static <T> T ok(Call<T> call) throws CallFailedRuntimeException {
-        Response<T> response;
-        try {
-            response = call.execute();
-        } catch (IOException e) {
-            throw new CallFailedRuntimeException(call, e);
-        }
+        Response<T> response = executeU(call);
         if (response.isSuccessful()) {
             return response.body();
         }
         throw new CallFailedRuntimeException(call, response);
     }
+
+    public static <T> Response<T> executeU(Call<T> call) throws CallFailedRuntimeException {
+        try {
+            return call.execute();
+        } catch (IOException e) {
+            throw new CallFailedRuntimeException(call, e);
+        }
+    }
 }
diff --git a/fineract-client/src/main/java/org/apache/fineract/client/util/Parts.java b/fineract-client/src/main/java/org/apache/fineract/client/util/Parts.java
index 486842f6d..40e4ffe95 100644
--- a/fineract-client/src/main/java/org/apache/fineract/client/util/Parts.java
+++ b/fineract-client/src/main/java/org/apache/fineract/client/util/Parts.java
@@ -37,7 +37,7 @@ public final class Parts {
         return Part.createFormData("file", file.getName(), rb);
     }
 
-    public static Part fromFile(String fileName, byte[] bytes) {
+    public static Part fromBytes(String fileName, byte[] bytes) {
         RequestBody rb = RequestBody.create(bytes, mediaType(fileName));
         return Part.createFormData("file", fileName, rb);
     }
diff --git a/fineract-client/src/test/java/org/apache/fineract/client/testutil/CallSubject.java b/fineract-client/src/test/java/org/apache/fineract/client/testutil/CallSubject.java
index edd4fae21..f2e6c7b1a 100644
--- a/fineract-client/src/test/java/org/apache/fineract/client/testutil/CallSubject.java
+++ b/fineract-client/src/test/java/org/apache/fineract/client/testutil/CallSubject.java
@@ -21,8 +21,8 @@ package org.apache.fineract.client.testutil;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
 import com.google.common.truth.Truth;
-import java.io.IOException;
 import javax.annotation.Nullable;
+import org.apache.fineract.client.util.Calls;
 import retrofit2.Call;
 
 /**
@@ -49,7 +49,7 @@ public class CallSubject extends Subject {
         this.actual = actual;
     }
 
-    public void hasHttpStatus(int expectedHttpStatus) throws IOException {
-        check("httpStatus").that(actual.execute().code()).isEqualTo(expectedHttpStatus);
+    public void hasHttpStatus(int expectedHttpStatus) {
+        check("httpStatus").that(Calls.executeU(actual).code()).isEqualTo(expectedHttpStatus);
     }
 }
diff --git a/fineract-client/src/test/java/org/apache/fineract/integrationtests/newstyle/DocumentTest.java b/fineract-client/src/test/java/org/apache/fineract/integrationtests/newstyle/DocumentTest.java
index c1d5d5db9..aa690eaff 100644
--- a/fineract-client/src/test/java/org/apache/fineract/integrationtests/newstyle/DocumentTest.java
+++ b/fineract-client/src/test/java/org/apache/fineract/integrationtests/newstyle/DocumentTest.java
@@ -43,7 +43,7 @@ public class DocumentTest extends IntegrationTest {
 
     @Test
     @Order(1)
-    void retrieveAllDocuments() throws IOException {
+	void retrieveAllDocuments() {
         assertThat(ok(fineract().documents.retrieveAllDocuments("clients", clientId))).isNotNull();
     }
 
@@ -100,14 +100,14 @@ public class DocumentTest extends IntegrationTest {
 
     @Test
     @Order(99)
-    void deleteDocument() throws IOException {
+    void deleteDocument() {
         ok(fineract().documents.deleteDocument("clients", clientId, documentId));
         assertThat(fineract().documents.getDocument("clients", clientId, documentId)).hasHttpStatus(404);
     }
 
     @Order(9999)
     @Test // FINERACT-1036
-    void createDocumentBadArgs() throws IOException {
+    void createDocumentBadArgs() {
         assertThat(fineract().documents.createDocument("clients", 123L, null, "test.pdf", null)).hasHttpStatus(400);
     }
 }