Updated Java project to use MDES Digital Enablement 1.2.9 and OpenAPI Generator 4.1.0 (Part 2)

Author: jaaufauvre

.gitignore

@@ -16,4 +16,13 @@
 **/obj
 **/bin
 **/*.nuget.cache
-**/*.nuget.props
+**/*.nuget.props
+
+#
+# Java
+#
+**/.travis.yml
+**/.idea
+**/target
+**/.gradle
+**/build

…rg/openapitools/client/ApiException.java …ital_enablement_client/ApiException.javajava/src/main/java/org/openapitools/client/ApiException.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/ApiException.java java/src/main/java/org/openapitools/client/ApiException.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/ApiException.java

@@ -1,8 +1,8 @@
 /*
  * MDES for Merchants
- * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously.  
+ * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously. <br> __Authentication__ Mastercard uses OAuth 1.0a with body hash extension for authenticating the API clients. This requires every request that you send to  Mastercard to be signed with an RSA private key. A private-public RSA key pair must be generated consisting of: <br> 1 . A private key for the OAuth signature for API requests. It is recommended to keep the private key in a password-protected or hardware keystore. <br> 2. A public key is shared with Mastercard during the project setup process through either a certificate signing request (CSR) or the API Key Generator. Mastercard will use the public key to verify the OAuth signature that is provided on every API call.<br>  An OAUTH1.0a signer library is available on [GitHub](https://github.com/Mastercard/oauth1-signer-java) <br>  __Encryption__<br>  All communications between Issuer web service and the Mastercard gateway is encrypted using TLS. <br> __Additional Encryption of Sensitive Data__ In addition to the OAuth authentication, when using MDES Digital Enablement Service, any PCI sensitive and all account holder Personally Identifiable Information (PII) data must be encrypted. This requirement applies to the API fields containing encryptedData. Sensitive data is encrypted using a symmetric session (one-time-use) key. The symmetric session key is then wrapped with an RSA Public Key supplied by Mastercard during API setup phase (the Customer Encryption Key). <br>  Java Client Encryption Library available on [GitHub](https://github.com/Mastercard/client-encryption-java) 
  *
- * The version of the OpenAPI document: 1.2.7
+ * The version of the OpenAPI document: 1.2.9
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -11,12 +11,12 @@
  */
 
 
-package org.openapitools.client;
+package com.mastercard.developer.mdes_digital_enablement_client;
 
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-07-25T13:48:59.971+02:00[Europe/Rome]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-08-16T09:54:27.990+01:00[Europe/London]")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;

java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/Configuration.java

@@ -0,0 +1,39 @@
+/*
+ * MDES for Merchants
+ * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously. <br> __Authentication__ Mastercard uses OAuth 1.0a with body hash extension for authenticating the API clients. This requires every request that you send to  Mastercard to be signed with an RSA private key. A private-public RSA key pair must be generated consisting of: <br> 1 . A private key for the OAuth signature for API requests. It is recommended to keep the private key in a password-protected or hardware keystore. <br> 2. A public key is shared with Mastercard during the project setup process through either a certificate signing request (CSR) or the API Key Generator. Mastercard will use the public key to verify the OAuth signature that is provided on every API call.<br>  An OAUTH1.0a signer library is available on [GitHub](https://github.com/Mastercard/oauth1-signer-java) <br>  __Encryption__<br>  All communications between Issuer web service and the Mastercard gateway is encrypted using TLS. <br> __Additional Encryption of Sensitive Data__ In addition to the OAuth authentication, when using MDES Digital Enablement Service, any PCI sensitive and all account holder Personally Identifiable Information (PII) data must be encrypted. This requirement applies to the API fields containing encryptedData. Sensitive data is encrypted using a symmetric session (one-time-use) key. The symmetric session key is then wrapped with an RSA Public Key supplied by Mastercard during API setup phase (the Customer Encryption Key). <br>  Java Client Encryption Library available on [GitHub](https://github.com/Mastercard/client-encryption-java) 
+ *
+ * The version of the OpenAPI document: 1.2.9
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package com.mastercard.developer.mdes_digital_enablement_client;
+
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-08-16T09:54:27.990+01:00[Europe/London]")
+public class Configuration {
+    private static ApiClient defaultApiClient = new ApiClient();
+
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
+
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
+}

…openapitools/client/auth/ApiKeyAuth.java …l_enablement_client/auth/ApiKeyAuth.javajava/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/auth/ApiKeyAuth.java java/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/auth/ApiKeyAuth.java

@@ -1,8 +1,8 @@
 /*
  * MDES for Merchants
- * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously.  
+ * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously. <br> __Authentication__ Mastercard uses OAuth 1.0a with body hash extension for authenticating the API clients. This requires every request that you send to  Mastercard to be signed with an RSA private key. A private-public RSA key pair must be generated consisting of: <br> 1 . A private key for the OAuth signature for API requests. It is recommended to keep the private key in a password-protected or hardware keystore. <br> 2. A public key is shared with Mastercard during the project setup process through either a certificate signing request (CSR) or the API Key Generator. Mastercard will use the public key to verify the OAuth signature that is provided on every API call.<br>  An OAUTH1.0a signer library is available on [GitHub](https://github.com/Mastercard/oauth1-signer-java) <br>  __Encryption__<br>  All communications between Issuer web service and the Mastercard gateway is encrypted using TLS. <br> __Additional Encryption of Sensitive Data__ In addition to the OAuth authentication, when using MDES Digital Enablement Service, any PCI sensitive and all account holder Personally Identifiable Information (PII) data must be encrypted. This requirement applies to the API fields containing encryptedData. Sensitive data is encrypted using a symmetric session (one-time-use) key. The symmetric session key is then wrapped with an RSA Public Key supplied by Mastercard during API setup phase (the Customer Encryption Key). <br>  Java Client Encryption Library available on [GitHub](https://github.com/Mastercard/client-encryption-java) 
  *
- * The version of the OpenAPI document: 1.2.7
+ * The version of the OpenAPI document: 1.2.9
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -11,14 +11,14 @@
  */
 
 
