Fix api's createpaymentacct error handling

core/src/main/java/bisq/core/api/model/PaymentAccountForm.java

@@ -28,6 +28,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -147,9 +149,9 @@ public File getPaymentAccountForm(String paymentMethodId) {
             String json = gson.toJson(paymentAccount); // serializes target to json
             outputStreamWriter.write(json);
         } catch (Exception ex) {
-            log.error(format("Could not write json file for a %s account.", paymentMethodId), ex);
-            throw new IllegalStateException(
-                    format("cannot create a payment account form for a %s payment method", paymentMethodId));
+            String errMsg = format("cannot create a payment account form for a %s payment method", paymentMethodId);
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException(errMsg);
         }
         return file;
     }
@@ -184,27 +186,32 @@ public String toJsonString(File jsonFile) {
             checkNotNull(jsonFile, "json file cannot be null");
             return new String(Files.readAllBytes(Paths.get(jsonFile.getAbsolutePath())));
         } catch (IOException ex) {
-            throw new IllegalStateException(format("cannot read content of file '%s'",
-                    jsonFile.getAbsolutePath()), ex);
+            String errMsg = format("cannot read json string from file '%s'",
+                    jsonFile.getAbsolutePath());
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException(errMsg);
         }
     }
 
     @VisibleForTesting
-    public URI getClickableURI(File jsonForm) {
+    public URI getClickableURI(File jsonFile) {
         try {
             return new URI("file",
                     "",
-                    jsonForm.toURI().getPath(),
+                    jsonFile.toURI().getPath(),
                     null,
                     null);
         } catch (URISyntaxException ex) {
-            throw new IllegalArgumentException("", ex);
+            String errMsg = format("cannot create clickable url to file '%s'",
+                    jsonFile.getAbsolutePath());
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException(errMsg);
         }
     }
 
     @VisibleForTesting
     public static File getTmpJsonFile(String paymentMethodId) {
-        File file = null;
+        File file;
         try {
             // Creates a tmp file that includes a random number string between the
             // prefix and suffix, i.e., sepa_form_13243546575879.json, so there is
@@ -213,7 +220,10 @@ public static File getTmpJsonFile(String paymentMethodId) {
                     ".json",
                     Paths.get(getProperty("java.io.tmpdir")).toFile());
         } catch (IOException ex) {
-            log.error("", ex);
+            String errMsg = format("cannot create json file for a %s payment method",
+                    paymentMethodId);
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException(errMsg);
         }
         return file;
     }

core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java

@@ -29,6 +29,8 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.IOException;
 
 import java.util.ArrayList;
@@ -115,8 +117,10 @@ public void write(JsonWriter out, PaymentAccount account) throws IOException {
                     out.value("Your " + fieldName.toLowerCase());
                 }
             } catch (Exception ex) {
-                throw new IllegalStateException(
-                        format("cannot not serialize a %s", account.getClass().getSimpleName()), ex);
+                String errMsg = format("cannot create a new %s json form",
+                        account.getClass().getSimpleName());
+                log.error(StringUtils.capitalize(errMsg) + ".", ex);
+                throw new IllegalStateException("programmer error: " + errMsg);
             }
         });
         out.endObject();
@@ -173,15 +177,17 @@ private void invokeSetterMethod(PaymentAccount account, Field field, JsonReader
                 } else if (isSetterOnPaymentAccountPayloadClass(setter.get(), account)) {
                     setter.get().invoke(account.getPaymentAccountPayload(), nextStringOrNull(jsonReader));
                 } else {
-                    String exMsg = format("programmer error: cannot de-serialize json to a '%s' using reflection"
+                    String errMsg = format("programmer error: cannot de-serialize json to a '%s' using reflection"
                                     + " because the setter method's declaring class was not found.",
                             account.getClass().getSimpleName());
-                    throw new IllegalStateException(exMsg);
+                    throw new IllegalStateException(errMsg);
                 }
             } catch (IllegalAccessException | InvocationTargetException ex) {
-                throw new IllegalStateException(
-                        format("programmer error: cannot de-serialize json to a '%s' due to reflection error.",
-                                account.getClass().getSimpleName()), ex);
+                String errMsg = format("cannot set field value for %s on %s",
+                        field.getName(),
+                        account.getClass().getSimpleName());
+                log.error(StringUtils.capitalize(errMsg) + ".", ex);
+                throw new IllegalStateException("programmer error: " + errMsg);
             }
         } else {
             throw new IllegalStateException(
@@ -229,9 +235,9 @@ private String nextStringOrNull(JsonReader in) {
                 return in.nextString();
             }
         } catch (IOException ex) {
-            throw new IllegalStateException(
-                    "programmer error: cannot not peek at next string value in json reader.",
-                    ex);
+            String errMsg = "cannot see next string in json reader";
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException("programmer error: " + errMsg);
         }
     }
 
@@ -245,9 +251,9 @@ private Long nextLongOrNull(JsonReader in) {
                 return in.nextLong();
             }
         } catch (IOException ex) {
-            throw new IllegalStateException(
-                    "programmer error: cannot not peek at next long value in json reader.",
-                    ex);
+            String errMsg = "cannot see next long in json reader";
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException("programmer error: " + errMsg);
         }
     }
 
@@ -305,9 +311,11 @@ private Class<? extends PaymentAccountPayload> getPaymentAccountPayloadType() {
             return (Class<? extends PaymentAccountPayload>) Class.forName(pkg.getName()
                     + "." + paymentAccountType.getSimpleName() + "Payload");
         } catch (Exception ex) {
-            throw new IllegalStateException(
-                    format("programmer error: cannot get payload class for %s",
-                            paymentAccountType.getSimpleName()), ex);
+            String errMsg = format("cannot get the payload class for %s",
+                    paymentAccountType.getSimpleName());
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException("programmer error: " + errMsg);
+
         }
     }
 
@@ -317,16 +325,14 @@ private PaymentAccount initNewPaymentAccount() {
             PaymentAccount paymentAccount = (PaymentAccount) constructor.newInstance();
             paymentAccount.init();
             return paymentAccount;
-        } catch (NoSuchMethodException ex) {
-            throw new IllegalStateException(
-                    format("programmer error: no default declared constructor  found for class %s",
-                            paymentAccountType.getSimpleName()),
-                    ex);
-        } catch (IllegalAccessException | InstantiationException | InvocationTargetException ex) {
-            throw new IllegalStateException(
-                    format("programmer error: cannot instantiate class %s",
-                            paymentAccountType.getSimpleName()),
-                    ex);
+        } catch (NoSuchMethodException
+                | IllegalAccessException
+                | InstantiationException
+                | InvocationTargetException ex) {
+            String errMsg = format("cannot instantiate a new %s",
+                    paymentAccountType.getSimpleName());
+            log.error(StringUtils.capitalize(errMsg) + ".", ex);
+            throw new IllegalStateException("programmer error: " + errMsg);
         }
     }
 }