Merge pull request #5 from konduto/payment-types

Payment types

README.md

@@ -18,7 +18,7 @@ To get started add our SDK as a dependency in your **pom.xml**:
 <dependency>
 	<groupId>com.konduto.sdk</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>2.7.0</version>
+	<version>2.8.0</version>
 </dependency>
 ```
 
@@ -115,13 +115,23 @@ created_at | _(optional)_ Date when customer was created.
 
 #### Payment information
 
+##### Credit card
 Parameter | Description 
 --- | ---
 status | _(required)_ The status of the transaction returned by the payment processor. Accepts `approved`, `declined` or `pending` if the payment wasn't been processed yet.
 bin | _(optional)_ First six digits of the customer's credit card. Used to identify the type of card being sent.
 last4 | _(optional)_ Four last digits of the customer's credit card number.
 expiration_date | _(optional)_ Card's expiration date under MMYYYY format.
 
+##### Boleto
+Parameter | Description
+--- | ---
+expiration_date | _(optional)_ Boleto's expiration date (yyyy-MM-dd).
+
+##### Other payment types available
+* DEBIT
+* TRANSFER
+* VOUCHER
 
 #### Billing address
 

java-sdk-test/src/com/konduto/Main.java

@@ -4,9 +4,9 @@
 import com.konduto.sdk.exceptions.KondutoHTTPException;
 import com.konduto.sdk.exceptions.KondutoInvalidEntityException;
 import com.konduto.sdk.exceptions.KondutoUnexpectedAPIResponseException;
-import com.konduto.sdk.models.*;
-
-import java.net.URI;
+import com.konduto.sdk.models.KondutoCustomer;
+import com.konduto.sdk.models.KondutoOrder;
+import com.konduto.sdk.models.KondutoOrderStatus;
 
 public class Main {
 

konduto.properties

@@ -1 +1 @@
-version = 2.7.0
+version = 2.8.0

src/main/java/com/konduto/sdk/Konduto.java

@@ -1,13 +1,12 @@
 package com.konduto.sdk;
 
-import com.google.gson.JsonObject; 
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.konduto.sdk.exceptions.KondutoHTTPException;
 import com.konduto.sdk.exceptions.KondutoHTTPExceptionFactory;
 import com.konduto.sdk.exceptions.KondutoInvalidEntityException;
 import com.konduto.sdk.exceptions.KondutoUnexpectedAPIResponseException;
 import com.konduto.sdk.models.*;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HttpClient;

src/main/java/com/konduto/sdk/adapters/KondutoBoletoPaymentSerializer.java

@@ -0,0 +1,23 @@
+package com.konduto.sdk.adapters;
+
+import com.google.gson.JsonObject;
+import com.konduto.sdk.models.KondutoBoletoPayment;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by rsampaio on 9/8/16.
+ *
+ * Serializes a boleto payment.
+ * Note the expiration date formatting.
+ */
+public class KondutoBoletoPaymentSerializer extends KondutoPaymentSerializer {
+    public JsonObject completeSerialization(JsonObject paymentAsJson, KondutoBoletoPayment boletoPayment) {
+        Date expirationDate = boletoPayment.getExpirationDate();
+        if(expirationDate == null) { return paymentAsJson; }
+        SimpleDateFormat boletoDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        paymentAsJson.addProperty("expiration_date", boletoDateFormat.format(expirationDate));
+        return paymentAsJson;
+    }
+}

src/main/java/com/konduto/sdk/adapters/KondutoCreditCardPaymentSerializer.java

@@ -0,0 +1,20 @@
+package com.konduto.sdk.adapters;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.konduto.sdk.models.KondutoCreditCardPayment;
+
+/**
+ * Created by rsampaio on 9/8/16.
+ *
+ * Serializes a credit card payment.
+ */
+public class KondutoCreditCardPaymentSerializer extends KondutoPaymentSerializer {
+    JsonElement completeSerialization(JsonObject paymentAsJson, KondutoCreditCardPayment creditCardPayment) {
+        paymentAsJson.addProperty("status", creditCardPayment.getStatusAsString());
+        paymentAsJson.addProperty("bin", creditCardPayment.getBin());
+        paymentAsJson.addProperty("last4", creditCardPayment.getLast4());
+        paymentAsJson.addProperty("expiration_date", creditCardPayment.getExpirationDate());
+        return paymentAsJson;
+    }
+}

src/main/java/com/konduto/sdk/adapters/KondutoPaymentCollectionDeserializer.java

@@ -0,0 +1,60 @@
+package com.konduto.sdk.adapters;
+
+import com.google.gson.*;
+import com.konduto.sdk.models.*;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ *
+ * Deserialization of KondutoPayment collections.
+ *
+ */
+public class KondutoPaymentCollectionDeserializer implements JsonDeserializer<Collection<KondutoPayment>> {
+
+	/**
+	 * Method to deserialize a JSON object into a collection of KondutoPayment.
+	 *
+	 * @param json a serialized object
+	 * @param typeOfT the object type
+	 * @param context GSON serialization context
+	 * @return an ArrayList of payments
+	 * @throws JsonParseException
+	 */
+	@Override
+	public Collection<KondutoPayment> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+			throws JsonParseException {
+
+		Collection<KondutoPayment> payments = new ArrayList<KondutoPayment>();
+
+		for(JsonElement je : json.getAsJsonArray()) {
+			KondutoPaymentType type =
+					KondutoPaymentType.valueOf(((JsonObject) je).get("type").getAsString().toUpperCase());
+			switch (type){
+				case BOLETO:
+					KondutoBoletoPayment boletoPayment = new KondutoBoletoPayment();
+					String expirationDateAsStr = ((JsonObject) je).get("expiration_date").getAsString();
+					boletoPayment.setExpirationDate(expirationDateAsStr);
+                    payments.add(boletoPayment);
+					break;
+				case CREDIT:
+					payments.add((KondutoCreditCardPayment) context.deserialize(je, KondutoCreditCardPayment.class));
+					break;
+				case DEBIT:
+					payments.add((KondutoDebitPayment) context.deserialize(je, KondutoDebitPayment.class));
+					break;
+				case TRANSFER:
+					payments.add((KondutoTransferPayment) context.deserialize(je, KondutoTransferPayment.class));
+					break;
+				case VOUCHER:
+					payments.add((KondutoVoucherPayment) context.deserialize(je, KondutoVoucherPayment.class));
+					break;
+			}
+		}
+
+		return payments;
+	}
+}
+

src/main/java/com/konduto/sdk/adapters/KondutoPaymentSerializer.java

@@ -0,0 +1,41 @@
+package com.konduto.sdk.adapters;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.konduto.sdk.models.KondutoBoletoPayment;
+import com.konduto.sdk.models.KondutoCreditCardPayment;
+import com.konduto.sdk.models.KondutoPayment;
+import com.konduto.sdk.models.KondutoPaymentType;
+
+import java.lang.reflect.Type;
+
+/**
+ * Created by rsampaio on 9/8/16.
+ *
+ */
+public class KondutoPaymentSerializer implements JsonSerializer<KondutoPayment> {
+    /**
+     * KondutoPayment serializer
+     *
+     * @param payment   the payment that needs to be converted to Json.
+     * @param typeOfSrc the actual type (fully genericized version) of the source object.
+     * @param context   the serialization context
+     * @return a JsonElement corresponding to the specified object.
+     */
+    @Override
+    public JsonElement serialize(KondutoPayment payment, Type typeOfSrc, JsonSerializationContext context) {
+        JsonObject paymentAsJson = new JsonObject();
+        paymentAsJson.addProperty("type", payment.getTypeAsString());
+        if(payment.getType().equals(KondutoPaymentType.CREDIT)) {
+            KondutoCreditCardPaymentSerializer creditCardPaymentSerializer = new KondutoCreditCardPaymentSerializer();
+            return creditCardPaymentSerializer.completeSerialization(paymentAsJson, (KondutoCreditCardPayment) payment);
+        }
+        if(payment.getType().equals(KondutoPaymentType.BOLETO)) {
+            KondutoBoletoPaymentSerializer boletoPaymentSerializer = new KondutoBoletoPaymentSerializer();
+            return boletoPaymentSerializer.completeSerialization(paymentAsJson, (KondutoBoletoPayment) payment);
+        }
+        return paymentAsJson;
+    }
+}

src/main/java/com/konduto/sdk/adapters/KondutoTravelAdapter.java

@@ -5,12 +5,8 @@
 import com.konduto.sdk.models.*;
 
 import java.lang.reflect.Type;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * KondutoTravelAdapter to deserialize KondutoTravel objects.

src/main/java/com/konduto/sdk/adapters/KondutoTravelLegAdapter.java

@@ -2,7 +2,8 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.konduto.sdk.models.*;
+import com.konduto.sdk.models.KondutoTravelLeg;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;