Bump json from 20180813 to 20200518 (#321)

* Bump json from 20180813 to 20200518

Bumps [json](https://github.com/douglascrockford/JSON-java) from 20180813 to 20200518.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* fix new json version conflicts

* fix failing build

* PR comment

* fix failing test

* fix sonarcloud code smeels

* fix build

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Constantin Costescu <constantineugen.costescu@gmail.com>

pom.xml

@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20180813</version>
+      <version>20200518</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

src/main/java/org/proshin/finapi/account/out/FpDailyBalance.java

@@ -19,6 +19,7 @@
 import java.time.OffsetDateTime;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.IterableJsonArray;
 import org.proshin.finapi.primitives.OffsetDateTimeOf;
 
@@ -37,17 +38,17 @@ public OffsetDateTime date() {
 
     @Override
     public BigDecimal balance() {
-        return this.origin.getBigDecimal("balance");
+        return new BigDecimalOf(this.origin, "balance").get();
     }
 
     @Override
     public BigDecimal income() {
-        return this.origin.getBigDecimal("income");
+        return new BigDecimalOf(this.origin, "income").get();
     }
 
     @Override
     public BigDecimal spending() {
-        return this.origin.getBigDecimal("spending");
+        return new BigDecimalOf(this.origin, "spending").get();
     }
 
     @Override

src/main/java/org/proshin/finapi/category/out/FpCashFlow.java

@@ -22,6 +22,7 @@
 import org.proshin.finapi.category.Category;
 import org.proshin.finapi.category.FpCategory;
 import org.proshin.finapi.endpoint.Endpoint;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.optional.OptionalObjectOf;
 
 public final class FpCashFlow implements CashFlow {
@@ -51,17 +52,17 @@ public Optional<Category> category() {
 
     @Override
     public BigDecimal income() {
-        return this.origin.getBigDecimal("income");
+        return new BigDecimalOf(this.origin, "income").get();
     }
 
     @Override
     public BigDecimal spending() {
-        return this.origin.getBigDecimal("spending");
+        return new BigDecimalOf(this.origin, "spending").get();
     }
 
     @Override
     public BigDecimal balance() {
-        return this.origin.getBigDecimal("balance");
+        return new BigDecimalOf(this.origin, "balance").get();
     }
 
     @Override

src/main/java/org/proshin/finapi/category/out/FpCashFlows.java

@@ -20,6 +20,7 @@
 import org.json.JSONObject;
 import org.proshin.finapi.accesstoken.AccessToken;
 import org.proshin.finapi.endpoint.Endpoint;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.IterableJsonArray;
 
 public final class FpCashFlows implements CashFlows {
@@ -43,17 +44,17 @@ public FpCashFlows(
 
     @Override
     public BigDecimal income() {
-        return this.origin.getBigDecimal("totalIncome");
+        return new BigDecimalOf(this.origin, "totalIncome").get();
     }
 
     @Override
     public BigDecimal spending() {
-        return this.origin.getBigDecimal("totalSpending");
+        return new BigDecimalOf(this.origin, "totalSpending").get();
     }
 
     @Override
     public BigDecimal balance() {
-        return this.origin.getBigDecimal("totalBalance");
+        return new BigDecimalOf(this.origin, "totalBalance").get();
     }
 
     @Override

src/main/java/org/proshin/finapi/payment/FpPayment.java

@@ -21,6 +21,7 @@
 import org.json.JSONObject;
 import org.proshin.finapi.payment.out.Status;
 import org.proshin.finapi.payment.out.Type;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.OffsetDateTimeOf;
 import org.proshin.finapi.primitives.optional.OptionalOf;
 import org.proshin.finapi.primitives.optional.OptionalOffsetDateTimeOf;
@@ -50,7 +51,7 @@ public Type type() {
 
     @Override
     public BigDecimal amount() {
-        return this.origin.getBigDecimal("amount");
+        return new BigDecimalOf(this.origin, "amount").get();
     }
 
     @Override

src/main/java/org/proshin/finapi/primitives/BigDecimalOf.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Roman Proshin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.proshin.finapi.primitives;
+
+import java.math.BigDecimal;
+import java.util.function.Supplier;
+import org.cactoos.text.FormattedText;
+import org.json.JSONObject;
+import org.proshin.finapi.primitives.optional.OptionalBigDecimalOf;
+
+public final class BigDecimalOf implements Supplier<BigDecimal> {
+
+    private final OptionalBigDecimalOf origin;
+    private final String field;
+
+    public BigDecimalOf(final JSONObject origin, final String name) {
+        this.origin = new OptionalBigDecimalOf(origin, name);
+        this.field = name;
+    }
+
+    @Override
+    public BigDecimal get() {
+        return this.origin.get()
+            .orElseThrow(() -> new IllegalStateException(
+                new FormattedText("Field '%s' cannot be null", this.field).toString()
+            ));
+    }
+}

src/main/java/org/proshin/finapi/primitives/optional/OptionalBigDecimalOf.java

@@ -25,7 +25,7 @@ public final class OptionalBigDecimalOf implements Supplier<Optional<BigDecimal>
     private final Supplier<Optional<BigDecimal>> origin;
 
     public OptionalBigDecimalOf(final JSONObject origin, final String name) {
-        this(new OptionalOf<>(origin, name, JSONObject::getBigDecimal));
+        this(new OptionalOf<>(origin, name, (json, key) -> new BigDecimal(json.getNumber(key).toString())));
     }
 
     public OptionalBigDecimalOf(final Supplier<Optional<BigDecimal>> origin) {

src/main/java/org/proshin/finapi/transaction/FpTransaction.java

@@ -26,6 +26,7 @@
 import org.proshin.finapi.endpoint.Endpoint;
 import org.proshin.finapi.label.FpLabel;
 import org.proshin.finapi.label.Label;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.IterableJsonArray;
 import org.proshin.finapi.primitives.OffsetDateTimeOf;
 import org.proshin.finapi.primitives.optional.OptionalBigDecimalOf;
@@ -88,7 +89,7 @@ public OffsetDateTime finapiBookingDate() {
 
     @Override
     public BigDecimal amount() {
-        return this.origin.getBigDecimal("amount");
+        return new BigDecimalOf(this.origin, "amount").get();
     }
 
     @Override

src/main/java/org/proshin/finapi/transaction/out/FpTransactionsPage.java

@@ -19,6 +19,7 @@
 import org.json.JSONObject;
 import org.proshin.finapi.accesstoken.AccessToken;
 import org.proshin.finapi.endpoint.Endpoint;
+import org.proshin.finapi.primitives.BigDecimalOf;
 import org.proshin.finapi.primitives.paging.FpPage;
 import org.proshin.finapi.primitives.paging.Page;
 import org.proshin.finapi.primitives.paging.Paging;
@@ -58,17 +59,17 @@ public FpTransactionsPage(final JSONObject origin, final Page<Transaction> page)
 
     @Override
     public BigDecimal income() {
-        return this.origin.getBigDecimal("income");
+        return new BigDecimalOf(this.origin, "income").get();
     }
 
     @Override
     public BigDecimal spending() {
-        return this.origin.getBigDecimal("spending");
+        return new BigDecimalOf(this.origin, "spending").get();
     }
 
     @Override
     public BigDecimal balance() {
-        return this.origin.getBigDecimal("balance");
+        return new BigDecimalOf(this.origin, "balance").get();
     }
 
     @Override

src/test/java/org/proshin/finapi/primitives/BigDecimalOfTest.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018 Roman Proshin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.proshin.finapi.primitives;
+
+import java.math.BigDecimal;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+
+public final class BigDecimalOfTest {
+
+    @Test
+    public void testJsonDouble() {
+        assertThat(new BigDecimalOf(new JSONObject().put("key", -12.34), "key").get())
+            .isEqualTo(new BigDecimal("-12.34"));
+    }
+
+    @Test
+    public void testJsonInt() {
+        assertThat(new BigDecimalOf(new JSONObject().put("key", -12), "key").get())
+            .isEqualTo(new BigDecimal("-12"));
+    }
+
+    @Test
+    public void testJsonString() {
+        assertThat(new BigDecimalOf(new JSONObject().put("key", "-12.34"), "key").get())
+            .isEqualTo(new BigDecimal("-12.34"));
+    }
+
+    @Test
+    public void testNullValue() {
+        final BigDecimalOf bigDecimalOf = new BigDecimalOf(new JSONObject(), "key");
+        assertThatThrownBy(bigDecimalOf::get)
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessage("Field 'key' cannot be null");
+    }
+
+    @Test
+    public void testInvalidValue() {
+        final BigDecimalOf bigDecimalOf = new BigDecimalOf(new JSONObject().put("key", "abc"), "key");
+        assertThatThrownBy(bigDecimalOf::get)
+            .isInstanceOf(JSONException.class)
+            .hasMessage("JSONObject[\"key\"] is not a number.");
+    }
+}