-package org.openapitools.client.auth;
+package com.mastercard.developer.mdes_digital_enablement_client.auth;
 
-import org.openapitools.client.Pair;
+import com.mastercard.developer.mdes_digital_enablement_client.Pair;
 
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-07-25T13:48:59.971+02:00[Europe/Rome]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-08-16T09:54:27.990+01:00[Europe/London]")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

…apitools/client/auth/HttpBearerAuth.java …ablement_client/auth/HttpBearerAuth.javajava/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/auth/HttpBearerAuth.java java/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/auth/HttpBearerAuth.java

@@ -1,8 +1,8 @@
 /*
  * MDES for Merchants
- * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously.  
+ * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously. <br> __Authentication__ Mastercard uses OAuth 1.0a with body hash extension for authenticating the API clients. This requires every request that you send to  Mastercard to be signed with an RSA private key. A private-public RSA key pair must be generated consisting of: <br> 1 . A private key for the OAuth signature for API requests. It is recommended to keep the private key in a password-protected or hardware keystore. <br> 2. A public key is shared with Mastercard during the project setup process through either a certificate signing request (CSR) or the API Key Generator. Mastercard will use the public key to verify the OAuth signature that is provided on every API call.<br>  An OAUTH1.0a signer library is available on [GitHub](https://github.com/Mastercard/oauth1-signer-java) <br>  __Encryption__<br>  All communications between Issuer web service and the Mastercard gateway is encrypted using TLS. <br> __Additional Encryption of Sensitive Data__ In addition to the OAuth authentication, when using MDES Digital Enablement Service, any PCI sensitive and all account holder Personally Identifiable Information (PII) data must be encrypted. This requirement applies to the API fields containing encryptedData. Sensitive data is encrypted using a symmetric session (one-time-use) key. The symmetric session key is then wrapped with an RSA Public Key supplied by Mastercard during API setup phase (the Customer Encryption Key). <br>  Java Client Encryption Library available on [GitHub](https://github.com/Mastercard/client-encryption-java) 
  *
- * The version of the OpenAPI document: 1.2.7
+ * The version of the OpenAPI document: 1.2.9
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -11,14 +11,14 @@
  */
 
 
-package org.openapitools.client.auth;
+package com.mastercard.developer.mdes_digital_enablement_client.auth;
 
-import org.openapitools.client.Pair;
+import com.mastercard.developer.mdes_digital_enablement_client.Pair;
 
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-07-25T13:48:59.971+02:00[Europe/Rome]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-08-16T09:54:27.990+01:00[Europe/London]")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;

…ools/client/model/AccountHolderData.java …ment_client/model/AccountHolderData.javajava/src/main/java/org/openapitools/client/model/AccountHolderData.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/model/AccountHolderData.java java/src/main/java/org/openapitools/client/model/AccountHolderData.java renamed to java/src/main/java/com/mastercard/developer/mdes_digital_enablement_client/model/AccountHolderData.java

