Merge pull request #135 from intuit/error-handling-updates

Error handling updates

Author: shweta-intuitdev

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.5</version>
+		<version>6.0.6</version>
 	</parent>
 
 	<artifactId>ipp-v3-java-data</artifactId>
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
+		<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
 	</properties>
 
 	<dependencies>

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.5</version>
+        <version>6.0.6</version>
     </parent>
 
 	<artifactId>ipp-v3-java-devkit</artifactId>
@@ -15,14 +15,14 @@
 	<properties>
 		<sonar.langauge>java</sonar.langauge>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
+		<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.intuit.quickbooks-online</groupId>
 			<artifactId>ipp-v3-java-data</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6</version>
 		</dependency>
         <dependency>
             <groupId>cglib</groupId>

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java

@@ -310,7 +310,7 @@ private <T extends IEntity> String prepareQBOUri(String entityName, Context cont
 
 		if(context.getMinorVersion() == null)
 		{
-		context.setMinorVersion("51");
+			context.setMinorVersion(Config.getProperty(Config.LATEST_MINOR_VERSION));
 		}
 
 		uri.append("minorversion").append("=").append(context.getMinorVersion()).append("&");

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/Config.java

@@ -184,6 +184,8 @@ public final class Config {
     public static final String BIGDECIMAL_SCALE_SHIFT = "feature.bigDecimalScaleShift";
 
     public static final String WEBHOOKS_VERIFIER_TOKEN = "webhooks.verifier.token";
+
+    public static final String LATEST_MINOR_VERSION = "minorVersion.latestMinorVersion";
 
 	/**
 	 * variable ThreadLocal

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/util/MessageUtils.java

@@ -108,6 +108,7 @@ public static List<Object> getWhitelistedEnums() {
 				enumList.add(FaultTypeEnum.class);
 				enumList.add(Gender.class);
 				enumList.add(GlobalTaxCalculationEnum.class);
+				enumList.add(GTMConfigTypeEnum.class);
 				enumList.add(IdDomainEnum.class);
 				enumList.add(ItemCategoryTypeEnum.class);
 				enumList.add(ItemTypeEnum.class);

ipp-v3-java-devkit/src/main/resources/intuit-default-config.xml

@@ -45,4 +45,9 @@
 		<connectionTimeout></connectionTimeout>
 		<requestTimeout></requestTimeout>
 	</timeout>
+
+	<minorVersion>
+		<latestMinorVersion>51</latestMinorVersion>
+	</minorVersion>
+
 </intuit-config>

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.5
+version = 6.0.6
 
 # This is to have the request source to be sent to IDS request header
 request.source = V3JavaSDK

ipp-v3-java-devkit/src/test/java/com/intuit/ipp/interceptors/PrepareRequestInterceptorTest.java

@@ -59,7 +59,8 @@ public void setUp() throws FMSException {
     public void testExecute_QBO_URI() throws FMSException  {
         instance.execute(message);
         String actual = message.getRequestElements().getRequestParameters().get("uri");
-        Assert.assertEquals(actual, Config.getProperty(Config.BASE_URL_QBO) + "/fakeRealm/fakeAction?requestid=anyRequestID&minorversion=51&");
+        String minorVersion = Config.getProperty(Config.LATEST_MINOR_VERSION);
+        Assert.assertEquals(actual, Config.getProperty(Config.BASE_URL_QBO) + "/fakeRealm/fakeAction?requestid=anyRequestID&minorversion="+minorVersion+"&");
      }
 
     @Test

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

@@ -1,7 +1,7 @@
 ### IPP Dev Kit helper properties
 
 ## Devkit version
-version = 6.0.5
+version = 6.0.6
 
 # 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.5</version>
+    <version>6.0.6</version>
   </parent>
   <artifactId>oauth2-platform-api</artifactId>
   <name>Quickbooks API Helper for OAuth2</name>