Merge pull request #133 from xendit/patch/update-response-headers-fro…

…m-instance

Update response header to get from instance instead of Static Variable

README.md

@@ -1899,12 +1899,12 @@ The following example will show how to obtain Request-ID when creating QRCode
 /* Without client */
 QRCode qrCode = QRCode.createQRCode("12", QRCode.QRCodeType.DYNAMIC, "IDR", 10000);
 /* Xendit.getResponseHeaders() will contain all response headers after your request is completed, hence you can obtain Request-Id from header by doing the following:*/
-System.out.println(Xendit.getResponseHeaders().get("Request-Id"));
+System.out.println(qrCode.getResponseHeaders().get("Request-Id"));
 
 /* With client */
 QRCode qrCode = xenditClient.qrCode.createQRCode("external_id", QRCode.QRCodeType.DYNAMIC, "IDR", 10000);
 /* Xendit.getResponseHeaders() will contain all response headers after your request is completed, hence you can obtain Request-Id from header by doing the following:*/
-System.out.println(Xendit.getResponseHeaders().get("Request-Id"));
+System.out.println(qrCode.getResponseHeaders().get("Request-Id"));
 ```
 Full Example can be found [here](https://github.com/xendit/xendit-java/blob/9bd69bd6f4061307a5dee30287a1f7712d060527/xendit-java-library-example/src/main/java/ExampleWithClient/ExampleCreateQRCode.java)
 

xendit-java-lib/src/main/java/com/xendit/Xendit.java

@@ -2,7 +2,6 @@
 
 import com.xendit.network.BaseRequest;
 import com.xendit.network.NetworkClient;
-import java.util.Map;
 
 public class Xendit {
 
@@ -20,16 +19,6 @@ public static void setRequestClient(NetworkClient requestClient) {
     Xendit.requestClient = requestClient;
   }
 
-  protected static Map<String, String> responseHeaders;
-
-  public static Map<String, String> getResponseHeaders() {
-    return responseHeaders;
-  }
-
-  public static void setResponseHeaders(Map<String, String> headers) {
-    Xendit.responseHeaders = headers;
-  }
-
   public static class Option {
 
     private String apiKey;

xendit-java-lib/src/main/java/com/xendit/model/AbstractResponseHeaders.java

@@ -0,0 +1,15 @@
+package com.xendit.model;
+
+import java.util.Map;
+
+public class AbstractResponseHeaders {
+  Map<String, String> responseHeaders;
+
+  public Map<String, String> getResponseHeaders() {
+    return responseHeaders;
+  }
+
+  public void setResponseHeaders(Map<String, String> responseHeaders) {
+    this.responseHeaders = responseHeaders;
+  }
+}

xendit-java-lib/src/main/java/com/xendit/model/AbstractRetailOutlet.java

@@ -2,7 +2,7 @@
 
 import com.xendit.Xendit;
 
-public class AbstractRetailOutlet {
+public class AbstractRetailOutlet extends AbstractResponseHeaders {
   protected static RetailOutletClient retailOutletClient;
   /**
    * Its create a client for RetailOutlet

xendit-java-lib/src/main/java/com/xendit/model/AccessibleLinkedAccount.java

@@ -10,7 +10,7 @@
 @Builder
 @Getter
 @Setter
-public class AccessibleLinkedAccount {
+public class AccessibleLinkedAccount extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/AvailableBank.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @ToString
-public class AvailableBank {
+public class AvailableBank extends AbstractResponseHeaders {
   @SerializedName("name")
   String name;
 

xendit-java-lib/src/main/java/com/xendit/model/AvailableBankInvoice.java

@@ -6,7 +6,7 @@
 
 @Getter
 @Setter
-public class AvailableBankInvoice {
+public class AvailableBankInvoice extends AbstractResponseHeaders {
   @SerializedName("bank_code")
   private String bankCode;
 

xendit-java-lib/src/main/java/com/xendit/model/AvailableEwalletInvoice.java

@@ -6,7 +6,7 @@
 
 @Getter
 @Setter
-public class AvailableEwalletInvoice {
+public class AvailableEwalletInvoice extends AbstractResponseHeaders {
   @SerializedName("ewallet_type")
   private String ewalletType;
 }

xendit-java-lib/src/main/java/com/xendit/model/AvailableRetailOutletInvoice.java

@@ -6,7 +6,7 @@
 
 @Getter
 @Setter
-public class AvailableRetailOutletInvoice {
+public class AvailableRetailOutletInvoice extends AbstractResponseHeaders {
   @SerializedName("retail_outlet_name")
   private String retailOutletName;
 

xendit-java-lib/src/main/java/com/xendit/model/Balance.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class Balance {
+public class Balance extends AbstractResponseHeaders {
   @SerializedName("balance")
   private Number balance;
 

xendit-java-lib/src/main/java/com/xendit/model/BatchDisbursement.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class BatchDisbursement {
+public class BatchDisbursement extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/Beneficiary.java

@@ -6,7 +6,7 @@
 @Getter
 @Setter
 @Builder
-public class Beneficiary {
+public class Beneficiary extends AbstractResponseHeaders {
   @SerializedName("type")
   private String type;
 

xendit-java-lib/src/main/java/com/xendit/model/CardlessCredit.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class CardlessCredit {
+public class CardlessCredit extends AbstractResponseHeaders {
   @SerializedName("redirect_url")
   private String redirectUrl;
 

xendit-java-lib/src/main/java/com/xendit/model/CardlessCreditCustomer.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class CardlessCreditCustomer {
+public class CardlessCreditCustomer extends AbstractResponseHeaders {
   @SerializedName("first_name")
   private String firstName;
 

xendit-java-lib/src/main/java/com/xendit/model/CardlessCreditItem.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class CardlessCreditItem {
+public class CardlessCreditItem extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/CardlessCreditShippingAddress.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class CardlessCreditShippingAddress {
+public class CardlessCreditShippingAddress extends AbstractResponseHeaders {
   @SerializedName("first_name")
   private String firstName;
 

xendit-java-lib/src/main/java/com/xendit/model/CreditCard.java

@@ -11,7 +11,7 @@
 @Getter
 @Setter
 @Builder
-public class CreditCard {
+public class CreditCard extends AbstractResponseHeaders {
 
   private static CreditCardClient creditCardClient;
 

xendit-java-lib/src/main/java/com/xendit/model/CreditCardCharge.java

@@ -9,7 +9,7 @@
 @Builder
 @Getter
 @Setter
-public class CreditCardCharge {
+public class CreditCardCharge extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/CreditCardRefund.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class CreditCardRefund {
+public class CreditCardRefund extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/CreditCardReverseAuth.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class CreditCardReverseAuth {
+public class CreditCardReverseAuth extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/Customer.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class Customer {
+public class Customer extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/DirectDebitBasketItem.java

@@ -9,7 +9,7 @@
 @Builder
 @Setter
 @Getter
-public class DirectDebitBasketItem {
+public class DirectDebitBasketItem extends AbstractResponseHeaders {
   @SerializedName("reference_id")
   private String referenceId;
 

xendit-java-lib/src/main/java/com/xendit/model/DirectDebitPayment.java

@@ -11,7 +11,7 @@
 @Getter
 @Setter
 @Builder
-public class DirectDebitPayment {
+public class DirectDebitPayment extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/DirectDebitRefunds.java

@@ -8,7 +8,7 @@
 @Builder
 @Setter
 @Getter
-public class DirectDebitRefunds {
+public class DirectDebitRefunds extends AbstractResponseHeaders {
   @SerializedName("data")
   private String[] data;
 

xendit-java-lib/src/main/java/com/xendit/model/Disbursement.java

@@ -12,7 +12,7 @@
 @Getter
 @Setter
 @Builder
-public class Disbursement {
+public class Disbursement extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/DisbursementChannel.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class DisbursementChannel {
+public class DisbursementChannel extends AbstractResponseHeaders {
   @SerializedName("channel_code")
   private String channelCode;
 

xendit-java-lib/src/main/java/com/xendit/model/DisbursementClient.java

@@ -10,7 +10,7 @@
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
-public class DisbursementClient {
+public class DisbursementClient extends AbstractResponseHeaders {
   private Xendit.Option opt;
 
   private NetworkClient requestClient;

xendit-java-lib/src/main/java/com/xendit/model/DisbursementPHP.java

@@ -11,7 +11,7 @@
 @Getter
 @Setter
 @Builder
-public class DisbursementPHP {
+public class DisbursementPHP extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/EWalletCharge.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class EWalletCharge {
+public class EWalletCharge extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/EWalletPayment.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class EWalletPayment {
+public class EWalletPayment extends AbstractResponseHeaders {
   public enum EWalletType {
     DANA,
     OVO,

xendit-java-lib/src/main/java/com/xendit/model/FixedPaymentCode.java

@@ -6,7 +6,7 @@
 @Getter
 @Setter
 @Builder
-public class FixedPaymentCode {
+public class FixedPaymentCode extends AbstractResponseHeaders {
   public enum RetailOutletName {
     ALFAMART,
     INDOMARET

xendit-java-lib/src/main/java/com/xendit/model/FixedVirtualAccount.java

@@ -11,7 +11,7 @@
 @Getter
 @Setter
 @Builder
-public class FixedVirtualAccount {
+public class FixedVirtualAccount extends AbstractResponseHeaders {
 
   @SerializedName("id")
   private String id;

xendit-java-lib/src/main/java/com/xendit/model/FixedVirtualAccountPayment.java

@@ -8,7 +8,7 @@
 @Builder
 @Getter
 @Setter
-public class FixedVirtualAccountPayment {
+public class FixedVirtualAccountPayment extends AbstractResponseHeaders {
   @SerializedName("id")
   String id;
 

xendit-java-lib/src/main/java/com/xendit/model/InitializedLinkedAccount.java

@@ -9,7 +9,7 @@
 @Getter
 @Setter
 @Builder
-public class InitializedLinkedAccount {
+public class InitializedLinkedAccount extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/Invoice.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class Invoice {
+public class Invoice extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/PaylaterCharge.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class PaylaterCharge {
+public class PaylaterCharge extends AbstractResponseHeaders {
   @SerializedName("charge_id")
   private String chargeId;
 

xendit-java-lib/src/main/java/com/xendit/model/PaylaterPlans.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class PaylaterPlans {
+public class PaylaterPlans extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/PaylaterRefund.java

@@ -10,7 +10,7 @@
 @Builder
 @Getter
 @Setter
-public class PaylaterRefund {
+public class PaylaterRefund extends AbstractResponseHeaders {
   @SerializedName("refund_id")
   private String refundId;
 

xendit-java-lib/src/main/java/com/xendit/model/PaymentMethod.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class PaymentMethod {
+public class PaymentMethod extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/Payout.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class Payout {
+public class Payout extends AbstractResponseHeaders {
   @SerializedName("id")
   private String id;
 

xendit-java-lib/src/main/java/com/xendit/model/QRCode.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class QRCode {
+public class QRCode extends AbstractResponseHeaders {
   public enum QRCodeType {
     DYNAMIC,
     STATIC