Updates

Ran tests
Handled errors

Author: cleopatra27

documentation/Collections.md

@@ -15,6 +15,16 @@
             <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.21.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -52,6 +62,12 @@
             <artifactId>gson</artifactId>
             <version>2.9.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <properties>

pom.xml

@@ -39,7 +39,7 @@ public class Authorization {
 
     public Authorization pinAuthorization(String pin){
         this.pin = pin;
-        this.mode = PIN.toString().toLowerCase();
+        this.mode = PIN.name().toLowerCase();
         return this;
     }
 

src/.DS_Store

@@ -14,7 +14,6 @@ public class Customer extends Shared{
     private String name;
     private String phone;
 
-
     public Customer(String name, String email, String phone){
         this.name = name;
         this.setEmail(email);

src/main/java/com/flutterwave/bean/Authorization.java

@@ -1,24 +1,36 @@
 package com.flutterwave.bean;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.json.JSONObject;
+import org.json.JSONPropertyName;
 
 import java.math.BigDecimal;
 
 @Getter
 @Setter
 @NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Data {
 
-    private Customer customer;
+    private Object customer;
+    private Object meta;
     private int id;
+    private int maximum;
+    private int minimum;
     private String tx_ref;
     private String flw_ref;
     private String device_fingerprint;
     private BigDecimal amount;
     private BigDecimal charged_amount;
     private BigDecimal app_fee;
+    private BigDecimal app_feefee;
     private BigDecimal fee;
     private BigDecimal merchant_fee;
     private String processor_response;
@@ -64,6 +76,7 @@ public class Data {
     private String state;
     private String address_1;
     private String address_2;
+    private String address;
     private String zip_code;
     private String cvv;
     private String expiration;
@@ -80,12 +93,50 @@ public class Data {
     private String customer_email;
     private String settlement_id;
     private String transaction_id;
-    private String meta;
     private String subaccount_id;
     private String bank_name;
     private String split_type;
     private BigDecimal split_value;
     private int split_ratio;
     private BigDecimal amount_settled;
     private BigDecimal amount_refunded;
+    private String response_code;
+    private String response_message;
+    private String product_code;
+    private String email;
+
+    private Customer getCustomer(){
+        try {
+            return new GsonBuilder().create().
+                    fromJson(new Gson().toJson(this.customer), Customer.class);
+        }catch (Exception e){
+            System.out.println(e);
+            throw new RuntimeException("Please use .getCustomerString()");
+        }
+    }
+
+
+    public Meta getMeta(){
+        try {
+            return new GsonBuilder().create().
+                    fromJson(new Gson().toJson(this.meta), Meta.class);
+        }catch (Exception e){
+            System.out.println(e);
+            throw new RuntimeException("Please use .getMetaString()");
+        }
+    }
+
+    public String getMetaString(){
+            if(this.meta != null){
+                return this.meta.toString();
+            }
+            return null;
+    }
+
+    public String getCustomerString(){
+        if(this.customer != null){
+            return this.customer.toString();
+        }
+        return null;
+    }
 }

src/main/java/com/flutterwave/bean/Customer.java

@@ -1,8 +1,12 @@
 package com.flutterwave.bean;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
@@ -20,4 +24,19 @@ public class Meta {
     private String random;
     private PageInfo page_info;
 
+    @Override
+    public String toString() {
+
+        String value = null;
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        try {
+            value = objectMapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+
+        return value;
+
+    }
 }

src/main/java/com/flutterwave/bean/Data.java

@@ -29,7 +29,7 @@ public static String runTransaction(String url, String request, Verb type,
         CloseableHttpClient client = HttpClientBuilder.create().build();
         CloseableHttpResponse closeableHttpResponse;
 //        new Thread(() -> send(chargeType)).start();
-        //send(chargeType);
+        send(chargeType);
 
         try {
             URI uri;

src/main/java/com/flutterwave/bean/Meta.java

@@ -19,7 +19,7 @@ public abstract class Charge {
      */
     public Response runTransaction(String request, ChargeTypes type, boolean encrypyt, Optional<String> urlSuffix){
         return Optional.ofNullable(Client.runTransaction(
-                        getProperty("CHARGE_BASE")+(urlSuffix.isEmpty() ?"?type="+type.toString().toLowerCase() : urlSuffix),
+                        getProperty("CHARGE_BASE")+(urlSuffix.isEmpty() ?"?type="+type.toString().toLowerCase() : urlSuffix.get()),
                         encrypyt?new Request(request).toString():request,
                         POST, type, null))
                 .map(Response::toResponse).orElseThrow(() -> new RuntimeException("Error processing request, please check logs"));

src/main/java/com/flutterwave/client/Client.java

@@ -10,6 +10,6 @@
 public class FawryPay extends Charge{
 
     public Response runTransaction(FawryPayRequest fawryPayRequest){
-        return runTransaction(fawryPayRequest.toString(), FAWRY_PAY, true, Optional.empty());
+        return runTransaction(fawryPayRequest.toString(), FAWRY_PAY, false, Optional.empty());
     }
 }