@@ -2,7 +2,7 @@
  * MDES for Merchants
  * The MDES APIs are designed as RPC style stateless web services where each API endpoint represents an operation to be performed.  All request and response payloads are sent in the JSON (JavaScript Object Notation) data-interchange format. Each endpoint in the API specifies the HTTP Method used to access it. All strings in request and response objects are to be UTF-8 encoded.  Each API URI includes the major and minor version of API that it conforms to.  This will allow multiple concurrent versions of the API to be deployed simultaneously. <br> __Authentication__ Mastercard uses OAuth 1.0a with body hash extension for authenticating the API clients. This requires every request that you send to  Mastercard to be signed with an RSA private key. A private-public RSA key pair must be generated consisting of: <br> 1 . A private key for the OAuth signature for API requests. It is recommended to keep the private key in a password-protected or hardware keystore. <br> 2. A public key is shared with Mastercard during the project setup process through either a certificate signing request (CSR) or the API Key Generator. Mastercard will use the public key to verify the OAuth signature that is provided on every API call.<br>  An OAUTH1.0a signer library is available on [GitHub](https://github.com/Mastercard/oauth1-signer-java) <br>  __Encryption__<br>  All communications between Issuer web service and the Mastercard gateway is encrypted using TLS. <br> __Additional Encryption of Sensitive Data__ In addition to the OAuth authentication, when using MDES Digital Enablement Service, any PCI sensitive and all account holder Personally Identifiable Information (PII) data must be encrypted. This requirement applies to the API fields containing encryptedData. Sensitive data is encrypted using a symmetric session (one-time-use) key. The symmetric session key is then wrapped with an RSA Public Key supplied by Mastercard during API setup phase (the Customer Encryption Key). <br>  Java Client Encryption Library available on [GitHub](https://github.com/Mastercard/client-encryption-java) 
  *
- * The version of the OpenAPI document: 1.2.8
+ * The version of the OpenAPI document: 1.2.9
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -11,7 +11,7 @@
  */
 
 
-package org.openapitools.client.model;
+package com.mastercard.developer.mdes_digital_enablement_client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
@@ -20,16 +20,16 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.mastercard.developer.mdes_digital_enablement_client.model.BillingAddress;
+import com.mastercard.developer.mdes_digital_enablement_client.model.PhoneNumber;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
-import org.openapitools.client.model.BillingAddress;
-import org.openapitools.client.model.PhoneNumber;
 
 /**
  * AccountHolderData
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-07-25T13:46:03.255+02:00[Europe/Rome]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-08-16T09:54:27.990+01:00[Europe/London]")
 public class AccountHolderData {
   public static final String SERIALIZED_NAME_ACCOUNT_HOLDER_NAME = "accountHolderName";
   @SerializedName(SERIALIZED_NAME_ACCOUNT_HOLDER_NAME)
@@ -57,10 +57,11 @@ public AccountHolderData accountHolderName(String accountHolderName) {
   }
 
    /**
-   * __(OPTIONAL)__ The name of the cardholder&lt;br&gt; __Max Length:27__ 
+   * __(OPTIONAL)__ The name of the cardholder in the format LASTNAME/FIRSTNAME or FIRSTNAME LASTNAME&lt;br&gt; __Max Length:27__ 
    * @return accountHolderName
   **/
-  @ApiModelProperty(value = "__(OPTIONAL)__ The name of the cardholder<br> __Max Length:27__ ")
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "__(OPTIONAL)__ The name of the cardholder in the format LASTNAME/FIRSTNAME or FIRSTNAME LASTNAME<br> __Max Length:27__ ")
   public String getAccountHolderName() {
     return accountHolderName;
   }
@@ -78,6 +79,7 @@ public AccountHolderData accountHolderAddress(BillingAddress accountHolderAddres
    * Get accountHolderAddress
    * @return accountHolderAddress
   **/
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BillingAddress getAccountHolderAddress() {
     return accountHolderAddress;
@@ -96,6 +98,7 @@ public AccountHolderData consumerIdentifier(String consumerIdentifier) {
    * __(OPTIONAL)__ Customer Identifier that may be required in some regions.&lt;br&gt; __Max Length:88__ 
    * @return consumerIdentifier
   **/
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "__(OPTIONAL)__ Customer Identifier that may be required in some regions.<br> __Max Length:88__ ")
   public String getConsumerIdentifier() {
     return consumerIdentifier;
@@ -114,6 +117,7 @@ public AccountHolderData accountHolderEmailAddress(String accountHolderEmailAddr
    * __(OPTIONAL)__ The e-mail address of the Account Holder&lt;br&gt; __Max Length: 320__ 
    * @return accountHolderEmailAddress
   **/
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "__(OPTIONAL)__ The e-mail address of the Account Holder<br> __Max Length: 320__ ")
   public String getAccountHolderEmailAddress() {
     return accountHolderEmailAddress;
@@ -132,6 +136,7 @@ public AccountHolderData accountHolderMobilePhoneNumber(PhoneNumber accountHolde
    * Get accountHolderMobilePhoneNumber
    * @return accountHolderMobilePhoneNumber
   **/
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public PhoneNumber getAccountHolderMobilePhoneNumber() {
     return accountHolderMobilePhoneNumber;