Merge pull request #144 from intuit/IPP-17608

add CCD to paymentModeEnum - increment version

Author: fjolin-intuit

ipp-v3-java-data/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.intuit.quickbooks-online</groupId>
 		<artifactId>ipp-v3-java-devkit-pom</artifactId>
-		<version>6.0.9</version>
+		<version>6.0.10</version>
 	</parent>
 
 	<artifactId>ipp-v3-java-data</artifactId>

ipp-v3-java-devkit/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>ipp-v3-java-devkit-pom</artifactId>
         <groupId>com.intuit.quickbooks-online</groupId>
-        <version>6.0.9</version>
+        <version>6.0.10</version>
     </parent>
 
 	<artifactId>ipp-v3-java-devkit</artifactId>

ipp-v3-java-devkit/src/main/resources/ippdevkit.properties

@@ -2,7 +2,7 @@
 
 ## Devkit Version
 # This version has to be updated according to the pom version
-version = 6.0.9
+version = 6.0.10
 
 # This is to have the request source to be sent to IDS request header
 request.source = V3JavaSDK

ipp-v3-java-devkit/src/test/resources/ippdevkit.properties

@@ -1,7 +1,7 @@
 ### IPP Dev Kit helper properties
 
 ## Devkit version
-version = 6.0.9
+version = 6.0.10
 
 # This is to have the request source to be sent to IDS request header
 request.source = V3JavaSDK

oauth2-platform-api/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <artifactId>ipp-v3-java-devkit-pom</artifactId>
     <groupId>com.intuit.quickbooks-online</groupId>
-    <version>6.0.9</version>
+    <version>6.0.10</version>
   </parent>
   <artifactId>oauth2-platform-api</artifactId>
   <name>Quickbooks API Helper for OAuth2</name>

oauth2-platform-api/src/main/resources/oauthclient.properties

@@ -34,7 +34,7 @@ EMAIL=email
 INTUIT_NAME=intuit_name
 
 #Version
-version=6.0.9
+version=6.0.10
 
 #MIGRATION SERVICE URL
 OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate

oauth2-platform-api/src/test/resources/oauthclient.properties

@@ -34,7 +34,7 @@ EMAIL=email
 INTUIT_NAME=intuit_name
 
 #Version
-version=6.0.9
+version=6.0.10
 
 #MIGRATION SERVICE URL
 OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate

payments-api/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <artifactId>ipp-v3-java-devkit-pom</artifactId>
     <groupId>com.intuit.quickbooks-online</groupId>
-    <version>6.0.9</version>
+    <version>6.0.10</version>
   </parent>
   <artifactId>payments-api</artifactId>
   <name>Payments API SDK</name>

payments-api/src/main/java/com/intuit/payment/data/ECheck.java

@@ -38,7 +38,7 @@ public class ECheck extends Entity {
 
 	public enum ECheckStatus {
 		PENDING, SUCCEEDED, DECLINED, VOIDED, REFUNDED
-	};
+	}
 
 	private BigDecimal amount = null;
 	private BankAccount bankAccount = null;
@@ -48,8 +48,8 @@ public enum ECheckStatus {
 	private PaymentModeType paymentMode = null;
 
 	public enum PaymentModeType {
-		WEB
-	};
+		WEB, CCD
+	}
 
 	private String description = null;
 	private String checkNumber = null;

payments-api/src/main/java/com/intuit/payment/util/JsonUtil.java

@@ -20,6 +20,7 @@
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import org.slf4j.Logger;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -51,6 +52,7 @@ public class JsonUtil {
 		mapper.setDateFormat(dateFormat);
 		mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
 		mapper.setSerializationInclusion(Include.NON_NULL);
+		mapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
 	}
 
 	/**