Merge pull request #148 from Adyen/PW-666-CheckoutPaymentV40

Pw 666 checkout payment v40 and Application info

Author: AlexandrosMor

src/main/java/com/adyen/Client.java

@@ -70,7 +70,12 @@ public Client(String username, String password, Environment environment, String
     }
 
     /**
-     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
+     * @param username your merchant account Username
+     * @param password your merchant accont Password
+     * @param environment This defines the payment enviroment live or test
+     * @param connectionTimeoutMillis Provide the time to time out
+     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link
+     * com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
      */
     @Deprecated
     public Client(String username, String password, Environment environment, int connectionTimeoutMillis) {
@@ -80,7 +85,13 @@ public Client(String username, String password, Environment environment, int con
     }
 
     /**
-     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
+     * @param username your merchant account Username
+     * @param password your merchant accont Password
+     * @param environment This defines the payment enviroment live or test
+     * @param connectionTimeoutMillis Provide the time to time out
+     * @param liveEndpointUrlPrefix provide the merchant specific url
+     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link
+     * com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
      */
     @Deprecated
     public Client(String username, String password, Environment environment, int connectionTimeoutMillis, String liveEndpointUrlPrefix) {
@@ -100,7 +111,11 @@ public Client(String apiKey, Environment environment, String liveEndpointUrlPref
     }
 
     /**
-     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
+     * @param apiKey Defines the api key that can be retrieved by back office
+     * @param environment This defines the payment enviroment live or test
+     * @param connectionTimeoutMillis Provide the time to time out
+     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link
+     * com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
      */
     @Deprecated
     public Client(String apiKey, Environment environment, int connectionTimeoutMillis) {
@@ -110,7 +125,12 @@ public Client(String apiKey, Environment environment, int connectionTimeoutMilli
     }
 
     /**
-     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
+     * @param apiKey Defines the api key that can be retrieved by back office
+     * @param environment This defines the payment enviroment live or test
+     * @param connectionTimeoutMillis Provide the time to time out
+     * @param liveEndpointUrlPrefix provide the merchant specific url
+     * @deprecated As of library version 1.6.1, timeouts should be set by {@link #setTimeouts(int connectionTimeoutMillis, int readTimeoutMillis)} or directly by {@link
+     * com.adyen.Config#setConnectionTimeoutMillis(int connectionTimeoutMillis)}.
      */
     @Deprecated
     public Client(String apiKey, Environment environment, int connectionTimeoutMillis, String liveEndpointUrlPrefix) {
@@ -120,6 +140,7 @@ public Client(String apiKey, Environment environment, int connectionTimeoutMilli
     }
 
     /**
+     * @param environment This defines the payment enviroment live or test
      * @deprecated As of library version 1.5.4, replaced by {@link #setEnvironment(Environment environment, String liveEndpointUrlPrefix)}.
      */
     @Deprecated
@@ -128,7 +149,7 @@ public void setEnvironment(Environment environment) {
     }
 
     /**
-     * @param environment
+     * @param environment           This defines the payment enviroment live or test
      * @param liveEndpointUrlPrefix Provide the unique live url prefix from the "API URLs and Response" menu in the Adyen Customer Area
      */
     public void setEnvironment(Environment environment, String liveEndpointUrlPrefix) {

src/main/java/com/adyen/Util/Util.java

@@ -73,9 +73,9 @@ public static <T> String implode(String glue, List<T> list) {
     /**
      * Returns an Amount struct to use on requests
      *
-     * @param amount
-     * @param currency
-     * @return
+     * @param amount Defines the amount
+     * @param currency Defines the amount currency
+     * @return amount
      */
     public static Amount createAmount(String amount, String currency) {
         return createAmount(new BigDecimal(amount), currency);
@@ -84,9 +84,9 @@ public static Amount createAmount(String amount, String currency) {
     /**
      * Returns an Amount struct to use on requests
      *
-     * @param amount
-     * @param currency
-     * @return
+     * @param amount Defines the amount
+     * @param currency Defines the amount currency
+     * @return amount
      */
     public static Amount createAmount(BigDecimal amount, String currency) {
         Amount amountData = new Amount();
@@ -138,6 +138,8 @@ public static int getDecimalPlaces(String currency) {
     /**
      * Convert the given object to string with each line indented by 4 spaces
      * (except the first line).
+     * @param o string
+     * @return string target "\n" replacement with "\n    "
      */
     public static String toIndentedString(Object o) {
         if (o == null) {

src/main/java/com/adyen/model/AbstractPaymentRequest.java

@@ -27,15 +27,15 @@
 import java.util.Map;
 import java.util.Objects;
 import com.adyen.constants.ApiConstants;
+import com.adyen.model.applicationinfo.ApplicationInfo;
 import com.adyen.model.recurring.Recurring;
 import com.adyen.serializer.DateSerializer;
 import com.adyen.serializer.DateTimeGMTSerializer;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 
 /**
- * AbstractPaymentRequest
- * Base for PaymentRequest and PaymentRequest3D
+ * AbstractPaymentRequest Base for PaymentRequest and PaymentRequest3D
  */
 public abstract class AbstractPaymentRequest<T extends AbstractPaymentRequest<T>> {
     @SerializedName("amount")
@@ -60,14 +60,11 @@ public abstract class AbstractPaymentRequest<T extends AbstractPaymentRequest<T>
      * how the shopper interacts with the system
      */
     public enum ShopperInteractionEnum {
-        @SerializedName("Ecommerce")
-        ECOMMERCE("Ecommerce"),
+        @SerializedName("Ecommerce") ECOMMERCE("Ecommerce"),
 
-        @SerializedName("ContAuth")
-        CONTAUTH("ContAuth"),
+        @SerializedName("ContAuth") CONTAUTH("ContAuth"),
 
-        @SerializedName("Moto")
-        MOTO("Moto");
+        @SerializedName("Moto") MOTO("Moto");
 
         private String value;
 
@@ -161,8 +158,20 @@ public String toString() {
     @SerializedName("metadata")
     private Map<String, String> metadata = null;
 
+    @SerializedName("applicationInfo")
+    private ApplicationInfo applicationInfo;
+
+    public AbstractPaymentRequest() {
+        if (this.applicationInfo == null) {
+            applicationInfo = new ApplicationInfo();
+        }
+    }
+
     /**
      * Set browser data
+     * @param userAgent http header
+     * @param acceptHeader http header
+     * @return browser data
      */
     public T setBrowserInfoData(String userAgent, String acceptHeader) {
         BrowserInfo browserInfo = new BrowserInfo();
@@ -174,10 +183,9 @@ public T setBrowserInfoData(String userAgent, String acceptHeader) {
     }
 
     /**
-     * get additionalData map
-     * Create the map if doesn't exists
+     * get additionalData map Create the map if doesn't exists
      *
-     * @return
+     * @return additional data
      */
     public Map<String, String> getOrCreateAdditionalData() {
         if (this.getAdditionalData() == null) {
@@ -745,6 +753,14 @@ public T metadata(Map<String, String> metadata) {
         return (T) this;
     }
 
+    public ApplicationInfo getApplicationInfo() {
+        return applicationInfo;
+    }
+
+    public void setApplicationInfo(ApplicationInfo applicationInfo) {
+        this.applicationInfo = applicationInfo;
+    }
+
     /**
      * a map of key/value pairs of metadata sent by merchant
      *
@@ -799,7 +815,8 @@ public boolean equals(Object o) {
                 && Objects.equals(this.dateOfBirth, paymentRequest.dateOfBirth)
                 && Objects.equals(this.telephoneNumber, paymentRequest.telephoneNumber)
                 && Objects.equals(this.mcc, paymentRequest.mcc)
-                && Objects.equals(this.metadata, paymentRequest.metadata);
+                && Objects.equals(this.metadata, paymentRequest.metadata)
+                && Objects.equals(this.applicationInfo, paymentRequest.applicationInfo);
     }
 
     @Override
@@ -835,7 +852,8 @@ public int hashCode() {
                             dateOfBirth,
                             telephoneNumber,
                             mcc,
-                            metadata);
+                            metadata,
+                            applicationInfo);
     }
 
 
@@ -875,6 +893,7 @@ public String toString() {
         sb.append("    telephoneNumber: ").append(toIndentedString(telephoneNumber)).append("\n");
         sb.append("    mcc: ").append(toIndentedString(mcc)).append("\n");
         sb.append("    metadata: ").append(toIndentedString(metadata)).append("\n");
+        sb.append("    applicationInfo: ").append(toIndentedString(applicationInfo)).append("\n");
 
         return sb.toString();
     }
@@ -901,8 +920,7 @@ private String stringifyAdditionalData() {
     }
 
     /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
+     * Convert the given object to string with each line indented by 4 spaces (except the first line).
      */
     private String toIndentedString(Object o) {
         if (o == null) {