Merge pull request #22 from intuit/develop

merge v2.9.6 to master

Author: diana-derose

ipp-java-qbapihelper/pom.xml

@@ -21,10 +21,10 @@
     <parent>
         <artifactId>ipp-v3-java-devkit-pom</artifactId>
         <groupId>com.intuit.quickbooks-online</groupId>
-        <version>2.9.5</version>
+        <version>2.9.6</version>
     </parent>
   <artifactId>ipp-java-qbapihelper</artifactId>
-  <version>2.9.5</version>
+  <version>2.9.6</version>
   <packaging>jar</packaging>
   <name>Quickbooks API Helper for Oauth</name>
   <description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>

ipp-v3-java-data/pom.xml

@@ -4,13 +4,13 @@
 	<parent>
 		<groupId>com.intuit.quickbooks-online</groupId>
 		<artifactId>ipp-v3-java-devkit-pom</artifactId>
-		<version>2.9.5</version>
+		<version>2.9.6</version>
 	</parent>
 
 	<artifactId>ipp-v3-java-data</artifactId>
 	<name>IPP V3 Java - Data Project</name>
 	<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
-    <version>2.9.5</version>
+    <version>2.9.6</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -78,7 +78,7 @@
 			    </executions>
 			</plugin> -->
 			<!-- commented to avoid regeneration of entities, as the same is not required everytime	-->
-  			 <!--        
+  			<!--        
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>

ipp-v3-java-data/src/main/java/META-INF/sun-jaxb.episode

@@ -5,7 +5,7 @@
 This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 Any modifications to this file will be lost upon recompilation of the source schema. 
-Generated on: 2017.06.06 at 02:08:21 PM PDT 
+Generated on: 2017.07.10 at 10:56:50 AM PDT 
 
   -->
   <bindings scd="x-schema::tns" xmlns:tns="http://schema.intuit.com/finance/v3">
@@ -516,12 +516,12 @@ Generated on: 2017.06.06 at 02:08:21 PM PDT
     <bindings scd="~tns:DiscountOverride">
       <class ref="com.intuit.ipp.data.DiscountOverride"/>
     </bindings>
-    <bindings scd="~tns:GroupLineDetail">
-      <class ref="com.intuit.ipp.data.GroupLineDetail"/>
-    </bindings>
     <bindings scd="~tns:Column">
       <class ref="com.intuit.ipp.data.Column"/>
     </bindings>
+    <bindings scd="~tns:GroupLineDetail">
+      <class ref="com.intuit.ipp.data.GroupLineDetail"/>
+    </bindings>
     <bindings scd="~tns:TemplateName">
       <class ref="com.intuit.ipp.data.TemplateName"/>
     </bindings>
@@ -720,12 +720,12 @@ Generated on: 2017.06.06 at 02:08:21 PM PDT
     <bindings scd="~tns:FaultTypeEnum">
       <typesafeEnumClass ref="com.intuit.ipp.data.FaultTypeEnum"/>
     </bindings>
-    <bindings scd="~tns:ETransactionStatusEnum">
-      <typesafeEnumClass ref="com.intuit.ipp.data.ETransactionStatusEnum"/>
-    </bindings>
     <bindings scd="~tns:RowTypeEnum">
       <typesafeEnumClass ref="com.intuit.ipp.data.RowTypeEnum"/>
     </bindings>
+    <bindings scd="~tns:ETransactionStatusEnum">
+      <typesafeEnumClass ref="com.intuit.ipp.data.ETransactionStatusEnum"/>
+    </bindings>
     <bindings scd="~tns:PhysicalAddressTypeEnum">
       <typesafeEnumClass ref="com.intuit.ipp.data.PhysicalAddressTypeEnum"/>
     </bindings>

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //
 
 

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //
 
 
@@ -29,10 +29,10 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import org.jvnet.jaxb2_commons.lang.Equals;
-import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
-import org.jvnet.jaxb2_commons.lang.HashCode;
-import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.Equals2;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
+import org.jvnet.jaxb2_commons.lang.HashCode2;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy2;
 import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
 import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
 import org.jvnet.jaxb2_commons.locator.ObjectLocator;
@@ -84,8 +84,7 @@
     "taxInclusiveAmt",
     "expenseDetailLineDetailEx"
 })
-public class AccountBasedExpenseLineDetail
-    implements Serializable, Equals, HashCode
+public class AccountBasedExpenseLineDetail implements Serializable, Equals2, HashCode2
 {
 
     private final static long serialVersionUID = 1L;
@@ -324,8 +323,8 @@ public void setExpenseDetailLineDetailEx(IntuitAnyType value) {
         this.expenseDetailLineDetailEx = value;
     }
 
-    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
-        if (!(object instanceof AccountBasedExpenseLineDetail)) {
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) {
+        if ((object == null)||(this.getClass()!= object.getClass())) {
             return false;
         }
         if (this == object) {
@@ -337,7 +336,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsCustomerRef = this.getCustomerRef();
             ReferenceType rhsCustomerRef;
             rhsCustomerRef = that.getCustomerRef();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "customerRef", lhsCustomerRef), LocatorUtils.property(thatLocator, "customerRef", rhsCustomerRef), lhsCustomerRef, rhsCustomerRef)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "customerRef", lhsCustomerRef), LocatorUtils.property(thatLocator, "customerRef", rhsCustomerRef), lhsCustomerRef, rhsCustomerRef, (this.customerRef!= null), (that.customerRef!= null))) {
                 return false;
             }
         }
