From 733c94822794ec170e2cb168295b6ec6e4b3987e Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 16:40:39 +0300 Subject: [PATCH 1/8] Add return_url field to PostData --- pom.xml | 2 +- src/main/java/com/yaphet/chapa/Chapa.java | 5 +++++ src/main/java/com/yaphet/chapa/model/PostData.java | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 323f963..0db8479 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.yaphet17 Chapa - 1.2.1 + 1.2.2-SNAPSHOT jar Chapa diff --git a/src/main/java/com/yaphet/chapa/Chapa.java b/src/main/java/com/yaphet/chapa/Chapa.java index 2976bd8..2dd8a8e 100644 --- a/src/main/java/com/yaphet/chapa/Chapa.java +++ b/src/main/java/com/yaphet/chapa/Chapa.java @@ -61,6 +61,7 @@ public InitializeResponseData initialize(PostData postData) throws Throwable { / Customization customization = postData.getCustomization(); String callbackUrl = postData.getCallbackUrl(); + String returnUrl = postData.getReturnUrl(); String subAccountId = postData.getSubAccountId(); if (Util.notNullAndEmpty(subAccountId)) { @@ -71,6 +72,10 @@ public InitializeResponseData initialize(PostData postData) throws Throwable { / fields.put("callback_url", callbackUrl); } + if (Util.notNullAndEmpty(returnUrl)) { + fields.put("return_url", returnUrl); + } + if (customization != null) { // TODO: consider directly adding all values to fields map if (Util.notNullAndEmpty(customization.getTitle())) { diff --git a/src/main/java/com/yaphet/chapa/model/PostData.java b/src/main/java/com/yaphet/chapa/model/PostData.java index f997295..fddacca 100644 --- a/src/main/java/com/yaphet/chapa/model/PostData.java +++ b/src/main/java/com/yaphet/chapa/model/PostData.java @@ -21,6 +21,8 @@ public class PostData { private String txRef; @SerializedName("callback_url") private String callbackUrl; + @SerializedName("return_url") + private String returnUrl; @SerializedName("subaccounts[id]") private String subAccountId; private Customization customization; @@ -88,6 +90,15 @@ public PostData setCallbackUrl(String callbackUrl) { return this; } + public String getReturnUrl() { + return returnUrl; + } + + public PostData setReturnUrl(String returnUrl) { + this.returnUrl = returnUrl; + return this; + } + public String getSubAccountId() { return subAccountId; } From 1fe71df82220d3276b603feaba100182bbadc72b Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 18:45:06 +0300 Subject: [PATCH 2/8] Create ChapaException class to handle 4XX and 5XX response codes --- src/main/java/com/yaphet/chapa/Chapa.java | 25 +++++++++++++++++++ .../chapa/exception/ChapaException.java | 19 ++++++++++++++ .../java/com/yaphet/chapa/utility/Util.java | 4 +++ src/test/java/com/yaphet/chapa/ChapaTest.java | 7 ++++-- 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/yaphet/chapa/exception/ChapaException.java diff --git a/src/main/java/com/yaphet/chapa/Chapa.java b/src/main/java/com/yaphet/chapa/Chapa.java index 2dd8a8e..eeb04ef 100644 --- a/src/main/java/com/yaphet/chapa/Chapa.java +++ b/src/main/java/com/yaphet/chapa/Chapa.java @@ -2,6 +2,7 @@ import com.yaphet.chapa.client.ChapaClient; import com.yaphet.chapa.client.ChapaClientImpl; +import com.yaphet.chapa.exception.ChapaException; import com.yaphet.chapa.model.*; import com.yaphet.chapa.utility.Util; @@ -94,6 +95,10 @@ public InitializeResponseData initialize(PostData postData) throws Throwable { / responseBody = chapaClient.post(BASE_URL + "/transaction/initialize", fields, SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + InitializeResponseData initializeResponseData = Util.jsonToInitializeResponseData(responseBody) .setRawJson(responseBody) .setStatusCode(statusCode); @@ -115,6 +120,10 @@ public InitializeResponseData initialize(String jsonData) throws Throwable { responseBody = chapaClient.post(BASE_URL + "/transaction/initialize", jsonData, SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + InitializeResponseData initializeResponseData = Util.jsonToInitializeResponseData(responseBody) .setRawJson(responseBody) .setStatusCode(statusCode); @@ -137,6 +146,10 @@ public VerifyResponseData verify(String transactionRef) throws Throwable { responseBody = chapaClient.get(BASE_URL + "/transaction/verify/" + transactionRef, SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + VerifyResponseData verifyResponseData = Util.jsonToVerifyResponseData(responseBody) .setRawJson(responseBody) .setStatusCode(statusCode); @@ -152,6 +165,10 @@ public List banks() throws Throwable { responseBody = chapaClient.get(BASE_URL + "/banks", SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + return Util.extractBanks(responseBody); } @@ -176,6 +193,10 @@ public SubAccountResponseData createSubAccount(SubAccount subAccount) throws Thr responseBody = chapaClient.post(BASE_URL + "/subaccount", fields, SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + SubAccountResponseData subAccountResponseData = Util.jsonToSubAccountResponseData(responseBody) .setRawJson(responseBody) .setStatusCode(statusCode); @@ -196,6 +217,10 @@ public SubAccountResponseData createSubAccount(String jsonData) throws Throwable responseBody = chapaClient.post(BASE_URL + "/subaccount", jsonData, SECRETE_KEY); statusCode = chapaClient.getStatusCode(); + if(!Util.is2xxSuccessful(chapaClient.getStatusCode())) { + throw new ChapaException(responseBody); + } + SubAccountResponseData subAccountResponseData = Util.jsonToSubAccountResponseData(responseBody) .setRawJson(responseBody) .setStatusCode(statusCode); diff --git a/src/main/java/com/yaphet/chapa/exception/ChapaException.java b/src/main/java/com/yaphet/chapa/exception/ChapaException.java new file mode 100644 index 0000000..52b3a17 --- /dev/null +++ b/src/main/java/com/yaphet/chapa/exception/ChapaException.java @@ -0,0 +1,19 @@ +package com.yaphet.chapa.exception; + +/** + * A ChapaException is thrown to signal a problem during SDK execution. + */ +public class ChapaException extends Exception { + + public ChapaException(String message) { + super(message); + } + + public ChapaException(Throwable cause) { + super(cause); + } + + public ChapaException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/com/yaphet/chapa/utility/Util.java b/src/main/java/com/yaphet/chapa/utility/Util.java index 59ad89f..c972235 100644 --- a/src/main/java/com/yaphet/chapa/utility/Util.java +++ b/src/main/java/com/yaphet/chapa/utility/Util.java @@ -124,4 +124,8 @@ public static String generateToken() { public static boolean notNullAndEmpty(String value) { return value != null && !value.isEmpty(); } + + public static boolean is2xxSuccessful(int statucCode) { + return (statucCode / 100) == 2; + } } diff --git a/src/test/java/com/yaphet/chapa/ChapaTest.java b/src/test/java/com/yaphet/chapa/ChapaTest.java index 744f0c1..2402537 100644 --- a/src/test/java/com/yaphet/chapa/ChapaTest.java +++ b/src/test/java/com/yaphet/chapa/ChapaTest.java @@ -47,6 +47,7 @@ void setUp() { .setEmail("abebe@bikila.com") .setTxRef(Util.generateToken()) .setCallbackUrl("https://chapa.co") + .setReturnUrl("https://chapa.co") .setSubAccountId("testSubAccountId") .setCustomization(customization); postDataString = " { " + @@ -57,6 +58,7 @@ void setUp() { "'last_name': 'Bikila'," + "'tx_ref': 'tx-myecommerce12345'," + "'callback_url': 'https://chapa.co'," + + "'return_url': 'https://chapa.co'," + "'subaccount[id]': 'testSubAccountId'," + "'customizations':{'customization[title]':'E-commerce','customization[description]':'It is time to pay','customization[logo]':'https://mylogo.com/log.png'}" + " }"; @@ -220,7 +222,7 @@ public void shouldCreateSubAccount_asResponseData() throws Throwable { // This should not run in the pipeline @Test - @Disabled +// @Disabled public void testDefault() throws Throwable { // given Customization customization = new Customization() @@ -232,9 +234,10 @@ public void testDefault() throws Throwable { .setCurrency("ETB") .setFirstName("Abebe") .setLastName("Bikila") - .setEmail("abebe@bikila.com") + .setEmail("abebe@bikila") .setTxRef(Util.generateToken()) .setCallbackUrl("https://chapa.co") + .setReturnUrl("https://chapa.co") .setSubAccountId("testSubAccountId") .setCustomization(customization); subAccount = new SubAccount() From c44bf780e6d3eb142fb581c78550f4cd54775803 Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 18:46:07 +0300 Subject: [PATCH 3/8] Prepare 1.2.2 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0db8479..39f575a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.yaphet17 Chapa - 1.2.2-SNAPSHOT + 1.2.2 jar Chapa From 526365bedcf773dd3bf339673e961b54b8eae6fc Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 18:49:24 +0300 Subject: [PATCH 4/8] Prepare 1.2.2 release --- docs/allclasses-frame.html | 5 +- docs/allclasses-noframe.html | 5 +- docs/com/yaphet/chapa/Chapa.html | 4 +- docs/com/yaphet/chapa/client/ChapaClient.html | 4 +- .../yaphet/chapa/client/ChapaClientImpl.html | 4 +- .../yaphet/chapa/client/package-frame.html | 4 +- .../yaphet/chapa/client/package-summary.html | 8 +- .../com/yaphet/chapa/client/package-tree.html | 8 +- .../chapa/exception/ChapaException.html | 287 ++++++++++++++++++ .../yaphet/chapa/exception/package-frame.html | 20 ++ .../chapa/exception/package-summary.html | 142 +++++++++ .../yaphet/chapa/exception/package-tree.html | 143 +++++++++ docs/com/yaphet/chapa/model/Bank.html | 4 +- .../com/yaphet/chapa/model/Customization.html | 4 +- .../model/InitializeResponseData.Data.html | 4 +- .../chapa/model/InitializeResponseData.html | 4 +- docs/com/yaphet/chapa/model/PostData.html | 52 +++- docs/com/yaphet/chapa/model/ResponseData.html | 4 +- docs/com/yaphet/chapa/model/SplitType.html | 4 +- docs/com/yaphet/chapa/model/SubAccount.html | 4 +- .../model/SubAccountResponseData.Data.html | 4 +- .../chapa/model/SubAccountResponseData.html | 4 +- .../chapa/model/VerifyResponseData.Data.html | 4 +- .../chapa/model/VerifyResponseData.html | 4 +- .../com/yaphet/chapa/model/package-frame.html | 4 +- .../yaphet/chapa/model/package-summary.html | 8 +- docs/com/yaphet/chapa/model/package-tree.html | 8 +- docs/com/yaphet/chapa/package-frame.html | 4 +- docs/com/yaphet/chapa/package-summary.html | 4 +- docs/com/yaphet/chapa/package-tree.html | 4 +- .../utility/LocalDateTimeDeserializer.html | 4 +- docs/com/yaphet/chapa/utility/Util.html | 33 +- .../yaphet/chapa/utility/package-frame.html | 4 +- .../yaphet/chapa/utility/package-summary.html | 4 +- .../yaphet/chapa/utility/package-tree.html | 4 +- docs/constant-values.html | 4 +- docs/deprecated-list.html | 4 +- docs/help-doc.html | 4 +- docs/index-files/index-1.html | 4 +- docs/index-files/index-10.html | 4 +- docs/index-files/index-11.html | 4 +- docs/index-files/index-12.html | 4 +- docs/index-files/index-13.html | 6 +- docs/index-files/index-14.html | 4 +- docs/index-files/index-15.html | 4 +- docs/index-files/index-2.html | 4 +- docs/index-files/index-3.html | 16 +- docs/index-files/index-4.html | 4 +- docs/index-files/index-5.html | 4 +- docs/index-files/index-6.html | 6 +- docs/index-files/index-7.html | 6 +- docs/index-files/index-8.html | 4 +- docs/index-files/index-9.html | 4 +- docs/index.html | 2 +- docs/overview-frame.html | 5 +- docs/overview-summary.html | 10 +- docs/overview-tree.html | 14 +- docs/package-list | 1 + docs/serialized-form.html | 135 ++++++++ 59 files changed, 935 insertions(+), 133 deletions(-) create mode 100644 docs/com/yaphet/chapa/exception/ChapaException.html create mode 100644 docs/com/yaphet/chapa/exception/package-frame.html create mode 100644 docs/com/yaphet/chapa/exception/package-summary.html create mode 100644 docs/com/yaphet/chapa/exception/package-tree.html create mode 100644 docs/serialized-form.html diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index 674f56e..40e3f09 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -16,6 +16,7 @@

All Classes

  • Chapa
  • ChapaClient
  • ChapaClientImpl
    • +
  • ChapaException
  • Customization
  • InitializeResponseData
  • InitializeResponseData.Data
    • diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index 73cf682..fe29bc4 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -16,6 +16,7 @@

    All Classes

  • Chapa
  • ChapaClient
  • ChapaClientImpl
    • +
  • ChapaException
  • Customization
  • InitializeResponseData
  • InitializeResponseData.Data
    • diff --git a/docs/com/yaphet/chapa/Chapa.html b/docs/com/yaphet/chapa/Chapa.html index 6fb1637..8b3439e 100644 --- a/docs/com/yaphet/chapa/Chapa.html +++ b/docs/com/yaphet/chapa/Chapa.html @@ -2,9 +2,9 @@ - + Chapa - + diff --git a/docs/com/yaphet/chapa/client/ChapaClient.html b/docs/com/yaphet/chapa/client/ChapaClient.html index a0a2182..96443a2 100644 --- a/docs/com/yaphet/chapa/client/ChapaClient.html +++ b/docs/com/yaphet/chapa/client/ChapaClient.html @@ -2,9 +2,9 @@ - + ChapaClient - + diff --git a/docs/com/yaphet/chapa/client/ChapaClientImpl.html b/docs/com/yaphet/chapa/client/ChapaClientImpl.html index a1f929a..1e72059 100644 --- a/docs/com/yaphet/chapa/client/ChapaClientImpl.html +++ b/docs/com/yaphet/chapa/client/ChapaClientImpl.html @@ -2,9 +2,9 @@ - + ChapaClientImpl - + diff --git a/docs/com/yaphet/chapa/client/package-frame.html b/docs/com/yaphet/chapa/client/package-frame.html index d00a156..d6b651f 100644 --- a/docs/com/yaphet/chapa/client/package-frame.html +++ b/docs/com/yaphet/chapa/client/package-frame.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.client - + diff --git a/docs/com/yaphet/chapa/client/package-summary.html b/docs/com/yaphet/chapa/client/package-summary.html index 63132c3..96945ad 100644 --- a/docs/com/yaphet/chapa/client/package-summary.html +++ b/docs/com/yaphet/chapa/client/package-summary.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.client - + @@ -43,7 +43,7 @@
    • Frames
      • @@ -130,7 +130,7 @@

      Package com.yaphet.chapa.client

      • Frames
        • diff --git a/docs/com/yaphet/chapa/client/package-tree.html b/docs/com/yaphet/chapa/client/package-tree.html index 3840ae9..a910ba3 100644 --- a/docs/com/yaphet/chapa/client/package-tree.html +++ b/docs/com/yaphet/chapa/client/package-tree.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.client Class Hierarchy - + @@ -43,7 +43,7 @@
        • Frames
          • @@ -110,7 +110,7 @@

          Interface Hierarchy

          • Frames
            • diff --git a/docs/com/yaphet/chapa/exception/ChapaException.html b/docs/com/yaphet/chapa/exception/ChapaException.html new file mode 100644 index 0000000..a46b115 --- /dev/null +++ b/docs/com/yaphet/chapa/exception/ChapaException.html @@ -0,0 +1,287 @@ + + + + + +ChapaException + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            +
              +
            • Prev Class
              • +
            • Next Class
              • +
            + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            +
              +
            • Detail: 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            +
            + + +
            + + +
            +
            com.yaphet.chapa.exception
            +

            Class ChapaException

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • java.lang.Throwable
                • +
              • +
                  +
                • java.lang.Exception
                  • +
                • +
                    +
                  • com.yaphet.chapa.exception.ChapaException
                    • +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class ChapaException
+extends java.lang.Exception
              +
              A ChapaException is thrown to signal a problem during SDK execution.
              +
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + + + + + + + +
                Constructors 
                Constructor and Description
                ChapaException(java.lang.String message) 
                ChapaException(java.lang.String message, + java.lang.Throwable cause) 
                ChapaException(java.lang.Throwable cause) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                +
                  +
                • + + +

                  Methods inherited from class java.lang.Throwable

                  +addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  ChapaException

                  +
                  public ChapaException(java.lang.String message)
                  +
                  • +
                + + + +
                  +
                • +

                  ChapaException

                  +
                  public ChapaException(java.lang.Throwable cause)
                  +
                  • +
                + + + +
                  +
                • +

                  ChapaException

                  +
                  public ChapaException(java.lang.String message,
+                      java.lang.Throwable cause)
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            +
              +
            • Prev Class
              • +
            • Next Class
              • +
            + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            +
              +
            • Detail: 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            +
            + + +
            + + + diff --git a/docs/com/yaphet/chapa/exception/package-frame.html b/docs/com/yaphet/chapa/exception/package-frame.html new file mode 100644 index 0000000..f08f44f --- /dev/null +++ b/docs/com/yaphet/chapa/exception/package-frame.html @@ -0,0 +1,20 @@ + + + + + +com.yaphet.chapa.exception + + + + + +

            com.yaphet.chapa.exception

            +
            +

            Exceptions

            + +
            + + diff --git a/docs/com/yaphet/chapa/exception/package-summary.html b/docs/com/yaphet/chapa/exception/package-summary.html new file mode 100644 index 0000000..100a518 --- /dev/null +++ b/docs/com/yaphet/chapa/exception/package-summary.html @@ -0,0 +1,142 @@ + + + + + +com.yaphet.chapa.exception + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Package com.yaphet.chapa.exception

            +
            +
            +
              +
            • + + + + + + + + + + + + +
              Exception Summary 
              ExceptionDescription
              ChapaException +
              A ChapaException is thrown to signal a problem during SDK execution.
              +
              +
              • +
            +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/docs/com/yaphet/chapa/exception/package-tree.html b/docs/com/yaphet/chapa/exception/package-tree.html new file mode 100644 index 0000000..52dc839 --- /dev/null +++ b/docs/com/yaphet/chapa/exception/package-tree.html @@ -0,0 +1,143 @@ + + + + + +com.yaphet.chapa.exception Class Hierarchy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Hierarchy For Package com.yaphet.chapa.exception

            +Package Hierarchies: + +
            +
            +

            Class Hierarchy

            +
              +
            • java.lang.Object +
                +
              • java.lang.Throwable (implements java.io.Serializable) +
                  +
                • java.lang.Exception + +
                  • +
                +
                • +
              +
              • +
            +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/docs/com/yaphet/chapa/model/Bank.html b/docs/com/yaphet/chapa/model/Bank.html index e0ef3f2..43ca807 100644 --- a/docs/com/yaphet/chapa/model/Bank.html +++ b/docs/com/yaphet/chapa/model/Bank.html @@ -2,9 +2,9 @@ - + Bank - + diff --git a/docs/com/yaphet/chapa/model/Customization.html b/docs/com/yaphet/chapa/model/Customization.html index 7c3f88c..6989c49 100644 --- a/docs/com/yaphet/chapa/model/Customization.html +++ b/docs/com/yaphet/chapa/model/Customization.html @@ -2,9 +2,9 @@ - + Customization - + diff --git a/docs/com/yaphet/chapa/model/InitializeResponseData.Data.html b/docs/com/yaphet/chapa/model/InitializeResponseData.Data.html index 8737f02..a940402 100644 --- a/docs/com/yaphet/chapa/model/InitializeResponseData.Data.html +++ b/docs/com/yaphet/chapa/model/InitializeResponseData.Data.html @@ -2,9 +2,9 @@ - + InitializeResponseData.Data - + diff --git a/docs/com/yaphet/chapa/model/InitializeResponseData.html b/docs/com/yaphet/chapa/model/InitializeResponseData.html index 5af47b7..1c965c0 100644 --- a/docs/com/yaphet/chapa/model/InitializeResponseData.html +++ b/docs/com/yaphet/chapa/model/InitializeResponseData.html @@ -2,9 +2,9 @@ - + InitializeResponseData - + diff --git a/docs/com/yaphet/chapa/model/PostData.html b/docs/com/yaphet/chapa/model/PostData.html index 2f2e36c..8fd30b3 100644 --- a/docs/com/yaphet/chapa/model/PostData.html +++ b/docs/com/yaphet/chapa/model/PostData.html @@ -2,9 +2,9 @@ - + PostData - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -177,45 +177,53 @@

            Method Summary

            java.lang.String -getSubAccountId()  +getReturnUrl()  java.lang.String -getTxRef()  +getSubAccountId()  +java.lang.String +getTxRef()  + + PostData setAmount(java.math.BigDecimal amount)  - + PostData setCallbackUrl(java.lang.String callbackUrl)  - + PostData setCurrency(java.lang.String currency)  - + PostData setCustomization(Customization customization)  - + PostData setEmail(java.lang.String email)  - + PostData setFirstName(java.lang.String firstName)  - + PostData setLastName(java.lang.String lastName)  - + +PostData +setReturnUrl(java.lang.String returnUrl)  + + PostData setSubAccountId(java.lang.String subAccountId)  - + PostData setTxRef(java.lang.String txRef)  @@ -384,6 +392,24 @@

            setCallbackUrl

            public PostData setCallbackUrl(java.lang.String callbackUrl)
          + + + +
            +
          • +

            getReturnUrl

            +
            public java.lang.String getReturnUrl()
            +
            • +
          + + + +
            +
          • +

            setReturnUrl

            +
            public PostData setReturnUrl(java.lang.String returnUrl)
            +
            • +
          diff --git a/docs/com/yaphet/chapa/model/ResponseData.html b/docs/com/yaphet/chapa/model/ResponseData.html index fe798c6..0388b8e 100644 --- a/docs/com/yaphet/chapa/model/ResponseData.html +++ b/docs/com/yaphet/chapa/model/ResponseData.html @@ -2,9 +2,9 @@ - + ResponseData - + diff --git a/docs/com/yaphet/chapa/model/SplitType.html b/docs/com/yaphet/chapa/model/SplitType.html index 37b0f54..0804759 100644 --- a/docs/com/yaphet/chapa/model/SplitType.html +++ b/docs/com/yaphet/chapa/model/SplitType.html @@ -2,9 +2,9 @@ - + SplitType - + diff --git a/docs/com/yaphet/chapa/model/SubAccount.html b/docs/com/yaphet/chapa/model/SubAccount.html index d7d715d..7d40450 100644 --- a/docs/com/yaphet/chapa/model/SubAccount.html +++ b/docs/com/yaphet/chapa/model/SubAccount.html @@ -2,9 +2,9 @@ - + SubAccount - + diff --git a/docs/com/yaphet/chapa/model/SubAccountResponseData.Data.html b/docs/com/yaphet/chapa/model/SubAccountResponseData.Data.html index f02c7fc..998f792 100644 --- a/docs/com/yaphet/chapa/model/SubAccountResponseData.Data.html +++ b/docs/com/yaphet/chapa/model/SubAccountResponseData.Data.html @@ -2,9 +2,9 @@ - + SubAccountResponseData.Data - + diff --git a/docs/com/yaphet/chapa/model/SubAccountResponseData.html b/docs/com/yaphet/chapa/model/SubAccountResponseData.html index e5b2667..e9dddbc 100644 --- a/docs/com/yaphet/chapa/model/SubAccountResponseData.html +++ b/docs/com/yaphet/chapa/model/SubAccountResponseData.html @@ -2,9 +2,9 @@ - + SubAccountResponseData - + diff --git a/docs/com/yaphet/chapa/model/VerifyResponseData.Data.html b/docs/com/yaphet/chapa/model/VerifyResponseData.Data.html index e58e189..12392e8 100644 --- a/docs/com/yaphet/chapa/model/VerifyResponseData.Data.html +++ b/docs/com/yaphet/chapa/model/VerifyResponseData.Data.html @@ -2,9 +2,9 @@ - + VerifyResponseData.Data - + diff --git a/docs/com/yaphet/chapa/model/VerifyResponseData.html b/docs/com/yaphet/chapa/model/VerifyResponseData.html index fc58449..ca8b3ba 100644 --- a/docs/com/yaphet/chapa/model/VerifyResponseData.html +++ b/docs/com/yaphet/chapa/model/VerifyResponseData.html @@ -2,9 +2,9 @@ - + VerifyResponseData - + diff --git a/docs/com/yaphet/chapa/model/package-frame.html b/docs/com/yaphet/chapa/model/package-frame.html index 55aa172..d56fb53 100644 --- a/docs/com/yaphet/chapa/model/package-frame.html +++ b/docs/com/yaphet/chapa/model/package-frame.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.model - + diff --git a/docs/com/yaphet/chapa/model/package-summary.html b/docs/com/yaphet/chapa/model/package-summary.html index 4c3090e..1ef158f 100644 --- a/docs/com/yaphet/chapa/model/package-summary.html +++ b/docs/com/yaphet/chapa/model/package-summary.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.model - + @@ -42,7 +42,7 @@
            @@ -171,7 +171,7 @@

            Package com.yaphet.chapa.model

            diff --git a/docs/com/yaphet/chapa/model/package-tree.html b/docs/com/yaphet/chapa/model/package-tree.html index 4cbfc92..bb385ef 100644 --- a/docs/com/yaphet/chapa/model/package-tree.html +++ b/docs/com/yaphet/chapa/model/package-tree.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.model Class Hierarchy - + @@ -42,7 +42,7 @@
            @@ -130,7 +130,7 @@

            Enum Hierarchy

            diff --git a/docs/com/yaphet/chapa/package-frame.html b/docs/com/yaphet/chapa/package-frame.html index 6beee79..d1cf2b5 100644 --- a/docs/com/yaphet/chapa/package-frame.html +++ b/docs/com/yaphet/chapa/package-frame.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa - + diff --git a/docs/com/yaphet/chapa/package-summary.html b/docs/com/yaphet/chapa/package-summary.html index 3f9bd5e..f4062b8 100644 --- a/docs/com/yaphet/chapa/package-summary.html +++ b/docs/com/yaphet/chapa/package-summary.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa - + diff --git a/docs/com/yaphet/chapa/package-tree.html b/docs/com/yaphet/chapa/package-tree.html index 3e89a38..fb10c6e 100644 --- a/docs/com/yaphet/chapa/package-tree.html +++ b/docs/com/yaphet/chapa/package-tree.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa Class Hierarchy - + diff --git a/docs/com/yaphet/chapa/utility/LocalDateTimeDeserializer.html b/docs/com/yaphet/chapa/utility/LocalDateTimeDeserializer.html index 25b5ad8..94d9402 100644 --- a/docs/com/yaphet/chapa/utility/LocalDateTimeDeserializer.html +++ b/docs/com/yaphet/chapa/utility/LocalDateTimeDeserializer.html @@ -2,9 +2,9 @@ - + LocalDateTimeDeserializer - + diff --git a/docs/com/yaphet/chapa/utility/Util.html b/docs/com/yaphet/chapa/utility/Util.html index 986375e..a6783b4 100644 --- a/docs/com/yaphet/chapa/utility/Util.html +++ b/docs/com/yaphet/chapa/utility/Util.html @@ -2,9 +2,9 @@ - + Util - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -155,30 +155,34 @@

            Method Summary

            generateToken()  +static boolean +is2xxSuccessful(int statucCode)  + + static InitializeResponseData jsonToInitializeResponseData(java.lang.String jsonData)  - + static java.util.Map<java.lang.String,java.lang.String> jsonToMap(java.lang.String jsonData)  - + static PostData jsonToPostData(java.lang.String jsonData)  - + static SubAccount jsonToSubAccount(java.lang.String jsonData)  - + static SubAccountResponseData jsonToSubAccountResponseData(java.lang.String jsonData)  - + static VerifyResponseData jsonToVerifyResponseData(java.lang.String jsonData)  - + static boolean notNullAndEmpty(java.lang.String value)  @@ -348,12 +352,21 @@

            generateToken

            -
              +

              • notNullAndEmpty

                public static boolean notNullAndEmpty(java.lang.String value)
              + + + +
                +
              • +

                is2xxSuccessful

                +
                public static boolean is2xxSuccessful(int statucCode)
                +
                • +
            diff --git a/docs/com/yaphet/chapa/utility/package-frame.html b/docs/com/yaphet/chapa/utility/package-frame.html index a5f3b4c..a6bf60c 100644 --- a/docs/com/yaphet/chapa/utility/package-frame.html +++ b/docs/com/yaphet/chapa/utility/package-frame.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.utility - + diff --git a/docs/com/yaphet/chapa/utility/package-summary.html b/docs/com/yaphet/chapa/utility/package-summary.html index 1f65e3c..48fd1bf 100644 --- a/docs/com/yaphet/chapa/utility/package-summary.html +++ b/docs/com/yaphet/chapa/utility/package-summary.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.utility - + diff --git a/docs/com/yaphet/chapa/utility/package-tree.html b/docs/com/yaphet/chapa/utility/package-tree.html index 1ae7c60..1c7745d 100644 --- a/docs/com/yaphet/chapa/utility/package-tree.html +++ b/docs/com/yaphet/chapa/utility/package-tree.html @@ -2,9 +2,9 @@ - + com.yaphet.chapa.utility Class Hierarchy - + diff --git a/docs/constant-values.html b/docs/constant-values.html index 4e72c61..6c44ba1 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index d6621db..d0b4810 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,9 +2,9 @@ - + Deprecated List - + diff --git a/docs/help-doc.html b/docs/help-doc.html index 8bc79f3..b1f8486 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -2,9 +2,9 @@ - + API Help - + diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index c13b360..d383491 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -2,9 +2,9 @@ - + A-Index - + diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index 948a140..7ad06b2 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,9 +2,9 @@ - + N-Index - + diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index 1a4286d..aebb29e 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -2,9 +2,9 @@ - + P-Index - + diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index 6ff6309..38ec60a 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -2,9 +2,9 @@ - + R-Index - + diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index 4d3fb33..0e2d400 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -2,9 +2,9 @@ - + S-Index - + @@ -155,6 +155,8 @@

            S

             
            setReference(String) - Method in class com.yaphet.chapa.model.VerifyResponseData.Data
             
            +
            setReturnUrl(String) - Method in class com.yaphet.chapa.model.PostData
            +
             
            setSplitType(SplitType) - Method in class com.yaphet.chapa.model.SubAccount
             
            setSplitValue(Double) - Method in class com.yaphet.chapa.model.SubAccount
            diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index 6162626..40c805c 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -2,9 +2,9 @@ - + U-Index - + diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index d387ac0..8ac7b80 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -2,9 +2,9 @@ - + V-Index - + diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index a863615..fc3cda4 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -2,9 +2,9 @@ - + B-Index - + diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index 433d37b..856d60b 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,9 +2,9 @@ - + C-Index - + @@ -92,10 +92,22 @@

            C

            ChapaClientImpl() - Constructor for class com.yaphet.chapa.client.ChapaClientImpl
             
            +
            ChapaException - Exception in com.yaphet.chapa.exception
            +
            +
            A ChapaException is thrown to signal a problem during SDK execution.
            +
            +
            ChapaException(String) - Constructor for exception com.yaphet.chapa.exception.ChapaException
            +
             
            +
            ChapaException(Throwable) - Constructor for exception com.yaphet.chapa.exception.ChapaException
            +
             
            +
            ChapaException(String, Throwable) - Constructor for exception com.yaphet.chapa.exception.ChapaException
            +
             
            com.yaphet.chapa - package com.yaphet.chapa
             
            com.yaphet.chapa.client - package com.yaphet.chapa.client
             
            +
            com.yaphet.chapa.exception - package com.yaphet.chapa.exception
            +
             
            com.yaphet.chapa.model - package com.yaphet.chapa.model
             
            com.yaphet.chapa.utility - package com.yaphet.chapa.utility
            diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index aac3254..534efbf 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -2,9 +2,9 @@ - + D-Index - + diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 187f6ac..dd6639c 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,9 +2,9 @@ - + E-Index - + diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index 0fb0787..147d771 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -2,9 +2,9 @@ - + G-Index - + @@ -149,6 +149,8 @@

            G

             
            getReference() - Method in class com.yaphet.chapa.model.VerifyResponseData.Data
             
            +
            getReturnUrl() - Method in class com.yaphet.chapa.model.PostData
            +
             
            getSplitType() - Method in class com.yaphet.chapa.model.SubAccount
             
            getSplitValue() - Method in class com.yaphet.chapa.model.SubAccount
            diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index 5fbe7e6..d745754 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -2,9 +2,9 @@ - + I-Index - + @@ -89,6 +89,8 @@

            I

             
            InitializeResponseData.Data - Class in com.yaphet.chapa.model
             
            +
            is2xxSuccessful(int) - Static method in class com.yaphet.chapa.utility.Util
            +
             
            A B C D E G I J L N P R S U V 
          diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index c59f664..c7dfb66 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -2,9 +2,9 @@ - + J-Index - + diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index b892009..5510ffa 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -2,9 +2,9 @@ - + L-Index - + diff --git a/docs/index.html b/docs/index.html index 50f982f..1f9876d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) @@ -15,6 +15,7 @@

          Packages

          diff --git a/docs/overview-summary.html b/docs/overview-summary.html index 2408427..647e9c4 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + @@ -85,10 +85,14 @@   -com.yaphet.chapa.model +com.yaphet.chapa.exception   +com.yaphet.chapa.model +  + + com.yaphet.chapa.utility   diff --git a/docs/overview-tree.html b/docs/overview-tree.html index 24839c6..4c0c2f2 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - + @@ -74,6 +74,7 @@

          Hierarchy For All Packages

          @@ -99,6 +100,15 @@

          Class Hierarchy

        • com.yaphet.chapa.model.SubAccount
        • com.yaphet.chapa.model.SubAccountResponseData.Data
          • +
        • java.lang.Throwable (implements java.io.Serializable) +
            +
          • java.lang.Exception + +
            • +
          +
        • com.yaphet.chapa.utility.Util
        • com.yaphet.chapa.model.VerifyResponseData.Data
        diff --git a/docs/package-list b/docs/package-list index 9f70c96..57a8037 100644 --- a/docs/package-list +++ b/docs/package-list @@ -1,4 +1,5 @@ com.yaphet.chapa com.yaphet.chapa.client +com.yaphet.chapa.exception com.yaphet.chapa.model com.yaphet.chapa.utility diff --git a/docs/serialized-form.html b/docs/serialized-form.html new file mode 100644 index 0000000..ce369ae --- /dev/null +++ b/docs/serialized-form.html @@ -0,0 +1,135 @@ + + + + + +Serialized Form + + + + + + + + +
        + + +
        Skip navigation links
        + + + + +
        +
        +
          +
        • Prev
          • +
        • Next
          • +
        + + +
        + +
        + + +
        + +
        +

        Serialized Form

        +
        +
        + +
        + +
        + + +
        Skip navigation links
        + + + + +
        +
        +
          +
        • Prev
          • +
        • Next
          • +
        + + +
        + +
        + + +
        + + + From bd4c175655cc0315110653112621bb17dd79696f Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 21:20:47 +0300 Subject: [PATCH 5/8] Fix broken tests --- src/test/java/com/yaphet/chapa/ChapaTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/yaphet/chapa/ChapaTest.java b/src/test/java/com/yaphet/chapa/ChapaTest.java index 2402537..7130493 100644 --- a/src/test/java/com/yaphet/chapa/ChapaTest.java +++ b/src/test/java/com/yaphet/chapa/ChapaTest.java @@ -80,6 +80,7 @@ public void shouldInitializeTransaction_asString() throws Throwable { // when when(chapaClient.post(anyString(), anyMap(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); String actualResponse = underTest.initialize(postData).asString(); // then @@ -93,12 +94,14 @@ public void shouldInitializeTransaction_asResponseData() throws Throwable { InitializeResponseData expectedResponseData = new InitializeResponseData() .setMessage("Transaction reference has been used before") .setStatus("failed") + .setStatusCode(200) .setData(new InitializeResponseData.Data().setCheckOutUrl("https://checkout.chapa.co/checkout/payment/somestring")); String expectedResponse = "{\"data\":{\"checkout_url\":\"https://checkout.chapa.co/checkout/payment/somestring\"},\"message\":\"Transaction reference has been used before\",\"status\":\"failed\"}"; // when when(chapaClient.post(anyString(), anyMap(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); InitializeResponseData actualResponseData = underTest.initialize(postData); // then @@ -113,6 +116,7 @@ public void shouldInitializeTransaction_With_Json_Input() throws Throwable { // when when(chapaClient.post(anyString(), anyString(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); String actualResponse = underTest.initialize(postDataString).asString(); // then @@ -127,6 +131,7 @@ public void shouldVerifyTransaction_asString() throws Throwable { // when when(chapaClient.get(anyString(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); String actualResponse = underTest.verify("test-transaction").asString(); // then @@ -140,11 +145,13 @@ public void shouldVerifyTransaction_asResponseData() throws Throwable { VerifyResponseData expectedResponseData = new VerifyResponseData() .setMessage("Payment not paid yet") .setStatus("null") + .setStatusCode(200) .setData(null); String expectedResponse = "{\"data\":null,\"message\":\"Payment not paid yet\",\"status\":\"null\"}"; // when when(chapaClient.get(anyString(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); VerifyResponseData actualResponseData = underTest.verify("test-transaction"); // then @@ -166,6 +173,7 @@ public void shouldGetListOfBanks() throws Throwable { .setUpdatedAt("2022-07-04T21:34:03.000000Z")); // when when(chapaClient.get(anyString(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); List actualBanks = underTest.banks(); // then @@ -180,6 +188,7 @@ public void shouldCreateSubAccount_asString() throws Throwable { // when when(chapaClient.post(anyString(), anyMap(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); String actualResponse = underTest.createSubAccount(subAccount).asString(); // then @@ -194,6 +203,7 @@ public void shouldCreateSubAccount_With_Json_Input() throws Throwable { // when when(chapaClient.post(anyString(), anyString(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); String actualResponse = underTest.createSubAccount(subAccountString).asString(); // then @@ -207,11 +217,13 @@ public void shouldCreateSubAccount_asResponseData() throws Throwable { SubAccountResponseData expectedResponseData = new SubAccountResponseData() .setMessage("The Bank Code is incorrect please check if it does exist with our getbanks endpoint.") .setStatus("failed") + .setStatusCode(200) .setData(null); String expectedResponse = "{\"data\":null,\"message\":\"The Bank Code is incorrect please check if it does exist with our getbanks endpoint.\",\"status\":\"failed\"}"; // when when(chapaClient.post(anyString(), anyMap(), anyString())).thenReturn(expectedResponse); + when(chapaClient.getStatusCode()).thenReturn(200); SubAccountResponseData actualResponse = underTest.createSubAccount(subAccount); // then @@ -222,7 +234,7 @@ public void shouldCreateSubAccount_asResponseData() throws Throwable { // This should not run in the pipeline @Test -// @Disabled + @Disabled public void testDefault() throws Throwable { // given Customization customization = new Customization() From b41b8c1d0e9e62121a63799acf34bead23d06da1 Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 21:31:50 +0300 Subject: [PATCH 6/8] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e93700..5ceb3d0 100644 --- a/README.md +++ b/README.md @@ -36,16 +36,19 @@ Visit official [Chapa's API Documentation](https://developer.chapa.co/docs) io.github.yaphet17 Chapa - 1.1.0 + 1.2.2 ``` Or add the below gradle dependency to your `build.gradle` file. ```groovy - implementation 'io.github.yaphet17:Chapa:1.1.0' + implementation 'io.github.yaphet17:Chapa:1.2.2' ``` ## Usage +> **Note** : This doc is not updated with the latest changes of this library (which have several amazing but breaking ): changes). I appreciate any contribution to the docs until I find some time to do it my self. + + Instantiate a `Chapa` class. ```java Chapa chapa = new Chapa("your-secrete-key"); From 726fbfe13e22e4dfaa1339e276487f7d7a17a59b Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 21:53:50 +0300 Subject: [PATCH 7/8] Automate publish to maven to workflow --- .github/workflows/maven-publish.yml | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/maven-publish.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml new file mode 100644 index 0000000..19730ae --- /dev/null +++ b/.github/workflows/maven-publish.yml @@ -0,0 +1,31 @@ +name: Publish package to the Maven Central Repository +on: + push: + branches: + - main + paths: + - 'docs/**' + - 'src/**' + - 'pom.xml' + workflow_dispatch: + + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up Maven Central Repository + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish package + run: mvn --batch-mode deploy + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file From 682fb1d01ecfd781d5c38d952184b38be3593c04 Mon Sep 17 00:00:00 2001 From: yaphet17 Date: Thu, 1 Jun 2023 22:10:49 +0300 Subject: [PATCH 8/8] Fix gpg signing issues --- .github/workflows/maven-publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 19730ae..fe33cee 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -24,8 +24,11 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish package run: mvn --batch-mode deploy env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file