@@ -346,7 +345,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsClassRef = this.getClassRef();
             ReferenceType rhsClassRef;
             rhsClassRef = that.getClassRef();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "classRef", lhsClassRef), LocatorUtils.property(thatLocator, "classRef", rhsClassRef), lhsClassRef, rhsClassRef)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "classRef", lhsClassRef), LocatorUtils.property(thatLocator, "classRef", rhsClassRef), lhsClassRef, rhsClassRef, (this.classRef!= null), (that.classRef!= null))) {
                 return false;
             }
         }
@@ -355,7 +354,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsAccountRef = this.getAccountRef();
             ReferenceType rhsAccountRef;
             rhsAccountRef = that.getAccountRef();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "accountRef", lhsAccountRef), LocatorUtils.property(thatLocator, "accountRef", rhsAccountRef), lhsAccountRef, rhsAccountRef)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "accountRef", lhsAccountRef), LocatorUtils.property(thatLocator, "accountRef", rhsAccountRef), lhsAccountRef, rhsAccountRef, (this.accountRef!= null), (that.accountRef!= null))) {
                 return false;
             }
         }
@@ -364,7 +363,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsBillableStatus = this.getBillableStatus();
             BillableStatusEnum rhsBillableStatus;
             rhsBillableStatus = that.getBillableStatus();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "billableStatus", lhsBillableStatus), LocatorUtils.property(thatLocator, "billableStatus", rhsBillableStatus), lhsBillableStatus, rhsBillableStatus)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "billableStatus", lhsBillableStatus), LocatorUtils.property(thatLocator, "billableStatus", rhsBillableStatus), lhsBillableStatus, rhsBillableStatus, (this.billableStatus!= null), (that.billableStatus!= null))) {
                 return false;
             }
         }
@@ -373,7 +372,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsMarkupInfo = this.getMarkupInfo();
             MarkupInfo rhsMarkupInfo;
             rhsMarkupInfo = that.getMarkupInfo();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "markupInfo", lhsMarkupInfo), LocatorUtils.property(thatLocator, "markupInfo", rhsMarkupInfo), lhsMarkupInfo, rhsMarkupInfo)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "markupInfo", lhsMarkupInfo), LocatorUtils.property(thatLocator, "markupInfo", rhsMarkupInfo), lhsMarkupInfo, rhsMarkupInfo, (this.markupInfo!= null), (that.markupInfo!= null))) {
                 return false;
             }
         }
@@ -382,7 +381,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsTaxAmount = this.getTaxAmount();
             BigDecimal rhsTaxAmount;
             rhsTaxAmount = that.getTaxAmount();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAmount", lhsTaxAmount), LocatorUtils.property(thatLocator, "taxAmount", rhsTaxAmount), lhsTaxAmount, rhsTaxAmount)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAmount", lhsTaxAmount), LocatorUtils.property(thatLocator, "taxAmount", rhsTaxAmount), lhsTaxAmount, rhsTaxAmount, (this.taxAmount!= null), (that.taxAmount!= null))) {
                 return false;
             }
         }
@@ -391,7 +390,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsTaxCodeRef = this.getTaxCodeRef();
             ReferenceType rhsTaxCodeRef;
             rhsTaxCodeRef = that.getTaxCodeRef();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeRef", lhsTaxCodeRef), LocatorUtils.property(thatLocator, "taxCodeRef", rhsTaxCodeRef), lhsTaxCodeRef, rhsTaxCodeRef)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeRef", lhsTaxCodeRef), LocatorUtils.property(thatLocator, "taxCodeRef", rhsTaxCodeRef), lhsTaxCodeRef, rhsTaxCodeRef, (this.taxCodeRef!= null), (that.taxCodeRef!= null))) {
                 return false;
             }
         }
@@ -400,7 +399,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsTaxInclusiveAmt = this.getTaxInclusiveAmt();
             BigDecimal rhsTaxInclusiveAmt;
             rhsTaxInclusiveAmt = that.getTaxInclusiveAmt();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxInclusiveAmt", lhsTaxInclusiveAmt), LocatorUtils.property(thatLocator, "taxInclusiveAmt", rhsTaxInclusiveAmt), lhsTaxInclusiveAmt, rhsTaxInclusiveAmt)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "taxInclusiveAmt", lhsTaxInclusiveAmt), LocatorUtils.property(thatLocator, "taxInclusiveAmt", rhsTaxInclusiveAmt), lhsTaxInclusiveAmt, rhsTaxInclusiveAmt, (this.taxInclusiveAmt!= null), (that.taxInclusiveAmt!= null))) {
                 return false;
             }
         }
@@ -409,70 +408,70 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje
             lhsExpenseDetailLineDetailEx = this.getExpenseDetailLineDetailEx();
             IntuitAnyType rhsExpenseDetailLineDetailEx;
             rhsExpenseDetailLineDetailEx = that.getExpenseDetailLineDetailEx();
-            if (!strategy.equals(LocatorUtils.property(thisLocator, "expenseDetailLineDetailEx", lhsExpenseDetailLineDetailEx), LocatorUtils.property(thatLocator, "expenseDetailLineDetailEx", rhsExpenseDetailLineDetailEx), lhsExpenseDetailLineDetailEx, rhsExpenseDetailLineDetailEx)) {
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "expenseDetailLineDetailEx", lhsExpenseDetailLineDetailEx), LocatorUtils.property(thatLocator, "expenseDetailLineDetailEx", rhsExpenseDetailLineDetailEx), lhsExpenseDetailLineDetailEx, rhsExpenseDetailLineDetailEx, (this.expenseDetailLineDetailEx!= null), (that.expenseDetailLineDetailEx!= null))) {
                 return false;
             }
         }
         return true;
     }
 
     public boolean equals(Object object) {
-        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        final EqualsStrategy2 strategy = JAXBEqualsStrategy.INSTANCE;
         return equals(null, null, object, strategy);
     }
 
-    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+    public int hashCode(ObjectLocator locator, HashCodeStrategy2 strategy) {
         int currentHashCode = 1;
         {
             ReferenceType theCustomerRef;
             theCustomerRef = this.getCustomerRef();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerRef", theCustomerRef), currentHashCode, theCustomerRef);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerRef", theCustomerRef), currentHashCode, theCustomerRef, (this.customerRef!= null));
         }
         {
             ReferenceType theClassRef;
             theClassRef = this.getClassRef();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classRef", theClassRef), currentHashCode, theClassRef);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classRef", theClassRef), currentHashCode, theClassRef, (this.classRef!= null));
         }
         {
             ReferenceType theAccountRef;
             theAccountRef = this.getAccountRef();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountRef", theAccountRef), currentHashCode, theAccountRef);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountRef", theAccountRef), currentHashCode, theAccountRef, (this.accountRef!= null));
         }
         {
             BillableStatusEnum theBillableStatus;
             theBillableStatus = this.getBillableStatus();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableStatus", theBillableStatus), currentHashCode, theBillableStatus);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableStatus", theBillableStatus), currentHashCode, theBillableStatus, (this.billableStatus!= null));
         }
         {
             MarkupInfo theMarkupInfo;
             theMarkupInfo = this.getMarkupInfo();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markupInfo", theMarkupInfo), currentHashCode, theMarkupInfo);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markupInfo", theMarkupInfo), currentHashCode, theMarkupInfo, (this.markupInfo!= null));
         }
         {
             BigDecimal theTaxAmount;
             theTaxAmount = this.getTaxAmount();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAmount", theTaxAmount), currentHashCode, theTaxAmount);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAmount", theTaxAmount), currentHashCode, theTaxAmount, (this.taxAmount!= null));
         }
         {
             ReferenceType theTaxCodeRef;
             theTaxCodeRef = this.getTaxCodeRef();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeRef", theTaxCodeRef), currentHashCode, theTaxCodeRef);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeRef", theTaxCodeRef), currentHashCode, theTaxCodeRef, (this.taxCodeRef!= null));
         }
         {
             BigDecimal theTaxInclusiveAmt;
             theTaxInclusiveAmt = this.getTaxInclusiveAmt();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxInclusiveAmt", theTaxInclusiveAmt), currentHashCode, theTaxInclusiveAmt);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxInclusiveAmt", theTaxInclusiveAmt), currentHashCode, theTaxInclusiveAmt, (this.taxInclusiveAmt!= null));
         }
         {
             IntuitAnyType theExpenseDetailLineDetailEx;
             theExpenseDetailLineDetailEx = this.getExpenseDetailLineDetailEx();
-            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expenseDetailLineDetailEx", theExpenseDetailLineDetailEx), currentHashCode, theExpenseDetailLineDetailEx);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expenseDetailLineDetailEx", theExpenseDetailLineDetailEx), currentHashCode, theExpenseDetailLineDetailEx, (this.expenseDetailLineDetailEx!= null));
         }
         return currentHashCode;
     }
 
     public int hashCode() {
-        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE;
         return this.hashCode(null, strategy);
     }
 

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //
 
 

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //
 
 

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //
 
 

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java

@@ -17,7 +17,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.06.06 at 02:08:21 PM PDT 
+// Generated on: 2017.07.10 at 10:56:50 AM PDT 
 //