diff --git a/ipp-java-qbapihelper/pom.xml b/ipp-java-qbapihelper/pom.xml index 5d2eaf9b..fc474bd1 100644 --- a/ipp-java-qbapihelper/pom.xml +++ b/ipp-java-qbapihelper/pom.xml @@ -21,10 +21,10 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 2.9.5 + 2.9.6 ipp-java-qbapihelper - 2.9.5 + 2.9.6 jar Quickbooks API Helper for Oauth Quickbooks API Helper Project for OAuth, Disconnect and Reconnect diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml index 04a83e36..1a7c7c0d 100755 --- a/ipp-v3-java-data/pom.xml +++ b/ipp-v3-java-data/pom.xml @@ -4,13 +4,13 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.5 + 2.9.6 ipp-v3-java-data IPP V3 Java - Data Project IPP Java V3 DevKit Data project - FMS Entities generation - 2.9.5 + 2.9.6 UTF-8 @@ -78,7 +78,7 @@ --> - @@ -516,12 +516,12 @@ Generated on: 2017.06.06 at 02:08:21 PM PDT - - - + + + @@ -720,12 +720,12 @@ Generated on: 2017.06.06 at 02:08:21 PM PDT - - - + + + diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java index ae5db69d..b0fdc3b9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java +++ b/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 http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java index 28353081..909e3e0e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java +++ b/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 http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -127,7 +127,7 @@ }) public class Account extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -784,8 +784,8 @@ public void setAccountEx(IntuitAnyType value) { this.accountEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Account)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -800,7 +800,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -809,7 +809,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubAccount = this.isSubAccount(); Boolean rhsSubAccount; rhsSubAccount = that.isSubAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subAccount", lhsSubAccount), LocatorUtils.property(thatLocator, "subAccount", rhsSubAccount), lhsSubAccount, rhsSubAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subAccount", lhsSubAccount), LocatorUtils.property(thatLocator, "subAccount", rhsSubAccount), lhsSubAccount, rhsSubAccount, (this.subAccount!= null), (that.subAccount!= null))) { return false; } } @@ -818,7 +818,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -827,7 +827,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -836,7 +836,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -845,7 +845,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountAlias = this.getAccountAlias(); String rhsAccountAlias; rhsAccountAlias = that.getAccountAlias(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountAlias", lhsAccountAlias), LocatorUtils.property(thatLocator, "accountAlias", rhsAccountAlias), lhsAccountAlias, rhsAccountAlias)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountAlias", lhsAccountAlias), LocatorUtils.property(thatLocator, "accountAlias", rhsAccountAlias), lhsAccountAlias, rhsAccountAlias, (this.accountAlias!= null), (that.accountAlias!= null))) { return false; } } @@ -854,7 +854,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnLocationType = this.getTxnLocationType(); String rhsTxnLocationType; rhsTxnLocationType = that.getTxnLocationType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnLocationType", lhsTxnLocationType), LocatorUtils.property(thatLocator, "txnLocationType", rhsTxnLocationType), lhsTxnLocationType, rhsTxnLocationType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnLocationType", lhsTxnLocationType), LocatorUtils.property(thatLocator, "txnLocationType", rhsTxnLocationType), lhsTxnLocationType, rhsTxnLocationType, (this.txnLocationType!= null), (that.txnLocationType!= null))) { return false; } } @@ -863,7 +863,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -872,7 +872,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClassification = this.getClassification(); AccountClassificationEnum rhsClassification; rhsClassification = that.getClassification(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "classification", lhsClassification), LocatorUtils.property(thatLocator, "classification", rhsClassification), lhsClassification, rhsClassification)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "classification", lhsClassification), LocatorUtils.property(thatLocator, "classification", rhsClassification), lhsClassification, rhsClassification, (this.classification!= null), (that.classification!= null))) { return false; } } @@ -881,7 +881,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountType = this.getAccountType(); AccountTypeEnum rhsAccountType; rhsAccountType = that.getAccountType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountType", lhsAccountType), LocatorUtils.property(thatLocator, "accountType", rhsAccountType), lhsAccountType, rhsAccountType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountType", lhsAccountType), LocatorUtils.property(thatLocator, "accountType", rhsAccountType), lhsAccountType, rhsAccountType, (this.accountType!= null), (that.accountType!= null))) { return false; } } @@ -890,7 +890,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountSubType = this.getAccountSubType(); String rhsAccountSubType; rhsAccountSubType = that.getAccountSubType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountSubType", lhsAccountSubType), LocatorUtils.property(thatLocator, "accountSubType", rhsAccountSubType), lhsAccountSubType, rhsAccountSubType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountSubType", lhsAccountSubType), LocatorUtils.property(thatLocator, "accountSubType", rhsAccountSubType), lhsAccountSubType, rhsAccountSubType, (this.accountSubType!= null), (that.accountSubType!= null))) { return false; } } @@ -899,7 +899,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNum = this.getAcctNum(); String rhsAcctNum; rhsAcctNum = that.getAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum, (this.acctNum!= null), (that.acctNum!= null))) { return false; } } @@ -908,7 +908,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNumExtn = this.getAcctNumExtn(); String rhsAcctNumExtn; rhsAcctNumExtn = that.getAcctNumExtn(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNumExtn", lhsAcctNumExtn), LocatorUtils.property(thatLocator, "acctNumExtn", rhsAcctNumExtn), lhsAcctNumExtn, rhsAcctNumExtn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNumExtn", lhsAcctNumExtn), LocatorUtils.property(thatLocator, "acctNumExtn", rhsAcctNumExtn), lhsAcctNumExtn, rhsAcctNumExtn, (this.acctNumExtn!= null), (that.acctNumExtn!= null))) { return false; } } @@ -917,7 +917,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBankNum = this.getBankNum(); String rhsBankNum; rhsBankNum = that.getBankNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bankNum", lhsBankNum), LocatorUtils.property(thatLocator, "bankNum", rhsBankNum), lhsBankNum, rhsBankNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bankNum", lhsBankNum), LocatorUtils.property(thatLocator, "bankNum", rhsBankNum), lhsBankNum, rhsBankNum, (this.bankNum!= null), (that.bankNum!= null))) { return false; } } @@ -926,7 +926,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOpeningBalance = this.getOpeningBalance(); BigDecimal rhsOpeningBalance; rhsOpeningBalance = that.getOpeningBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "openingBalance", lhsOpeningBalance), LocatorUtils.property(thatLocator, "openingBalance", rhsOpeningBalance), lhsOpeningBalance, rhsOpeningBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "openingBalance", lhsOpeningBalance), LocatorUtils.property(thatLocator, "openingBalance", rhsOpeningBalance), lhsOpeningBalance, rhsOpeningBalance, (this.openingBalance!= null), (that.openingBalance!= null))) { return false; } } @@ -935,7 +935,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOpeningBalanceDate = this.getOpeningBalanceDate(); Date rhsOpeningBalanceDate; rhsOpeningBalanceDate = that.getOpeningBalanceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "openingBalanceDate", lhsOpeningBalanceDate), LocatorUtils.property(thatLocator, "openingBalanceDate", rhsOpeningBalanceDate), lhsOpeningBalanceDate, rhsOpeningBalanceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "openingBalanceDate", lhsOpeningBalanceDate), LocatorUtils.property(thatLocator, "openingBalanceDate", rhsOpeningBalanceDate), lhsOpeningBalanceDate, rhsOpeningBalanceDate, (this.openingBalanceDate!= null), (that.openingBalanceDate!= null))) { return false; } } @@ -944,7 +944,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrentBalance = this.getCurrentBalance(); BigDecimal rhsCurrentBalance; rhsCurrentBalance = that.getCurrentBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currentBalance", lhsCurrentBalance), LocatorUtils.property(thatLocator, "currentBalance", rhsCurrentBalance), lhsCurrentBalance, rhsCurrentBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currentBalance", lhsCurrentBalance), LocatorUtils.property(thatLocator, "currentBalance", rhsCurrentBalance), lhsCurrentBalance, rhsCurrentBalance, (this.currentBalance!= null), (that.currentBalance!= null))) { return false; } } @@ -953,7 +953,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrentBalanceWithSubAccounts = this.getCurrentBalanceWithSubAccounts(); BigDecimal rhsCurrentBalanceWithSubAccounts; rhsCurrentBalanceWithSubAccounts = that.getCurrentBalanceWithSubAccounts(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currentBalanceWithSubAccounts", lhsCurrentBalanceWithSubAccounts), LocatorUtils.property(thatLocator, "currentBalanceWithSubAccounts", rhsCurrentBalanceWithSubAccounts), lhsCurrentBalanceWithSubAccounts, rhsCurrentBalanceWithSubAccounts)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currentBalanceWithSubAccounts", lhsCurrentBalanceWithSubAccounts), LocatorUtils.property(thatLocator, "currentBalanceWithSubAccounts", rhsCurrentBalanceWithSubAccounts), lhsCurrentBalanceWithSubAccounts, rhsCurrentBalanceWithSubAccounts, (this.currentBalanceWithSubAccounts!= null), (that.currentBalanceWithSubAccounts!= null))) { return false; } } @@ -962,7 +962,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyRef = this.getCurrencyRef(); ReferenceType rhsCurrencyRef; rhsCurrencyRef = that.getCurrencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef, (this.currencyRef!= null), (that.currencyRef!= null))) { return false; } } @@ -971,7 +971,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxAccount = this.isTaxAccount(); Boolean rhsTaxAccount; rhsTaxAccount = that.isTaxAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAccount", lhsTaxAccount), LocatorUtils.property(thatLocator, "taxAccount", rhsTaxAccount), lhsTaxAccount, rhsTaxAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAccount", lhsTaxAccount), LocatorUtils.property(thatLocator, "taxAccount", rhsTaxAccount), lhsTaxAccount, rhsTaxAccount, (this.taxAccount!= null), (that.taxAccount!= null))) { return false; } } @@ -980,7 +980,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; } } @@ -989,7 +989,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOnlineBankingEnabled = this.isOnlineBankingEnabled(); Boolean rhsOnlineBankingEnabled; rhsOnlineBankingEnabled = that.isOnlineBankingEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineBankingEnabled", lhsOnlineBankingEnabled), LocatorUtils.property(thatLocator, "onlineBankingEnabled", rhsOnlineBankingEnabled), lhsOnlineBankingEnabled, rhsOnlineBankingEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineBankingEnabled", lhsOnlineBankingEnabled), LocatorUtils.property(thatLocator, "onlineBankingEnabled", rhsOnlineBankingEnabled), lhsOnlineBankingEnabled, rhsOnlineBankingEnabled, (this.onlineBankingEnabled!= null), (that.onlineBankingEnabled!= null))) { return false; } } @@ -998,7 +998,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFIName = this.getFIName(); String rhsFIName; rhsFIName = that.getFIName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fiName", lhsFIName), LocatorUtils.property(thatLocator, "fiName", rhsFIName), lhsFIName, rhsFIName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fiName", lhsFIName), LocatorUtils.property(thatLocator, "fiName", rhsFIName), lhsFIName, rhsFIName, (this.fiName!= null), (that.fiName!= null))) { return false; } } @@ -1007,7 +1007,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalCodeRef = this.getJournalCodeRef(); ReferenceType rhsJournalCodeRef; rhsJournalCodeRef = that.getJournalCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeRef", lhsJournalCodeRef), LocatorUtils.property(thatLocator, "journalCodeRef", rhsJournalCodeRef), lhsJournalCodeRef, rhsJournalCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeRef", lhsJournalCodeRef), LocatorUtils.property(thatLocator, "journalCodeRef", rhsJournalCodeRef), lhsJournalCodeRef, rhsJournalCodeRef, (this.journalCodeRef!= null), (that.journalCodeRef!= null))) { return false; } } @@ -1016,7 +1016,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountEx = this.getAccountEx(); IntuitAnyType rhsAccountEx; rhsAccountEx = that.getAccountEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountEx", lhsAccountEx), LocatorUtils.property(thatLocator, "accountEx", rhsAccountEx), lhsAccountEx, rhsAccountEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountEx", lhsAccountEx), LocatorUtils.property(thatLocator, "accountEx", rhsAccountEx), lhsAccountEx, rhsAccountEx, (this.accountEx!= null), (that.accountEx!= null))) { return false; } } @@ -1024,142 +1024,142 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theSubAccount; theSubAccount = this.isSubAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subAccount", theSubAccount), currentHashCode, theSubAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subAccount", theSubAccount), currentHashCode, theSubAccount, (this.subAccount!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { String theAccountAlias; theAccountAlias = this.getAccountAlias(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountAlias", theAccountAlias), currentHashCode, theAccountAlias); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountAlias", theAccountAlias), currentHashCode, theAccountAlias, (this.accountAlias!= null)); } { String theTxnLocationType; theTxnLocationType = this.getTxnLocationType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnLocationType", theTxnLocationType), currentHashCode, theTxnLocationType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnLocationType", theTxnLocationType), currentHashCode, theTxnLocationType, (this.txnLocationType!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { AccountClassificationEnum theClassification; theClassification = this.getClassification(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classification", theClassification), currentHashCode, theClassification); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classification", theClassification), currentHashCode, theClassification, (this.classification!= null)); } { AccountTypeEnum theAccountType; theAccountType = this.getAccountType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountType", theAccountType), currentHashCode, theAccountType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountType", theAccountType), currentHashCode, theAccountType, (this.accountType!= null)); } { String theAccountSubType; theAccountSubType = this.getAccountSubType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountSubType", theAccountSubType), currentHashCode, theAccountSubType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountSubType", theAccountSubType), currentHashCode, theAccountSubType, (this.accountSubType!= null)); } { String theAcctNum; theAcctNum = this.getAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum, (this.acctNum!= null)); } { String theAcctNumExtn; theAcctNumExtn = this.getAcctNumExtn(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNumExtn", theAcctNumExtn), currentHashCode, theAcctNumExtn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNumExtn", theAcctNumExtn), currentHashCode, theAcctNumExtn, (this.acctNumExtn!= null)); } { String theBankNum; theBankNum = this.getBankNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankNum", theBankNum), currentHashCode, theBankNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankNum", theBankNum), currentHashCode, theBankNum, (this.bankNum!= null)); } { BigDecimal theOpeningBalance; theOpeningBalance = this.getOpeningBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openingBalance", theOpeningBalance), currentHashCode, theOpeningBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openingBalance", theOpeningBalance), currentHashCode, theOpeningBalance, (this.openingBalance!= null)); } { Date theOpeningBalanceDate; theOpeningBalanceDate = this.getOpeningBalanceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openingBalanceDate", theOpeningBalanceDate), currentHashCode, theOpeningBalanceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openingBalanceDate", theOpeningBalanceDate), currentHashCode, theOpeningBalanceDate, (this.openingBalanceDate!= null)); } { BigDecimal theCurrentBalance; theCurrentBalance = this.getCurrentBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currentBalance", theCurrentBalance), currentHashCode, theCurrentBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currentBalance", theCurrentBalance), currentHashCode, theCurrentBalance, (this.currentBalance!= null)); } { BigDecimal theCurrentBalanceWithSubAccounts; theCurrentBalanceWithSubAccounts = this.getCurrentBalanceWithSubAccounts(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currentBalanceWithSubAccounts", theCurrentBalanceWithSubAccounts), currentHashCode, theCurrentBalanceWithSubAccounts); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currentBalanceWithSubAccounts", theCurrentBalanceWithSubAccounts), currentHashCode, theCurrentBalanceWithSubAccounts, (this.currentBalanceWithSubAccounts!= null)); } { ReferenceType theCurrencyRef; theCurrencyRef = this.getCurrencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef, (this.currencyRef!= null)); } { Boolean theTaxAccount; theTaxAccount = this.isTaxAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAccount", theTaxAccount), currentHashCode, theTaxAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAccount", theTaxAccount), currentHashCode, theTaxAccount, (this.taxAccount!= 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)); } { Boolean theOnlineBankingEnabled; theOnlineBankingEnabled = this.isOnlineBankingEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineBankingEnabled", theOnlineBankingEnabled), currentHashCode, theOnlineBankingEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineBankingEnabled", theOnlineBankingEnabled), currentHashCode, theOnlineBankingEnabled, (this.onlineBankingEnabled!= null)); } { String theFIName; theFIName = this.getFIName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiName", theFIName), currentHashCode, theFIName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiName", theFIName), currentHashCode, theFIName, (this.fiName!= null)); } { ReferenceType theJournalCodeRef; theJournalCodeRef = this.getJournalCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeRef", theJournalCodeRef), currentHashCode, theJournalCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeRef", theJournalCodeRef), currentHashCode, theJournalCodeRef, (this.journalCodeRef!= null)); } { IntuitAnyType theAccountEx; theAccountEx = this.getAccountEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountEx", theAccountEx), currentHashCode, theAccountEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountEx", theAccountEx), currentHashCode, theAccountEx, (this.accountEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java index 17afcfe8..4a257457 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java +++ b/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 http://java.sun.com/xml/jaxb // 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,7 +408,7 @@ 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; } } @@ -417,62 +416,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java index 5bb4e691..89a1bdfc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java +++ b/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 http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java index 39c90079..187ee6e7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java +++ b/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 http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java index 5c665d77..4899e538 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java +++ b/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 http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java index 6411df78..dfd63338 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java index ceacdc61..e2148cf2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -90,8 +90,7 @@ "rowShelfBinEnabled", "barcodeEnabled" }) -public class AdvancedInventoryPrefs - implements Serializable, Equals, HashCode +public class AdvancedInventoryPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -410,8 +409,8 @@ public void setBarcodeEnabled(Boolean value) { this.barcodeEnabled = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof AdvancedInventoryPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -423,7 +422,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMLIAvailable = this.isMLIAvailable(); Boolean rhsMLIAvailable; rhsMLIAvailable = that.isMLIAvailable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "mliAvailable", lhsMLIAvailable), LocatorUtils.property(thatLocator, "mliAvailable", rhsMLIAvailable), lhsMLIAvailable, rhsMLIAvailable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "mliAvailable", lhsMLIAvailable), LocatorUtils.property(thatLocator, "mliAvailable", rhsMLIAvailable), lhsMLIAvailable, rhsMLIAvailable, (this.mliAvailable!= null), (that.mliAvailable!= null))) { return false; } } @@ -432,7 +431,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMLIEnabled = this.isMLIEnabled(); Boolean rhsMLIEnabled; rhsMLIEnabled = that.isMLIEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "mliEnabled", lhsMLIEnabled), LocatorUtils.property(thatLocator, "mliEnabled", rhsMLIEnabled), lhsMLIEnabled, rhsMLIEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "mliEnabled", lhsMLIEnabled), LocatorUtils.property(thatLocator, "mliEnabled", rhsMLIEnabled), lhsMLIEnabled, rhsMLIEnabled, (this.mliEnabled!= null), (that.mliEnabled!= null))) { return false; } } @@ -441,7 +440,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEnhancedInventoryReceivingEnabled = this.isEnhancedInventoryReceivingEnabled(); Boolean rhsEnhancedInventoryReceivingEnabled; rhsEnhancedInventoryReceivingEnabled = that.isEnhancedInventoryReceivingEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "enhancedInventoryReceivingEnabled", lhsEnhancedInventoryReceivingEnabled), LocatorUtils.property(thatLocator, "enhancedInventoryReceivingEnabled", rhsEnhancedInventoryReceivingEnabled), lhsEnhancedInventoryReceivingEnabled, rhsEnhancedInventoryReceivingEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "enhancedInventoryReceivingEnabled", lhsEnhancedInventoryReceivingEnabled), LocatorUtils.property(thatLocator, "enhancedInventoryReceivingEnabled", rhsEnhancedInventoryReceivingEnabled), lhsEnhancedInventoryReceivingEnabled, rhsEnhancedInventoryReceivingEnabled, (this.enhancedInventoryReceivingEnabled!= null), (that.enhancedInventoryReceivingEnabled!= null))) { return false; } } @@ -450,7 +449,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingSerialOrLotNumber = this.isTrackingSerialOrLotNumber(); Boolean rhsTrackingSerialOrLotNumber; rhsTrackingSerialOrLotNumber = that.isTrackingSerialOrLotNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingSerialOrLotNumber", lhsTrackingSerialOrLotNumber), LocatorUtils.property(thatLocator, "trackingSerialOrLotNumber", rhsTrackingSerialOrLotNumber), lhsTrackingSerialOrLotNumber, rhsTrackingSerialOrLotNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingSerialOrLotNumber", lhsTrackingSerialOrLotNumber), LocatorUtils.property(thatLocator, "trackingSerialOrLotNumber", rhsTrackingSerialOrLotNumber), lhsTrackingSerialOrLotNumber, rhsTrackingSerialOrLotNumber, (this.trackingSerialOrLotNumber!= null), (that.trackingSerialOrLotNumber!= null))) { return false; } } @@ -459,7 +458,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingOnSalesTransactionsEnabled = this.isTrackingOnSalesTransactionsEnabled(); Boolean rhsTrackingOnSalesTransactionsEnabled; rhsTrackingOnSalesTransactionsEnabled = that.isTrackingOnSalesTransactionsEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnSalesTransactionsEnabled", lhsTrackingOnSalesTransactionsEnabled), LocatorUtils.property(thatLocator, "trackingOnSalesTransactionsEnabled", rhsTrackingOnSalesTransactionsEnabled), lhsTrackingOnSalesTransactionsEnabled, rhsTrackingOnSalesTransactionsEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnSalesTransactionsEnabled", lhsTrackingOnSalesTransactionsEnabled), LocatorUtils.property(thatLocator, "trackingOnSalesTransactionsEnabled", rhsTrackingOnSalesTransactionsEnabled), lhsTrackingOnSalesTransactionsEnabled, rhsTrackingOnSalesTransactionsEnabled, (this.trackingOnSalesTransactionsEnabled!= null), (that.trackingOnSalesTransactionsEnabled!= null))) { return false; } } @@ -468,7 +467,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingOnPurchaseTransactionsEnabled = this.isTrackingOnPurchaseTransactionsEnabled(); Boolean rhsTrackingOnPurchaseTransactionsEnabled; rhsTrackingOnPurchaseTransactionsEnabled = that.isTrackingOnPurchaseTransactionsEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnPurchaseTransactionsEnabled", lhsTrackingOnPurchaseTransactionsEnabled), LocatorUtils.property(thatLocator, "trackingOnPurchaseTransactionsEnabled", rhsTrackingOnPurchaseTransactionsEnabled), lhsTrackingOnPurchaseTransactionsEnabled, rhsTrackingOnPurchaseTransactionsEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnPurchaseTransactionsEnabled", lhsTrackingOnPurchaseTransactionsEnabled), LocatorUtils.property(thatLocator, "trackingOnPurchaseTransactionsEnabled", rhsTrackingOnPurchaseTransactionsEnabled), lhsTrackingOnPurchaseTransactionsEnabled, rhsTrackingOnPurchaseTransactionsEnabled, (this.trackingOnPurchaseTransactionsEnabled!= null), (that.trackingOnPurchaseTransactionsEnabled!= null))) { return false; } } @@ -477,7 +476,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingOnInventoryAdjustmentEnabled = this.isTrackingOnInventoryAdjustmentEnabled(); Boolean rhsTrackingOnInventoryAdjustmentEnabled; rhsTrackingOnInventoryAdjustmentEnabled = that.isTrackingOnInventoryAdjustmentEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnInventoryAdjustmentEnabled", lhsTrackingOnInventoryAdjustmentEnabled), LocatorUtils.property(thatLocator, "trackingOnInventoryAdjustmentEnabled", rhsTrackingOnInventoryAdjustmentEnabled), lhsTrackingOnInventoryAdjustmentEnabled, rhsTrackingOnInventoryAdjustmentEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnInventoryAdjustmentEnabled", lhsTrackingOnInventoryAdjustmentEnabled), LocatorUtils.property(thatLocator, "trackingOnInventoryAdjustmentEnabled", rhsTrackingOnInventoryAdjustmentEnabled), lhsTrackingOnInventoryAdjustmentEnabled, rhsTrackingOnInventoryAdjustmentEnabled, (this.trackingOnInventoryAdjustmentEnabled!= null), (that.trackingOnInventoryAdjustmentEnabled!= null))) { return false; } } @@ -486,7 +485,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingOnBuildAssemblyEnabled = this.isTrackingOnBuildAssemblyEnabled(); Boolean rhsTrackingOnBuildAssemblyEnabled; rhsTrackingOnBuildAssemblyEnabled = that.isTrackingOnBuildAssemblyEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnBuildAssemblyEnabled", lhsTrackingOnBuildAssemblyEnabled), LocatorUtils.property(thatLocator, "trackingOnBuildAssemblyEnabled", rhsTrackingOnBuildAssemblyEnabled), lhsTrackingOnBuildAssemblyEnabled, rhsTrackingOnBuildAssemblyEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingOnBuildAssemblyEnabled", lhsTrackingOnBuildAssemblyEnabled), LocatorUtils.property(thatLocator, "trackingOnBuildAssemblyEnabled", rhsTrackingOnBuildAssemblyEnabled), lhsTrackingOnBuildAssemblyEnabled, rhsTrackingOnBuildAssemblyEnabled, (this.trackingOnBuildAssemblyEnabled!= null), (that.trackingOnBuildAssemblyEnabled!= null))) { return false; } } @@ -495,7 +494,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFIFOEnabled = this.isFIFOEnabled(); Boolean rhsFIFOEnabled; rhsFIFOEnabled = that.isFIFOEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fifoEnabled", lhsFIFOEnabled), LocatorUtils.property(thatLocator, "fifoEnabled", rhsFIFOEnabled), lhsFIFOEnabled, rhsFIFOEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fifoEnabled", lhsFIFOEnabled), LocatorUtils.property(thatLocator, "fifoEnabled", rhsFIFOEnabled), lhsFIFOEnabled, rhsFIFOEnabled, (this.fifoEnabled!= null), (that.fifoEnabled!= null))) { return false; } } @@ -504,7 +503,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFIFOEffectiveDate = this.getFIFOEffectiveDate(); Date rhsFIFOEffectiveDate; rhsFIFOEffectiveDate = that.getFIFOEffectiveDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fifoEffectiveDate", lhsFIFOEffectiveDate), LocatorUtils.property(thatLocator, "fifoEffectiveDate", rhsFIFOEffectiveDate), lhsFIFOEffectiveDate, rhsFIFOEffectiveDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fifoEffectiveDate", lhsFIFOEffectiveDate), LocatorUtils.property(thatLocator, "fifoEffectiveDate", rhsFIFOEffectiveDate), lhsFIFOEffectiveDate, rhsFIFOEffectiveDate, (this.fifoEffectiveDate!= null), (that.fifoEffectiveDate!= null))) { return false; } } @@ -513,7 +512,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRowShelfBinEnabled = this.isRowShelfBinEnabled(); Boolean rhsRowShelfBinEnabled; rhsRowShelfBinEnabled = that.isRowShelfBinEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rowShelfBinEnabled", lhsRowShelfBinEnabled), LocatorUtils.property(thatLocator, "rowShelfBinEnabled", rhsRowShelfBinEnabled), lhsRowShelfBinEnabled, rhsRowShelfBinEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rowShelfBinEnabled", lhsRowShelfBinEnabled), LocatorUtils.property(thatLocator, "rowShelfBinEnabled", rhsRowShelfBinEnabled), lhsRowShelfBinEnabled, rhsRowShelfBinEnabled, (this.rowShelfBinEnabled!= null), (that.rowShelfBinEnabled!= null))) { return false; } } @@ -522,7 +521,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBarcodeEnabled = this.isBarcodeEnabled(); Boolean rhsBarcodeEnabled; rhsBarcodeEnabled = that.isBarcodeEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "barcodeEnabled", lhsBarcodeEnabled), LocatorUtils.property(thatLocator, "barcodeEnabled", rhsBarcodeEnabled), lhsBarcodeEnabled, rhsBarcodeEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "barcodeEnabled", lhsBarcodeEnabled), LocatorUtils.property(thatLocator, "barcodeEnabled", rhsBarcodeEnabled), lhsBarcodeEnabled, rhsBarcodeEnabled, (this.barcodeEnabled!= null), (that.barcodeEnabled!= null))) { return false; } } @@ -530,77 +529,77 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theMLIAvailable; theMLIAvailable = this.isMLIAvailable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mliAvailable", theMLIAvailable), currentHashCode, theMLIAvailable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mliAvailable", theMLIAvailable), currentHashCode, theMLIAvailable, (this.mliAvailable!= null)); } { Boolean theMLIEnabled; theMLIEnabled = this.isMLIEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mliEnabled", theMLIEnabled), currentHashCode, theMLIEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mliEnabled", theMLIEnabled), currentHashCode, theMLIEnabled, (this.mliEnabled!= null)); } { Boolean theEnhancedInventoryReceivingEnabled; theEnhancedInventoryReceivingEnabled = this.isEnhancedInventoryReceivingEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enhancedInventoryReceivingEnabled", theEnhancedInventoryReceivingEnabled), currentHashCode, theEnhancedInventoryReceivingEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enhancedInventoryReceivingEnabled", theEnhancedInventoryReceivingEnabled), currentHashCode, theEnhancedInventoryReceivingEnabled, (this.enhancedInventoryReceivingEnabled!= null)); } { Boolean theTrackingSerialOrLotNumber; theTrackingSerialOrLotNumber = this.isTrackingSerialOrLotNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingSerialOrLotNumber", theTrackingSerialOrLotNumber), currentHashCode, theTrackingSerialOrLotNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingSerialOrLotNumber", theTrackingSerialOrLotNumber), currentHashCode, theTrackingSerialOrLotNumber, (this.trackingSerialOrLotNumber!= null)); } { Boolean theTrackingOnSalesTransactionsEnabled; theTrackingOnSalesTransactionsEnabled = this.isTrackingOnSalesTransactionsEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnSalesTransactionsEnabled", theTrackingOnSalesTransactionsEnabled), currentHashCode, theTrackingOnSalesTransactionsEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnSalesTransactionsEnabled", theTrackingOnSalesTransactionsEnabled), currentHashCode, theTrackingOnSalesTransactionsEnabled, (this.trackingOnSalesTransactionsEnabled!= null)); } { Boolean theTrackingOnPurchaseTransactionsEnabled; theTrackingOnPurchaseTransactionsEnabled = this.isTrackingOnPurchaseTransactionsEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnPurchaseTransactionsEnabled", theTrackingOnPurchaseTransactionsEnabled), currentHashCode, theTrackingOnPurchaseTransactionsEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnPurchaseTransactionsEnabled", theTrackingOnPurchaseTransactionsEnabled), currentHashCode, theTrackingOnPurchaseTransactionsEnabled, (this.trackingOnPurchaseTransactionsEnabled!= null)); } { Boolean theTrackingOnInventoryAdjustmentEnabled; theTrackingOnInventoryAdjustmentEnabled = this.isTrackingOnInventoryAdjustmentEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnInventoryAdjustmentEnabled", theTrackingOnInventoryAdjustmentEnabled), currentHashCode, theTrackingOnInventoryAdjustmentEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnInventoryAdjustmentEnabled", theTrackingOnInventoryAdjustmentEnabled), currentHashCode, theTrackingOnInventoryAdjustmentEnabled, (this.trackingOnInventoryAdjustmentEnabled!= null)); } { Boolean theTrackingOnBuildAssemblyEnabled; theTrackingOnBuildAssemblyEnabled = this.isTrackingOnBuildAssemblyEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnBuildAssemblyEnabled", theTrackingOnBuildAssemblyEnabled), currentHashCode, theTrackingOnBuildAssemblyEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingOnBuildAssemblyEnabled", theTrackingOnBuildAssemblyEnabled), currentHashCode, theTrackingOnBuildAssemblyEnabled, (this.trackingOnBuildAssemblyEnabled!= null)); } { Boolean theFIFOEnabled; theFIFOEnabled = this.isFIFOEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fifoEnabled", theFIFOEnabled), currentHashCode, theFIFOEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fifoEnabled", theFIFOEnabled), currentHashCode, theFIFOEnabled, (this.fifoEnabled!= null)); } { Date theFIFOEffectiveDate; theFIFOEffectiveDate = this.getFIFOEffectiveDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fifoEffectiveDate", theFIFOEffectiveDate), currentHashCode, theFIFOEffectiveDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fifoEffectiveDate", theFIFOEffectiveDate), currentHashCode, theFIFOEffectiveDate, (this.fifoEffectiveDate!= null)); } { Boolean theRowShelfBinEnabled; theRowShelfBinEnabled = this.isRowShelfBinEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rowShelfBinEnabled", theRowShelfBinEnabled), currentHashCode, theRowShelfBinEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rowShelfBinEnabled", theRowShelfBinEnabled), currentHashCode, theRowShelfBinEnabled, (this.rowShelfBinEnabled!= null)); } { Boolean theBarcodeEnabled; theBarcodeEnabled = this.isBarcodeEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "barcodeEnabled", theBarcodeEnabled), currentHashCode, theBarcodeEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "barcodeEnabled", theBarcodeEnabled), currentHashCode, theBarcodeEnabled, (this.barcodeEnabled!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java index 2f2ab239..2a17ac69 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -95,7 +95,7 @@ }) public class Attachable extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -464,8 +464,8 @@ public void setAttachableEx(IntuitAnyType value) { this.attachableEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Attachable)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -480,7 +480,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFileName = this.getFileName(); String rhsFileName; rhsFileName = that.getFileName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fileName", lhsFileName), LocatorUtils.property(thatLocator, "fileName", rhsFileName), lhsFileName, rhsFileName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fileName", lhsFileName), LocatorUtils.property(thatLocator, "fileName", rhsFileName), lhsFileName, rhsFileName, (this.fileName!= null), (that.fileName!= null))) { return false; } } @@ -489,7 +489,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFileAccessUri = this.getFileAccessUri(); String rhsFileAccessUri; rhsFileAccessUri = that.getFileAccessUri(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fileAccessUri", lhsFileAccessUri), LocatorUtils.property(thatLocator, "fileAccessUri", rhsFileAccessUri), lhsFileAccessUri, rhsFileAccessUri)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fileAccessUri", lhsFileAccessUri), LocatorUtils.property(thatLocator, "fileAccessUri", rhsFileAccessUri), lhsFileAccessUri, rhsFileAccessUri, (this.fileAccessUri!= null), (that.fileAccessUri!= null))) { return false; } } @@ -498,7 +498,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTempDownloadUri = this.getTempDownloadUri(); String rhsTempDownloadUri; rhsTempDownloadUri = that.getTempDownloadUri(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tempDownloadUri", lhsTempDownloadUri), LocatorUtils.property(thatLocator, "tempDownloadUri", rhsTempDownloadUri), lhsTempDownloadUri, rhsTempDownloadUri)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tempDownloadUri", lhsTempDownloadUri), LocatorUtils.property(thatLocator, "tempDownloadUri", rhsTempDownloadUri), lhsTempDownloadUri, rhsTempDownloadUri, (this.tempDownloadUri!= null), (that.tempDownloadUri!= null))) { return false; } } @@ -507,7 +507,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSize = this.getSize(); Long rhsSize; rhsSize = that.getSize(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "size", lhsSize), LocatorUtils.property(thatLocator, "size", rhsSize), lhsSize, rhsSize)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "size", lhsSize), LocatorUtils.property(thatLocator, "size", rhsSize), lhsSize, rhsSize, (this.size!= null), (that.size!= null))) { return false; } } @@ -516,7 +516,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsContentType = this.getContentType(); String rhsContentType; rhsContentType = that.getContentType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "contentType", lhsContentType), LocatorUtils.property(thatLocator, "contentType", rhsContentType), lhsContentType, rhsContentType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "contentType", lhsContentType), LocatorUtils.property(thatLocator, "contentType", rhsContentType), lhsContentType, rhsContentType, (this.contentType!= null), (that.contentType!= null))) { return false; } } @@ -525,7 +525,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCategory = this.getCategory(); String rhsCategory; rhsCategory = that.getCategory(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "category", lhsCategory), LocatorUtils.property(thatLocator, "category", rhsCategory), lhsCategory, rhsCategory)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "category", lhsCategory), LocatorUtils.property(thatLocator, "category", rhsCategory), lhsCategory, rhsCategory, (this.category!= null), (that.category!= null))) { return false; } } @@ -534,7 +534,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLat = this.getLat(); String rhsLat; rhsLat = that.getLat(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lat", lhsLat), LocatorUtils.property(thatLocator, "lat", rhsLat), lhsLat, rhsLat)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lat", lhsLat), LocatorUtils.property(thatLocator, "lat", rhsLat), lhsLat, rhsLat, (this.lat!= null), (that.lat!= null))) { return false; } } @@ -543,7 +543,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLong = this.getLong(); String rhsLong; rhsLong = that.getLong(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_long", lhsLong), LocatorUtils.property(thatLocator, "_long", rhsLong), lhsLong, rhsLong)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_long", lhsLong), LocatorUtils.property(thatLocator, "_long", rhsLong), lhsLong, rhsLong, (this._long!= null), (that._long!= null))) { return false; } } @@ -552,7 +552,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPlaceName = this.getPlaceName(); String rhsPlaceName; rhsPlaceName = that.getPlaceName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "placeName", lhsPlaceName), LocatorUtils.property(thatLocator, "placeName", rhsPlaceName), lhsPlaceName, rhsPlaceName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "placeName", lhsPlaceName), LocatorUtils.property(thatLocator, "placeName", rhsPlaceName), lhsPlaceName, rhsPlaceName, (this.placeName!= null), (that.placeName!= null))) { return false; } } @@ -561,7 +561,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNote = this.getNote(); String rhsNote; rhsNote = that.getNote(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "note", lhsNote), LocatorUtils.property(thatLocator, "note", rhsNote), lhsNote, rhsNote)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "note", lhsNote), LocatorUtils.property(thatLocator, "note", rhsNote), lhsNote, rhsNote, (this.note!= null), (that.note!= null))) { return false; } } @@ -570,7 +570,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -579,7 +579,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsThumbnailFileAccessUri = this.getThumbnailFileAccessUri(); String rhsThumbnailFileAccessUri; rhsThumbnailFileAccessUri = that.getThumbnailFileAccessUri(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "thumbnailFileAccessUri", lhsThumbnailFileAccessUri), LocatorUtils.property(thatLocator, "thumbnailFileAccessUri", rhsThumbnailFileAccessUri), lhsThumbnailFileAccessUri, rhsThumbnailFileAccessUri)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "thumbnailFileAccessUri", lhsThumbnailFileAccessUri), LocatorUtils.property(thatLocator, "thumbnailFileAccessUri", rhsThumbnailFileAccessUri), lhsThumbnailFileAccessUri, rhsThumbnailFileAccessUri, (this.thumbnailFileAccessUri!= null), (that.thumbnailFileAccessUri!= null))) { return false; } } @@ -588,7 +588,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsThumbnailTempDownloadUri = this.getThumbnailTempDownloadUri(); String rhsThumbnailTempDownloadUri; rhsThumbnailTempDownloadUri = that.getThumbnailTempDownloadUri(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "thumbnailTempDownloadUri", lhsThumbnailTempDownloadUri), LocatorUtils.property(thatLocator, "thumbnailTempDownloadUri", rhsThumbnailTempDownloadUri), lhsThumbnailTempDownloadUri, rhsThumbnailTempDownloadUri)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "thumbnailTempDownloadUri", lhsThumbnailTempDownloadUri), LocatorUtils.property(thatLocator, "thumbnailTempDownloadUri", rhsThumbnailTempDownloadUri), lhsThumbnailTempDownloadUri, rhsThumbnailTempDownloadUri, (this.thumbnailTempDownloadUri!= null), (that.thumbnailTempDownloadUri!= null))) { return false; } } @@ -597,7 +597,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttachableEx = this.getAttachableEx(); IntuitAnyType rhsAttachableEx; rhsAttachableEx = that.getAttachableEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableEx", lhsAttachableEx), LocatorUtils.property(thatLocator, "attachableEx", rhsAttachableEx), lhsAttachableEx, rhsAttachableEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableEx", lhsAttachableEx), LocatorUtils.property(thatLocator, "attachableEx", rhsAttachableEx), lhsAttachableEx, rhsAttachableEx, (this.attachableEx!= null), (that.attachableEx!= null))) { return false; } } @@ -605,87 +605,87 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theFileName; theFileName = this.getFileName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileName", theFileName), currentHashCode, theFileName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileName", theFileName), currentHashCode, theFileName, (this.fileName!= null)); } { String theFileAccessUri; theFileAccessUri = this.getFileAccessUri(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileAccessUri", theFileAccessUri), currentHashCode, theFileAccessUri); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileAccessUri", theFileAccessUri), currentHashCode, theFileAccessUri, (this.fileAccessUri!= null)); } { String theTempDownloadUri; theTempDownloadUri = this.getTempDownloadUri(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tempDownloadUri", theTempDownloadUri), currentHashCode, theTempDownloadUri); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tempDownloadUri", theTempDownloadUri), currentHashCode, theTempDownloadUri, (this.tempDownloadUri!= null)); } { Long theSize; theSize = this.getSize(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "size", theSize), currentHashCode, theSize); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "size", theSize), currentHashCode, theSize, (this.size!= null)); } { String theContentType; theContentType = this.getContentType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contentType", theContentType), currentHashCode, theContentType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contentType", theContentType), currentHashCode, theContentType, (this.contentType!= null)); } { String theCategory; theCategory = this.getCategory(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "category", theCategory), currentHashCode, theCategory); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "category", theCategory), currentHashCode, theCategory, (this.category!= null)); } { String theLat; theLat = this.getLat(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lat", theLat), currentHashCode, theLat); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lat", theLat), currentHashCode, theLat, (this.lat!= null)); } { String theLong; theLong = this.getLong(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_long", theLong), currentHashCode, theLong); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_long", theLong), currentHashCode, theLong, (this._long!= null)); } { String thePlaceName; thePlaceName = this.getPlaceName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "placeName", thePlaceName), currentHashCode, thePlaceName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "placeName", thePlaceName), currentHashCode, thePlaceName, (this.placeName!= null)); } { String theNote; theNote = this.getNote(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "note", theNote), currentHashCode, theNote); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "note", theNote), currentHashCode, theNote, (this.note!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } { String theThumbnailFileAccessUri; theThumbnailFileAccessUri = this.getThumbnailFileAccessUri(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "thumbnailFileAccessUri", theThumbnailFileAccessUri), currentHashCode, theThumbnailFileAccessUri); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "thumbnailFileAccessUri", theThumbnailFileAccessUri), currentHashCode, theThumbnailFileAccessUri, (this.thumbnailFileAccessUri!= null)); } { String theThumbnailTempDownloadUri; theThumbnailTempDownloadUri = this.getThumbnailTempDownloadUri(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "thumbnailTempDownloadUri", theThumbnailTempDownloadUri), currentHashCode, theThumbnailTempDownloadUri); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "thumbnailTempDownloadUri", theThumbnailTempDownloadUri), currentHashCode, theThumbnailTempDownloadUri, (this.thumbnailTempDownloadUri!= null)); } { IntuitAnyType theAttachableEx; theAttachableEx = this.getAttachableEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableEx", theAttachableEx), currentHashCode, theAttachableEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableEx", theAttachableEx), currentHashCode, theAttachableEx, (this.attachableEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java index 44ae6123..777d3c10 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java index 5d2c5f65..74e6c17d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -76,8 +76,7 @@ "customField", "attachableRefEx" }) -public class AttachableRef - implements Serializable, Equals, HashCode +public class AttachableRef implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -229,8 +228,8 @@ public void setCustomField(List customField) { this.customField = customField; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof AttachableRef)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -242,7 +241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityRef = this.getEntityRef(); ReferenceType rhsEntityRef; rhsEntityRef = that.getEntityRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef, (this.entityRef!= null), (that.entityRef!= null))) { return false; } } @@ -251,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLineInfo = this.getLineInfo(); String rhsLineInfo; rhsLineInfo = that.getLineInfo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lineInfo", lhsLineInfo), LocatorUtils.property(thatLocator, "lineInfo", rhsLineInfo), lhsLineInfo, rhsLineInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lineInfo", lhsLineInfo), LocatorUtils.property(thatLocator, "lineInfo", rhsLineInfo), lhsLineInfo, rhsLineInfo, (this.lineInfo!= null), (that.lineInfo!= null))) { return false; } } @@ -260,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIncludeOnSend = this.isIncludeOnSend(); Boolean rhsIncludeOnSend; rhsIncludeOnSend = that.isIncludeOnSend(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "includeOnSend", lhsIncludeOnSend), LocatorUtils.property(thatLocator, "includeOnSend", rhsIncludeOnSend), lhsIncludeOnSend, rhsIncludeOnSend)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "includeOnSend", lhsIncludeOnSend), LocatorUtils.property(thatLocator, "includeOnSend", rhsIncludeOnSend), lhsIncludeOnSend, rhsIncludeOnSend, (this.includeOnSend!= null), (that.includeOnSend!= null))) { return false; } } @@ -269,7 +268,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); List rhsCustomField; rhsCustomField = (((that.customField!= null)&&(!that.customField.isEmpty()))?that.getCustomField():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField, ((this.customField!= null)&&(!this.customField.isEmpty())), ((that.customField!= null)&&(!that.customField.isEmpty())))) { return false; } } @@ -278,7 +277,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttachableRefEx = this.getAttachableRefEx(); IntuitAnyType rhsAttachableRefEx; rhsAttachableRefEx = that.getAttachableRefEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableRefEx", lhsAttachableRefEx), LocatorUtils.property(thatLocator, "attachableRefEx", rhsAttachableRefEx), lhsAttachableRefEx, rhsAttachableRefEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableRefEx", lhsAttachableRefEx), LocatorUtils.property(thatLocator, "attachableRefEx", rhsAttachableRefEx), lhsAttachableRefEx, rhsAttachableRefEx, (this.attachableRefEx!= null), (that.attachableRefEx!= null))) { return false; } } @@ -286,42 +285,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theEntityRef; theEntityRef = this.getEntityRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef, (this.entityRef!= null)); } { String theLineInfo; theLineInfo = this.getLineInfo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineInfo", theLineInfo), currentHashCode, theLineInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineInfo", theLineInfo), currentHashCode, theLineInfo, (this.lineInfo!= null)); } { Boolean theIncludeOnSend; theIncludeOnSend = this.isIncludeOnSend(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "includeOnSend", theIncludeOnSend), currentHashCode, theIncludeOnSend); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "includeOnSend", theIncludeOnSend), currentHashCode, theIncludeOnSend, (this.includeOnSend!= null)); } { List theCustomField; theCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField, ((this.customField!= null)&&(!this.customField.isEmpty()))); } { IntuitAnyType theAttachableRefEx; theAttachableRefEx = this.getAttachableRefEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableRefEx", theAttachableRefEx), currentHashCode, theAttachableRefEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableRefEx", theAttachableRefEx), currentHashCode, theAttachableRefEx, (this.attachableRefEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java index 7c5fdcec..3032fabc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -67,8 +67,7 @@ "attachable", "fault" }) -public class AttachableResponse - implements Serializable, Equals, HashCode +public class AttachableResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -125,8 +124,8 @@ public void setFault(Fault value) { this.fault = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof AttachableResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -138,7 +137,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttachable = this.getAttachable(); Attachable rhsAttachable; rhsAttachable = that.getAttachable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attachable", lhsAttachable), LocatorUtils.property(thatLocator, "attachable", rhsAttachable), lhsAttachable, rhsAttachable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attachable", lhsAttachable), LocatorUtils.property(thatLocator, "attachable", rhsAttachable), lhsAttachable, rhsAttachable, (this.attachable!= null), (that.attachable!= null))) { return false; } } @@ -147,7 +146,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -155,27 +154,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Attachable theAttachable; theAttachable = this.getAttachable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachable", theAttachable), currentHashCode, theAttachable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachable", theAttachable), currentHashCode, theAttachable, (this.attachable!= null)); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java index 7a8de6ba..f085f9b3 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -63,8 +63,7 @@ "type", "value" }) -public class Attribute - implements Serializable, Equals, HashCode +public class Attribute implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -121,8 +120,8 @@ public void setValue(String value) { this.value = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Attribute)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -134,7 +133,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -143,7 +142,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -151,27 +150,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java index 3d446276..407642c2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -63,8 +63,7 @@ @XmlType(name = "Attributes", propOrder = { "attribute" }) -public class Attributes - implements Serializable, Equals, HashCode +public class Attributes implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -112,8 +111,8 @@ public void setAttribute(List attribute) { this.attribute = attribute; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Attributes)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -125,7 +124,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttribute = (((this.attribute!= null)&&(!this.attribute.isEmpty()))?this.getAttribute():null); List rhsAttribute; rhsAttribute = (((that.attribute!= null)&&(!that.attribute.isEmpty()))?that.getAttribute():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attribute", lhsAttribute), LocatorUtils.property(thatLocator, "attribute", rhsAttribute), lhsAttribute, rhsAttribute)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attribute", lhsAttribute), LocatorUtils.property(thatLocator, "attribute", rhsAttribute), lhsAttribute, rhsAttribute, ((this.attribute!= null)&&(!this.attribute.isEmpty())), ((that.attribute!= null)&&(!that.attribute.isEmpty())))) { return false; } } @@ -133,22 +132,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theAttribute; theAttribute = (((this.attribute!= null)&&(!this.attribute.isEmpty()))?this.getAttribute():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attribute", theAttribute), currentHashCode, theAttribute); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attribute", theAttribute), currentHashCode, theAttribute, ((this.attribute!= null)&&(!this.attribute.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java index e41c0733..475c4401 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; 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; @@ -77,8 +77,7 @@ "reportQuery", "cdcQuery" }) -public class BatchItemRequest - implements Serializable, Equals, HashCode +public class BatchItemRequest implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -102,68 +101,68 @@ public class BatchItemRequest * * @return * possible object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public JAXBElement getIntuitObject() { @@ -175,68 +174,68 @@ public JAXBElement getIntuitObject() { * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public void setIntuitObject(JAXBElement value) { @@ -387,8 +386,8 @@ public void setOptionsData(String value) { this.optionsData = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BatchItemRequest)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -400,7 +399,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitObject = this.getIntuitObject(); JAXBElement rhsIntuitObject; rhsIntuitObject = that.getIntuitObject(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject, (this.intuitObject!= null), (that.intuitObject!= null))) { return false; } } @@ -409,7 +408,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQuery = this.getQuery(); String rhsQuery; rhsQuery = that.getQuery(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "query", lhsQuery), LocatorUtils.property(thatLocator, "query", rhsQuery), lhsQuery, rhsQuery)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "query", lhsQuery), LocatorUtils.property(thatLocator, "query", rhsQuery), lhsQuery, rhsQuery, (this.query!= null), (that.query!= null))) { return false; } } @@ -418,7 +417,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportQuery = this.getReportQuery(); String rhsReportQuery; rhsReportQuery = that.getReportQuery(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportQuery", lhsReportQuery), LocatorUtils.property(thatLocator, "reportQuery", rhsReportQuery), lhsReportQuery, rhsReportQuery)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportQuery", lhsReportQuery), LocatorUtils.property(thatLocator, "reportQuery", rhsReportQuery), lhsReportQuery, rhsReportQuery, (this.reportQuery!= null), (that.reportQuery!= null))) { return false; } } @@ -427,7 +426,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCDCQuery = this.getCDCQuery(); CDCQuery rhsCDCQuery; rhsCDCQuery = that.getCDCQuery(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcQuery", lhsCDCQuery), LocatorUtils.property(thatLocator, "cdcQuery", rhsCDCQuery), lhsCDCQuery, rhsCDCQuery)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcQuery", lhsCDCQuery), LocatorUtils.property(thatLocator, "cdcQuery", rhsCDCQuery), lhsCDCQuery, rhsCDCQuery, (this.cdcQuery!= null), (that.cdcQuery!= null))) { return false; } } @@ -436,7 +435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBId = this.getBId(); String rhsBId; rhsBId = that.getBId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bId", lhsBId), LocatorUtils.property(thatLocator, "bId", rhsBId), lhsBId, rhsBId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bId", lhsBId), LocatorUtils.property(thatLocator, "bId", rhsBId), lhsBId, rhsBId, (this.bId!= null), (that.bId!= null))) { return false; } } @@ -445,7 +444,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOperation = this.getOperation(); OperationEnum rhsOperation; rhsOperation = that.getOperation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "operation", lhsOperation), LocatorUtils.property(thatLocator, "operation", rhsOperation), lhsOperation, rhsOperation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "operation", lhsOperation), LocatorUtils.property(thatLocator, "operation", rhsOperation), lhsOperation, rhsOperation, (this.operation!= null), (that.operation!= null))) { return false; } } @@ -454,7 +453,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOptionsData = this.getOptionsData(); String rhsOptionsData; rhsOptionsData = that.getOptionsData(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "optionsData", lhsOptionsData), LocatorUtils.property(thatLocator, "optionsData", rhsOptionsData), lhsOptionsData, rhsOptionsData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "optionsData", lhsOptionsData), LocatorUtils.property(thatLocator, "optionsData", rhsOptionsData), lhsOptionsData, rhsOptionsData, (this.optionsData!= null), (that.optionsData!= null))) { return false; } } @@ -462,52 +461,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { JAXBElement theIntuitObject; theIntuitObject = this.getIntuitObject(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject, (this.intuitObject!= null)); } { String theQuery; theQuery = this.getQuery(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "query", theQuery), currentHashCode, theQuery); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "query", theQuery), currentHashCode, theQuery, (this.query!= null)); } { String theReportQuery; theReportQuery = this.getReportQuery(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportQuery", theReportQuery), currentHashCode, theReportQuery); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportQuery", theReportQuery), currentHashCode, theReportQuery, (this.reportQuery!= null)); } { CDCQuery theCDCQuery; theCDCQuery = this.getCDCQuery(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcQuery", theCDCQuery), currentHashCode, theCDCQuery); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcQuery", theCDCQuery), currentHashCode, theCDCQuery, (this.cdcQuery!= null)); } { String theBId; theBId = this.getBId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bId", theBId), currentHashCode, theBId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bId", theBId), currentHashCode, theBId, (this.bId!= null)); } { OperationEnum theOperation; theOperation = this.getOperation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "operation", theOperation), currentHashCode, theOperation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "operation", theOperation), currentHashCode, theOperation, (this.operation!= null)); } { String theOptionsData; theOptionsData = this.getOptionsData(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "optionsData", theOptionsData), currentHashCode, theOptionsData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "optionsData", theOptionsData), currentHashCode, theOptionsData, (this.optionsData!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java index 864c3803..75ee8e46 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; 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; @@ -81,8 +81,7 @@ "cdcResponse", "cascadeResponse" }) -public class BatchItemResponse - implements Serializable, Equals, HashCode +public class BatchItemResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -132,68 +131,68 @@ public void setWarnings(Warnings value) { * * @return * possible object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public JAXBElement getIntuitObject() { @@ -205,68 +204,68 @@ public JAXBElement getIntuitObject() { * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public void setIntuitObject(JAXBElement value) { @@ -417,8 +416,8 @@ public void setBId(String value) { this.bId = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BatchItemResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -430,7 +429,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWarnings = this.getWarnings(); Warnings rhsWarnings; rhsWarnings = that.getWarnings(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings, (this.warnings!= null), (that.warnings!= null))) { return false; } } @@ -439,7 +438,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitObject = this.getIntuitObject(); JAXBElement rhsIntuitObject; rhsIntuitObject = that.getIntuitObject(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject, (this.intuitObject!= null), (that.intuitObject!= null))) { return false; } } @@ -448,7 +447,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -457,7 +456,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReport = this.getReport(); Report rhsReport; rhsReport = that.getReport(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "report", lhsReport), LocatorUtils.property(thatLocator, "report", rhsReport), lhsReport, rhsReport)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "report", lhsReport), LocatorUtils.property(thatLocator, "report", rhsReport), lhsReport, rhsReport, (this.report!= null), (that.report!= null))) { return false; } } @@ -466,7 +465,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQueryResponse = this.getQueryResponse(); QueryResponse rhsQueryResponse; rhsQueryResponse = that.getQueryResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse, (this.queryResponse!= null), (that.queryResponse!= null))) { return false; } } @@ -475,7 +474,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCDCResponse = this.getCDCResponse(); CDCResponse rhsCDCResponse; rhsCDCResponse = that.getCDCResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcResponse", lhsCDCResponse), LocatorUtils.property(thatLocator, "cdcResponse", rhsCDCResponse), lhsCDCResponse, rhsCDCResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcResponse", lhsCDCResponse), LocatorUtils.property(thatLocator, "cdcResponse", rhsCDCResponse), lhsCDCResponse, rhsCDCResponse, (this.cdcResponse!= null), (that.cdcResponse!= null))) { return false; } } @@ -484,7 +483,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCascadeResponse = this.getCascadeResponse(); CascadeResponse rhsCascadeResponse; rhsCascadeResponse = that.getCascadeResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cascadeResponse", lhsCascadeResponse), LocatorUtils.property(thatLocator, "cascadeResponse", rhsCascadeResponse), lhsCascadeResponse, rhsCascadeResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cascadeResponse", lhsCascadeResponse), LocatorUtils.property(thatLocator, "cascadeResponse", rhsCascadeResponse), lhsCascadeResponse, rhsCascadeResponse, (this.cascadeResponse!= null), (that.cascadeResponse!= null))) { return false; } } @@ -493,7 +492,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBId = this.getBId(); String rhsBId; rhsBId = that.getBId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bId", lhsBId), LocatorUtils.property(thatLocator, "bId", rhsBId), lhsBId, rhsBId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bId", lhsBId), LocatorUtils.property(thatLocator, "bId", rhsBId), lhsBId, rhsBId, (this.bId!= null), (that.bId!= null))) { return false; } } @@ -501,57 +500,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Warnings theWarnings; theWarnings = this.getWarnings(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings, (this.warnings!= null)); } { JAXBElement theIntuitObject; theIntuitObject = this.getIntuitObject(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject, (this.intuitObject!= null)); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } { Report theReport; theReport = this.getReport(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "report", theReport), currentHashCode, theReport); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "report", theReport), currentHashCode, theReport, (this.report!= null)); } { QueryResponse theQueryResponse; theQueryResponse = this.getQueryResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse, (this.queryResponse!= null)); } { CDCResponse theCDCResponse; theCDCResponse = this.getCDCResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcResponse", theCDCResponse), currentHashCode, theCDCResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcResponse", theCDCResponse), currentHashCode, theCDCResponse, (this.cdcResponse!= null)); } { CascadeResponse theCascadeResponse; theCascadeResponse = this.getCascadeResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cascadeResponse", theCascadeResponse), currentHashCode, theCascadeResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cascadeResponse", theCascadeResponse), currentHashCode, theCascadeResponse, (this.cascadeResponse!= null)); } { String theBId; theBId = this.getBId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bId", theBId), currentHashCode, theBId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bId", theBId), currentHashCode, theBId, (this.bId!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java index e2542c53..cfc747b6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -86,7 +86,7 @@ }) public class Bill extends PurchaseByVendor - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -301,8 +301,8 @@ public void setBillEx(IntuitAnyType value) { this.billEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Bill)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -317,7 +317,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayerRef = this.getPayerRef(); ReferenceType rhsPayerRef; rhsPayerRef = that.getPayerRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payerRef", lhsPayerRef), LocatorUtils.property(thatLocator, "payerRef", rhsPayerRef), lhsPayerRef, rhsPayerRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payerRef", lhsPayerRef), LocatorUtils.property(thatLocator, "payerRef", rhsPayerRef), lhsPayerRef, rhsPayerRef, (this.payerRef!= null), (that.payerRef!= null))) { return false; } } @@ -326,7 +326,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTermRef = this.getSalesTermRef(); ReferenceType rhsSalesTermRef; rhsSalesTermRef = that.getSalesTermRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef, (this.salesTermRef!= null), (that.salesTermRef!= null))) { return false; } } @@ -335,7 +335,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -344,7 +344,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToAddr = this.getRemitToAddr(); PhysicalAddress rhsRemitToAddr; rhsRemitToAddr = that.getRemitToAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToAddr", lhsRemitToAddr), LocatorUtils.property(thatLocator, "remitToAddr", rhsRemitToAddr), lhsRemitToAddr, rhsRemitToAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToAddr", lhsRemitToAddr), LocatorUtils.property(thatLocator, "remitToAddr", rhsRemitToAddr), lhsRemitToAddr, rhsRemitToAddr, (this.remitToAddr!= null), (that.remitToAddr!= null))) { return false; } } @@ -353,7 +353,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -362,7 +362,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalance = this.getBalance(); BigDecimal rhsBalance; rhsBalance = that.getBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -371,7 +371,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeBalance = this.getHomeBalance(); BigDecimal rhsHomeBalance; rhsHomeBalance = that.getHomeBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance, (this.homeBalance!= null), (that.homeBalance!= null))) { return false; } } @@ -380,7 +380,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillEx = this.getBillEx(); IntuitAnyType rhsBillEx; rhsBillEx = that.getBillEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billEx", lhsBillEx), LocatorUtils.property(thatLocator, "billEx", rhsBillEx), lhsBillEx, rhsBillEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billEx", lhsBillEx), LocatorUtils.property(thatLocator, "billEx", rhsBillEx), lhsBillEx, rhsBillEx, (this.billEx!= null), (that.billEx!= null))) { return false; } } @@ -388,57 +388,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType thePayerRef; thePayerRef = this.getPayerRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payerRef", thePayerRef), currentHashCode, thePayerRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payerRef", thePayerRef), currentHashCode, thePayerRef, (this.payerRef!= null)); } { ReferenceType theSalesTermRef; theSalesTermRef = this.getSalesTermRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef, (this.salesTermRef!= null)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { PhysicalAddress theRemitToAddr; theRemitToAddr = this.getRemitToAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToAddr", theRemitToAddr), currentHashCode, theRemitToAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToAddr", theRemitToAddr), currentHashCode, theRemitToAddr, (this.remitToAddr!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { BigDecimal theBalance; theBalance = this.getBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } { BigDecimal theHomeBalance; theHomeBalance = this.getHomeBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance, (this.homeBalance!= null)); } { IntuitAnyType theBillEx; theBillEx = this.getBillEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEx", theBillEx), currentHashCode, theBillEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEx", theBillEx), currentHashCode, theBillEx, (this.billEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java index bc5bd71f..19b977f4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -82,7 +82,7 @@ }) public class BillPayment extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -269,8 +269,8 @@ public void setBillPaymentEx(IntuitAnyType value) { this.billPaymentEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BillPayment)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -285,7 +285,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorRef = this.getVendorRef(); ReferenceType rhsVendorRef; rhsVendorRef = that.getVendorRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef, (this.vendorRef!= null), (that.vendorRef!= null))) { return false; } } @@ -294,7 +294,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAPAccountRef = this.getAPAccountRef(); ReferenceType rhsAPAccountRef; rhsAPAccountRef = that.getAPAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef, (this.apAccountRef!= null), (that.apAccountRef!= null))) { return false; } } @@ -303,7 +303,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayType = this.getPayType(); BillPaymentTypeEnum rhsPayType; rhsPayType = that.getPayType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payType", lhsPayType), LocatorUtils.property(thatLocator, "payType", rhsPayType), lhsPayType, rhsPayType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payType", lhsPayType), LocatorUtils.property(thatLocator, "payType", rhsPayType), lhsPayType, rhsPayType, (this.payType!= null), (that.payType!= null))) { return false; } } @@ -312,7 +312,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckPayment = this.getCheckPayment(); BillPaymentCheck rhsCheckPayment; rhsCheckPayment = that.getCheckPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment, (this.checkPayment!= null), (that.checkPayment!= null))) { return false; } } @@ -321,7 +321,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditCardPayment = this.getCreditCardPayment(); BillPaymentCreditCard rhsCreditCardPayment; rhsCreditCardPayment = that.getCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment, (this.creditCardPayment!= null), (that.creditCardPayment!= null))) { return false; } } @@ -330,7 +330,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -339,7 +339,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillPaymentEx = this.getBillPaymentEx(); IntuitAnyType rhsBillPaymentEx; rhsBillPaymentEx = that.getBillPaymentEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentEx", lhsBillPaymentEx), LocatorUtils.property(thatLocator, "billPaymentEx", rhsBillPaymentEx), lhsBillPaymentEx, rhsBillPaymentEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentEx", lhsBillPaymentEx), LocatorUtils.property(thatLocator, "billPaymentEx", rhsBillPaymentEx), lhsBillPaymentEx, rhsBillPaymentEx, (this.billPaymentEx!= null), (that.billPaymentEx!= null))) { return false; } } @@ -347,52 +347,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theVendorRef; theVendorRef = this.getVendorRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef, (this.vendorRef!= null)); } { ReferenceType theAPAccountRef; theAPAccountRef = this.getAPAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef, (this.apAccountRef!= null)); } { BillPaymentTypeEnum thePayType; thePayType = this.getPayType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payType", thePayType), currentHashCode, thePayType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payType", thePayType), currentHashCode, thePayType, (this.payType!= null)); } { BillPaymentCheck theCheckPayment; theCheckPayment = this.getCheckPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment, (this.checkPayment!= null)); } { BillPaymentCreditCard theCreditCardPayment; theCreditCardPayment = this.getCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment, (this.creditCardPayment!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { IntuitAnyType theBillPaymentEx; theBillPaymentEx = this.getBillPaymentEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentEx", theBillPaymentEx), currentHashCode, theBillPaymentEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentEx", theBillPaymentEx), currentHashCode, theBillPaymentEx, (this.billPaymentEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java index 265f8356..919416a0 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -69,8 +69,7 @@ "payeeAddr", "billPaymentCheckEx" }) -public class BillPaymentCheck - implements Serializable, Equals, HashCode +public class BillPaymentCheck implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -205,8 +204,8 @@ public void setBillPaymentCheckEx(IntuitAnyType value) { this.billPaymentCheckEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BillPaymentCheck)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -218,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBankAccountRef = this.getBankAccountRef(); ReferenceType rhsBankAccountRef; rhsBankAccountRef = that.getBankAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bankAccountRef", lhsBankAccountRef), LocatorUtils.property(thatLocator, "bankAccountRef", rhsBankAccountRef), lhsBankAccountRef, rhsBankAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bankAccountRef", lhsBankAccountRef), LocatorUtils.property(thatLocator, "bankAccountRef", rhsBankAccountRef), lhsBankAccountRef, rhsBankAccountRef, (this.bankAccountRef!= null), (that.bankAccountRef!= null))) { return false; } } @@ -227,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintStatus = this.getPrintStatus(); PrintStatusEnum rhsPrintStatus; rhsPrintStatus = that.getPrintStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus, (this.printStatus!= null), (that.printStatus!= null))) { return false; } } @@ -236,7 +235,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckDetail = this.getCheckDetail(); CheckPayment rhsCheckDetail; rhsCheckDetail = that.getCheckDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkDetail", lhsCheckDetail), LocatorUtils.property(thatLocator, "checkDetail", rhsCheckDetail), lhsCheckDetail, rhsCheckDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkDetail", lhsCheckDetail), LocatorUtils.property(thatLocator, "checkDetail", rhsCheckDetail), lhsCheckDetail, rhsCheckDetail, (this.checkDetail!= null), (that.checkDetail!= null))) { return false; } } @@ -245,7 +244,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayeeAddr = this.getPayeeAddr(); PhysicalAddress rhsPayeeAddr; rhsPayeeAddr = that.getPayeeAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payeeAddr", lhsPayeeAddr), LocatorUtils.property(thatLocator, "payeeAddr", rhsPayeeAddr), lhsPayeeAddr, rhsPayeeAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payeeAddr", lhsPayeeAddr), LocatorUtils.property(thatLocator, "payeeAddr", rhsPayeeAddr), lhsPayeeAddr, rhsPayeeAddr, (this.payeeAddr!= null), (that.payeeAddr!= null))) { return false; } } @@ -254,7 +253,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillPaymentCheckEx = this.getBillPaymentCheckEx(); IntuitAnyType rhsBillPaymentCheckEx; rhsBillPaymentCheckEx = that.getBillPaymentCheckEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentCheckEx", lhsBillPaymentCheckEx), LocatorUtils.property(thatLocator, "billPaymentCheckEx", rhsBillPaymentCheckEx), lhsBillPaymentCheckEx, rhsBillPaymentCheckEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentCheckEx", lhsBillPaymentCheckEx), LocatorUtils.property(thatLocator, "billPaymentCheckEx", rhsBillPaymentCheckEx), lhsBillPaymentCheckEx, rhsBillPaymentCheckEx, (this.billPaymentCheckEx!= null), (that.billPaymentCheckEx!= null))) { return false; } } @@ -262,42 +261,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theBankAccountRef; theBankAccountRef = this.getBankAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankAccountRef", theBankAccountRef), currentHashCode, theBankAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankAccountRef", theBankAccountRef), currentHashCode, theBankAccountRef, (this.bankAccountRef!= null)); } { PrintStatusEnum thePrintStatus; thePrintStatus = this.getPrintStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus, (this.printStatus!= null)); } { CheckPayment theCheckDetail; theCheckDetail = this.getCheckDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkDetail", theCheckDetail), currentHashCode, theCheckDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkDetail", theCheckDetail), currentHashCode, theCheckDetail, (this.checkDetail!= null)); } { PhysicalAddress thePayeeAddr; thePayeeAddr = this.getPayeeAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payeeAddr", thePayeeAddr), currentHashCode, thePayeeAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payeeAddr", thePayeeAddr), currentHashCode, thePayeeAddr, (this.payeeAddr!= null)); } { IntuitAnyType theBillPaymentCheckEx; theBillPaymentCheckEx = this.getBillPaymentCheckEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentCheckEx", theBillPaymentCheckEx), currentHashCode, theBillPaymentCheckEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentCheckEx", theBillPaymentCheckEx), currentHashCode, theBillPaymentCheckEx, (this.billPaymentCheckEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java index c4465572..06ec4b9c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -65,8 +65,7 @@ "ccDetail", "billPaymentCreditCardEx" }) -public class BillPaymentCreditCard - implements Serializable, Equals, HashCode +public class BillPaymentCreditCard implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -149,8 +148,8 @@ public void setBillPaymentCreditCardEx(IntuitAnyType value) { this.billPaymentCreditCardEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BillPaymentCreditCard)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -162,7 +161,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCAccountRef = this.getCCAccountRef(); ReferenceType rhsCCAccountRef; rhsCCAccountRef = that.getCCAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccAccountRef", lhsCCAccountRef), LocatorUtils.property(thatLocator, "ccAccountRef", rhsCCAccountRef), lhsCCAccountRef, rhsCCAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccAccountRef", lhsCCAccountRef), LocatorUtils.property(thatLocator, "ccAccountRef", rhsCCAccountRef), lhsCCAccountRef, rhsCCAccountRef, (this.ccAccountRef!= null), (that.ccAccountRef!= null))) { return false; } } @@ -171,7 +170,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCDetail = this.getCCDetail(); CreditCardPayment rhsCCDetail; rhsCCDetail = that.getCCDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccDetail", lhsCCDetail), LocatorUtils.property(thatLocator, "ccDetail", rhsCCDetail), lhsCCDetail, rhsCCDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccDetail", lhsCCDetail), LocatorUtils.property(thatLocator, "ccDetail", rhsCCDetail), lhsCCDetail, rhsCCDetail, (this.ccDetail!= null), (that.ccDetail!= null))) { return false; } } @@ -180,7 +179,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillPaymentCreditCardEx = this.getBillPaymentCreditCardEx(); IntuitAnyType rhsBillPaymentCreditCardEx; rhsBillPaymentCreditCardEx = that.getBillPaymentCreditCardEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentCreditCardEx", lhsBillPaymentCreditCardEx), LocatorUtils.property(thatLocator, "billPaymentCreditCardEx", rhsBillPaymentCreditCardEx), lhsBillPaymentCreditCardEx, rhsBillPaymentCreditCardEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billPaymentCreditCardEx", lhsBillPaymentCreditCardEx), LocatorUtils.property(thatLocator, "billPaymentCreditCardEx", rhsBillPaymentCreditCardEx), lhsBillPaymentCreditCardEx, rhsBillPaymentCreditCardEx, (this.billPaymentCreditCardEx!= null), (that.billPaymentCreditCardEx!= null))) { return false; } } @@ -188,32 +187,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theCCAccountRef; theCCAccountRef = this.getCCAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccAccountRef", theCCAccountRef), currentHashCode, theCCAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccAccountRef", theCCAccountRef), currentHashCode, theCCAccountRef, (this.ccAccountRef!= null)); } { CreditCardPayment theCCDetail; theCCDetail = this.getCCDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccDetail", theCCDetail), currentHashCode, theCCDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccDetail", theCCDetail), currentHashCode, theCCDetail, (this.ccDetail!= null)); } { IntuitAnyType theBillPaymentCreditCardEx; theBillPaymentCreditCardEx = this.getBillPaymentCreditCardEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentCreditCardEx", theBillPaymentCreditCardEx), currentHashCode, theBillPaymentCreditCardEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billPaymentCreditCardEx", theBillPaymentCreditCardEx), currentHashCode, theBillPaymentCreditCardEx, (this.billPaymentCreditCardEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java index 09526c9f..6ebaa0e9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java index a9378b73..28b1ab9c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BooleanTypeCustomFieldDefinition.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BooleanTypeCustomFieldDefinition.java index 79c864ef..c409e8cd 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BooleanTypeCustomFieldDefinition.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BooleanTypeCustomFieldDefinition.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -68,7 +68,7 @@ }) public class BooleanTypeCustomFieldDefinition extends CustomFieldDefinition - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -99,8 +99,8 @@ public void setDefaultValue(Boolean value) { this.defaultValue = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BooleanTypeCustomFieldDefinition)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -115,7 +115,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultValue = this.isDefaultValue(); Boolean rhsDefaultValue; rhsDefaultValue = that.isDefaultValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultValue", lhsDefaultValue), LocatorUtils.property(thatLocator, "defaultValue", rhsDefaultValue), lhsDefaultValue, rhsDefaultValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultValue", lhsDefaultValue), LocatorUtils.property(thatLocator, "defaultValue", rhsDefaultValue), lhsDefaultValue, rhsDefaultValue, (this.defaultValue!= null), (that.defaultValue!= null))) { return false; } } @@ -123,22 +123,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theDefaultValue; theDefaultValue = this.isDefaultValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultValue", theDefaultValue), currentHashCode, theDefaultValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultValue", theDefaultValue), currentHashCode, theDefaultValue, (this.defaultValue!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Budget.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Budget.java index e730e45d..f22e8bd7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Budget.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Budget.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -83,7 +83,7 @@ }) public class Budget extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -291,8 +291,8 @@ public void setBudgetDetail(List budgetDetail) { this.budgetDetail = budgetDetail; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Budget)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -307,7 +307,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -316,7 +316,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartDate = this.getStartDate(); Date rhsStartDate; rhsStartDate = that.getStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate, (this.startDate!= null), (that.startDate!= null))) { return false; } } @@ -325,7 +325,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndDate = this.getEndDate(); Date rhsEndDate; rhsEndDate = that.getEndDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate, (this.endDate!= null), (that.endDate!= null))) { return false; } } @@ -334,7 +334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBudgetType = this.getBudgetType(); BudgetTypeEnum rhsBudgetType; rhsBudgetType = that.getBudgetType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetType", lhsBudgetType), LocatorUtils.property(thatLocator, "budgetType", rhsBudgetType), lhsBudgetType, rhsBudgetType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetType", lhsBudgetType), LocatorUtils.property(thatLocator, "budgetType", rhsBudgetType), lhsBudgetType, rhsBudgetType, (this.budgetType!= null), (that.budgetType!= null))) { return false; } } @@ -343,7 +343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBudgetEntryType = this.getBudgetEntryType(); BudgetEntryTypeEnum rhsBudgetEntryType; rhsBudgetEntryType = that.getBudgetEntryType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetEntryType", lhsBudgetEntryType), LocatorUtils.property(thatLocator, "budgetEntryType", rhsBudgetEntryType), lhsBudgetEntryType, rhsBudgetEntryType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetEntryType", lhsBudgetEntryType), LocatorUtils.property(thatLocator, "budgetEntryType", rhsBudgetEntryType), lhsBudgetEntryType, rhsBudgetEntryType, (this.budgetEntryType!= null), (that.budgetEntryType!= null))) { return false; } } @@ -352,7 +352,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -361,7 +361,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBudgetDetail = (((this.budgetDetail!= null)&&(!this.budgetDetail.isEmpty()))?this.getBudgetDetail():null); List rhsBudgetDetail; rhsBudgetDetail = (((that.budgetDetail!= null)&&(!that.budgetDetail.isEmpty()))?that.getBudgetDetail():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetDetail", lhsBudgetDetail), LocatorUtils.property(thatLocator, "budgetDetail", rhsBudgetDetail), lhsBudgetDetail, rhsBudgetDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetDetail", lhsBudgetDetail), LocatorUtils.property(thatLocator, "budgetDetail", rhsBudgetDetail), lhsBudgetDetail, rhsBudgetDetail, ((this.budgetDetail!= null)&&(!this.budgetDetail.isEmpty())), ((that.budgetDetail!= null)&&(!that.budgetDetail.isEmpty())))) { return false; } } @@ -369,52 +369,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Date theStartDate; theStartDate = this.getStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate, (this.startDate!= null)); } { Date theEndDate; theEndDate = this.getEndDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate, (this.endDate!= null)); } { BudgetTypeEnum theBudgetType; theBudgetType = this.getBudgetType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetType", theBudgetType), currentHashCode, theBudgetType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetType", theBudgetType), currentHashCode, theBudgetType, (this.budgetType!= null)); } { BudgetEntryTypeEnum theBudgetEntryType; theBudgetEntryType = this.getBudgetEntryType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetEntryType", theBudgetEntryType), currentHashCode, theBudgetEntryType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetEntryType", theBudgetEntryType), currentHashCode, theBudgetEntryType, (this.budgetEntryType!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { List theBudgetDetail; theBudgetDetail = (((this.budgetDetail!= null)&&(!this.budgetDetail.isEmpty()))?this.getBudgetDetail():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetDetail", theBudgetDetail), currentHashCode, theBudgetDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetDetail", theBudgetDetail), currentHashCode, theBudgetDetail, ((this.budgetDetail!= null)&&(!this.budgetDetail.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetDetail.java index 20f8e303..bf5dc6f6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -79,8 +79,7 @@ "classRef", "departmentRef" }) -public class BudgetDetail - implements Serializable, Equals, HashCode +public class BudgetDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -243,8 +242,8 @@ public void setDepartmentRef(ReferenceType value) { this.departmentRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof BudgetDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -256,7 +255,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBudgetDate = this.getBudgetDate(); Date rhsBudgetDate; rhsBudgetDate = that.getBudgetDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetDate", lhsBudgetDate), LocatorUtils.property(thatLocator, "budgetDate", rhsBudgetDate), lhsBudgetDate, rhsBudgetDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "budgetDate", lhsBudgetDate), LocatorUtils.property(thatLocator, "budgetDate", rhsBudgetDate), lhsBudgetDate, rhsBudgetDate, (this.budgetDate!= null), (that.budgetDate!= null))) { return false; } } @@ -265,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -274,7 +273,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; } } @@ -283,7 +282,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; } } @@ -292,7 +291,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; } } @@ -301,7 +300,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentRef = this.getDepartmentRef(); ReferenceType rhsDepartmentRef; rhsDepartmentRef = that.getDepartmentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef, (this.departmentRef!= null), (that.departmentRef!= null))) { return false; } } @@ -309,47 +308,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Date theBudgetDate; theBudgetDate = this.getBudgetDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetDate", theBudgetDate), currentHashCode, theBudgetDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "budgetDate", theBudgetDate), currentHashCode, theBudgetDate, (this.budgetDate!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= 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)); } { 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 theDepartmentRef; theDepartmentRef = this.getDepartmentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef, (this.departmentRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetEntryTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetEntryTypeEnum.java index 40eb1e6c..fd4039db 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetEntryTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetEntryTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetTypeEnum.java index 7b0894b1..e139293b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BudgetTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCAVSMatchEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCAVSMatchEnum.java index 8323caf0..6436fb80 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCAVSMatchEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCAVSMatchEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCPaymentStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCPaymentStatusEnum.java index a6e231a7..9aa043ec 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCPaymentStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCPaymentStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCSecurityCodeMatchEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCSecurityCodeMatchEnum.java index dd961d44..ad2faf95 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCSecurityCodeMatchEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCSecurityCodeMatchEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnModeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnModeEnum.java index c931ebf0..962e80a1 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnModeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnModeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnTypeEnum.java index d35fa33a..12fe22e7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CCTxnTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCQuery.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCQuery.java index 26147ea7..797b2194 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCQuery.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCQuery.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -69,8 +69,7 @@ "entities", "changedSince" }) -public class CDCQuery - implements Serializable, Equals, HashCode +public class CDCQuery implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -129,8 +128,8 @@ public void setChangedSince(Date value) { this.changedSince = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CDCQuery)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -142,7 +141,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntities = this.getEntities(); String rhsEntities; rhsEntities = that.getEntities(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entities", lhsEntities), LocatorUtils.property(thatLocator, "entities", rhsEntities), lhsEntities, rhsEntities)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entities", lhsEntities), LocatorUtils.property(thatLocator, "entities", rhsEntities), lhsEntities, rhsEntities, (this.entities!= null), (that.entities!= null))) { return false; } } @@ -151,7 +150,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsChangedSince = this.getChangedSince(); Date rhsChangedSince; rhsChangedSince = that.getChangedSince(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "changedSince", lhsChangedSince), LocatorUtils.property(thatLocator, "changedSince", rhsChangedSince), lhsChangedSince, rhsChangedSince)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "changedSince", lhsChangedSince), LocatorUtils.property(thatLocator, "changedSince", rhsChangedSince), lhsChangedSince, rhsChangedSince, (this.changedSince!= null), (that.changedSince!= null))) { return false; } } @@ -159,27 +158,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theEntities; theEntities = this.getEntities(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entities", theEntities), currentHashCode, theEntities); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entities", theEntities), currentHashCode, theEntities, (this.entities!= null)); } { Date theChangedSince; theChangedSince = this.getChangedSince(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "changedSince", theChangedSince), currentHashCode, theChangedSince); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "changedSince", theChangedSince), currentHashCode, theChangedSince, (this.changedSince!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCResponse.java index 9c4886d3..1940fff4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CDCResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlAttribute; 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; @@ -71,8 +71,7 @@ "queryResponse", "fault" }) -public class CDCResponse - implements Serializable, Equals, HashCode +public class CDCResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -172,8 +171,8 @@ public void setQueryResponse(List queryResponse) { this.queryResponse = queryResponse; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CDCResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -185,7 +184,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQueryResponse = (((this.queryResponse!= null)&&(!this.queryResponse.isEmpty()))?this.getQueryResponse():null); List rhsQueryResponse; rhsQueryResponse = (((that.queryResponse!= null)&&(!that.queryResponse.isEmpty()))?that.getQueryResponse():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse, ((this.queryResponse!= null)&&(!this.queryResponse.isEmpty())), ((that.queryResponse!= null)&&(!that.queryResponse.isEmpty())))) { return false; } } @@ -194,7 +193,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -203,7 +202,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSize = this.getSize(); Integer rhsSize; rhsSize = that.getSize(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "size", lhsSize), LocatorUtils.property(thatLocator, "size", rhsSize), lhsSize, rhsSize)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "size", lhsSize), LocatorUtils.property(thatLocator, "size", rhsSize), lhsSize, rhsSize, (this.size!= null), (that.size!= null))) { return false; } } @@ -211,32 +210,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theQueryResponse; theQueryResponse = (((this.queryResponse!= null)&&(!this.queryResponse.isEmpty()))?this.getQueryResponse():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse, ((this.queryResponse!= null)&&(!this.queryResponse.isEmpty()))); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } { Integer theSize; theSize = this.getSize(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "size", theSize), currentHashCode, theSize); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "size", theSize), currentHashCode, theSize, (this.size!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Cascade.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Cascade.java index 90b0ebf7..9d839b1b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Cascade.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Cascade.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -69,8 +69,7 @@ "id", "keyValue" }) -public class Cascade - implements Serializable, Equals, HashCode +public class Cascade implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -170,8 +169,8 @@ public void setKeyValue(List keyValue) { this.keyValue = keyValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Cascade)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -183,7 +182,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityName = this.getEntityName(); String rhsEntityName; rhsEntityName = that.getEntityName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityName", lhsEntityName), LocatorUtils.property(thatLocator, "entityName", rhsEntityName), lhsEntityName, rhsEntityName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityName", lhsEntityName), LocatorUtils.property(thatLocator, "entityName", rhsEntityName), lhsEntityName, rhsEntityName, (this.entityName!= null), (that.entityName!= null))) { return false; } } @@ -192,7 +191,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -201,7 +200,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsKeyValue = (((this.keyValue!= null)&&(!this.keyValue.isEmpty()))?this.getKeyValue():null); List rhsKeyValue; rhsKeyValue = (((that.keyValue!= null)&&(!that.keyValue.isEmpty()))?that.getKeyValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "keyValue", lhsKeyValue), LocatorUtils.property(thatLocator, "keyValue", rhsKeyValue), lhsKeyValue, rhsKeyValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "keyValue", lhsKeyValue), LocatorUtils.property(thatLocator, "keyValue", rhsKeyValue), lhsKeyValue, rhsKeyValue, ((this.keyValue!= null)&&(!this.keyValue.isEmpty())), ((that.keyValue!= null)&&(!that.keyValue.isEmpty())))) { return false; } } @@ -209,32 +208,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theEntityName; theEntityName = this.getEntityName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityName", theEntityName), currentHashCode, theEntityName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityName", theEntityName), currentHashCode, theEntityName, (this.entityName!= null)); } { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { List theKeyValue; theKeyValue = (((this.keyValue!= null)&&(!this.keyValue.isEmpty()))?this.getKeyValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyValue", theKeyValue), currentHashCode, theKeyValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyValue", theKeyValue), currentHashCode, theKeyValue, ((this.keyValue!= null)&&(!this.keyValue.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CascadeResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CascadeResponse.java index 510f3cc5..ca4138d6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CascadeResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CascadeResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "CascadeResponse", propOrder = { "cascade" }) -public class CascadeResponse - implements Serializable, Equals, HashCode +public class CascadeResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setCascade(List cascade) { this.cascade = cascade; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CascadeResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCascade = (((this.cascade!= null)&&(!this.cascade.isEmpty()))?this.getCascade():null); List rhsCascade; rhsCascade = (((that.cascade!= null)&&(!that.cascade.isEmpty()))?that.getCascade():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cascade", lhsCascade), LocatorUtils.property(thatLocator, "cascade", rhsCascade), lhsCascade, rhsCascade)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cascade", lhsCascade), LocatorUtils.property(thatLocator, "cascade", rhsCascade), lhsCascade, rhsCascade, ((this.cascade!= null)&&(!this.cascade.isEmpty())), ((that.cascade!= null)&&(!that.cascade.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theCascade; theCascade = (((this.cascade!= null)&&(!this.cascade.isEmpty()))?this.getCascade():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cascade", theCascade), currentHashCode, theCascade); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cascade", theCascade), currentHashCode, theCascade, ((this.cascade!= null)&&(!this.cascade.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashBackInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashBackInfo.java index 9d819446..445fb20a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashBackInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashBackInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -66,8 +66,7 @@ "amount", "memo" }) -public class CashBackInfo - implements Serializable, Equals, HashCode +public class CashBackInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -150,8 +149,8 @@ public void setMemo(String value) { this.memo = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CashBackInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -163,7 +162,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; } } @@ -172,7 +171,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -181,7 +180,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMemo = this.getMemo(); String rhsMemo; rhsMemo = that.getMemo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo, (this.memo!= null), (that.memo!= null))) { return false; } } @@ -189,32 +188,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 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)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } { String theMemo; theMemo = this.getMemo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo, (this.memo!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashPurchase.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashPurchase.java index 2dbd118f..61bb3228 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashPurchase.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CashPurchase.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -64,8 +64,7 @@ @XmlType(name = "CashPurchase", propOrder = { "accountRef" }) -public class CashPurchase - implements Serializable, Equals, HashCode +public class CashPurchase implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -96,8 +95,8 @@ public void setAccountRef(ReferenceType value) { this.accountRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CashPurchase)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -109,7 +108,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; } } @@ -117,22 +116,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 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)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ChargeCredit.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ChargeCredit.java index d8aea51d..3113b39d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ChargeCredit.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ChargeCredit.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -89,7 +89,7 @@ }) public class ChargeCredit extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -332,8 +332,8 @@ public void setChargeCreditEx(IntuitAnyType value) { this.chargeCreditEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ChargeCredit)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -348,7 +348,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCredit = this.isCredit(); Boolean rhsCredit; rhsCredit = that.isCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit, (this.credit!= null), (that.credit!= null))) { return false; } } @@ -357,7 +357,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; } } @@ -366,7 +366,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToRef = this.getRemitToRef(); ReferenceType rhsRemitToRef; rhsRemitToRef = that.getRemitToRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef, (this.remitToRef!= null), (that.remitToRef!= null))) { return false; } } @@ -375,7 +375,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsARAccountRef = this.getARAccountRef(); ReferenceType rhsARAccountRef; rhsARAccountRef = that.getARAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef, (this.arAccountRef!= null), (that.arAccountRef!= null))) { return false; } } @@ -384,7 +384,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; } } @@ -393,7 +393,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -402,7 +402,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBilledDate = this.getBilledDate(); Date rhsBilledDate; rhsBilledDate = that.getBilledDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billedDate", lhsBilledDate), LocatorUtils.property(thatLocator, "billedDate", rhsBilledDate), lhsBilledDate, rhsBilledDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billedDate", lhsBilledDate), LocatorUtils.property(thatLocator, "billedDate", rhsBilledDate), lhsBilledDate, rhsBilledDate, (this.billedDate!= null), (that.billedDate!= null))) { return false; } } @@ -411,7 +411,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -420,7 +420,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsChargeCreditEx = this.getChargeCreditEx(); IntuitAnyType rhsChargeCreditEx; rhsChargeCreditEx = that.getChargeCreditEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "chargeCreditEx", lhsChargeCreditEx), LocatorUtils.property(thatLocator, "chargeCreditEx", rhsChargeCreditEx), lhsChargeCreditEx, rhsChargeCreditEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "chargeCreditEx", lhsChargeCreditEx), LocatorUtils.property(thatLocator, "chargeCreditEx", rhsChargeCreditEx), lhsChargeCreditEx, rhsChargeCreditEx, (this.chargeCreditEx!= null), (that.chargeCreditEx!= null))) { return false; } } @@ -428,62 +428,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theCredit; theCredit = this.isCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit, (this.credit!= null)); } { 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 theRemitToRef; theRemitToRef = this.getRemitToRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef, (this.remitToRef!= null)); } { ReferenceType theARAccountRef; theARAccountRef = this.getARAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef, (this.arAccountRef!= 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)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { Date theBilledDate; theBilledDate = this.getBilledDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billedDate", theBilledDate), currentHashCode, theBilledDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billedDate", theBilledDate), currentHashCode, theBilledDate, (this.billedDate!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { IntuitAnyType theChargeCreditEx; theChargeCreditEx = this.getChargeCreditEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "chargeCreditEx", theChargeCreditEx), currentHashCode, theChargeCreditEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "chargeCreditEx", theChargeCreditEx), currentHashCode, theChargeCreditEx, (this.chargeCreditEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPayment.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPayment.java index 45716b91..4be92c31 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPayment.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPayment.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -77,8 +77,7 @@ "bankName", "checkPaymentEx" }) -public class CheckPayment - implements Serializable, Equals, HashCode +public class CheckPayment implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -239,8 +238,8 @@ public void setCheckPaymentEx(IntuitAnyType value) { this.checkPaymentEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CheckPayment)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -252,7 +251,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckNum = this.getCheckNum(); String rhsCheckNum; rhsCheckNum = that.getCheckNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkNum", lhsCheckNum), LocatorUtils.property(thatLocator, "checkNum", rhsCheckNum), lhsCheckNum, rhsCheckNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkNum", lhsCheckNum), LocatorUtils.property(thatLocator, "checkNum", rhsCheckNum), lhsCheckNum, rhsCheckNum, (this.checkNum!= null), (that.checkNum!= null))) { return false; } } @@ -261,7 +260,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); String rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -270,7 +269,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameOnAcct = this.getNameOnAcct(); String rhsNameOnAcct; rhsNameOnAcct = that.getNameOnAcct(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOnAcct", lhsNameOnAcct), LocatorUtils.property(thatLocator, "nameOnAcct", rhsNameOnAcct), lhsNameOnAcct, rhsNameOnAcct)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOnAcct", lhsNameOnAcct), LocatorUtils.property(thatLocator, "nameOnAcct", rhsNameOnAcct), lhsNameOnAcct, rhsNameOnAcct, (this.nameOnAcct!= null), (that.nameOnAcct!= null))) { return false; } } @@ -279,7 +278,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNum = this.getAcctNum(); String rhsAcctNum; rhsAcctNum = that.getAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum, (this.acctNum!= null), (that.acctNum!= null))) { return false; } } @@ -288,7 +287,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBankName = this.getBankName(); String rhsBankName; rhsBankName = that.getBankName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bankName", lhsBankName), LocatorUtils.property(thatLocator, "bankName", rhsBankName), lhsBankName, rhsBankName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bankName", lhsBankName), LocatorUtils.property(thatLocator, "bankName", rhsBankName), lhsBankName, rhsBankName, (this.bankName!= null), (that.bankName!= null))) { return false; } } @@ -297,7 +296,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckPaymentEx = this.getCheckPaymentEx(); IntuitAnyType rhsCheckPaymentEx; rhsCheckPaymentEx = that.getCheckPaymentEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPaymentEx", lhsCheckPaymentEx), LocatorUtils.property(thatLocator, "checkPaymentEx", rhsCheckPaymentEx), lhsCheckPaymentEx, rhsCheckPaymentEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPaymentEx", lhsCheckPaymentEx), LocatorUtils.property(thatLocator, "checkPaymentEx", rhsCheckPaymentEx), lhsCheckPaymentEx, rhsCheckPaymentEx, (this.checkPaymentEx!= null), (that.checkPaymentEx!= null))) { return false; } } @@ -305,47 +304,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theCheckNum; theCheckNum = this.getCheckNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkNum", theCheckNum), currentHashCode, theCheckNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkNum", theCheckNum), currentHashCode, theCheckNum, (this.checkNum!= null)); } { String theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } { String theNameOnAcct; theNameOnAcct = this.getNameOnAcct(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOnAcct", theNameOnAcct), currentHashCode, theNameOnAcct); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOnAcct", theNameOnAcct), currentHashCode, theNameOnAcct, (this.nameOnAcct!= null)); } { String theAcctNum; theAcctNum = this.getAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum, (this.acctNum!= null)); } { String theBankName; theBankName = this.getBankName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankName", theBankName), currentHashCode, theBankName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bankName", theBankName), currentHashCode, theBankName, (this.bankName!= null)); } { IntuitAnyType theCheckPaymentEx; theCheckPaymentEx = this.getCheckPaymentEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPaymentEx", theCheckPaymentEx), currentHashCode, theCheckPaymentEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPaymentEx", theCheckPaymentEx), currentHashCode, theCheckPaymentEx, (this.checkPaymentEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPurchase.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPurchase.java index 8f0fda48..369ab269 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPurchase.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CheckPurchase.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -70,8 +70,7 @@ "memoOnCheck", "printStatus" }) -public class CheckPurchase - implements Serializable, Equals, HashCode +public class CheckPurchase implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -180,8 +179,8 @@ public void setPrintStatus(PrintStatusEnum value) { this.printStatus = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CheckPurchase)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -193,7 +192,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; } } @@ -202,7 +201,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayeeAddr = this.getPayeeAddr(); PhysicalAddress rhsPayeeAddr; rhsPayeeAddr = that.getPayeeAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payeeAddr", lhsPayeeAddr), LocatorUtils.property(thatLocator, "payeeAddr", rhsPayeeAddr), lhsPayeeAddr, rhsPayeeAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payeeAddr", lhsPayeeAddr), LocatorUtils.property(thatLocator, "payeeAddr", rhsPayeeAddr), lhsPayeeAddr, rhsPayeeAddr, (this.payeeAddr!= null), (that.payeeAddr!= null))) { return false; } } @@ -211,7 +210,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMemoOnCheck = this.getMemoOnCheck(); String rhsMemoOnCheck; rhsMemoOnCheck = that.getMemoOnCheck(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "memoOnCheck", lhsMemoOnCheck), LocatorUtils.property(thatLocator, "memoOnCheck", rhsMemoOnCheck), lhsMemoOnCheck, rhsMemoOnCheck)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "memoOnCheck", lhsMemoOnCheck), LocatorUtils.property(thatLocator, "memoOnCheck", rhsMemoOnCheck), lhsMemoOnCheck, rhsMemoOnCheck, (this.memoOnCheck!= null), (that.memoOnCheck!= null))) { return false; } } @@ -220,7 +219,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintStatus = this.getPrintStatus(); PrintStatusEnum rhsPrintStatus; rhsPrintStatus = that.getPrintStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus, (this.printStatus!= null), (that.printStatus!= null))) { return false; } } @@ -228,37 +227,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 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)); } { PhysicalAddress thePayeeAddr; thePayeeAddr = this.getPayeeAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payeeAddr", thePayeeAddr), currentHashCode, thePayeeAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payeeAddr", thePayeeAddr), currentHashCode, thePayeeAddr, (this.payeeAddr!= null)); } { String theMemoOnCheck; theMemoOnCheck = this.getMemoOnCheck(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memoOnCheck", theMemoOnCheck), currentHashCode, theMemoOnCheck); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memoOnCheck", theMemoOnCheck), currentHashCode, theMemoOnCheck, (this.memoOnCheck!= null)); } { PrintStatusEnum thePrintStatus; thePrintStatus = this.getPrintStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus, (this.printStatus!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Class.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Class.java index d9463eb9..73c3e79e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Class.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Class.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -78,7 +78,7 @@ }) public class Class extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -239,8 +239,8 @@ public void setClassEx(IntuitAnyType value) { this.classEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Class)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -255,7 +255,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -264,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubClass = this.isSubClass(); Boolean rhsSubClass; rhsSubClass = that.isSubClass(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subClass", lhsSubClass), LocatorUtils.property(thatLocator, "subClass", rhsSubClass), lhsSubClass, rhsSubClass)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subClass", lhsSubClass), LocatorUtils.property(thatLocator, "subClass", rhsSubClass), lhsSubClass, rhsSubClass, (this.subClass!= null), (that.subClass!= null))) { return false; } } @@ -273,7 +273,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -282,7 +282,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -291,7 +291,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -300,7 +300,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClassEx = this.getClassEx(); IntuitAnyType rhsClassEx; rhsClassEx = that.getClassEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "classEx", lhsClassEx), LocatorUtils.property(thatLocator, "classEx", rhsClassEx), lhsClassEx, rhsClassEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "classEx", lhsClassEx), LocatorUtils.property(thatLocator, "classEx", rhsClassEx), lhsClassEx, rhsClassEx, (this.classEx!= null), (that.classEx!= null))) { return false; } } @@ -308,47 +308,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theSubClass; theSubClass = this.isSubClass(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subClass", theSubClass), currentHashCode, theSubClass); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subClass", theSubClass), currentHashCode, theSubClass, (this.subClass!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { IntuitAnyType theClassEx; theClassEx = this.getClassEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classEx", theClassEx), currentHashCode, theClassEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classEx", theClassEx), currentHashCode, theClassEx, (this.classEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColData.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColData.java index 69f7a4bc..4462e6c3 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColData.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColData.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; 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; @@ -67,8 +67,7 @@ @XmlType(name = "ColData", propOrder = { "attributes" }) -public class ColData - implements Serializable, Equals, HashCode +public class ColData implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -177,8 +176,8 @@ public void setHref(String value) { this.href = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ColData)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -190,7 +189,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttributes = this.getAttributes(); Attributes rhsAttributes; rhsAttributes = that.getAttributes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attributes", lhsAttributes), LocatorUtils.property(thatLocator, "attributes", rhsAttributes), lhsAttributes, rhsAttributes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attributes", lhsAttributes), LocatorUtils.property(thatLocator, "attributes", rhsAttributes), lhsAttributes, rhsAttributes, (this.attributes!= null), (that.attributes!= null))) { return false; } } @@ -199,7 +198,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -208,7 +207,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -217,7 +216,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHref = this.getHref(); String rhsHref; rhsHref = that.getHref(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "href", lhsHref), LocatorUtils.property(thatLocator, "href", rhsHref), lhsHref, rhsHref)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "href", lhsHref), LocatorUtils.property(thatLocator, "href", rhsHref), lhsHref, rhsHref, (this.href!= null), (that.href!= null))) { return false; } } @@ -225,37 +224,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Attributes theAttributes; theAttributes = this.getAttributes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributes", theAttributes), currentHashCode, theAttributes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributes", theAttributes), currentHashCode, theAttributes, (this.attributes!= null)); } { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theHref; theHref = this.getHref(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "href", theHref), currentHashCode, theHref); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "href", theHref), currentHashCode, theHref, (this.href!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Column.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Column.java index 26d1cf6f..0878b41d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Column.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Column.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -71,8 +71,7 @@ "metaData", "columns" }) -public class Column - implements Serializable, Equals, HashCode +public class Column implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -198,8 +197,8 @@ public void setMetaData(List metaData) { this.metaData = metaData; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Column)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -211,7 +210,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColTitle = this.getColTitle(); String rhsColTitle; rhsColTitle = that.getColTitle(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "colTitle", lhsColTitle), LocatorUtils.property(thatLocator, "colTitle", rhsColTitle), lhsColTitle, rhsColTitle)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "colTitle", lhsColTitle), LocatorUtils.property(thatLocator, "colTitle", rhsColTitle), lhsColTitle, rhsColTitle, (this.colTitle!= null), (that.colTitle!= null))) { return false; } } @@ -220,7 +219,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColType = this.getColType(); String rhsColType; rhsColType = that.getColType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "colType", lhsColType), LocatorUtils.property(thatLocator, "colType", rhsColType), lhsColType, rhsColType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "colType", lhsColType), LocatorUtils.property(thatLocator, "colType", rhsColType), lhsColType, rhsColType, (this.colType!= null), (that.colType!= null))) { return false; } } @@ -229,7 +228,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMetaData = (((this.metaData!= null)&&(!this.metaData.isEmpty()))?this.getMetaData():null); List rhsMetaData; rhsMetaData = (((that.metaData!= null)&&(!that.metaData.isEmpty()))?that.getMetaData():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "metaData", lhsMetaData), LocatorUtils.property(thatLocator, "metaData", rhsMetaData), lhsMetaData, rhsMetaData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "metaData", lhsMetaData), LocatorUtils.property(thatLocator, "metaData", rhsMetaData), lhsMetaData, rhsMetaData, ((this.metaData!= null)&&(!this.metaData.isEmpty())), ((that.metaData!= null)&&(!that.metaData.isEmpty())))) { return false; } } @@ -238,7 +237,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColumns = this.getColumns(); Columns rhsColumns; rhsColumns = that.getColumns(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "columns", lhsColumns), LocatorUtils.property(thatLocator, "columns", rhsColumns), lhsColumns, rhsColumns)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "columns", lhsColumns), LocatorUtils.property(thatLocator, "columns", rhsColumns), lhsColumns, rhsColumns, (this.columns!= null), (that.columns!= null))) { return false; } } @@ -246,37 +245,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theColTitle; theColTitle = this.getColTitle(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colTitle", theColTitle), currentHashCode, theColTitle); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colTitle", theColTitle), currentHashCode, theColTitle, (this.colTitle!= null)); } { String theColType; theColType = this.getColType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colType", theColType), currentHashCode, theColType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colType", theColType), currentHashCode, theColType, (this.colType!= null)); } { List theMetaData; theMetaData = (((this.metaData!= null)&&(!this.metaData.isEmpty()))?this.getMetaData():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "metaData", theMetaData), currentHashCode, theMetaData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "metaData", theMetaData), currentHashCode, theMetaData, ((this.metaData!= null)&&(!this.metaData.isEmpty()))); } { Columns theColumns; theColumns = this.getColumns(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "columns", theColumns), currentHashCode, theColumns); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "columns", theColumns), currentHashCode, theColumns, (this.columns!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColumnTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColumnTypeEnum.java index 9922883a..5baa1ba8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColumnTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ColumnTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Columns.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Columns.java index 3f32881b..5d293b7c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Columns.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Columns.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "Columns", propOrder = { "column" }) -public class Columns - implements Serializable, Equals, HashCode +public class Columns implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setColumn(List column) { this.column = column; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Columns)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColumn = (((this.column!= null)&&(!this.column.isEmpty()))?this.getColumn():null); List rhsColumn; rhsColumn = (((that.column!= null)&&(!that.column.isEmpty()))?that.getColumn():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "column", lhsColumn), LocatorUtils.property(thatLocator, "column", rhsColumn), lhsColumn, rhsColumn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "column", lhsColumn), LocatorUtils.property(thatLocator, "column", rhsColumn), lhsColumn, rhsColumn, ((this.column!= null)&&(!this.column.isEmpty())), ((that.column!= null)&&(!that.column.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theColumn; theColumn = (((this.column!= null)&&(!this.column.isEmpty()))?this.getColumn():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "column", theColumn), currentHashCode, theColumn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "column", theColumn), currentHashCode, theColumn, ((this.column!= null)&&(!this.column.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Company.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Company.java index a7f4f047..8f416852 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Company.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Company.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -136,7 +136,7 @@ }) public class Company extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1054,8 +1054,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Company)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1070,7 +1070,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyName = this.getCompanyName(); String rhsCompanyName; rhsCompanyName = that.getCompanyName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName, (this.companyName!= null), (that.companyName!= null))) { return false; } } @@ -1079,7 +1079,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLegalName = this.getLegalName(); String rhsLegalName; rhsLegalName = that.getLegalName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "legalName", lhsLegalName), LocatorUtils.property(thatLocator, "legalName", rhsLegalName), lhsLegalName, rhsLegalName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "legalName", lhsLegalName), LocatorUtils.property(thatLocator, "legalName", rhsLegalName), lhsLegalName, rhsLegalName, (this.legalName!= null), (that.legalName!= null))) { return false; } } @@ -1088,7 +1088,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyAddr = this.getCompanyAddr(); PhysicalAddress rhsCompanyAddr; rhsCompanyAddr = that.getCompanyAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyAddr", lhsCompanyAddr), LocatorUtils.property(thatLocator, "companyAddr", rhsCompanyAddr), lhsCompanyAddr, rhsCompanyAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyAddr", lhsCompanyAddr), LocatorUtils.property(thatLocator, "companyAddr", rhsCompanyAddr), lhsCompanyAddr, rhsCompanyAddr, (this.companyAddr!= null), (that.companyAddr!= null))) { return false; } } @@ -1097,7 +1097,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerCommunicationAddr = this.getCustomerCommunicationAddr(); PhysicalAddress rhsCustomerCommunicationAddr; rhsCustomerCommunicationAddr = that.getCustomerCommunicationAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationAddr", lhsCustomerCommunicationAddr), LocatorUtils.property(thatLocator, "customerCommunicationAddr", rhsCustomerCommunicationAddr), lhsCustomerCommunicationAddr, rhsCustomerCommunicationAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationAddr", lhsCustomerCommunicationAddr), LocatorUtils.property(thatLocator, "customerCommunicationAddr", rhsCustomerCommunicationAddr), lhsCustomerCommunicationAddr, rhsCustomerCommunicationAddr, (this.customerCommunicationAddr!= null), (that.customerCommunicationAddr!= null))) { return false; } } @@ -1106,7 +1106,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLegalAddr = this.getLegalAddr(); PhysicalAddress rhsLegalAddr; rhsLegalAddr = that.getLegalAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "legalAddr", lhsLegalAddr), LocatorUtils.property(thatLocator, "legalAddr", rhsLegalAddr), lhsLegalAddr, rhsLegalAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "legalAddr", lhsLegalAddr), LocatorUtils.property(thatLocator, "legalAddr", rhsLegalAddr), lhsLegalAddr, rhsLegalAddr, (this.legalAddr!= null), (that.legalAddr!= null))) { return false; } } @@ -1115,7 +1115,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyEmailAddr = this.getCompanyEmailAddr(); EmailAddress rhsCompanyEmailAddr; rhsCompanyEmailAddr = that.getCompanyEmailAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyEmailAddr", lhsCompanyEmailAddr), LocatorUtils.property(thatLocator, "companyEmailAddr", rhsCompanyEmailAddr), lhsCompanyEmailAddr, rhsCompanyEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyEmailAddr", lhsCompanyEmailAddr), LocatorUtils.property(thatLocator, "companyEmailAddr", rhsCompanyEmailAddr), lhsCompanyEmailAddr, rhsCompanyEmailAddr, (this.companyEmailAddr!= null), (that.companyEmailAddr!= null))) { return false; } } @@ -1124,7 +1124,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerCommunicationEmailAddr = this.getCustomerCommunicationEmailAddr(); EmailAddress rhsCustomerCommunicationEmailAddr; rhsCustomerCommunicationEmailAddr = that.getCustomerCommunicationEmailAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationEmailAddr", lhsCustomerCommunicationEmailAddr), LocatorUtils.property(thatLocator, "customerCommunicationEmailAddr", rhsCustomerCommunicationEmailAddr), lhsCustomerCommunicationEmailAddr, rhsCustomerCommunicationEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationEmailAddr", lhsCustomerCommunicationEmailAddr), LocatorUtils.property(thatLocator, "customerCommunicationEmailAddr", rhsCustomerCommunicationEmailAddr), lhsCustomerCommunicationEmailAddr, rhsCustomerCommunicationEmailAddr, (this.customerCommunicationEmailAddr!= null), (that.customerCommunicationEmailAddr!= null))) { return false; } } @@ -1133,7 +1133,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyURL = this.getCompanyURL(); WebSiteAddress rhsCompanyURL; rhsCompanyURL = that.getCompanyURL(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyURL", lhsCompanyURL), LocatorUtils.property(thatLocator, "companyURL", rhsCompanyURL), lhsCompanyURL, rhsCompanyURL)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyURL", lhsCompanyURL), LocatorUtils.property(thatLocator, "companyURL", rhsCompanyURL), lhsCompanyURL, rhsCompanyURL, (this.companyURL!= null), (that.companyURL!= null))) { return false; } } @@ -1142,7 +1142,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryPhone = this.getPrimaryPhone(); TelephoneNumber rhsPrimaryPhone; rhsPrimaryPhone = that.getPrimaryPhone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone, (this.primaryPhone!= null), (that.primaryPhone!= null))) { return false; } } @@ -1151,7 +1151,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); List rhsOtherContactInfo; rhsOtherContactInfo = (((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty()))?that.getOtherContactInfo():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty())), ((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty())))) { return false; } } @@ -1160,7 +1160,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyFileName = this.getCompanyFileName(); String rhsCompanyFileName; rhsCompanyFileName = that.getCompanyFileName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyFileName", lhsCompanyFileName), LocatorUtils.property(thatLocator, "companyFileName", rhsCompanyFileName), lhsCompanyFileName, rhsCompanyFileName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyFileName", lhsCompanyFileName), LocatorUtils.property(thatLocator, "companyFileName", rhsCompanyFileName), lhsCompanyFileName, rhsCompanyFileName, (this.companyFileName!= null), (that.companyFileName!= null))) { return false; } } @@ -1169,7 +1169,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFlavorStratum = this.getFlavorStratum(); String rhsFlavorStratum; rhsFlavorStratum = that.getFlavorStratum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "flavorStratum", lhsFlavorStratum), LocatorUtils.property(thatLocator, "flavorStratum", rhsFlavorStratum), lhsFlavorStratum, rhsFlavorStratum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "flavorStratum", lhsFlavorStratum), LocatorUtils.property(thatLocator, "flavorStratum", rhsFlavorStratum), lhsFlavorStratum, rhsFlavorStratum, (this.flavorStratum!= null), (that.flavorStratum!= null))) { return false; } } @@ -1178,7 +1178,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSampleFile = this.isSampleFile(); Boolean rhsSampleFile; rhsSampleFile = that.isSampleFile(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "sampleFile", lhsSampleFile), LocatorUtils.property(thatLocator, "sampleFile", rhsSampleFile), lhsSampleFile, rhsSampleFile)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "sampleFile", lhsSampleFile), LocatorUtils.property(thatLocator, "sampleFile", rhsSampleFile), lhsSampleFile, rhsSampleFile, (this.sampleFile!= null), (that.sampleFile!= null))) { return false; } } @@ -1187,7 +1187,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyUserId = this.getCompanyUserId(); String rhsCompanyUserId; rhsCompanyUserId = that.getCompanyUserId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserId", lhsCompanyUserId), LocatorUtils.property(thatLocator, "companyUserId", rhsCompanyUserId), lhsCompanyUserId, rhsCompanyUserId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserId", lhsCompanyUserId), LocatorUtils.property(thatLocator, "companyUserId", rhsCompanyUserId), lhsCompanyUserId, rhsCompanyUserId, (this.companyUserId!= null), (that.companyUserId!= null))) { return false; } } @@ -1196,7 +1196,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyUserAdminEmail = this.getCompanyUserAdminEmail(); String rhsCompanyUserAdminEmail; rhsCompanyUserAdminEmail = that.getCompanyUserAdminEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserAdminEmail", lhsCompanyUserAdminEmail), LocatorUtils.property(thatLocator, "companyUserAdminEmail", rhsCompanyUserAdminEmail), lhsCompanyUserAdminEmail, rhsCompanyUserAdminEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserAdminEmail", lhsCompanyUserAdminEmail), LocatorUtils.property(thatLocator, "companyUserAdminEmail", rhsCompanyUserAdminEmail), lhsCompanyUserAdminEmail, rhsCompanyUserAdminEmail, (this.companyUserAdminEmail!= null), (that.companyUserAdminEmail!= null))) { return false; } } @@ -1205,7 +1205,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyStartDate = this.getCompanyStartDate(); Date rhsCompanyStartDate; rhsCompanyStartDate = that.getCompanyStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyStartDate", lhsCompanyStartDate), LocatorUtils.property(thatLocator, "companyStartDate", rhsCompanyStartDate), lhsCompanyStartDate, rhsCompanyStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyStartDate", lhsCompanyStartDate), LocatorUtils.property(thatLocator, "companyStartDate", rhsCompanyStartDate), lhsCompanyStartDate, rhsCompanyStartDate, (this.companyStartDate!= null), (that.companyStartDate!= null))) { return false; } } @@ -1214,7 +1214,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployerId = this.getEmployerId(); String rhsEmployerId; rhsEmployerId = that.getEmployerId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employerId", lhsEmployerId), LocatorUtils.property(thatLocator, "employerId", rhsEmployerId), lhsEmployerId, rhsEmployerId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employerId", lhsEmployerId), LocatorUtils.property(thatLocator, "employerId", rhsEmployerId), lhsEmployerId, rhsEmployerId, (this.employerId!= null), (that.employerId!= null))) { return false; } } @@ -1223,7 +1223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFiscalYearStartMonth = this.getFiscalYearStartMonth(); MonthEnum rhsFiscalYearStartMonth; rhsFiscalYearStartMonth = that.getFiscalYearStartMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fiscalYearStartMonth", lhsFiscalYearStartMonth), LocatorUtils.property(thatLocator, "fiscalYearStartMonth", rhsFiscalYearStartMonth), lhsFiscalYearStartMonth, rhsFiscalYearStartMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fiscalYearStartMonth", lhsFiscalYearStartMonth), LocatorUtils.property(thatLocator, "fiscalYearStartMonth", rhsFiscalYearStartMonth), lhsFiscalYearStartMonth, rhsFiscalYearStartMonth, (this.fiscalYearStartMonth!= null), (that.fiscalYearStartMonth!= null))) { return false; } } @@ -1232,7 +1232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxYearStartMonth = this.getTaxYearStartMonth(); MonthEnum rhsTaxYearStartMonth; rhsTaxYearStartMonth = that.getTaxYearStartMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearStartMonth", lhsTaxYearStartMonth), LocatorUtils.property(thatLocator, "taxYearStartMonth", rhsTaxYearStartMonth), lhsTaxYearStartMonth, rhsTaxYearStartMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearStartMonth", lhsTaxYearStartMonth), LocatorUtils.property(thatLocator, "taxYearStartMonth", rhsTaxYearStartMonth), lhsTaxYearStartMonth, rhsTaxYearStartMonth, (this.taxYearStartMonth!= null), (that.taxYearStartMonth!= null))) { return false; } } @@ -1241,7 +1241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQBVersion = this.getQBVersion(); String rhsQBVersion; rhsQBVersion = that.getQBVersion(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion, (this.qbVersion!= null), (that.qbVersion!= null))) { return false; } } @@ -1250,7 +1250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountry = this.getCountry(); String rhsCountry; rhsCountry = that.getCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry, (this.country!= null), (that.country!= null))) { return false; } } @@ -1259,7 +1259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -1268,7 +1268,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -1277,7 +1277,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMobile = this.getMobile(); TelephoneNumber rhsMobile; rhsMobile = that.getMobile(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile, (this.mobile!= null), (that.mobile!= null))) { return false; } } @@ -1286,7 +1286,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFax = this.getFax(); TelephoneNumber rhsFax; rhsFax = that.getFax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax, (this.fax!= null), (that.fax!= null))) { return false; } } @@ -1295,7 +1295,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmail = this.getEmail(); EmailAddress rhsEmail; rhsEmail = that.getEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail, (this.email!= null), (that.email!= null))) { return false; } } @@ -1304,7 +1304,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWebSite = this.getWebSite(); WebSiteAddress rhsWebSite; rhsWebSite = that.getWebSite(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "webSite", lhsWebSite), LocatorUtils.property(thatLocator, "webSite", rhsWebSite), lhsWebSite, rhsWebSite)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "webSite", lhsWebSite), LocatorUtils.property(thatLocator, "webSite", rhsWebSite), lhsWebSite, rhsWebSite, (this.webSite!= null), (that.webSite!= null))) { return false; } } @@ -1313,7 +1313,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastImportedTime = this.getLastImportedTime(); Date rhsLastImportedTime; rhsLastImportedTime = that.getLastImportedTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastImportedTime", lhsLastImportedTime), LocatorUtils.property(thatLocator, "lastImportedTime", rhsLastImportedTime), lhsLastImportedTime, rhsLastImportedTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastImportedTime", lhsLastImportedTime), LocatorUtils.property(thatLocator, "lastImportedTime", rhsLastImportedTime), lhsLastImportedTime, rhsLastImportedTime, (this.lastImportedTime!= null), (that.lastImportedTime!= null))) { return false; } } @@ -1322,7 +1322,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSupportedLanguages = this.getSupportedLanguages(); String rhsSupportedLanguages; rhsSupportedLanguages = that.getSupportedLanguages(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "supportedLanguages", lhsSupportedLanguages), LocatorUtils.property(thatLocator, "supportedLanguages", rhsSupportedLanguages), lhsSupportedLanguages, rhsSupportedLanguages)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "supportedLanguages", lhsSupportedLanguages), LocatorUtils.property(thatLocator, "supportedLanguages", rhsSupportedLanguages), lhsSupportedLanguages, rhsSupportedLanguages, (this.supportedLanguages!= null), (that.supportedLanguages!= null))) { return false; } } @@ -1331,7 +1331,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTimeZone = this.getDefaultTimeZone(); String rhsDefaultTimeZone; rhsDefaultTimeZone = that.getDefaultTimeZone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeZone", lhsDefaultTimeZone), LocatorUtils.property(thatLocator, "defaultTimeZone", rhsDefaultTimeZone), lhsDefaultTimeZone, rhsDefaultTimeZone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeZone", lhsDefaultTimeZone), LocatorUtils.property(thatLocator, "defaultTimeZone", rhsDefaultTimeZone), lhsDefaultTimeZone, rhsDefaultTimeZone, (this.defaultTimeZone!= null), (that.defaultTimeZone!= null))) { return false; } } @@ -1340,7 +1340,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMultiByteCharsSupported = this.isMultiByteCharsSupported(); Boolean rhsMultiByteCharsSupported; rhsMultiByteCharsSupported = that.isMultiByteCharsSupported(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "multiByteCharsSupported", lhsMultiByteCharsSupported), LocatorUtils.property(thatLocator, "multiByteCharsSupported", rhsMultiByteCharsSupported), lhsMultiByteCharsSupported, rhsMultiByteCharsSupported)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "multiByteCharsSupported", lhsMultiByteCharsSupported), LocatorUtils.property(thatLocator, "multiByteCharsSupported", rhsMultiByteCharsSupported), lhsMultiByteCharsSupported, rhsMultiByteCharsSupported, (this.multiByteCharsSupported!= null), (that.multiByteCharsSupported!= null))) { return false; } } @@ -1349,7 +1349,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -1358,7 +1358,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyInfoEx = this.getCompanyInfoEx(); IntuitAnyType rhsCompanyInfoEx; rhsCompanyInfoEx = that.getCompanyInfoEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyInfoEx", lhsCompanyInfoEx), LocatorUtils.property(thatLocator, "companyInfoEx", rhsCompanyInfoEx), lhsCompanyInfoEx, rhsCompanyInfoEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyInfoEx", lhsCompanyInfoEx), LocatorUtils.property(thatLocator, "companyInfoEx", rhsCompanyInfoEx), lhsCompanyInfoEx, rhsCompanyInfoEx, (this.companyInfoEx!= null), (that.companyInfoEx!= null))) { return false; } } @@ -1366,182 +1366,182 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theCompanyName; theCompanyName = this.getCompanyName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName, (this.companyName!= null)); } { String theLegalName; theLegalName = this.getLegalName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalName", theLegalName), currentHashCode, theLegalName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalName", theLegalName), currentHashCode, theLegalName, (this.legalName!= null)); } { PhysicalAddress theCompanyAddr; theCompanyAddr = this.getCompanyAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyAddr", theCompanyAddr), currentHashCode, theCompanyAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyAddr", theCompanyAddr), currentHashCode, theCompanyAddr, (this.companyAddr!= null)); } { PhysicalAddress theCustomerCommunicationAddr; theCustomerCommunicationAddr = this.getCustomerCommunicationAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationAddr", theCustomerCommunicationAddr), currentHashCode, theCustomerCommunicationAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationAddr", theCustomerCommunicationAddr), currentHashCode, theCustomerCommunicationAddr, (this.customerCommunicationAddr!= null)); } { PhysicalAddress theLegalAddr; theLegalAddr = this.getLegalAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalAddr", theLegalAddr), currentHashCode, theLegalAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalAddr", theLegalAddr), currentHashCode, theLegalAddr, (this.legalAddr!= null)); } { EmailAddress theCompanyEmailAddr; theCompanyEmailAddr = this.getCompanyEmailAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyEmailAddr", theCompanyEmailAddr), currentHashCode, theCompanyEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyEmailAddr", theCompanyEmailAddr), currentHashCode, theCompanyEmailAddr, (this.companyEmailAddr!= null)); } { EmailAddress theCustomerCommunicationEmailAddr; theCustomerCommunicationEmailAddr = this.getCustomerCommunicationEmailAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationEmailAddr", theCustomerCommunicationEmailAddr), currentHashCode, theCustomerCommunicationEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationEmailAddr", theCustomerCommunicationEmailAddr), currentHashCode, theCustomerCommunicationEmailAddr, (this.customerCommunicationEmailAddr!= null)); } { WebSiteAddress theCompanyURL; theCompanyURL = this.getCompanyURL(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyURL", theCompanyURL), currentHashCode, theCompanyURL); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyURL", theCompanyURL), currentHashCode, theCompanyURL, (this.companyURL!= null)); } { TelephoneNumber thePrimaryPhone; thePrimaryPhone = this.getPrimaryPhone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone, (this.primaryPhone!= null)); } { List theOtherContactInfo; theOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))); } { String theCompanyFileName; theCompanyFileName = this.getCompanyFileName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyFileName", theCompanyFileName), currentHashCode, theCompanyFileName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyFileName", theCompanyFileName), currentHashCode, theCompanyFileName, (this.companyFileName!= null)); } { String theFlavorStratum; theFlavorStratum = this.getFlavorStratum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flavorStratum", theFlavorStratum), currentHashCode, theFlavorStratum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flavorStratum", theFlavorStratum), currentHashCode, theFlavorStratum, (this.flavorStratum!= null)); } { Boolean theSampleFile; theSampleFile = this.isSampleFile(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sampleFile", theSampleFile), currentHashCode, theSampleFile); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sampleFile", theSampleFile), currentHashCode, theSampleFile, (this.sampleFile!= null)); } { String theCompanyUserId; theCompanyUserId = this.getCompanyUserId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserId", theCompanyUserId), currentHashCode, theCompanyUserId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserId", theCompanyUserId), currentHashCode, theCompanyUserId, (this.companyUserId!= null)); } { String theCompanyUserAdminEmail; theCompanyUserAdminEmail = this.getCompanyUserAdminEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserAdminEmail", theCompanyUserAdminEmail), currentHashCode, theCompanyUserAdminEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserAdminEmail", theCompanyUserAdminEmail), currentHashCode, theCompanyUserAdminEmail, (this.companyUserAdminEmail!= null)); } { Date theCompanyStartDate; theCompanyStartDate = this.getCompanyStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyStartDate", theCompanyStartDate), currentHashCode, theCompanyStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyStartDate", theCompanyStartDate), currentHashCode, theCompanyStartDate, (this.companyStartDate!= null)); } { String theEmployerId; theEmployerId = this.getEmployerId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employerId", theEmployerId), currentHashCode, theEmployerId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employerId", theEmployerId), currentHashCode, theEmployerId, (this.employerId!= null)); } { MonthEnum theFiscalYearStartMonth; theFiscalYearStartMonth = this.getFiscalYearStartMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiscalYearStartMonth", theFiscalYearStartMonth), currentHashCode, theFiscalYearStartMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiscalYearStartMonth", theFiscalYearStartMonth), currentHashCode, theFiscalYearStartMonth, (this.fiscalYearStartMonth!= null)); } { MonthEnum theTaxYearStartMonth; theTaxYearStartMonth = this.getTaxYearStartMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearStartMonth", theTaxYearStartMonth), currentHashCode, theTaxYearStartMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearStartMonth", theTaxYearStartMonth), currentHashCode, theTaxYearStartMonth, (this.taxYearStartMonth!= null)); } { String theQBVersion; theQBVersion = this.getQBVersion(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion, (this.qbVersion!= null)); } { String theCountry; theCountry = this.getCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry, (this.country!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { TelephoneNumber theMobile; theMobile = this.getMobile(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile, (this.mobile!= null)); } { TelephoneNumber theFax; theFax = this.getFax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax, (this.fax!= null)); } { EmailAddress theEmail; theEmail = this.getEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail, (this.email!= null)); } { WebSiteAddress theWebSite; theWebSite = this.getWebSite(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webSite", theWebSite), currentHashCode, theWebSite); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webSite", theWebSite), currentHashCode, theWebSite, (this.webSite!= null)); } { Date theLastImportedTime; theLastImportedTime = this.getLastImportedTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastImportedTime", theLastImportedTime), currentHashCode, theLastImportedTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastImportedTime", theLastImportedTime), currentHashCode, theLastImportedTime, (this.lastImportedTime!= null)); } { String theSupportedLanguages; theSupportedLanguages = this.getSupportedLanguages(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "supportedLanguages", theSupportedLanguages), currentHashCode, theSupportedLanguages); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "supportedLanguages", theSupportedLanguages), currentHashCode, theSupportedLanguages, (this.supportedLanguages!= null)); } { String theDefaultTimeZone; theDefaultTimeZone = this.getDefaultTimeZone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeZone", theDefaultTimeZone), currentHashCode, theDefaultTimeZone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeZone", theDefaultTimeZone), currentHashCode, theDefaultTimeZone, (this.defaultTimeZone!= null)); } { Boolean theMultiByteCharsSupported; theMultiByteCharsSupported = this.isMultiByteCharsSupported(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiByteCharsSupported", theMultiByteCharsSupported), currentHashCode, theMultiByteCharsSupported); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiByteCharsSupported", theMultiByteCharsSupported), currentHashCode, theMultiByteCharsSupported, (this.multiByteCharsSupported!= null)); } { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } { IntuitAnyType theCompanyInfoEx; theCompanyInfoEx = this.getCompanyInfoEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyInfoEx", theCompanyInfoEx), currentHashCode, theCompanyInfoEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyInfoEx", theCompanyInfoEx), currentHashCode, theCompanyInfoEx, (this.companyInfoEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyAccountingPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyAccountingPrefs.java index 028d4a49..78defede 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyAccountingPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyAccountingPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -98,8 +98,7 @@ "otherContactInfo", "customerTerminology" }) -public class CompanyAccountingPrefs - implements Serializable, Equals, HashCode +public class CompanyAccountingPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -513,8 +512,8 @@ public void setOtherContactInfo(List otherContactInfo) { this.otherContactInfo = otherContactInfo; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CompanyAccountingPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -526,7 +525,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUseAccountNumbers = this.isUseAccountNumbers(); Boolean rhsUseAccountNumbers; rhsUseAccountNumbers = that.isUseAccountNumbers(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "useAccountNumbers", lhsUseAccountNumbers), LocatorUtils.property(thatLocator, "useAccountNumbers", rhsUseAccountNumbers), lhsUseAccountNumbers, rhsUseAccountNumbers)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "useAccountNumbers", lhsUseAccountNumbers), LocatorUtils.property(thatLocator, "useAccountNumbers", rhsUseAccountNumbers), lhsUseAccountNumbers, rhsUseAccountNumbers, (this.useAccountNumbers!= null), (that.useAccountNumbers!= null))) { return false; } } @@ -535,7 +534,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultARAccount = this.getDefaultARAccount(); ReferenceType rhsDefaultARAccount; rhsDefaultARAccount = that.getDefaultARAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultARAccount", lhsDefaultARAccount), LocatorUtils.property(thatLocator, "defaultARAccount", rhsDefaultARAccount), lhsDefaultARAccount, rhsDefaultARAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultARAccount", lhsDefaultARAccount), LocatorUtils.property(thatLocator, "defaultARAccount", rhsDefaultARAccount), lhsDefaultARAccount, rhsDefaultARAccount, (this.defaultARAccount!= null), (that.defaultARAccount!= null))) { return false; } } @@ -544,7 +543,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultAPAccount = this.getDefaultAPAccount(); ReferenceType rhsDefaultAPAccount; rhsDefaultAPAccount = that.getDefaultAPAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultAPAccount", lhsDefaultAPAccount), LocatorUtils.property(thatLocator, "defaultAPAccount", rhsDefaultAPAccount), lhsDefaultAPAccount, rhsDefaultAPAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultAPAccount", lhsDefaultAPAccount), LocatorUtils.property(thatLocator, "defaultAPAccount", rhsDefaultAPAccount), lhsDefaultAPAccount, rhsDefaultAPAccount, (this.defaultAPAccount!= null), (that.defaultAPAccount!= null))) { return false; } } @@ -553,7 +552,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRequiresAccounts = this.isRequiresAccounts(); Boolean rhsRequiresAccounts; rhsRequiresAccounts = that.isRequiresAccounts(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "requiresAccounts", lhsRequiresAccounts), LocatorUtils.property(thatLocator, "requiresAccounts", rhsRequiresAccounts), lhsRequiresAccounts, rhsRequiresAccounts)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "requiresAccounts", lhsRequiresAccounts), LocatorUtils.property(thatLocator, "requiresAccounts", rhsRequiresAccounts), lhsRequiresAccounts, rhsRequiresAccounts, (this.requiresAccounts!= null), (that.requiresAccounts!= null))) { return false; } } @@ -562,7 +561,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackDepartments = this.isTrackDepartments(); Boolean rhsTrackDepartments; rhsTrackDepartments = that.isTrackDepartments(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackDepartments", lhsTrackDepartments), LocatorUtils.property(thatLocator, "trackDepartments", rhsTrackDepartments), lhsTrackDepartments, rhsTrackDepartments)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackDepartments", lhsTrackDepartments), LocatorUtils.property(thatLocator, "trackDepartments", rhsTrackDepartments), lhsTrackDepartments, rhsTrackDepartments, (this.trackDepartments!= null), (that.trackDepartments!= null))) { return false; } } @@ -571,7 +570,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentTerminology = this.getDepartmentTerminology(); String rhsDepartmentTerminology; rhsDepartmentTerminology = that.getDepartmentTerminology(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentTerminology", lhsDepartmentTerminology), LocatorUtils.property(thatLocator, "departmentTerminology", rhsDepartmentTerminology), lhsDepartmentTerminology, rhsDepartmentTerminology)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentTerminology", lhsDepartmentTerminology), LocatorUtils.property(thatLocator, "departmentTerminology", rhsDepartmentTerminology), lhsDepartmentTerminology, rhsDepartmentTerminology, (this.departmentTerminology!= null), (that.departmentTerminology!= null))) { return false; } } @@ -580,7 +579,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClassTrackingPerTxn = this.isClassTrackingPerTxn(); Boolean rhsClassTrackingPerTxn; rhsClassTrackingPerTxn = that.isClassTrackingPerTxn(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "classTrackingPerTxn", lhsClassTrackingPerTxn), LocatorUtils.property(thatLocator, "classTrackingPerTxn", rhsClassTrackingPerTxn), lhsClassTrackingPerTxn, rhsClassTrackingPerTxn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "classTrackingPerTxn", lhsClassTrackingPerTxn), LocatorUtils.property(thatLocator, "classTrackingPerTxn", rhsClassTrackingPerTxn), lhsClassTrackingPerTxn, rhsClassTrackingPerTxn, (this.classTrackingPerTxn!= null), (that.classTrackingPerTxn!= null))) { return false; } } @@ -589,7 +588,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClassTrackingPerTxnLine = this.isClassTrackingPerTxnLine(); Boolean rhsClassTrackingPerTxnLine; rhsClassTrackingPerTxnLine = that.isClassTrackingPerTxnLine(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "classTrackingPerTxnLine", lhsClassTrackingPerTxnLine), LocatorUtils.property(thatLocator, "classTrackingPerTxnLine", rhsClassTrackingPerTxnLine), lhsClassTrackingPerTxnLine, rhsClassTrackingPerTxnLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "classTrackingPerTxnLine", lhsClassTrackingPerTxnLine), LocatorUtils.property(thatLocator, "classTrackingPerTxnLine", rhsClassTrackingPerTxnLine), lhsClassTrackingPerTxnLine, rhsClassTrackingPerTxnLine, (this.classTrackingPerTxnLine!= null), (that.classTrackingPerTxnLine!= null))) { return false; } } @@ -598,7 +597,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAutoJournalEntryNumber = this.isAutoJournalEntryNumber(); Boolean rhsAutoJournalEntryNumber; rhsAutoJournalEntryNumber = that.isAutoJournalEntryNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "autoJournalEntryNumber", lhsAutoJournalEntryNumber), LocatorUtils.property(thatLocator, "autoJournalEntryNumber", rhsAutoJournalEntryNumber), lhsAutoJournalEntryNumber, rhsAutoJournalEntryNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "autoJournalEntryNumber", lhsAutoJournalEntryNumber), LocatorUtils.property(thatLocator, "autoJournalEntryNumber", rhsAutoJournalEntryNumber), lhsAutoJournalEntryNumber, rhsAutoJournalEntryNumber, (this.autoJournalEntryNumber!= null), (that.autoJournalEntryNumber!= null))) { return false; } } @@ -607,7 +606,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFirstMonthOfFiscalYear = this.getFirstMonthOfFiscalYear(); MonthEnum rhsFirstMonthOfFiscalYear; rhsFirstMonthOfFiscalYear = that.getFirstMonthOfFiscalYear(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "firstMonthOfFiscalYear", lhsFirstMonthOfFiscalYear), LocatorUtils.property(thatLocator, "firstMonthOfFiscalYear", rhsFirstMonthOfFiscalYear), lhsFirstMonthOfFiscalYear, rhsFirstMonthOfFiscalYear)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "firstMonthOfFiscalYear", lhsFirstMonthOfFiscalYear), LocatorUtils.property(thatLocator, "firstMonthOfFiscalYear", rhsFirstMonthOfFiscalYear), lhsFirstMonthOfFiscalYear, rhsFirstMonthOfFiscalYear, (this.firstMonthOfFiscalYear!= null), (that.firstMonthOfFiscalYear!= null))) { return false; } } @@ -616,7 +615,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxYearMonth = this.getTaxYearMonth(); MonthEnum rhsTaxYearMonth; rhsTaxYearMonth = that.getTaxYearMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearMonth", lhsTaxYearMonth), LocatorUtils.property(thatLocator, "taxYearMonth", rhsTaxYearMonth), lhsTaxYearMonth, rhsTaxYearMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearMonth", lhsTaxYearMonth), LocatorUtils.property(thatLocator, "taxYearMonth", rhsTaxYearMonth), lhsTaxYearMonth, rhsTaxYearMonth, (this.taxYearMonth!= null), (that.taxYearMonth!= null))) { return false; } } @@ -625,7 +624,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxForm = this.getTaxForm(); String rhsTaxForm; rhsTaxForm = that.getTaxForm(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxForm", lhsTaxForm), LocatorUtils.property(thatLocator, "taxForm", rhsTaxForm), lhsTaxForm, rhsTaxForm)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxForm", lhsTaxForm), LocatorUtils.property(thatLocator, "taxForm", rhsTaxForm), lhsTaxForm, rhsTaxForm, (this.taxForm!= null), (that.taxForm!= null))) { return false; } } @@ -634,7 +633,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBookCloseDate = this.getBookCloseDate(); Date rhsBookCloseDate; rhsBookCloseDate = that.getBookCloseDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bookCloseDate", lhsBookCloseDate), LocatorUtils.property(thatLocator, "bookCloseDate", rhsBookCloseDate), lhsBookCloseDate, rhsBookCloseDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bookCloseDate", lhsBookCloseDate), LocatorUtils.property(thatLocator, "bookCloseDate", rhsBookCloseDate), lhsBookCloseDate, rhsBookCloseDate, (this.bookCloseDate!= null), (that.bookCloseDate!= null))) { return false; } } @@ -643,7 +642,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); List rhsOtherContactInfo; rhsOtherContactInfo = (((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty()))?that.getOtherContactInfo():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty())), ((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty())))) { return false; } } @@ -652,7 +651,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerTerminology = this.getCustomerTerminology(); String rhsCustomerTerminology; rhsCustomerTerminology = that.getCustomerTerminology(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerTerminology", lhsCustomerTerminology), LocatorUtils.property(thatLocator, "customerTerminology", rhsCustomerTerminology), lhsCustomerTerminology, rhsCustomerTerminology)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerTerminology", lhsCustomerTerminology), LocatorUtils.property(thatLocator, "customerTerminology", rhsCustomerTerminology), lhsCustomerTerminology, rhsCustomerTerminology, (this.customerTerminology!= null), (that.customerTerminology!= null))) { return false; } } @@ -660,92 +659,92 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theUseAccountNumbers; theUseAccountNumbers = this.isUseAccountNumbers(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useAccountNumbers", theUseAccountNumbers), currentHashCode, theUseAccountNumbers); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useAccountNumbers", theUseAccountNumbers), currentHashCode, theUseAccountNumbers, (this.useAccountNumbers!= null)); } { ReferenceType theDefaultARAccount; theDefaultARAccount = this.getDefaultARAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultARAccount", theDefaultARAccount), currentHashCode, theDefaultARAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultARAccount", theDefaultARAccount), currentHashCode, theDefaultARAccount, (this.defaultARAccount!= null)); } { ReferenceType theDefaultAPAccount; theDefaultAPAccount = this.getDefaultAPAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultAPAccount", theDefaultAPAccount), currentHashCode, theDefaultAPAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultAPAccount", theDefaultAPAccount), currentHashCode, theDefaultAPAccount, (this.defaultAPAccount!= null)); } { Boolean theRequiresAccounts; theRequiresAccounts = this.isRequiresAccounts(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requiresAccounts", theRequiresAccounts), currentHashCode, theRequiresAccounts); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requiresAccounts", theRequiresAccounts), currentHashCode, theRequiresAccounts, (this.requiresAccounts!= null)); } { Boolean theTrackDepartments; theTrackDepartments = this.isTrackDepartments(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackDepartments", theTrackDepartments), currentHashCode, theTrackDepartments); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackDepartments", theTrackDepartments), currentHashCode, theTrackDepartments, (this.trackDepartments!= null)); } { String theDepartmentTerminology; theDepartmentTerminology = this.getDepartmentTerminology(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentTerminology", theDepartmentTerminology), currentHashCode, theDepartmentTerminology); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentTerminology", theDepartmentTerminology), currentHashCode, theDepartmentTerminology, (this.departmentTerminology!= null)); } { Boolean theClassTrackingPerTxn; theClassTrackingPerTxn = this.isClassTrackingPerTxn(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classTrackingPerTxn", theClassTrackingPerTxn), currentHashCode, theClassTrackingPerTxn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classTrackingPerTxn", theClassTrackingPerTxn), currentHashCode, theClassTrackingPerTxn, (this.classTrackingPerTxn!= null)); } { Boolean theClassTrackingPerTxnLine; theClassTrackingPerTxnLine = this.isClassTrackingPerTxnLine(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classTrackingPerTxnLine", theClassTrackingPerTxnLine), currentHashCode, theClassTrackingPerTxnLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "classTrackingPerTxnLine", theClassTrackingPerTxnLine), currentHashCode, theClassTrackingPerTxnLine, (this.classTrackingPerTxnLine!= null)); } { Boolean theAutoJournalEntryNumber; theAutoJournalEntryNumber = this.isAutoJournalEntryNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoJournalEntryNumber", theAutoJournalEntryNumber), currentHashCode, theAutoJournalEntryNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoJournalEntryNumber", theAutoJournalEntryNumber), currentHashCode, theAutoJournalEntryNumber, (this.autoJournalEntryNumber!= null)); } { MonthEnum theFirstMonthOfFiscalYear; theFirstMonthOfFiscalYear = this.getFirstMonthOfFiscalYear(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "firstMonthOfFiscalYear", theFirstMonthOfFiscalYear), currentHashCode, theFirstMonthOfFiscalYear); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "firstMonthOfFiscalYear", theFirstMonthOfFiscalYear), currentHashCode, theFirstMonthOfFiscalYear, (this.firstMonthOfFiscalYear!= null)); } { MonthEnum theTaxYearMonth; theTaxYearMonth = this.getTaxYearMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearMonth", theTaxYearMonth), currentHashCode, theTaxYearMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearMonth", theTaxYearMonth), currentHashCode, theTaxYearMonth, (this.taxYearMonth!= null)); } { String theTaxForm; theTaxForm = this.getTaxForm(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxForm", theTaxForm), currentHashCode, theTaxForm); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxForm", theTaxForm), currentHashCode, theTaxForm, (this.taxForm!= null)); } { Date theBookCloseDate; theBookCloseDate = this.getBookCloseDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bookCloseDate", theBookCloseDate), currentHashCode, theBookCloseDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bookCloseDate", theBookCloseDate), currentHashCode, theBookCloseDate, (this.bookCloseDate!= null)); } { List theOtherContactInfo; theOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))); } { String theCustomerTerminology; theCustomerTerminology = this.getCustomerTerminology(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerTerminology", theCustomerTerminology), currentHashCode, theCustomerTerminology); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerTerminology", theCustomerTerminology), currentHashCode, theCustomerTerminology, (this.customerTerminology!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyCurrency.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyCurrency.java index 2896cce6..ea57a068 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyCurrency.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyCurrency.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -73,7 +73,7 @@ }) public class CompanyCurrency extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -182,8 +182,8 @@ public void setCompanyCurrencyEx(IntuitAnyType value) { this.companyCurrencyEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CompanyCurrency)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -198,7 +198,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCode = this.getCode(); String rhsCode; rhsCode = that.getCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode, (this.code!= null), (that.code!= null))) { return false; } } @@ -207,7 +207,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -216,7 +216,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -225,7 +225,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyCurrencyEx = this.getCompanyCurrencyEx(); IntuitAnyType rhsCompanyCurrencyEx; rhsCompanyCurrencyEx = that.getCompanyCurrencyEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyCurrencyEx", lhsCompanyCurrencyEx), LocatorUtils.property(thatLocator, "companyCurrencyEx", rhsCompanyCurrencyEx), lhsCompanyCurrencyEx, rhsCompanyCurrencyEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyCurrencyEx", lhsCompanyCurrencyEx), LocatorUtils.property(thatLocator, "companyCurrencyEx", rhsCompanyCurrencyEx), lhsCompanyCurrencyEx, rhsCompanyCurrencyEx, (this.companyCurrencyEx!= null), (that.companyCurrencyEx!= null))) { return false; } } @@ -233,37 +233,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theCode; theCode = this.getCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode, (this.code!= null)); } { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { IntuitAnyType theCompanyCurrencyEx; theCompanyCurrencyEx = this.getCompanyCurrencyEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyCurrencyEx", theCompanyCurrencyEx), currentHashCode, theCompanyCurrencyEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyCurrencyEx", theCompanyCurrencyEx), currentHashCode, theCompanyCurrencyEx, (this.companyCurrencyEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyInfo.java index 417b890a..11e76974 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CompanyInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -138,7 +138,7 @@ }) public class CompanyInfo extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1084,8 +1084,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CompanyInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1100,7 +1100,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyName = this.getCompanyName(); String rhsCompanyName; rhsCompanyName = that.getCompanyName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName, (this.companyName!= null), (that.companyName!= null))) { return false; } } @@ -1109,7 +1109,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLegalName = this.getLegalName(); String rhsLegalName; rhsLegalName = that.getLegalName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "legalName", lhsLegalName), LocatorUtils.property(thatLocator, "legalName", rhsLegalName), lhsLegalName, rhsLegalName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "legalName", lhsLegalName), LocatorUtils.property(thatLocator, "legalName", rhsLegalName), lhsLegalName, rhsLegalName, (this.legalName!= null), (that.legalName!= null))) { return false; } } @@ -1118,7 +1118,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyAddr = this.getCompanyAddr(); PhysicalAddress rhsCompanyAddr; rhsCompanyAddr = that.getCompanyAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyAddr", lhsCompanyAddr), LocatorUtils.property(thatLocator, "companyAddr", rhsCompanyAddr), lhsCompanyAddr, rhsCompanyAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyAddr", lhsCompanyAddr), LocatorUtils.property(thatLocator, "companyAddr", rhsCompanyAddr), lhsCompanyAddr, rhsCompanyAddr, (this.companyAddr!= null), (that.companyAddr!= null))) { return false; } } @@ -1127,7 +1127,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerCommunicationAddr = this.getCustomerCommunicationAddr(); PhysicalAddress rhsCustomerCommunicationAddr; rhsCustomerCommunicationAddr = that.getCustomerCommunicationAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationAddr", lhsCustomerCommunicationAddr), LocatorUtils.property(thatLocator, "customerCommunicationAddr", rhsCustomerCommunicationAddr), lhsCustomerCommunicationAddr, rhsCustomerCommunicationAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationAddr", lhsCustomerCommunicationAddr), LocatorUtils.property(thatLocator, "customerCommunicationAddr", rhsCustomerCommunicationAddr), lhsCustomerCommunicationAddr, rhsCustomerCommunicationAddr, (this.customerCommunicationAddr!= null), (that.customerCommunicationAddr!= null))) { return false; } } @@ -1136,7 +1136,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLegalAddr = this.getLegalAddr(); PhysicalAddress rhsLegalAddr; rhsLegalAddr = that.getLegalAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "legalAddr", lhsLegalAddr), LocatorUtils.property(thatLocator, "legalAddr", rhsLegalAddr), lhsLegalAddr, rhsLegalAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "legalAddr", lhsLegalAddr), LocatorUtils.property(thatLocator, "legalAddr", rhsLegalAddr), lhsLegalAddr, rhsLegalAddr, (this.legalAddr!= null), (that.legalAddr!= null))) { return false; } } @@ -1145,7 +1145,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyEmailAddr = this.getCompanyEmailAddr(); EmailAddress rhsCompanyEmailAddr; rhsCompanyEmailAddr = that.getCompanyEmailAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyEmailAddr", lhsCompanyEmailAddr), LocatorUtils.property(thatLocator, "companyEmailAddr", rhsCompanyEmailAddr), lhsCompanyEmailAddr, rhsCompanyEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyEmailAddr", lhsCompanyEmailAddr), LocatorUtils.property(thatLocator, "companyEmailAddr", rhsCompanyEmailAddr), lhsCompanyEmailAddr, rhsCompanyEmailAddr, (this.companyEmailAddr!= null), (that.companyEmailAddr!= null))) { return false; } } @@ -1154,7 +1154,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerCommunicationEmailAddr = this.getCustomerCommunicationEmailAddr(); EmailAddress rhsCustomerCommunicationEmailAddr; rhsCustomerCommunicationEmailAddr = that.getCustomerCommunicationEmailAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationEmailAddr", lhsCustomerCommunicationEmailAddr), LocatorUtils.property(thatLocator, "customerCommunicationEmailAddr", rhsCustomerCommunicationEmailAddr), lhsCustomerCommunicationEmailAddr, rhsCustomerCommunicationEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerCommunicationEmailAddr", lhsCustomerCommunicationEmailAddr), LocatorUtils.property(thatLocator, "customerCommunicationEmailAddr", rhsCustomerCommunicationEmailAddr), lhsCustomerCommunicationEmailAddr, rhsCustomerCommunicationEmailAddr, (this.customerCommunicationEmailAddr!= null), (that.customerCommunicationEmailAddr!= null))) { return false; } } @@ -1163,7 +1163,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyURL = this.getCompanyURL(); WebSiteAddress rhsCompanyURL; rhsCompanyURL = that.getCompanyURL(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyURL", lhsCompanyURL), LocatorUtils.property(thatLocator, "companyURL", rhsCompanyURL), lhsCompanyURL, rhsCompanyURL)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyURL", lhsCompanyURL), LocatorUtils.property(thatLocator, "companyURL", rhsCompanyURL), lhsCompanyURL, rhsCompanyURL, (this.companyURL!= null), (that.companyURL!= null))) { return false; } } @@ -1172,7 +1172,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryPhone = this.getPrimaryPhone(); TelephoneNumber rhsPrimaryPhone; rhsPrimaryPhone = that.getPrimaryPhone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone, (this.primaryPhone!= null), (that.primaryPhone!= null))) { return false; } } @@ -1181,7 +1181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); List rhsOtherContactInfo; rhsOtherContactInfo = (((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty()))?that.getOtherContactInfo():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty())), ((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty())))) { return false; } } @@ -1190,7 +1190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyFileName = this.getCompanyFileName(); String rhsCompanyFileName; rhsCompanyFileName = that.getCompanyFileName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyFileName", lhsCompanyFileName), LocatorUtils.property(thatLocator, "companyFileName", rhsCompanyFileName), lhsCompanyFileName, rhsCompanyFileName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyFileName", lhsCompanyFileName), LocatorUtils.property(thatLocator, "companyFileName", rhsCompanyFileName), lhsCompanyFileName, rhsCompanyFileName, (this.companyFileName!= null), (that.companyFileName!= null))) { return false; } } @@ -1199,7 +1199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFlavorStratum = this.getFlavorStratum(); String rhsFlavorStratum; rhsFlavorStratum = that.getFlavorStratum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "flavorStratum", lhsFlavorStratum), LocatorUtils.property(thatLocator, "flavorStratum", rhsFlavorStratum), lhsFlavorStratum, rhsFlavorStratum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "flavorStratum", lhsFlavorStratum), LocatorUtils.property(thatLocator, "flavorStratum", rhsFlavorStratum), lhsFlavorStratum, rhsFlavorStratum, (this.flavorStratum!= null), (that.flavorStratum!= null))) { return false; } } @@ -1208,7 +1208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSampleFile = this.isSampleFile(); Boolean rhsSampleFile; rhsSampleFile = that.isSampleFile(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "sampleFile", lhsSampleFile), LocatorUtils.property(thatLocator, "sampleFile", rhsSampleFile), lhsSampleFile, rhsSampleFile)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "sampleFile", lhsSampleFile), LocatorUtils.property(thatLocator, "sampleFile", rhsSampleFile), lhsSampleFile, rhsSampleFile, (this.sampleFile!= null), (that.sampleFile!= null))) { return false; } } @@ -1217,7 +1217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyUserId = this.getCompanyUserId(); String rhsCompanyUserId; rhsCompanyUserId = that.getCompanyUserId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserId", lhsCompanyUserId), LocatorUtils.property(thatLocator, "companyUserId", rhsCompanyUserId), lhsCompanyUserId, rhsCompanyUserId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserId", lhsCompanyUserId), LocatorUtils.property(thatLocator, "companyUserId", rhsCompanyUserId), lhsCompanyUserId, rhsCompanyUserId, (this.companyUserId!= null), (that.companyUserId!= null))) { return false; } } @@ -1226,7 +1226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyUserAdminEmail = this.getCompanyUserAdminEmail(); String rhsCompanyUserAdminEmail; rhsCompanyUserAdminEmail = that.getCompanyUserAdminEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserAdminEmail", lhsCompanyUserAdminEmail), LocatorUtils.property(thatLocator, "companyUserAdminEmail", rhsCompanyUserAdminEmail), lhsCompanyUserAdminEmail, rhsCompanyUserAdminEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyUserAdminEmail", lhsCompanyUserAdminEmail), LocatorUtils.property(thatLocator, "companyUserAdminEmail", rhsCompanyUserAdminEmail), lhsCompanyUserAdminEmail, rhsCompanyUserAdminEmail, (this.companyUserAdminEmail!= null), (that.companyUserAdminEmail!= null))) { return false; } } @@ -1235,7 +1235,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyStartDate = this.getCompanyStartDate(); Date rhsCompanyStartDate; rhsCompanyStartDate = that.getCompanyStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyStartDate", lhsCompanyStartDate), LocatorUtils.property(thatLocator, "companyStartDate", rhsCompanyStartDate), lhsCompanyStartDate, rhsCompanyStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyStartDate", lhsCompanyStartDate), LocatorUtils.property(thatLocator, "companyStartDate", rhsCompanyStartDate), lhsCompanyStartDate, rhsCompanyStartDate, (this.companyStartDate!= null), (that.companyStartDate!= null))) { return false; } } @@ -1244,7 +1244,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployerId = this.getEmployerId(); String rhsEmployerId; rhsEmployerId = that.getEmployerId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employerId", lhsEmployerId), LocatorUtils.property(thatLocator, "employerId", rhsEmployerId), lhsEmployerId, rhsEmployerId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employerId", lhsEmployerId), LocatorUtils.property(thatLocator, "employerId", rhsEmployerId), lhsEmployerId, rhsEmployerId, (this.employerId!= null), (that.employerId!= null))) { return false; } } @@ -1253,7 +1253,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFiscalYearStartMonth = this.getFiscalYearStartMonth(); MonthEnum rhsFiscalYearStartMonth; rhsFiscalYearStartMonth = that.getFiscalYearStartMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fiscalYearStartMonth", lhsFiscalYearStartMonth), LocatorUtils.property(thatLocator, "fiscalYearStartMonth", rhsFiscalYearStartMonth), lhsFiscalYearStartMonth, rhsFiscalYearStartMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fiscalYearStartMonth", lhsFiscalYearStartMonth), LocatorUtils.property(thatLocator, "fiscalYearStartMonth", rhsFiscalYearStartMonth), lhsFiscalYearStartMonth, rhsFiscalYearStartMonth, (this.fiscalYearStartMonth!= null), (that.fiscalYearStartMonth!= null))) { return false; } } @@ -1262,7 +1262,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxYearStartMonth = this.getTaxYearStartMonth(); MonthEnum rhsTaxYearStartMonth; rhsTaxYearStartMonth = that.getTaxYearStartMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearStartMonth", lhsTaxYearStartMonth), LocatorUtils.property(thatLocator, "taxYearStartMonth", rhsTaxYearStartMonth), lhsTaxYearStartMonth, rhsTaxYearStartMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxYearStartMonth", lhsTaxYearStartMonth), LocatorUtils.property(thatLocator, "taxYearStartMonth", rhsTaxYearStartMonth), lhsTaxYearStartMonth, rhsTaxYearStartMonth, (this.taxYearStartMonth!= null), (that.taxYearStartMonth!= null))) { return false; } } @@ -1271,7 +1271,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQBVersion = this.getQBVersion(); String rhsQBVersion; rhsQBVersion = that.getQBVersion(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion, (this.qbVersion!= null), (that.qbVersion!= null))) { return false; } } @@ -1280,7 +1280,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountry = this.getCountry(); String rhsCountry; rhsCountry = that.getCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry, (this.country!= null), (that.country!= null))) { return false; } } @@ -1289,7 +1289,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -1298,7 +1298,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -1307,7 +1307,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMobile = this.getMobile(); TelephoneNumber rhsMobile; rhsMobile = that.getMobile(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile, (this.mobile!= null), (that.mobile!= null))) { return false; } } @@ -1316,7 +1316,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFax = this.getFax(); TelephoneNumber rhsFax; rhsFax = that.getFax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax, (this.fax!= null), (that.fax!= null))) { return false; } } @@ -1325,7 +1325,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmail = this.getEmail(); EmailAddress rhsEmail; rhsEmail = that.getEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail, (this.email!= null), (that.email!= null))) { return false; } } @@ -1334,7 +1334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWebAddr = this.getWebAddr(); WebSiteAddress rhsWebAddr; rhsWebAddr = that.getWebAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "webAddr", lhsWebAddr), LocatorUtils.property(thatLocator, "webAddr", rhsWebAddr), lhsWebAddr, rhsWebAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "webAddr", lhsWebAddr), LocatorUtils.property(thatLocator, "webAddr", rhsWebAddr), lhsWebAddr, rhsWebAddr, (this.webAddr!= null), (that.webAddr!= null))) { return false; } } @@ -1343,7 +1343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastImportedTime = this.getLastImportedTime(); Date rhsLastImportedTime; rhsLastImportedTime = that.getLastImportedTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastImportedTime", lhsLastImportedTime), LocatorUtils.property(thatLocator, "lastImportedTime", rhsLastImportedTime), lhsLastImportedTime, rhsLastImportedTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastImportedTime", lhsLastImportedTime), LocatorUtils.property(thatLocator, "lastImportedTime", rhsLastImportedTime), lhsLastImportedTime, rhsLastImportedTime, (this.lastImportedTime!= null), (that.lastImportedTime!= null))) { return false; } } @@ -1352,7 +1352,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastSyncTime = this.getLastSyncTime(); Date rhsLastSyncTime; rhsLastSyncTime = that.getLastSyncTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastSyncTime", lhsLastSyncTime), LocatorUtils.property(thatLocator, "lastSyncTime", rhsLastSyncTime), lhsLastSyncTime, rhsLastSyncTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastSyncTime", lhsLastSyncTime), LocatorUtils.property(thatLocator, "lastSyncTime", rhsLastSyncTime), lhsLastSyncTime, rhsLastSyncTime, (this.lastSyncTime!= null), (that.lastSyncTime!= null))) { return false; } } @@ -1361,7 +1361,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSupportedLanguages = this.getSupportedLanguages(); String rhsSupportedLanguages; rhsSupportedLanguages = that.getSupportedLanguages(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "supportedLanguages", lhsSupportedLanguages), LocatorUtils.property(thatLocator, "supportedLanguages", rhsSupportedLanguages), lhsSupportedLanguages, rhsSupportedLanguages)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "supportedLanguages", lhsSupportedLanguages), LocatorUtils.property(thatLocator, "supportedLanguages", rhsSupportedLanguages), lhsSupportedLanguages, rhsSupportedLanguages, (this.supportedLanguages!= null), (that.supportedLanguages!= null))) { return false; } } @@ -1370,7 +1370,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTimeZone = this.getDefaultTimeZone(); String rhsDefaultTimeZone; rhsDefaultTimeZone = that.getDefaultTimeZone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeZone", lhsDefaultTimeZone), LocatorUtils.property(thatLocator, "defaultTimeZone", rhsDefaultTimeZone), lhsDefaultTimeZone, rhsDefaultTimeZone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeZone", lhsDefaultTimeZone), LocatorUtils.property(thatLocator, "defaultTimeZone", rhsDefaultTimeZone), lhsDefaultTimeZone, rhsDefaultTimeZone, (this.defaultTimeZone!= null), (that.defaultTimeZone!= null))) { return false; } } @@ -1379,7 +1379,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMultiByteCharsSupported = this.isMultiByteCharsSupported(); Boolean rhsMultiByteCharsSupported; rhsMultiByteCharsSupported = that.isMultiByteCharsSupported(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "multiByteCharsSupported", lhsMultiByteCharsSupported), LocatorUtils.property(thatLocator, "multiByteCharsSupported", rhsMultiByteCharsSupported), lhsMultiByteCharsSupported, rhsMultiByteCharsSupported)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "multiByteCharsSupported", lhsMultiByteCharsSupported), LocatorUtils.property(thatLocator, "multiByteCharsSupported", rhsMultiByteCharsSupported), lhsMultiByteCharsSupported, rhsMultiByteCharsSupported, (this.multiByteCharsSupported!= null), (that.multiByteCharsSupported!= null))) { return false; } } @@ -1388,7 +1388,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -1397,7 +1397,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyInfoEx = this.getCompanyInfoEx(); IntuitAnyType rhsCompanyInfoEx; rhsCompanyInfoEx = that.getCompanyInfoEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyInfoEx", lhsCompanyInfoEx), LocatorUtils.property(thatLocator, "companyInfoEx", rhsCompanyInfoEx), lhsCompanyInfoEx, rhsCompanyInfoEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyInfoEx", lhsCompanyInfoEx), LocatorUtils.property(thatLocator, "companyInfoEx", rhsCompanyInfoEx), lhsCompanyInfoEx, rhsCompanyInfoEx, (this.companyInfoEx!= null), (that.companyInfoEx!= null))) { return false; } } @@ -1405,187 +1405,187 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theCompanyName; theCompanyName = this.getCompanyName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName, (this.companyName!= null)); } { String theLegalName; theLegalName = this.getLegalName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalName", theLegalName), currentHashCode, theLegalName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalName", theLegalName), currentHashCode, theLegalName, (this.legalName!= null)); } { PhysicalAddress theCompanyAddr; theCompanyAddr = this.getCompanyAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyAddr", theCompanyAddr), currentHashCode, theCompanyAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyAddr", theCompanyAddr), currentHashCode, theCompanyAddr, (this.companyAddr!= null)); } { PhysicalAddress theCustomerCommunicationAddr; theCustomerCommunicationAddr = this.getCustomerCommunicationAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationAddr", theCustomerCommunicationAddr), currentHashCode, theCustomerCommunicationAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationAddr", theCustomerCommunicationAddr), currentHashCode, theCustomerCommunicationAddr, (this.customerCommunicationAddr!= null)); } { PhysicalAddress theLegalAddr; theLegalAddr = this.getLegalAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalAddr", theLegalAddr), currentHashCode, theLegalAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legalAddr", theLegalAddr), currentHashCode, theLegalAddr, (this.legalAddr!= null)); } { EmailAddress theCompanyEmailAddr; theCompanyEmailAddr = this.getCompanyEmailAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyEmailAddr", theCompanyEmailAddr), currentHashCode, theCompanyEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyEmailAddr", theCompanyEmailAddr), currentHashCode, theCompanyEmailAddr, (this.companyEmailAddr!= null)); } { EmailAddress theCustomerCommunicationEmailAddr; theCustomerCommunicationEmailAddr = this.getCustomerCommunicationEmailAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationEmailAddr", theCustomerCommunicationEmailAddr), currentHashCode, theCustomerCommunicationEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerCommunicationEmailAddr", theCustomerCommunicationEmailAddr), currentHashCode, theCustomerCommunicationEmailAddr, (this.customerCommunicationEmailAddr!= null)); } { WebSiteAddress theCompanyURL; theCompanyURL = this.getCompanyURL(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyURL", theCompanyURL), currentHashCode, theCompanyURL); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyURL", theCompanyURL), currentHashCode, theCompanyURL, (this.companyURL!= null)); } { TelephoneNumber thePrimaryPhone; thePrimaryPhone = this.getPrimaryPhone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone, (this.primaryPhone!= null)); } { List theOtherContactInfo; theOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))); } { String theCompanyFileName; theCompanyFileName = this.getCompanyFileName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyFileName", theCompanyFileName), currentHashCode, theCompanyFileName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyFileName", theCompanyFileName), currentHashCode, theCompanyFileName, (this.companyFileName!= null)); } { String theFlavorStratum; theFlavorStratum = this.getFlavorStratum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flavorStratum", theFlavorStratum), currentHashCode, theFlavorStratum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flavorStratum", theFlavorStratum), currentHashCode, theFlavorStratum, (this.flavorStratum!= null)); } { Boolean theSampleFile; theSampleFile = this.isSampleFile(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sampleFile", theSampleFile), currentHashCode, theSampleFile); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sampleFile", theSampleFile), currentHashCode, theSampleFile, (this.sampleFile!= null)); } { String theCompanyUserId; theCompanyUserId = this.getCompanyUserId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserId", theCompanyUserId), currentHashCode, theCompanyUserId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserId", theCompanyUserId), currentHashCode, theCompanyUserId, (this.companyUserId!= null)); } { String theCompanyUserAdminEmail; theCompanyUserAdminEmail = this.getCompanyUserAdminEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserAdminEmail", theCompanyUserAdminEmail), currentHashCode, theCompanyUserAdminEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyUserAdminEmail", theCompanyUserAdminEmail), currentHashCode, theCompanyUserAdminEmail, (this.companyUserAdminEmail!= null)); } { Date theCompanyStartDate; theCompanyStartDate = this.getCompanyStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyStartDate", theCompanyStartDate), currentHashCode, theCompanyStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyStartDate", theCompanyStartDate), currentHashCode, theCompanyStartDate, (this.companyStartDate!= null)); } { String theEmployerId; theEmployerId = this.getEmployerId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employerId", theEmployerId), currentHashCode, theEmployerId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employerId", theEmployerId), currentHashCode, theEmployerId, (this.employerId!= null)); } { MonthEnum theFiscalYearStartMonth; theFiscalYearStartMonth = this.getFiscalYearStartMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiscalYearStartMonth", theFiscalYearStartMonth), currentHashCode, theFiscalYearStartMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fiscalYearStartMonth", theFiscalYearStartMonth), currentHashCode, theFiscalYearStartMonth, (this.fiscalYearStartMonth!= null)); } { MonthEnum theTaxYearStartMonth; theTaxYearStartMonth = this.getTaxYearStartMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearStartMonth", theTaxYearStartMonth), currentHashCode, theTaxYearStartMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxYearStartMonth", theTaxYearStartMonth), currentHashCode, theTaxYearStartMonth, (this.taxYearStartMonth!= null)); } { String theQBVersion; theQBVersion = this.getQBVersion(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion, (this.qbVersion!= null)); } { String theCountry; theCountry = this.getCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry, (this.country!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { TelephoneNumber theMobile; theMobile = this.getMobile(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile, (this.mobile!= null)); } { TelephoneNumber theFax; theFax = this.getFax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax, (this.fax!= null)); } { EmailAddress theEmail; theEmail = this.getEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail, (this.email!= null)); } { WebSiteAddress theWebAddr; theWebAddr = this.getWebAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webAddr", theWebAddr), currentHashCode, theWebAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webAddr", theWebAddr), currentHashCode, theWebAddr, (this.webAddr!= null)); } { Date theLastImportedTime; theLastImportedTime = this.getLastImportedTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastImportedTime", theLastImportedTime), currentHashCode, theLastImportedTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastImportedTime", theLastImportedTime), currentHashCode, theLastImportedTime, (this.lastImportedTime!= null)); } { Date theLastSyncTime; theLastSyncTime = this.getLastSyncTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastSyncTime", theLastSyncTime), currentHashCode, theLastSyncTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastSyncTime", theLastSyncTime), currentHashCode, theLastSyncTime, (this.lastSyncTime!= null)); } { String theSupportedLanguages; theSupportedLanguages = this.getSupportedLanguages(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "supportedLanguages", theSupportedLanguages), currentHashCode, theSupportedLanguages); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "supportedLanguages", theSupportedLanguages), currentHashCode, theSupportedLanguages, (this.supportedLanguages!= null)); } { String theDefaultTimeZone; theDefaultTimeZone = this.getDefaultTimeZone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeZone", theDefaultTimeZone), currentHashCode, theDefaultTimeZone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeZone", theDefaultTimeZone), currentHashCode, theDefaultTimeZone, (this.defaultTimeZone!= null)); } { Boolean theMultiByteCharsSupported; theMultiByteCharsSupported = this.isMultiByteCharsSupported(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiByteCharsSupported", theMultiByteCharsSupported), currentHashCode, theMultiByteCharsSupported); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiByteCharsSupported", theMultiByteCharsSupported), currentHashCode, theMultiByteCharsSupported, (this.multiByteCharsSupported!= null)); } { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } { IntuitAnyType theCompanyInfoEx; theCompanyInfoEx = this.getCompanyInfoEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyInfoEx", theCompanyInfoEx), currentHashCode, theCompanyInfoEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyInfoEx", theCompanyInfoEx), currentHashCode, theCompanyInfoEx, (this.companyInfoEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactInfo.java index dc5d318a..05453796 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -76,8 +76,7 @@ "webSite", "otherContact" }) -public class ContactInfo - implements Serializable, Equals, HashCode +public class ContactInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -212,8 +211,8 @@ public void setOtherContact(GenericContactType value) { this.otherContact = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ContactInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -225,7 +224,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); ContactTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -234,7 +233,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTelephone = this.getTelephone(); TelephoneNumber rhsTelephone; rhsTelephone = that.getTelephone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "telephone", lhsTelephone), LocatorUtils.property(thatLocator, "telephone", rhsTelephone), lhsTelephone, rhsTelephone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "telephone", lhsTelephone), LocatorUtils.property(thatLocator, "telephone", rhsTelephone), lhsTelephone, rhsTelephone, (this.telephone!= null), (that.telephone!= null))) { return false; } } @@ -243,7 +242,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmail = this.getEmail(); EmailAddress rhsEmail; rhsEmail = that.getEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "email", lhsEmail), LocatorUtils.property(thatLocator, "email", rhsEmail), lhsEmail, rhsEmail, (this.email!= null), (that.email!= null))) { return false; } } @@ -252,7 +251,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWebSite = this.getWebSite(); WebSiteAddress rhsWebSite; rhsWebSite = that.getWebSite(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "webSite", lhsWebSite), LocatorUtils.property(thatLocator, "webSite", rhsWebSite), lhsWebSite, rhsWebSite)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "webSite", lhsWebSite), LocatorUtils.property(thatLocator, "webSite", rhsWebSite), lhsWebSite, rhsWebSite, (this.webSite!= null), (that.webSite!= null))) { return false; } } @@ -261,7 +260,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherContact = this.getOtherContact(); GenericContactType rhsOtherContact; rhsOtherContact = that.getOtherContact(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContact", lhsOtherContact), LocatorUtils.property(thatLocator, "otherContact", rhsOtherContact), lhsOtherContact, rhsOtherContact)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContact", lhsOtherContact), LocatorUtils.property(thatLocator, "otherContact", rhsOtherContact), lhsOtherContact, rhsOtherContact, (this.otherContact!= null), (that.otherContact!= null))) { return false; } } @@ -269,42 +268,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { ContactTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { TelephoneNumber theTelephone; theTelephone = this.getTelephone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "telephone", theTelephone), currentHashCode, theTelephone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "telephone", theTelephone), currentHashCode, theTelephone, (this.telephone!= null)); } { EmailAddress theEmail; theEmail = this.getEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "email", theEmail), currentHashCode, theEmail, (this.email!= null)); } { WebSiteAddress theWebSite; theWebSite = this.getWebSite(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webSite", theWebSite), currentHashCode, theWebSite); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webSite", theWebSite), currentHashCode, theWebSite, (this.webSite!= null)); } { GenericContactType theOtherContact; theOtherContact = this.getOtherContact(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContact", theOtherContact), currentHashCode, theOtherContact); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContact", theOtherContact), currentHashCode, theOtherContact, (this.otherContact!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactTypeEnum.java index a2aec772..f16f0ec2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ContactTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPayment.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPayment.java index d67401ee..4bf59ee2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPayment.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPayment.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -69,8 +69,7 @@ "creditChargeInfo", "creditChargeResponse" }) -public class CreditCardPayment - implements Serializable, Equals, HashCode +public class CreditCardPayment implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +126,8 @@ public void setCreditChargeResponse(CreditChargeResponse value) { this.creditChargeResponse = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CreditCardPayment)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -140,7 +139,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditChargeInfo = this.getCreditChargeInfo(); CreditChargeInfo rhsCreditChargeInfo; rhsCreditChargeInfo = that.getCreditChargeInfo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeInfo", lhsCreditChargeInfo), LocatorUtils.property(thatLocator, "creditChargeInfo", rhsCreditChargeInfo), lhsCreditChargeInfo, rhsCreditChargeInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeInfo", lhsCreditChargeInfo), LocatorUtils.property(thatLocator, "creditChargeInfo", rhsCreditChargeInfo), lhsCreditChargeInfo, rhsCreditChargeInfo, (this.creditChargeInfo!= null), (that.creditChargeInfo!= null))) { return false; } } @@ -149,7 +148,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditChargeResponse = this.getCreditChargeResponse(); CreditChargeResponse rhsCreditChargeResponse; rhsCreditChargeResponse = that.getCreditChargeResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeResponse", lhsCreditChargeResponse), LocatorUtils.property(thatLocator, "creditChargeResponse", rhsCreditChargeResponse), lhsCreditChargeResponse, rhsCreditChargeResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeResponse", lhsCreditChargeResponse), LocatorUtils.property(thatLocator, "creditChargeResponse", rhsCreditChargeResponse), lhsCreditChargeResponse, rhsCreditChargeResponse, (this.creditChargeResponse!= null), (that.creditChargeResponse!= null))) { return false; } } @@ -157,27 +156,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { CreditChargeInfo theCreditChargeInfo; theCreditChargeInfo = this.getCreditChargeInfo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeInfo", theCreditChargeInfo), currentHashCode, theCreditChargeInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeInfo", theCreditChargeInfo), currentHashCode, theCreditChargeInfo, (this.creditChargeInfo!= null)); } { CreditChargeResponse theCreditChargeResponse; theCreditChargeResponse = this.getCreditChargeResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeResponse", theCreditChargeResponse), currentHashCode, theCreditChargeResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeResponse", theCreditChargeResponse), currentHashCode, theCreditChargeResponse, (this.creditChargeResponse!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPurchase.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPurchase.java index a946587b..0beb35db 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPurchase.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardPurchase.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -66,8 +66,7 @@ "accountRef", "credit" }) -public class CreditCardPurchase - implements Serializable, Equals, HashCode +public class CreditCardPurchase implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -124,8 +123,8 @@ public void setCredit(Boolean value) { this.credit = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CreditCardPurchase)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -137,7 +136,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; } } @@ -146,7 +145,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCredit = this.isCredit(); Boolean rhsCredit; rhsCredit = that.isCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit, (this.credit!= null), (that.credit!= null))) { return false; } } @@ -154,27 +153,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 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)); } { Boolean theCredit; theCredit = this.isCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit, (this.credit!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardTypeEnum.java index 5318a41d..f40471be 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditCardTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeInfo.java index 49112e92..8d8c4122 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -93,8 +93,7 @@ "processPayment", "creditCardChargeInfoEx" }) -public class CreditChargeInfo - implements Serializable, Equals, HashCode +public class CreditChargeInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -463,8 +462,8 @@ public void setCreditCardChargeInfoEx(IntuitAnyType value) { this.creditCardChargeInfoEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CreditChargeInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -476,7 +475,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNumber = this.getNumber(); String rhsNumber; rhsNumber = that.getNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "number", lhsNumber), LocatorUtils.property(thatLocator, "number", rhsNumber), lhsNumber, rhsNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "number", lhsNumber), LocatorUtils.property(thatLocator, "number", rhsNumber), lhsNumber, rhsNumber, (this.number!= null), (that.number!= null))) { return false; } } @@ -485,7 +484,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -494,7 +493,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameOnAcct = this.getNameOnAcct(); String rhsNameOnAcct; rhsNameOnAcct = that.getNameOnAcct(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOnAcct", lhsNameOnAcct), LocatorUtils.property(thatLocator, "nameOnAcct", rhsNameOnAcct), lhsNameOnAcct, rhsNameOnAcct)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOnAcct", lhsNameOnAcct), LocatorUtils.property(thatLocator, "nameOnAcct", rhsNameOnAcct), lhsNameOnAcct, rhsNameOnAcct, (this.nameOnAcct!= null), (that.nameOnAcct!= null))) { return false; } } @@ -503,7 +502,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCcExpiryMonth = this.getCcExpiryMonth(); Integer rhsCcExpiryMonth; rhsCcExpiryMonth = that.getCcExpiryMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccExpiryMonth", lhsCcExpiryMonth), LocatorUtils.property(thatLocator, "ccExpiryMonth", rhsCcExpiryMonth), lhsCcExpiryMonth, rhsCcExpiryMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccExpiryMonth", lhsCcExpiryMonth), LocatorUtils.property(thatLocator, "ccExpiryMonth", rhsCcExpiryMonth), lhsCcExpiryMonth, rhsCcExpiryMonth, (this.ccExpiryMonth!= null), (that.ccExpiryMonth!= null))) { return false; } } @@ -512,7 +511,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCcExpiryYear = this.getCcExpiryYear(); Integer rhsCcExpiryYear; rhsCcExpiryYear = that.getCcExpiryYear(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccExpiryYear", lhsCcExpiryYear), LocatorUtils.property(thatLocator, "ccExpiryYear", rhsCcExpiryYear), lhsCcExpiryYear, rhsCcExpiryYear)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccExpiryYear", lhsCcExpiryYear), LocatorUtils.property(thatLocator, "ccExpiryYear", rhsCcExpiryYear), lhsCcExpiryYear, rhsCcExpiryYear, (this.ccExpiryYear!= null), (that.ccExpiryYear!= null))) { return false; } } @@ -521,7 +520,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillAddrStreet = this.getBillAddrStreet(); String rhsBillAddrStreet; rhsBillAddrStreet = that.getBillAddrStreet(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddrStreet", lhsBillAddrStreet), LocatorUtils.property(thatLocator, "billAddrStreet", rhsBillAddrStreet), lhsBillAddrStreet, rhsBillAddrStreet)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddrStreet", lhsBillAddrStreet), LocatorUtils.property(thatLocator, "billAddrStreet", rhsBillAddrStreet), lhsBillAddrStreet, rhsBillAddrStreet, (this.billAddrStreet!= null), (that.billAddrStreet!= null))) { return false; } } @@ -530,7 +529,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPostalCode = this.getPostalCode(); String rhsPostalCode; rhsPostalCode = that.getPostalCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCode", lhsPostalCode), LocatorUtils.property(thatLocator, "postalCode", rhsPostalCode), lhsPostalCode, rhsPostalCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCode", lhsPostalCode), LocatorUtils.property(thatLocator, "postalCode", rhsPostalCode), lhsPostalCode, rhsPostalCode, (this.postalCode!= null), (that.postalCode!= null))) { return false; } } @@ -539,7 +538,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCommercialCardCode = this.getCommercialCardCode(); String rhsCommercialCardCode; rhsCommercialCardCode = that.getCommercialCardCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "commercialCardCode", lhsCommercialCardCode), LocatorUtils.property(thatLocator, "commercialCardCode", rhsCommercialCardCode), lhsCommercialCardCode, rhsCommercialCardCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "commercialCardCode", lhsCommercialCardCode), LocatorUtils.property(thatLocator, "commercialCardCode", rhsCommercialCardCode), lhsCommercialCardCode, rhsCommercialCardCode, (this.commercialCardCode!= null), (that.commercialCardCode!= null))) { return false; } } @@ -548,7 +547,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCTxnMode = this.getCCTxnMode(); CCTxnModeEnum rhsCCTxnMode; rhsCCTxnMode = that.getCCTxnMode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTxnMode", lhsCCTxnMode), LocatorUtils.property(thatLocator, "ccTxnMode", rhsCCTxnMode), lhsCCTxnMode, rhsCCTxnMode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTxnMode", lhsCCTxnMode), LocatorUtils.property(thatLocator, "ccTxnMode", rhsCCTxnMode), lhsCCTxnMode, rhsCCTxnMode, (this.ccTxnMode!= null), (that.ccTxnMode!= null))) { return false; } } @@ -557,7 +556,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCTxnType = this.getCCTxnType(); CCTxnTypeEnum rhsCCTxnType; rhsCCTxnType = that.getCCTxnType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTxnType", lhsCCTxnType), LocatorUtils.property(thatLocator, "ccTxnType", rhsCCTxnType), lhsCCTxnType, rhsCCTxnType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTxnType", lhsCCTxnType), LocatorUtils.property(thatLocator, "ccTxnType", rhsCCTxnType), lhsCCTxnType, rhsCCTxnType, (this.ccTxnType!= null), (that.ccTxnType!= null))) { return false; } } @@ -566,7 +565,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrevCCTransId = this.getPrevCCTransId(); String rhsPrevCCTransId; rhsPrevCCTransId = that.getPrevCCTransId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "prevCCTransId", lhsPrevCCTransId), LocatorUtils.property(thatLocator, "prevCCTransId", rhsPrevCCTransId), lhsPrevCCTransId, rhsPrevCCTransId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "prevCCTransId", lhsPrevCCTransId), LocatorUtils.property(thatLocator, "prevCCTransId", rhsPrevCCTransId), lhsPrevCCTransId, rhsPrevCCTransId, (this.prevCCTransId!= null), (that.prevCCTransId!= null))) { return false; } } @@ -575,7 +574,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -584,7 +583,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsProcessPayment = this.isProcessPayment(); Boolean rhsProcessPayment; rhsProcessPayment = that.isProcessPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "processPayment", lhsProcessPayment), LocatorUtils.property(thatLocator, "processPayment", rhsProcessPayment), lhsProcessPayment, rhsProcessPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "processPayment", lhsProcessPayment), LocatorUtils.property(thatLocator, "processPayment", rhsProcessPayment), lhsProcessPayment, rhsProcessPayment, (this.processPayment!= null), (that.processPayment!= null))) { return false; } } @@ -593,7 +592,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditCardChargeInfoEx = this.getCreditCardChargeInfoEx(); IntuitAnyType rhsCreditCardChargeInfoEx; rhsCreditCardChargeInfoEx = that.getCreditCardChargeInfoEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardChargeInfoEx", lhsCreditCardChargeInfoEx), LocatorUtils.property(thatLocator, "creditCardChargeInfoEx", rhsCreditCardChargeInfoEx), lhsCreditCardChargeInfoEx, rhsCreditCardChargeInfoEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardChargeInfoEx", lhsCreditCardChargeInfoEx), LocatorUtils.property(thatLocator, "creditCardChargeInfoEx", rhsCreditCardChargeInfoEx), lhsCreditCardChargeInfoEx, rhsCreditCardChargeInfoEx, (this.creditCardChargeInfoEx!= null), (that.creditCardChargeInfoEx!= null))) { return false; } } @@ -601,87 +600,87 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theNumber; theNumber = this.getNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "number", theNumber), currentHashCode, theNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "number", theNumber), currentHashCode, theNumber, (this.number!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theNameOnAcct; theNameOnAcct = this.getNameOnAcct(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOnAcct", theNameOnAcct), currentHashCode, theNameOnAcct); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOnAcct", theNameOnAcct), currentHashCode, theNameOnAcct, (this.nameOnAcct!= null)); } { Integer theCcExpiryMonth; theCcExpiryMonth = this.getCcExpiryMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccExpiryMonth", theCcExpiryMonth), currentHashCode, theCcExpiryMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccExpiryMonth", theCcExpiryMonth), currentHashCode, theCcExpiryMonth, (this.ccExpiryMonth!= null)); } { Integer theCcExpiryYear; theCcExpiryYear = this.getCcExpiryYear(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccExpiryYear", theCcExpiryYear), currentHashCode, theCcExpiryYear); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccExpiryYear", theCcExpiryYear), currentHashCode, theCcExpiryYear, (this.ccExpiryYear!= null)); } { String theBillAddrStreet; theBillAddrStreet = this.getBillAddrStreet(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddrStreet", theBillAddrStreet), currentHashCode, theBillAddrStreet); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddrStreet", theBillAddrStreet), currentHashCode, theBillAddrStreet, (this.billAddrStreet!= null)); } { String thePostalCode; thePostalCode = this.getPostalCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCode", thePostalCode), currentHashCode, thePostalCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCode", thePostalCode), currentHashCode, thePostalCode, (this.postalCode!= null)); } { String theCommercialCardCode; theCommercialCardCode = this.getCommercialCardCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "commercialCardCode", theCommercialCardCode), currentHashCode, theCommercialCardCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "commercialCardCode", theCommercialCardCode), currentHashCode, theCommercialCardCode, (this.commercialCardCode!= null)); } { CCTxnModeEnum theCCTxnMode; theCCTxnMode = this.getCCTxnMode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTxnMode", theCCTxnMode), currentHashCode, theCCTxnMode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTxnMode", theCCTxnMode), currentHashCode, theCCTxnMode, (this.ccTxnMode!= null)); } { CCTxnTypeEnum theCCTxnType; theCCTxnType = this.getCCTxnType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTxnType", theCCTxnType), currentHashCode, theCCTxnType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTxnType", theCCTxnType), currentHashCode, theCCTxnType, (this.ccTxnType!= null)); } { String thePrevCCTransId; thePrevCCTransId = this.getPrevCCTransId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prevCCTransId", thePrevCCTransId), currentHashCode, thePrevCCTransId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prevCCTransId", thePrevCCTransId), currentHashCode, thePrevCCTransId, (this.prevCCTransId!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } { Boolean theProcessPayment; theProcessPayment = this.isProcessPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "processPayment", theProcessPayment), currentHashCode, theProcessPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "processPayment", theProcessPayment), currentHashCode, theProcessPayment, (this.processPayment!= null)); } { IntuitAnyType theCreditCardChargeInfoEx; theCreditCardChargeInfoEx = this.getCreditCardChargeInfoEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardChargeInfoEx", theCreditCardChargeInfoEx), currentHashCode, theCreditCardChargeInfoEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardChargeInfoEx", theCreditCardChargeInfoEx), currentHashCode, theCreditCardChargeInfoEx, (this.creditCardChargeInfoEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeResponse.java index e5f91a36..37b528e4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditChargeResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -102,8 +102,7 @@ "clientTransID", "creditChargeResponseEx" }) -public class CreditChargeResponse - implements Serializable, Equals, HashCode +public class CreditChargeResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -552,8 +551,8 @@ public void setCreditChargeResponseEx(IntuitAnyType value) { this.creditChargeResponseEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CreditChargeResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -565,7 +564,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCProcessor = this.getCCProcessor(); String rhsCCProcessor; rhsCCProcessor = that.getCCProcessor(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccProcessor", lhsCCProcessor), LocatorUtils.property(thatLocator, "ccProcessor", rhsCCProcessor), lhsCCProcessor, rhsCCProcessor)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccProcessor", lhsCCProcessor), LocatorUtils.property(thatLocator, "ccProcessor", rhsCCProcessor), lhsCCProcessor, rhsCCProcessor, (this.ccProcessor!= null), (that.ccProcessor!= null))) { return false; } } @@ -574,7 +573,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCTransId = this.getCCTransId(); String rhsCCTransId; rhsCCTransId = that.getCCTransId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTransId", lhsCCTransId), LocatorUtils.property(thatLocator, "ccTransId", rhsCCTransId), lhsCCTransId, rhsCCTransId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccTransId", lhsCCTransId), LocatorUtils.property(thatLocator, "ccTransId", rhsCCTransId), lhsCCTransId, rhsCCTransId, (this.ccTransId!= null), (that.ccTransId!= null))) { return false; } } @@ -583,7 +582,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); CCPaymentStatusEnum rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -592,7 +591,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsResultCode = this.getResultCode(); Integer rhsResultCode; rhsResultCode = that.getResultCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "resultCode", lhsResultCode), LocatorUtils.property(thatLocator, "resultCode", rhsResultCode), lhsResultCode, rhsResultCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "resultCode", lhsResultCode), LocatorUtils.property(thatLocator, "resultCode", rhsResultCode), lhsResultCode, rhsResultCode, (this.resultCode!= null), (that.resultCode!= null))) { return false; } } @@ -601,7 +600,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsResultMsg = this.getResultMsg(); String rhsResultMsg; rhsResultMsg = that.getResultMsg(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "resultMsg", lhsResultMsg), LocatorUtils.property(thatLocator, "resultMsg", rhsResultMsg), lhsResultMsg, rhsResultMsg)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "resultMsg", lhsResultMsg), LocatorUtils.property(thatLocator, "resultMsg", rhsResultMsg), lhsResultMsg, rhsResultMsg, (this.resultMsg!= null), (that.resultMsg!= null))) { return false; } } @@ -610,7 +609,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMerchantAcctNum = this.getMerchantAcctNum(); String rhsMerchantAcctNum; rhsMerchantAcctNum = that.getMerchantAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "merchantAcctNum", lhsMerchantAcctNum), LocatorUtils.property(thatLocator, "merchantAcctNum", rhsMerchantAcctNum), lhsMerchantAcctNum, rhsMerchantAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "merchantAcctNum", lhsMerchantAcctNum), LocatorUtils.property(thatLocator, "merchantAcctNum", rhsMerchantAcctNum), lhsMerchantAcctNum, rhsMerchantAcctNum, (this.merchantAcctNum!= null), (that.merchantAcctNum!= null))) { return false; } } @@ -619,7 +618,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCardSecurityCodeMatch = this.getCardSecurityCodeMatch(); CCSecurityCodeMatchEnum rhsCardSecurityCodeMatch; rhsCardSecurityCodeMatch = that.getCardSecurityCodeMatch(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cardSecurityCodeMatch", lhsCardSecurityCodeMatch), LocatorUtils.property(thatLocator, "cardSecurityCodeMatch", rhsCardSecurityCodeMatch), lhsCardSecurityCodeMatch, rhsCardSecurityCodeMatch)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cardSecurityCodeMatch", lhsCardSecurityCodeMatch), LocatorUtils.property(thatLocator, "cardSecurityCodeMatch", rhsCardSecurityCodeMatch), lhsCardSecurityCodeMatch, rhsCardSecurityCodeMatch, (this.cardSecurityCodeMatch!= null), (that.cardSecurityCodeMatch!= null))) { return false; } } @@ -628,7 +627,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAuthCode = this.getAuthCode(); String rhsAuthCode; rhsAuthCode = that.getAuthCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "authCode", lhsAuthCode), LocatorUtils.property(thatLocator, "authCode", rhsAuthCode), lhsAuthCode, rhsAuthCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "authCode", lhsAuthCode), LocatorUtils.property(thatLocator, "authCode", rhsAuthCode), lhsAuthCode, rhsAuthCode, (this.authCode!= null), (that.authCode!= null))) { return false; } } @@ -637,7 +636,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAvsStreet = this.getAvsStreet(); CCAVSMatchEnum rhsAvsStreet; rhsAvsStreet = that.getAvsStreet(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "avsStreet", lhsAvsStreet), LocatorUtils.property(thatLocator, "avsStreet", rhsAvsStreet), lhsAvsStreet, rhsAvsStreet)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "avsStreet", lhsAvsStreet), LocatorUtils.property(thatLocator, "avsStreet", rhsAvsStreet), lhsAvsStreet, rhsAvsStreet, (this.avsStreet!= null), (that.avsStreet!= null))) { return false; } } @@ -646,7 +645,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAvsZip = this.getAvsZip(); CCAVSMatchEnum rhsAvsZip; rhsAvsZip = that.getAvsZip(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "avsZip", lhsAvsZip), LocatorUtils.property(thatLocator, "avsZip", rhsAvsZip), lhsAvsZip, rhsAvsZip)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "avsZip", lhsAvsZip), LocatorUtils.property(thatLocator, "avsZip", rhsAvsZip), lhsAvsZip, rhsAvsZip, (this.avsZip!= null), (that.avsZip!= null))) { return false; } } @@ -655,7 +654,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSecurityCode = this.getSecurityCode(); String rhsSecurityCode; rhsSecurityCode = that.getSecurityCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "securityCode", lhsSecurityCode), LocatorUtils.property(thatLocator, "securityCode", rhsSecurityCode), lhsSecurityCode, rhsSecurityCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "securityCode", lhsSecurityCode), LocatorUtils.property(thatLocator, "securityCode", rhsSecurityCode), lhsSecurityCode, rhsSecurityCode, (this.securityCode!= null), (that.securityCode!= null))) { return false; } } @@ -664,7 +663,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReconBatchId = this.getReconBatchId(); String rhsReconBatchId; rhsReconBatchId = that.getReconBatchId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reconBatchId", lhsReconBatchId), LocatorUtils.property(thatLocator, "reconBatchId", rhsReconBatchId), lhsReconBatchId, rhsReconBatchId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reconBatchId", lhsReconBatchId), LocatorUtils.property(thatLocator, "reconBatchId", rhsReconBatchId), lhsReconBatchId, rhsReconBatchId, (this.reconBatchId!= null), (that.reconBatchId!= null))) { return false; } } @@ -673,7 +672,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentGroupingCode = this.getPaymentGroupingCode(); Integer rhsPaymentGroupingCode; rhsPaymentGroupingCode = that.getPaymentGroupingCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentGroupingCode", lhsPaymentGroupingCode), LocatorUtils.property(thatLocator, "paymentGroupingCode", rhsPaymentGroupingCode), lhsPaymentGroupingCode, rhsPaymentGroupingCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentGroupingCode", lhsPaymentGroupingCode), LocatorUtils.property(thatLocator, "paymentGroupingCode", rhsPaymentGroupingCode), lhsPaymentGroupingCode, rhsPaymentGroupingCode, (this.paymentGroupingCode!= null), (that.paymentGroupingCode!= null))) { return false; } } @@ -682,7 +681,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnAuthorizationTime = this.getTxnAuthorizationTime(); Date rhsTxnAuthorizationTime; rhsTxnAuthorizationTime = that.getTxnAuthorizationTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnAuthorizationTime", lhsTxnAuthorizationTime), LocatorUtils.property(thatLocator, "txnAuthorizationTime", rhsTxnAuthorizationTime), lhsTxnAuthorizationTime, rhsTxnAuthorizationTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnAuthorizationTime", lhsTxnAuthorizationTime), LocatorUtils.property(thatLocator, "txnAuthorizationTime", rhsTxnAuthorizationTime), lhsTxnAuthorizationTime, rhsTxnAuthorizationTime, (this.txnAuthorizationTime!= null), (that.txnAuthorizationTime!= null))) { return false; } } @@ -691,7 +690,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnAuthorizationStamp = this.getTxnAuthorizationStamp(); Integer rhsTxnAuthorizationStamp; rhsTxnAuthorizationStamp = that.getTxnAuthorizationStamp(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnAuthorizationStamp", lhsTxnAuthorizationStamp), LocatorUtils.property(thatLocator, "txnAuthorizationStamp", rhsTxnAuthorizationStamp), lhsTxnAuthorizationStamp, rhsTxnAuthorizationStamp)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnAuthorizationStamp", lhsTxnAuthorizationStamp), LocatorUtils.property(thatLocator, "txnAuthorizationStamp", rhsTxnAuthorizationStamp), lhsTxnAuthorizationStamp, rhsTxnAuthorizationStamp, (this.txnAuthorizationStamp!= null), (that.txnAuthorizationStamp!= null))) { return false; } } @@ -700,7 +699,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClientTransID = this.getClientTransID(); String rhsClientTransID; rhsClientTransID = that.getClientTransID(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "clientTransID", lhsClientTransID), LocatorUtils.property(thatLocator, "clientTransID", rhsClientTransID), lhsClientTransID, rhsClientTransID)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "clientTransID", lhsClientTransID), LocatorUtils.property(thatLocator, "clientTransID", rhsClientTransID), lhsClientTransID, rhsClientTransID, (this.clientTransID!= null), (that.clientTransID!= null))) { return false; } } @@ -709,7 +708,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditChargeResponseEx = this.getCreditChargeResponseEx(); IntuitAnyType rhsCreditChargeResponseEx; rhsCreditChargeResponseEx = that.getCreditChargeResponseEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeResponseEx", lhsCreditChargeResponseEx), LocatorUtils.property(thatLocator, "creditChargeResponseEx", rhsCreditChargeResponseEx), lhsCreditChargeResponseEx, rhsCreditChargeResponseEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditChargeResponseEx", lhsCreditChargeResponseEx), LocatorUtils.property(thatLocator, "creditChargeResponseEx", rhsCreditChargeResponseEx), lhsCreditChargeResponseEx, rhsCreditChargeResponseEx, (this.creditChargeResponseEx!= null), (that.creditChargeResponseEx!= null))) { return false; } } @@ -717,102 +716,102 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theCCProcessor; theCCProcessor = this.getCCProcessor(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccProcessor", theCCProcessor), currentHashCode, theCCProcessor); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccProcessor", theCCProcessor), currentHashCode, theCCProcessor, (this.ccProcessor!= null)); } { String theCCTransId; theCCTransId = this.getCCTransId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTransId", theCCTransId), currentHashCode, theCCTransId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccTransId", theCCTransId), currentHashCode, theCCTransId, (this.ccTransId!= null)); } { CCPaymentStatusEnum theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } { Integer theResultCode; theResultCode = this.getResultCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resultCode", theResultCode), currentHashCode, theResultCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resultCode", theResultCode), currentHashCode, theResultCode, (this.resultCode!= null)); } { String theResultMsg; theResultMsg = this.getResultMsg(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resultMsg", theResultMsg), currentHashCode, theResultMsg); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resultMsg", theResultMsg), currentHashCode, theResultMsg, (this.resultMsg!= null)); } { String theMerchantAcctNum; theMerchantAcctNum = this.getMerchantAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "merchantAcctNum", theMerchantAcctNum), currentHashCode, theMerchantAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "merchantAcctNum", theMerchantAcctNum), currentHashCode, theMerchantAcctNum, (this.merchantAcctNum!= null)); } { CCSecurityCodeMatchEnum theCardSecurityCodeMatch; theCardSecurityCodeMatch = this.getCardSecurityCodeMatch(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cardSecurityCodeMatch", theCardSecurityCodeMatch), currentHashCode, theCardSecurityCodeMatch); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cardSecurityCodeMatch", theCardSecurityCodeMatch), currentHashCode, theCardSecurityCodeMatch, (this.cardSecurityCodeMatch!= null)); } { String theAuthCode; theAuthCode = this.getAuthCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "authCode", theAuthCode), currentHashCode, theAuthCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "authCode", theAuthCode), currentHashCode, theAuthCode, (this.authCode!= null)); } { CCAVSMatchEnum theAvsStreet; theAvsStreet = this.getAvsStreet(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avsStreet", theAvsStreet), currentHashCode, theAvsStreet); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avsStreet", theAvsStreet), currentHashCode, theAvsStreet, (this.avsStreet!= null)); } { CCAVSMatchEnum theAvsZip; theAvsZip = this.getAvsZip(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avsZip", theAvsZip), currentHashCode, theAvsZip); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avsZip", theAvsZip), currentHashCode, theAvsZip, (this.avsZip!= null)); } { String theSecurityCode; theSecurityCode = this.getSecurityCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "securityCode", theSecurityCode), currentHashCode, theSecurityCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "securityCode", theSecurityCode), currentHashCode, theSecurityCode, (this.securityCode!= null)); } { String theReconBatchId; theReconBatchId = this.getReconBatchId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reconBatchId", theReconBatchId), currentHashCode, theReconBatchId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reconBatchId", theReconBatchId), currentHashCode, theReconBatchId, (this.reconBatchId!= null)); } { Integer thePaymentGroupingCode; thePaymentGroupingCode = this.getPaymentGroupingCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentGroupingCode", thePaymentGroupingCode), currentHashCode, thePaymentGroupingCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentGroupingCode", thePaymentGroupingCode), currentHashCode, thePaymentGroupingCode, (this.paymentGroupingCode!= null)); } { Date theTxnAuthorizationTime; theTxnAuthorizationTime = this.getTxnAuthorizationTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnAuthorizationTime", theTxnAuthorizationTime), currentHashCode, theTxnAuthorizationTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnAuthorizationTime", theTxnAuthorizationTime), currentHashCode, theTxnAuthorizationTime, (this.txnAuthorizationTime!= null)); } { Integer theTxnAuthorizationStamp; theTxnAuthorizationStamp = this.getTxnAuthorizationStamp(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnAuthorizationStamp", theTxnAuthorizationStamp), currentHashCode, theTxnAuthorizationStamp); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnAuthorizationStamp", theTxnAuthorizationStamp), currentHashCode, theTxnAuthorizationStamp, (this.txnAuthorizationStamp!= null)); } { String theClientTransID; theClientTransID = this.getClientTransID(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "clientTransID", theClientTransID), currentHashCode, theClientTransID); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "clientTransID", theClientTransID), currentHashCode, theClientTransID, (this.clientTransID!= null)); } { IntuitAnyType theCreditChargeResponseEx; theCreditChargeResponseEx = this.getCreditChargeResponseEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeResponseEx", theCreditChargeResponseEx), currentHashCode, theCreditChargeResponseEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditChargeResponseEx", theCreditChargeResponseEx), currentHashCode, theCreditChargeResponseEx, (this.creditChargeResponseEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditMemo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditMemo.java index 1b32c233..e1875943 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditMemo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CreditMemo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -70,7 +70,7 @@ }) public class CreditMemo extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +127,8 @@ public void setCreditMemoEx(IntuitAnyType value) { this.creditMemoEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CreditMemo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -143,7 +143,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemainingCredit = this.getRemainingCredit(); BigDecimal rhsRemainingCredit; rhsRemainingCredit = that.getRemainingCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remainingCredit", lhsRemainingCredit), LocatorUtils.property(thatLocator, "remainingCredit", rhsRemainingCredit), lhsRemainingCredit, rhsRemainingCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remainingCredit", lhsRemainingCredit), LocatorUtils.property(thatLocator, "remainingCredit", rhsRemainingCredit), lhsRemainingCredit, rhsRemainingCredit, (this.remainingCredit!= null), (that.remainingCredit!= null))) { return false; } } @@ -152,7 +152,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditMemoEx = this.getCreditMemoEx(); IntuitAnyType rhsCreditMemoEx; rhsCreditMemoEx = that.getCreditMemoEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditMemoEx", lhsCreditMemoEx), LocatorUtils.property(thatLocator, "creditMemoEx", rhsCreditMemoEx), lhsCreditMemoEx, rhsCreditMemoEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditMemoEx", lhsCreditMemoEx), LocatorUtils.property(thatLocator, "creditMemoEx", rhsCreditMemoEx), lhsCreditMemoEx, rhsCreditMemoEx, (this.creditMemoEx!= null), (that.creditMemoEx!= null))) { return false; } } @@ -160,27 +160,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { BigDecimal theRemainingCredit; theRemainingCredit = this.getRemainingCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remainingCredit", theRemainingCredit), currentHashCode, theRemainingCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remainingCredit", theRemainingCredit), currentHashCode, theRemainingCredit, (this.remainingCredit!= null)); } { IntuitAnyType theCreditMemoEx; theCreditMemoEx = this.getCreditMemoEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditMemoEx", theCreditMemoEx), currentHashCode, theCreditMemoEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditMemoEx", theCreditMemoEx), currentHashCode, theCreditMemoEx, (this.creditMemoEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Currency.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Currency.java index 5ad2c5f6..c76c71bd 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Currency.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Currency.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -97,7 +97,7 @@ }) public class Currency extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -443,8 +443,8 @@ public void setCurrencyEx(IntuitAnyType value) { this.currencyEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Currency)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -459,7 +459,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -468,7 +468,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -477,7 +477,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCode = this.getCode(); CurrencyCode rhsCode; rhsCode = that.getCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode, (this.code!= null), (that.code!= null))) { return false; } } @@ -486,7 +486,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSeparator = this.getSeparator(); String rhsSeparator; rhsSeparator = that.getSeparator(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "separator", lhsSeparator), LocatorUtils.property(thatLocator, "separator", rhsSeparator), lhsSeparator, rhsSeparator)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "separator", lhsSeparator), LocatorUtils.property(thatLocator, "separator", rhsSeparator), lhsSeparator, rhsSeparator, (this.separator!= null), (that.separator!= null))) { return false; } } @@ -495,7 +495,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFormat = this.getFormat(); String rhsFormat; rhsFormat = that.getFormat(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "format", lhsFormat), LocatorUtils.property(thatLocator, "format", rhsFormat), lhsFormat, rhsFormat)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "format", lhsFormat), LocatorUtils.property(thatLocator, "format", rhsFormat), lhsFormat, rhsFormat, (this.format!= null), (that.format!= null))) { return false; } } @@ -504,7 +504,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDecimalPlaces = this.getDecimalPlaces(); BigInteger rhsDecimalPlaces; rhsDecimalPlaces = that.getDecimalPlaces(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "decimalPlaces", lhsDecimalPlaces), LocatorUtils.property(thatLocator, "decimalPlaces", rhsDecimalPlaces), lhsDecimalPlaces, rhsDecimalPlaces)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "decimalPlaces", lhsDecimalPlaces), LocatorUtils.property(thatLocator, "decimalPlaces", rhsDecimalPlaces), lhsDecimalPlaces, rhsDecimalPlaces, (this.decimalPlaces!= null), (that.decimalPlaces!= null))) { return false; } } @@ -513,7 +513,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDecimalSeparator = this.getDecimalSeparator(); String rhsDecimalSeparator; rhsDecimalSeparator = that.getDecimalSeparator(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "decimalSeparator", lhsDecimalSeparator), LocatorUtils.property(thatLocator, "decimalSeparator", rhsDecimalSeparator), lhsDecimalSeparator, rhsDecimalSeparator)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "decimalSeparator", lhsDecimalSeparator), LocatorUtils.property(thatLocator, "decimalSeparator", rhsDecimalSeparator), lhsDecimalSeparator, rhsDecimalSeparator, (this.decimalSeparator!= null), (that.decimalSeparator!= null))) { return false; } } @@ -522,7 +522,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSymbol = this.getSymbol(); String rhsSymbol; rhsSymbol = that.getSymbol(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "symbol", lhsSymbol), LocatorUtils.property(thatLocator, "symbol", rhsSymbol), lhsSymbol, rhsSymbol)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "symbol", lhsSymbol), LocatorUtils.property(thatLocator, "symbol", rhsSymbol), lhsSymbol, rhsSymbol, (this.symbol!= null), (that.symbol!= null))) { return false; } } @@ -531,7 +531,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSymbolPosition = this.getSymbolPosition(); SymbolPositionEnum rhsSymbolPosition; rhsSymbolPosition = that.getSymbolPosition(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "symbolPosition", lhsSymbolPosition), LocatorUtils.property(thatLocator, "symbolPosition", rhsSymbolPosition), lhsSymbolPosition, rhsSymbolPosition)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "symbolPosition", lhsSymbolPosition), LocatorUtils.property(thatLocator, "symbolPosition", rhsSymbolPosition), lhsSymbolPosition, rhsSymbolPosition, (this.symbolPosition!= null), (that.symbolPosition!= null))) { return false; } } @@ -540,7 +540,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUserDefined = this.isUserDefined(); Boolean rhsUserDefined; rhsUserDefined = that.isUserDefined(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "userDefined", lhsUserDefined), LocatorUtils.property(thatLocator, "userDefined", rhsUserDefined), lhsUserDefined, rhsUserDefined)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "userDefined", lhsUserDefined), LocatorUtils.property(thatLocator, "userDefined", rhsUserDefined), lhsUserDefined, rhsUserDefined, (this.userDefined!= null), (that.userDefined!= null))) { return false; } } @@ -549,7 +549,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExchangeRate = this.getExchangeRate(); BigDecimal rhsExchangeRate; rhsExchangeRate = that.getExchangeRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRate", lhsExchangeRate), LocatorUtils.property(thatLocator, "exchangeRate", rhsExchangeRate), lhsExchangeRate, rhsExchangeRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRate", lhsExchangeRate), LocatorUtils.property(thatLocator, "exchangeRate", rhsExchangeRate), lhsExchangeRate, rhsExchangeRate, (this.exchangeRate!= null), (that.exchangeRate!= null))) { return false; } } @@ -558,7 +558,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAsOfDate = this.getAsOfDate(); Date rhsAsOfDate; rhsAsOfDate = that.getAsOfDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "asOfDate", lhsAsOfDate), LocatorUtils.property(thatLocator, "asOfDate", rhsAsOfDate), lhsAsOfDate, rhsAsOfDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "asOfDate", lhsAsOfDate), LocatorUtils.property(thatLocator, "asOfDate", rhsAsOfDate), lhsAsOfDate, rhsAsOfDate, (this.asOfDate!= null), (that.asOfDate!= null))) { return false; } } @@ -567,7 +567,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyEx = this.getCurrencyEx(); IntuitAnyType rhsCurrencyEx; rhsCurrencyEx = that.getCurrencyEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyEx", lhsCurrencyEx), LocatorUtils.property(thatLocator, "currencyEx", rhsCurrencyEx), lhsCurrencyEx, rhsCurrencyEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyEx", lhsCurrencyEx), LocatorUtils.property(thatLocator, "currencyEx", rhsCurrencyEx), lhsCurrencyEx, rhsCurrencyEx, (this.currencyEx!= null), (that.currencyEx!= null))) { return false; } } @@ -575,82 +575,82 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { CurrencyCode theCode; theCode = this.getCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode, (this.code!= null)); } { String theSeparator; theSeparator = this.getSeparator(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "separator", theSeparator), currentHashCode, theSeparator); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "separator", theSeparator), currentHashCode, theSeparator, (this.separator!= null)); } { String theFormat; theFormat = this.getFormat(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "format", theFormat), currentHashCode, theFormat); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "format", theFormat), currentHashCode, theFormat, (this.format!= null)); } { BigInteger theDecimalPlaces; theDecimalPlaces = this.getDecimalPlaces(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "decimalPlaces", theDecimalPlaces), currentHashCode, theDecimalPlaces); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "decimalPlaces", theDecimalPlaces), currentHashCode, theDecimalPlaces, (this.decimalPlaces!= null)); } { String theDecimalSeparator; theDecimalSeparator = this.getDecimalSeparator(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "decimalSeparator", theDecimalSeparator), currentHashCode, theDecimalSeparator); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "decimalSeparator", theDecimalSeparator), currentHashCode, theDecimalSeparator, (this.decimalSeparator!= null)); } { String theSymbol; theSymbol = this.getSymbol(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "symbol", theSymbol), currentHashCode, theSymbol); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "symbol", theSymbol), currentHashCode, theSymbol, (this.symbol!= null)); } { SymbolPositionEnum theSymbolPosition; theSymbolPosition = this.getSymbolPosition(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "symbolPosition", theSymbolPosition), currentHashCode, theSymbolPosition); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "symbolPosition", theSymbolPosition), currentHashCode, theSymbolPosition, (this.symbolPosition!= null)); } { Boolean theUserDefined; theUserDefined = this.isUserDefined(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userDefined", theUserDefined), currentHashCode, theUserDefined); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userDefined", theUserDefined), currentHashCode, theUserDefined, (this.userDefined!= null)); } { BigDecimal theExchangeRate; theExchangeRate = this.getExchangeRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRate", theExchangeRate), currentHashCode, theExchangeRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRate", theExchangeRate), currentHashCode, theExchangeRate, (this.exchangeRate!= null)); } { Date theAsOfDate; theAsOfDate = this.getAsOfDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "asOfDate", theAsOfDate), currentHashCode, theAsOfDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "asOfDate", theAsOfDate), currentHashCode, theAsOfDate, (this.asOfDate!= null)); } { IntuitAnyType theCurrencyEx; theCurrencyEx = this.getCurrencyEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyEx", theCurrencyEx), currentHashCode, theCurrencyEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyEx", theCurrencyEx), currentHashCode, theCurrencyEx, (this.currencyEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyCode.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyCode.java index c67d4f48..591dcffc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyCode.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyCode.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyPrefs.java index 5dc12466..14a5604f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CurrencyPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -63,8 +63,7 @@ "multiCurrencyEnabled", "homeCurrency" }) -public class CurrencyPrefs - implements Serializable, Equals, HashCode +public class CurrencyPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -121,8 +120,8 @@ public void setHomeCurrency(ReferenceType value) { this.homeCurrency = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CurrencyPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -134,7 +133,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMultiCurrencyEnabled = this.isMultiCurrencyEnabled(); Boolean rhsMultiCurrencyEnabled; rhsMultiCurrencyEnabled = that.isMultiCurrencyEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "multiCurrencyEnabled", lhsMultiCurrencyEnabled), LocatorUtils.property(thatLocator, "multiCurrencyEnabled", rhsMultiCurrencyEnabled), lhsMultiCurrencyEnabled, rhsMultiCurrencyEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "multiCurrencyEnabled", lhsMultiCurrencyEnabled), LocatorUtils.property(thatLocator, "multiCurrencyEnabled", rhsMultiCurrencyEnabled), lhsMultiCurrencyEnabled, rhsMultiCurrencyEnabled, (this.multiCurrencyEnabled!= null), (that.multiCurrencyEnabled!= null))) { return false; } } @@ -143,7 +142,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeCurrency = this.getHomeCurrency(); ReferenceType rhsHomeCurrency; rhsHomeCurrency = that.getHomeCurrency(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeCurrency", lhsHomeCurrency), LocatorUtils.property(thatLocator, "homeCurrency", rhsHomeCurrency), lhsHomeCurrency, rhsHomeCurrency)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeCurrency", lhsHomeCurrency), LocatorUtils.property(thatLocator, "homeCurrency", rhsHomeCurrency), lhsHomeCurrency, rhsHomeCurrency, (this.homeCurrency!= null), (that.homeCurrency!= null))) { return false; } } @@ -151,27 +150,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theMultiCurrencyEnabled; theMultiCurrencyEnabled = this.isMultiCurrencyEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiCurrencyEnabled", theMultiCurrencyEnabled), currentHashCode, theMultiCurrencyEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "multiCurrencyEnabled", theMultiCurrencyEnabled), currentHashCode, theMultiCurrencyEnabled, (this.multiCurrencyEnabled!= null)); } { ReferenceType theHomeCurrency; theHomeCurrency = this.getHomeCurrency(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeCurrency", theHomeCurrency), currentHashCode, theHomeCurrency); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeCurrency", theHomeCurrency), currentHashCode, theHomeCurrency, (this.homeCurrency!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomField.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomField.java index f5f07baa..82700c4c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomField.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomField.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -85,8 +85,7 @@ "dateValue", "numberValue" }) -public class CustomField - implements Serializable, Equals, HashCode +public class CustomField implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -275,8 +274,8 @@ public void setNumberValue(BigDecimal value) { this.numberValue = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CustomField)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -288,7 +287,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefinitionId = this.getDefinitionId(); String rhsDefinitionId; rhsDefinitionId = that.getDefinitionId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "definitionId", lhsDefinitionId), LocatorUtils.property(thatLocator, "definitionId", rhsDefinitionId), lhsDefinitionId, rhsDefinitionId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "definitionId", lhsDefinitionId), LocatorUtils.property(thatLocator, "definitionId", rhsDefinitionId), lhsDefinitionId, rhsDefinitionId, (this.definitionId!= null), (that.definitionId!= null))) { return false; } } @@ -297,7 +296,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -306,7 +305,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); CustomFieldTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -315,7 +314,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStringValue = this.getStringValue(); String rhsStringValue; rhsStringValue = that.getStringValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "stringValue", lhsStringValue), LocatorUtils.property(thatLocator, "stringValue", rhsStringValue), lhsStringValue, rhsStringValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "stringValue", lhsStringValue), LocatorUtils.property(thatLocator, "stringValue", rhsStringValue), lhsStringValue, rhsStringValue, (this.stringValue!= null), (that.stringValue!= null))) { return false; } } @@ -324,7 +323,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBooleanValue = this.isBooleanValue(); Boolean rhsBooleanValue; rhsBooleanValue = that.isBooleanValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "booleanValue", lhsBooleanValue), LocatorUtils.property(thatLocator, "booleanValue", rhsBooleanValue), lhsBooleanValue, rhsBooleanValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "booleanValue", lhsBooleanValue), LocatorUtils.property(thatLocator, "booleanValue", rhsBooleanValue), lhsBooleanValue, rhsBooleanValue, (this.booleanValue!= null), (that.booleanValue!= null))) { return false; } } @@ -333,7 +332,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDateValue = this.getDateValue(); Date rhsDateValue; rhsDateValue = that.getDateValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dateValue", lhsDateValue), LocatorUtils.property(thatLocator, "dateValue", rhsDateValue), lhsDateValue, rhsDateValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dateValue", lhsDateValue), LocatorUtils.property(thatLocator, "dateValue", rhsDateValue), lhsDateValue, rhsDateValue, (this.dateValue!= null), (that.dateValue!= null))) { return false; } } @@ -342,7 +341,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNumberValue = this.getNumberValue(); BigDecimal rhsNumberValue; rhsNumberValue = that.getNumberValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "numberValue", lhsNumberValue), LocatorUtils.property(thatLocator, "numberValue", rhsNumberValue), lhsNumberValue, rhsNumberValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "numberValue", lhsNumberValue), LocatorUtils.property(thatLocator, "numberValue", rhsNumberValue), lhsNumberValue, rhsNumberValue, (this.numberValue!= null), (that.numberValue!= null))) { return false; } } @@ -350,52 +349,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theDefinitionId; theDefinitionId = this.getDefinitionId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "definitionId", theDefinitionId), currentHashCode, theDefinitionId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "definitionId", theDefinitionId), currentHashCode, theDefinitionId, (this.definitionId!= null)); } { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { CustomFieldTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theStringValue; theStringValue = this.getStringValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stringValue", theStringValue), currentHashCode, theStringValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stringValue", theStringValue), currentHashCode, theStringValue, (this.stringValue!= null)); } { Boolean theBooleanValue; theBooleanValue = this.isBooleanValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "booleanValue", theBooleanValue), currentHashCode, theBooleanValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "booleanValue", theBooleanValue), currentHashCode, theBooleanValue, (this.booleanValue!= null)); } { Date theDateValue; theDateValue = this.getDateValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dateValue", theDateValue), currentHashCode, theDateValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dateValue", theDateValue), currentHashCode, theDateValue, (this.dateValue!= null)); } { BigDecimal theNumberValue; theNumberValue = this.getNumberValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "numberValue", theNumberValue), currentHashCode, theNumberValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "numberValue", theNumberValue), currentHashCode, theNumberValue, (this.numberValue!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldDefinition.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldDefinition.java index 8012000e..2f1b87f7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldDefinition.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldDefinition.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; 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; @@ -83,7 +83,7 @@ }) public abstract class CustomFieldDefinition extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -218,8 +218,8 @@ public void setAppId(String value) { this.appId = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CustomFieldDefinition)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -234,7 +234,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityType = this.getEntityType(); String rhsEntityType; rhsEntityType = that.getEntityType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityType", lhsEntityType), LocatorUtils.property(thatLocator, "entityType", rhsEntityType), lhsEntityType, rhsEntityType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityType", lhsEntityType), LocatorUtils.property(thatLocator, "entityType", rhsEntityType), lhsEntityType, rhsEntityType, (this.entityType!= null), (that.entityType!= null))) { return false; } } @@ -243,7 +243,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -252,7 +252,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHidden = this.isHidden(); Boolean rhsHidden; rhsHidden = that.isHidden(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "hidden", lhsHidden), LocatorUtils.property(thatLocator, "hidden", rhsHidden), lhsHidden, rhsHidden)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "hidden", lhsHidden), LocatorUtils.property(thatLocator, "hidden", rhsHidden), lhsHidden, rhsHidden, (this.hidden!= null), (that.hidden!= null))) { return false; } } @@ -261,7 +261,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRequired = this.isRequired(); Boolean rhsRequired; rhsRequired = that.isRequired(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "required", lhsRequired), LocatorUtils.property(thatLocator, "required", rhsRequired), lhsRequired, rhsRequired)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "required", lhsRequired), LocatorUtils.property(thatLocator, "required", rhsRequired), lhsRequired, rhsRequired, (this.required!= null), (that.required!= null))) { return false; } } @@ -270,7 +270,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAppId = this.getAppId(); String rhsAppId; rhsAppId = that.getAppId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "appId", lhsAppId), LocatorUtils.property(thatLocator, "appId", rhsAppId), lhsAppId, rhsAppId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "appId", lhsAppId), LocatorUtils.property(thatLocator, "appId", rhsAppId), lhsAppId, rhsAppId, (this.appId!= null), (that.appId!= null))) { return false; } } @@ -278,42 +278,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theEntityType; theEntityType = this.getEntityType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityType", theEntityType), currentHashCode, theEntityType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityType", theEntityType), currentHashCode, theEntityType, (this.entityType!= null)); } { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theHidden; theHidden = this.isHidden(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hidden", theHidden), currentHashCode, theHidden); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hidden", theHidden), currentHashCode, theHidden, (this.hidden!= null)); } { Boolean theRequired; theRequired = this.isRequired(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "required", theRequired), currentHashCode, theRequired); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "required", theRequired), currentHashCode, theRequired, (this.required!= null)); } { String theAppId; theAppId = this.getAppId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appId", theAppId), currentHashCode, theAppId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appId", theAppId), currentHashCode, theAppId, (this.appId!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldTypeEnum.java index c901592c..18941222 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomFieldTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Customer.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Customer.java index 1eee1d09..4a72747d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Customer.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Customer.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -153,7 +153,7 @@ }) public class Customer extends NameBase - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1165,8 +1165,8 @@ public void setOtherAddr(List otherAddr) { this.otherAddr = otherAddr; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Customer)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1181,7 +1181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxable = this.isTaxable(); Boolean rhsTaxable; rhsTaxable = that.isTaxable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable, (this.taxable!= null), (that.taxable!= null))) { return false; } } @@ -1190,7 +1190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillAddr = this.getBillAddr(); PhysicalAddress rhsBillAddr; rhsBillAddr = that.getBillAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr, (this.billAddr!= null), (that.billAddr!= null))) { return false; } } @@ -1199,7 +1199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -1208,7 +1208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -1217,7 +1217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsContactName = this.getContactName(); String rhsContactName; rhsContactName = that.getContactName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "contactName", lhsContactName), LocatorUtils.property(thatLocator, "contactName", rhsContactName), lhsContactName, rhsContactName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "contactName", lhsContactName), LocatorUtils.property(thatLocator, "contactName", rhsContactName), lhsContactName, rhsContactName, (this.contactName!= null), (that.contactName!= null))) { return false; } } @@ -1226,7 +1226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAltContactName = this.getAltContactName(); String rhsAltContactName; rhsAltContactName = that.getAltContactName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "altContactName", lhsAltContactName), LocatorUtils.property(thatLocator, "altContactName", rhsAltContactName), lhsAltContactName, rhsAltContactName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "altContactName", lhsAltContactName), LocatorUtils.property(thatLocator, "altContactName", rhsAltContactName), lhsAltContactName, rhsAltContactName, (this.altContactName!= null), (that.altContactName!= null))) { return false; } } @@ -1235,7 +1235,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNotes = this.getNotes(); String rhsNotes; rhsNotes = that.getNotes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes, (this.notes!= null), (that.notes!= null))) { return false; } } @@ -1244,7 +1244,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJob = this.isJob(); Boolean rhsJob; rhsJob = that.isJob(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "job", lhsJob), LocatorUtils.property(thatLocator, "job", rhsJob), lhsJob, rhsJob)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "job", lhsJob), LocatorUtils.property(thatLocator, "job", rhsJob), lhsJob, rhsJob, (this.job!= null), (that.job!= null))) { return false; } } @@ -1253,7 +1253,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillWithParent = this.isBillWithParent(); Boolean rhsBillWithParent; rhsBillWithParent = that.isBillWithParent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billWithParent", lhsBillWithParent), LocatorUtils.property(thatLocator, "billWithParent", rhsBillWithParent), lhsBillWithParent, rhsBillWithParent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billWithParent", lhsBillWithParent), LocatorUtils.property(thatLocator, "billWithParent", rhsBillWithParent), lhsBillWithParent, rhsBillWithParent, (this.billWithParent!= null), (that.billWithParent!= null))) { return false; } } @@ -1262,7 +1262,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRootCustomerRef = this.getRootCustomerRef(); ReferenceType rhsRootCustomerRef; rhsRootCustomerRef = that.getRootCustomerRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rootCustomerRef", lhsRootCustomerRef), LocatorUtils.property(thatLocator, "rootCustomerRef", rhsRootCustomerRef), lhsRootCustomerRef, rhsRootCustomerRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rootCustomerRef", lhsRootCustomerRef), LocatorUtils.property(thatLocator, "rootCustomerRef", rhsRootCustomerRef), lhsRootCustomerRef, rhsRootCustomerRef, (this.rootCustomerRef!= null), (that.rootCustomerRef!= null))) { return false; } } @@ -1271,7 +1271,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -1280,7 +1280,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLevel = this.getLevel(); Integer rhsLevel; rhsLevel = that.getLevel(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "level", lhsLevel), LocatorUtils.property(thatLocator, "level", rhsLevel), lhsLevel, rhsLevel)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "level", lhsLevel), LocatorUtils.property(thatLocator, "level", rhsLevel), lhsLevel, rhsLevel, (this.level!= null), (that.level!= null))) { return false; } } @@ -1289,7 +1289,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerTypeRef = this.getCustomerTypeRef(); ReferenceType rhsCustomerTypeRef; rhsCustomerTypeRef = that.getCustomerTypeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerTypeRef", lhsCustomerTypeRef), LocatorUtils.property(thatLocator, "customerTypeRef", rhsCustomerTypeRef), lhsCustomerTypeRef, rhsCustomerTypeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerTypeRef", lhsCustomerTypeRef), LocatorUtils.property(thatLocator, "customerTypeRef", rhsCustomerTypeRef), lhsCustomerTypeRef, rhsCustomerTypeRef, (this.customerTypeRef!= null), (that.customerTypeRef!= null))) { return false; } } @@ -1298,7 +1298,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTermRef = this.getSalesTermRef(); ReferenceType rhsSalesTermRef; rhsSalesTermRef = that.getSalesTermRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef, (this.salesTermRef!= null), (that.salesTermRef!= null))) { return false; } } @@ -1307,7 +1307,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesRepRef = this.getSalesRepRef(); ReferenceType rhsSalesRepRef; rhsSalesRepRef = that.getSalesRepRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepRef", lhsSalesRepRef), LocatorUtils.property(thatLocator, "salesRepRef", rhsSalesRepRef), lhsSalesRepRef, rhsSalesRepRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepRef", lhsSalesRepRef), LocatorUtils.property(thatLocator, "salesRepRef", rhsSalesRepRef), lhsSalesRepRef, rhsSalesRepRef, (this.salesRepRef!= null), (that.salesRepRef!= null))) { return false; } } @@ -1316,7 +1316,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxGroupCodeRef = this.getTaxGroupCodeRef(); ReferenceType rhsTaxGroupCodeRef; rhsTaxGroupCodeRef = that.getTaxGroupCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroupCodeRef", lhsTaxGroupCodeRef), LocatorUtils.property(thatLocator, "taxGroupCodeRef", rhsTaxGroupCodeRef), lhsTaxGroupCodeRef, rhsTaxGroupCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroupCodeRef", lhsTaxGroupCodeRef), LocatorUtils.property(thatLocator, "taxGroupCodeRef", rhsTaxGroupCodeRef), lhsTaxGroupCodeRef, rhsTaxGroupCodeRef, (this.taxGroupCodeRef!= null), (that.taxGroupCodeRef!= null))) { return false; } } @@ -1325,7 +1325,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateRef = this.getTaxRateRef(); ReferenceType rhsTaxRateRef; rhsTaxRateRef = that.getTaxRateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef, (this.taxRateRef!= null), (that.taxRateRef!= null))) { return false; } } @@ -1334,7 +1334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -1343,7 +1343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCCDetail = this.getCCDetail(); CreditChargeInfo rhsCCDetail; rhsCCDetail = that.getCCDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ccDetail", lhsCCDetail), LocatorUtils.property(thatLocator, "ccDetail", rhsCCDetail), lhsCCDetail, rhsCCDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ccDetail", lhsCCDetail), LocatorUtils.property(thatLocator, "ccDetail", rhsCCDetail), lhsCCDetail, rhsCCDetail, (this.ccDetail!= null), (that.ccDetail!= null))) { return false; } } @@ -1352,7 +1352,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelRef = this.getPriceLevelRef(); ReferenceType rhsPriceLevelRef; rhsPriceLevelRef = that.getPriceLevelRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef, (this.priceLevelRef!= null), (that.priceLevelRef!= null))) { return false; } } @@ -1361,7 +1361,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalance = this.getBalance(); BigDecimal rhsBalance; rhsBalance = that.getBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -1370,7 +1370,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOpenBalanceDate = this.getOpenBalanceDate(); Date rhsOpenBalanceDate; rhsOpenBalanceDate = that.getOpenBalanceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "openBalanceDate", lhsOpenBalanceDate), LocatorUtils.property(thatLocator, "openBalanceDate", rhsOpenBalanceDate), lhsOpenBalanceDate, rhsOpenBalanceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "openBalanceDate", lhsOpenBalanceDate), LocatorUtils.property(thatLocator, "openBalanceDate", rhsOpenBalanceDate), lhsOpenBalanceDate, rhsOpenBalanceDate, (this.openBalanceDate!= null), (that.openBalanceDate!= null))) { return false; } } @@ -1379,7 +1379,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalanceWithJobs = this.getBalanceWithJobs(); BigDecimal rhsBalanceWithJobs; rhsBalanceWithJobs = that.getBalanceWithJobs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balanceWithJobs", lhsBalanceWithJobs), LocatorUtils.property(thatLocator, "balanceWithJobs", rhsBalanceWithJobs), lhsBalanceWithJobs, rhsBalanceWithJobs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balanceWithJobs", lhsBalanceWithJobs), LocatorUtils.property(thatLocator, "balanceWithJobs", rhsBalanceWithJobs), lhsBalanceWithJobs, rhsBalanceWithJobs, (this.balanceWithJobs!= null), (that.balanceWithJobs!= null))) { return false; } } @@ -1388,7 +1388,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditLimit = this.getCreditLimit(); BigDecimal rhsCreditLimit; rhsCreditLimit = that.getCreditLimit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditLimit", lhsCreditLimit), LocatorUtils.property(thatLocator, "creditLimit", rhsCreditLimit), lhsCreditLimit, rhsCreditLimit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditLimit", lhsCreditLimit), LocatorUtils.property(thatLocator, "creditLimit", rhsCreditLimit), lhsCreditLimit, rhsCreditLimit, (this.creditLimit!= null), (that.creditLimit!= null))) { return false; } } @@ -1397,7 +1397,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNum = this.getAcctNum(); String rhsAcctNum; rhsAcctNum = that.getAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum, (this.acctNum!= null), (that.acctNum!= null))) { return false; } } @@ -1406,7 +1406,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyRef = this.getCurrencyRef(); ReferenceType rhsCurrencyRef; rhsCurrencyRef = that.getCurrencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef, (this.currencyRef!= null), (that.currencyRef!= null))) { return false; } } @@ -1415,7 +1415,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOverDueBalance = this.getOverDueBalance(); BigDecimal rhsOverDueBalance; rhsOverDueBalance = that.getOverDueBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "overDueBalance", lhsOverDueBalance), LocatorUtils.property(thatLocator, "overDueBalance", rhsOverDueBalance), lhsOverDueBalance, rhsOverDueBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "overDueBalance", lhsOverDueBalance), LocatorUtils.property(thatLocator, "overDueBalance", rhsOverDueBalance), lhsOverDueBalance, rhsOverDueBalance, (this.overDueBalance!= null), (that.overDueBalance!= null))) { return false; } } @@ -1424,7 +1424,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalRevenue = this.getTotalRevenue(); BigDecimal rhsTotalRevenue; rhsTotalRevenue = that.getTotalRevenue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalRevenue", lhsTotalRevenue), LocatorUtils.property(thatLocator, "totalRevenue", rhsTotalRevenue), lhsTotalRevenue, rhsTotalRevenue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalRevenue", lhsTotalRevenue), LocatorUtils.property(thatLocator, "totalRevenue", rhsTotalRevenue), lhsTotalRevenue, rhsTotalRevenue, (this.totalRevenue!= null), (that.totalRevenue!= null))) { return false; } } @@ -1433,7 +1433,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalExpense = this.getTotalExpense(); BigDecimal rhsTotalExpense; rhsTotalExpense = that.getTotalExpense(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalExpense", lhsTotalExpense), LocatorUtils.property(thatLocator, "totalExpense", rhsTotalExpense), lhsTotalExpense, rhsTotalExpense)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalExpense", lhsTotalExpense), LocatorUtils.property(thatLocator, "totalExpense", rhsTotalExpense), lhsTotalExpense, rhsTotalExpense, (this.totalExpense!= null), (that.totalExpense!= null))) { return false; } } @@ -1442,7 +1442,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPreferredDeliveryMethod = this.getPreferredDeliveryMethod(); String rhsPreferredDeliveryMethod; rhsPreferredDeliveryMethod = that.getPreferredDeliveryMethod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "preferredDeliveryMethod", lhsPreferredDeliveryMethod), LocatorUtils.property(thatLocator, "preferredDeliveryMethod", rhsPreferredDeliveryMethod), lhsPreferredDeliveryMethod, rhsPreferredDeliveryMethod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "preferredDeliveryMethod", lhsPreferredDeliveryMethod), LocatorUtils.property(thatLocator, "preferredDeliveryMethod", rhsPreferredDeliveryMethod), lhsPreferredDeliveryMethod, rhsPreferredDeliveryMethod, (this.preferredDeliveryMethod!= null), (that.preferredDeliveryMethod!= null))) { return false; } } @@ -1451,7 +1451,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsResaleNum = this.getResaleNum(); String rhsResaleNum; rhsResaleNum = that.getResaleNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "resaleNum", lhsResaleNum), LocatorUtils.property(thatLocator, "resaleNum", rhsResaleNum), lhsResaleNum, rhsResaleNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "resaleNum", lhsResaleNum), LocatorUtils.property(thatLocator, "resaleNum", rhsResaleNum), lhsResaleNum, rhsResaleNum, (this.resaleNum!= null), (that.resaleNum!= null))) { return false; } } @@ -1460,7 +1460,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJobInfo = this.getJobInfo(); JobInfo rhsJobInfo; rhsJobInfo = that.getJobInfo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "jobInfo", lhsJobInfo), LocatorUtils.property(thatLocator, "jobInfo", rhsJobInfo), lhsJobInfo, rhsJobInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "jobInfo", lhsJobInfo), LocatorUtils.property(thatLocator, "jobInfo", rhsJobInfo), lhsJobInfo, rhsJobInfo, (this.jobInfo!= null), (that.jobInfo!= null))) { return false; } } @@ -1469,7 +1469,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSEnabled = this.isTDSEnabled(); Boolean rhsTDSEnabled; rhsTDSEnabled = that.isTDSEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEnabled", lhsTDSEnabled), LocatorUtils.property(thatLocator, "tdsEnabled", rhsTDSEnabled), lhsTDSEnabled, rhsTDSEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEnabled", lhsTDSEnabled), LocatorUtils.property(thatLocator, "tdsEnabled", rhsTDSEnabled), lhsTDSEnabled, rhsTDSEnabled, (this.tdsEnabled!= null), (that.tdsEnabled!= null))) { return false; } } @@ -1478,7 +1478,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerEx = this.getCustomerEx(); IntuitAnyType rhsCustomerEx; rhsCustomerEx = that.getCustomerEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerEx", lhsCustomerEx), LocatorUtils.property(thatLocator, "customerEx", rhsCustomerEx), lhsCustomerEx, rhsCustomerEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerEx", lhsCustomerEx), LocatorUtils.property(thatLocator, "customerEx", rhsCustomerEx), lhsCustomerEx, rhsCustomerEx, (this.customerEx!= null), (that.customerEx!= null))) { return false; } } @@ -1487,7 +1487,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSecondaryTaxIdentifier = this.getSecondaryTaxIdentifier(); String rhsSecondaryTaxIdentifier; rhsSecondaryTaxIdentifier = that.getSecondaryTaxIdentifier(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "secondaryTaxIdentifier", lhsSecondaryTaxIdentifier), LocatorUtils.property(thatLocator, "secondaryTaxIdentifier", rhsSecondaryTaxIdentifier), lhsSecondaryTaxIdentifier, rhsSecondaryTaxIdentifier)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "secondaryTaxIdentifier", lhsSecondaryTaxIdentifier), LocatorUtils.property(thatLocator, "secondaryTaxIdentifier", rhsSecondaryTaxIdentifier), lhsSecondaryTaxIdentifier, rhsSecondaryTaxIdentifier, (this.secondaryTaxIdentifier!= null), (that.secondaryTaxIdentifier!= null))) { return false; } } @@ -1496,7 +1496,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsARAccountRef = this.getARAccountRef(); ReferenceType rhsARAccountRef; rhsARAccountRef = that.getARAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef, (this.arAccountRef!= null), (that.arAccountRef!= null))) { return false; } } @@ -1505,7 +1505,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryTaxIdentifier = this.getPrimaryTaxIdentifier(); String rhsPrimaryTaxIdentifier; rhsPrimaryTaxIdentifier = that.getPrimaryTaxIdentifier(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryTaxIdentifier", lhsPrimaryTaxIdentifier), LocatorUtils.property(thatLocator, "primaryTaxIdentifier", rhsPrimaryTaxIdentifier), lhsPrimaryTaxIdentifier, rhsPrimaryTaxIdentifier)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryTaxIdentifier", lhsPrimaryTaxIdentifier), LocatorUtils.property(thatLocator, "primaryTaxIdentifier", rhsPrimaryTaxIdentifier), lhsPrimaryTaxIdentifier, rhsPrimaryTaxIdentifier, (this.primaryTaxIdentifier!= null), (that.primaryTaxIdentifier!= null))) { return false; } } @@ -1514,7 +1514,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxExemptionReasonId = this.getTaxExemptionReasonId(); String rhsTaxExemptionReasonId; rhsTaxExemptionReasonId = that.getTaxExemptionReasonId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxExemptionReasonId", lhsTaxExemptionReasonId), LocatorUtils.property(thatLocator, "taxExemptionReasonId", rhsTaxExemptionReasonId), lhsTaxExemptionReasonId, rhsTaxExemptionReasonId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxExemptionReasonId", lhsTaxExemptionReasonId), LocatorUtils.property(thatLocator, "taxExemptionReasonId", rhsTaxExemptionReasonId), lhsTaxExemptionReasonId, rhsTaxExemptionReasonId, (this.taxExemptionReasonId!= null), (that.taxExemptionReasonId!= null))) { return false; } } @@ -1522,207 +1522,207 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theTaxable; theTaxable = this.isTaxable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable, (this.taxable!= null)); } { PhysicalAddress theBillAddr; theBillAddr = this.getBillAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr, (this.billAddr!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { String theContactName; theContactName = this.getContactName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactName", theContactName), currentHashCode, theContactName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactName", theContactName), currentHashCode, theContactName, (this.contactName!= null)); } { String theAltContactName; theAltContactName = this.getAltContactName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "altContactName", theAltContactName), currentHashCode, theAltContactName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "altContactName", theAltContactName), currentHashCode, theAltContactName, (this.altContactName!= null)); } { String theNotes; theNotes = this.getNotes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes, (this.notes!= null)); } { Boolean theJob; theJob = this.isJob(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "job", theJob), currentHashCode, theJob); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "job", theJob), currentHashCode, theJob, (this.job!= null)); } { Boolean theBillWithParent; theBillWithParent = this.isBillWithParent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billWithParent", theBillWithParent), currentHashCode, theBillWithParent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billWithParent", theBillWithParent), currentHashCode, theBillWithParent, (this.billWithParent!= null)); } { ReferenceType theRootCustomerRef; theRootCustomerRef = this.getRootCustomerRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rootCustomerRef", theRootCustomerRef), currentHashCode, theRootCustomerRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rootCustomerRef", theRootCustomerRef), currentHashCode, theRootCustomerRef, (this.rootCustomerRef!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { Integer theLevel; theLevel = this.getLevel(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "level", theLevel), currentHashCode, theLevel); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "level", theLevel), currentHashCode, theLevel, (this.level!= null)); } { ReferenceType theCustomerTypeRef; theCustomerTypeRef = this.getCustomerTypeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerTypeRef", theCustomerTypeRef), currentHashCode, theCustomerTypeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerTypeRef", theCustomerTypeRef), currentHashCode, theCustomerTypeRef, (this.customerTypeRef!= null)); } { ReferenceType theSalesTermRef; theSalesTermRef = this.getSalesTermRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef, (this.salesTermRef!= null)); } { ReferenceType theSalesRepRef; theSalesRepRef = this.getSalesRepRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepRef", theSalesRepRef), currentHashCode, theSalesRepRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepRef", theSalesRepRef), currentHashCode, theSalesRepRef, (this.salesRepRef!= null)); } { ReferenceType theTaxGroupCodeRef; theTaxGroupCodeRef = this.getTaxGroupCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroupCodeRef", theTaxGroupCodeRef), currentHashCode, theTaxGroupCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroupCodeRef", theTaxGroupCodeRef), currentHashCode, theTaxGroupCodeRef, (this.taxGroupCodeRef!= null)); } { ReferenceType theTaxRateRef; theTaxRateRef = this.getTaxRateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef, (this.taxRateRef!= null)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { CreditChargeInfo theCCDetail; theCCDetail = this.getCCDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccDetail", theCCDetail), currentHashCode, theCCDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ccDetail", theCCDetail), currentHashCode, theCCDetail, (this.ccDetail!= null)); } { ReferenceType thePriceLevelRef; thePriceLevelRef = this.getPriceLevelRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef, (this.priceLevelRef!= null)); } { BigDecimal theBalance; theBalance = this.getBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } { Date theOpenBalanceDate; theOpenBalanceDate = this.getOpenBalanceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openBalanceDate", theOpenBalanceDate), currentHashCode, theOpenBalanceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openBalanceDate", theOpenBalanceDate), currentHashCode, theOpenBalanceDate, (this.openBalanceDate!= null)); } { BigDecimal theBalanceWithJobs; theBalanceWithJobs = this.getBalanceWithJobs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balanceWithJobs", theBalanceWithJobs), currentHashCode, theBalanceWithJobs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balanceWithJobs", theBalanceWithJobs), currentHashCode, theBalanceWithJobs, (this.balanceWithJobs!= null)); } { BigDecimal theCreditLimit; theCreditLimit = this.getCreditLimit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditLimit", theCreditLimit), currentHashCode, theCreditLimit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditLimit", theCreditLimit), currentHashCode, theCreditLimit, (this.creditLimit!= null)); } { String theAcctNum; theAcctNum = this.getAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum, (this.acctNum!= null)); } { ReferenceType theCurrencyRef; theCurrencyRef = this.getCurrencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef, (this.currencyRef!= null)); } { BigDecimal theOverDueBalance; theOverDueBalance = this.getOverDueBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "overDueBalance", theOverDueBalance), currentHashCode, theOverDueBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "overDueBalance", theOverDueBalance), currentHashCode, theOverDueBalance, (this.overDueBalance!= null)); } { BigDecimal theTotalRevenue; theTotalRevenue = this.getTotalRevenue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalRevenue", theTotalRevenue), currentHashCode, theTotalRevenue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalRevenue", theTotalRevenue), currentHashCode, theTotalRevenue, (this.totalRevenue!= null)); } { BigDecimal theTotalExpense; theTotalExpense = this.getTotalExpense(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalExpense", theTotalExpense), currentHashCode, theTotalExpense); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalExpense", theTotalExpense), currentHashCode, theTotalExpense, (this.totalExpense!= null)); } { String thePreferredDeliveryMethod; thePreferredDeliveryMethod = this.getPreferredDeliveryMethod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "preferredDeliveryMethod", thePreferredDeliveryMethod), currentHashCode, thePreferredDeliveryMethod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "preferredDeliveryMethod", thePreferredDeliveryMethod), currentHashCode, thePreferredDeliveryMethod, (this.preferredDeliveryMethod!= null)); } { String theResaleNum; theResaleNum = this.getResaleNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resaleNum", theResaleNum), currentHashCode, theResaleNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "resaleNum", theResaleNum), currentHashCode, theResaleNum, (this.resaleNum!= null)); } { JobInfo theJobInfo; theJobInfo = this.getJobInfo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "jobInfo", theJobInfo), currentHashCode, theJobInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "jobInfo", theJobInfo), currentHashCode, theJobInfo, (this.jobInfo!= null)); } { Boolean theTDSEnabled; theTDSEnabled = this.isTDSEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEnabled", theTDSEnabled), currentHashCode, theTDSEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEnabled", theTDSEnabled), currentHashCode, theTDSEnabled, (this.tdsEnabled!= null)); } { IntuitAnyType theCustomerEx; theCustomerEx = this.getCustomerEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerEx", theCustomerEx), currentHashCode, theCustomerEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerEx", theCustomerEx), currentHashCode, theCustomerEx, (this.customerEx!= null)); } { String theSecondaryTaxIdentifier; theSecondaryTaxIdentifier = this.getSecondaryTaxIdentifier(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "secondaryTaxIdentifier", theSecondaryTaxIdentifier), currentHashCode, theSecondaryTaxIdentifier); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "secondaryTaxIdentifier", theSecondaryTaxIdentifier), currentHashCode, theSecondaryTaxIdentifier, (this.secondaryTaxIdentifier!= null)); } { ReferenceType theARAccountRef; theARAccountRef = this.getARAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef, (this.arAccountRef!= null)); } { String thePrimaryTaxIdentifier; thePrimaryTaxIdentifier = this.getPrimaryTaxIdentifier(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryTaxIdentifier", thePrimaryTaxIdentifier), currentHashCode, thePrimaryTaxIdentifier); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryTaxIdentifier", thePrimaryTaxIdentifier), currentHashCode, thePrimaryTaxIdentifier, (this.primaryTaxIdentifier!= null)); } { String theTaxExemptionReasonId; theTaxExemptionReasonId = this.getTaxExemptionReasonId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxExemptionReasonId", theTaxExemptionReasonId), currentHashCode, theTaxExemptionReasonId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxExemptionReasonId", theTaxExemptionReasonId), currentHashCode, theTaxExemptionReasonId, (this.taxExemptionReasonId!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerMsg.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerMsg.java index fae888df..be9df183 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerMsg.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerMsg.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -71,7 +71,7 @@ }) public class CustomerMsg extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -154,8 +154,8 @@ public void setCustomerMsgEx(IntuitAnyType value) { this.customerMsgEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CustomerMsg)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -170,7 +170,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -179,7 +179,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -188,7 +188,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerMsgEx = this.getCustomerMsgEx(); IntuitAnyType rhsCustomerMsgEx; rhsCustomerMsgEx = that.getCustomerMsgEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerMsgEx", lhsCustomerMsgEx), LocatorUtils.property(thatLocator, "customerMsgEx", rhsCustomerMsgEx), lhsCustomerMsgEx, rhsCustomerMsgEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerMsgEx", lhsCustomerMsgEx), LocatorUtils.property(thatLocator, "customerMsgEx", rhsCustomerMsgEx), lhsCustomerMsgEx, rhsCustomerMsgEx, (this.customerMsgEx!= null), (that.customerMsgEx!= null))) { return false; } } @@ -196,32 +196,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { IntuitAnyType theCustomerMsgEx; theCustomerMsgEx = this.getCustomerMsgEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerMsgEx", theCustomerMsgEx), currentHashCode, theCustomerMsgEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerMsgEx", theCustomerMsgEx), currentHashCode, theCustomerMsgEx, (this.customerMsgEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerType.java index f1c55f3b..98273ad5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -74,7 +74,7 @@ }) public class CustomerType extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -183,8 +183,8 @@ public void setActive(Boolean value) { this.active = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof CustomerType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -199,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -208,7 +208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -217,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -226,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -234,37 +234,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerTypeEnum.java index 575da89d..e92b7db3 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/CustomerTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateMacro.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateMacro.java index ebfa3408..86729c6c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateMacro.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateMacro.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateTypeCustomFieldDefinition.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateTypeCustomFieldDefinition.java index 47a7bf2e..d34661c9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateTypeCustomFieldDefinition.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DateTypeCustomFieldDefinition.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -76,7 +76,7 @@ }) public class DateTypeCustomFieldDefinition extends CustomFieldDefinition - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -165,8 +165,8 @@ public void setMaxDate(Date value) { this.maxDate = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof DateTypeCustomFieldDefinition)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -181,7 +181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultDate = this.getDefaultDate(); Date rhsDefaultDate; rhsDefaultDate = that.getDefaultDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDate", lhsDefaultDate), LocatorUtils.property(thatLocator, "defaultDate", rhsDefaultDate), lhsDefaultDate, rhsDefaultDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDate", lhsDefaultDate), LocatorUtils.property(thatLocator, "defaultDate", rhsDefaultDate), lhsDefaultDate, rhsDefaultDate, (this.defaultDate!= null), (that.defaultDate!= null))) { return false; } } @@ -190,7 +190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMinDate = this.getMinDate(); Date rhsMinDate; rhsMinDate = that.getMinDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "minDate", lhsMinDate), LocatorUtils.property(thatLocator, "minDate", rhsMinDate), lhsMinDate, rhsMinDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "minDate", lhsMinDate), LocatorUtils.property(thatLocator, "minDate", rhsMinDate), lhsMinDate, rhsMinDate, (this.minDate!= null), (that.minDate!= null))) { return false; } } @@ -199,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxDate = this.getMaxDate(); Date rhsMaxDate; rhsMaxDate = that.getMaxDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxDate", lhsMaxDate), LocatorUtils.property(thatLocator, "maxDate", rhsMaxDate), lhsMaxDate, rhsMaxDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxDate", lhsMaxDate), LocatorUtils.property(thatLocator, "maxDate", rhsMaxDate), lhsMaxDate, rhsMaxDate, (this.maxDate!= null), (that.maxDate!= null))) { return false; } } @@ -207,32 +207,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Date theDefaultDate; theDefaultDate = this.getDefaultDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDate", theDefaultDate), currentHashCode, theDefaultDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDate", theDefaultDate), currentHashCode, theDefaultDate, (this.defaultDate!= null)); } { Date theMinDate; theMinDate = this.getMinDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minDate", theMinDate), currentHashCode, theMinDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minDate", theMinDate), currentHashCode, theMinDate, (this.minDate!= null)); } { Date theMaxDate; theMaxDate = this.getMaxDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxDate", theMaxDate), currentHashCode, theMaxDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxDate", theMaxDate), currentHashCode, theMaxDate, (this.maxDate!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DayOfWeekEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DayOfWeekEnum.java index 48dda293..aa9004b5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DayOfWeekEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DayOfWeekEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryErrorTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryErrorTypeEnum.java index 5403d841..b36943fc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryErrorTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryErrorTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryTypeEnum.java index 211e3905..084e414d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DeliveryTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Department.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Department.java index 59f48bc3..55ddd5b7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Department.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Department.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -79,7 +79,7 @@ }) public class Department extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -240,8 +240,8 @@ public void setDepartmentEx(IntuitAnyType value) { this.departmentEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Department)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -256,7 +256,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -265,7 +265,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubDepartment = this.isSubDepartment(); Boolean rhsSubDepartment; rhsSubDepartment = that.isSubDepartment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subDepartment", lhsSubDepartment), LocatorUtils.property(thatLocator, "subDepartment", rhsSubDepartment), lhsSubDepartment, rhsSubDepartment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subDepartment", lhsSubDepartment), LocatorUtils.property(thatLocator, "subDepartment", rhsSubDepartment), lhsSubDepartment, rhsSubDepartment, (this.subDepartment!= null), (that.subDepartment!= null))) { return false; } } @@ -274,7 +274,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -283,7 +283,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -292,7 +292,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -301,7 +301,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentEx = this.getDepartmentEx(); IntuitAnyType rhsDepartmentEx; rhsDepartmentEx = that.getDepartmentEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentEx", lhsDepartmentEx), LocatorUtils.property(thatLocator, "departmentEx", rhsDepartmentEx), lhsDepartmentEx, rhsDepartmentEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentEx", lhsDepartmentEx), LocatorUtils.property(thatLocator, "departmentEx", rhsDepartmentEx), lhsDepartmentEx, rhsDepartmentEx, (this.departmentEx!= null), (that.departmentEx!= null))) { return false; } } @@ -309,47 +309,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theSubDepartment; theSubDepartment = this.isSubDepartment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subDepartment", theSubDepartment), currentHashCode, theSubDepartment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subDepartment", theSubDepartment), currentHashCode, theSubDepartment, (this.subDepartment!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { IntuitAnyType theDepartmentEx; theDepartmentEx = this.getDepartmentEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentEx", theDepartmentEx), currentHashCode, theDepartmentEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentEx", theDepartmentEx), currentHashCode, theDepartmentEx, (this.departmentEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Deposit.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Deposit.java index 6f18b0e1..fd91b333 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Deposit.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Deposit.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -78,7 +78,7 @@ }) public class Deposit extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -239,8 +239,8 @@ public void setDepositEx(IntuitAnyType value) { this.depositEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Deposit)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -255,7 +255,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositToAccountRef = this.getDepositToAccountRef(); ReferenceType rhsDepositToAccountRef; rhsDepositToAccountRef = that.getDepositToAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef, (this.depositToAccountRef!= null), (that.depositToAccountRef!= null))) { return false; } } @@ -264,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCashBack = this.getCashBack(); CashBackInfo rhsCashBack; rhsCashBack = that.getCashBack(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cashBack", lhsCashBack), LocatorUtils.property(thatLocator, "cashBack", rhsCashBack), lhsCashBack, rhsCashBack)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cashBack", lhsCashBack), LocatorUtils.property(thatLocator, "cashBack", rhsCashBack), lhsCashBack, rhsCashBack, (this.cashBack!= null), (that.cashBack!= null))) { return false; } } @@ -273,7 +273,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGlobalTaxCalculation = this.getGlobalTaxCalculation(); GlobalTaxCalculationEnum rhsGlobalTaxCalculation; rhsGlobalTaxCalculation = that.getGlobalTaxCalculation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation, (this.globalTaxCalculation!= null), (that.globalTaxCalculation!= null))) { return false; } } @@ -282,7 +282,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -291,7 +291,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeTotalAmt = this.getHomeTotalAmt(); BigDecimal rhsHomeTotalAmt; rhsHomeTotalAmt = that.getHomeTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt, (this.homeTotalAmt!= null), (that.homeTotalAmt!= null))) { return false; } } @@ -300,7 +300,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositEx = this.getDepositEx(); IntuitAnyType rhsDepositEx; rhsDepositEx = that.getDepositEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositEx", lhsDepositEx), LocatorUtils.property(thatLocator, "depositEx", rhsDepositEx), lhsDepositEx, rhsDepositEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositEx", lhsDepositEx), LocatorUtils.property(thatLocator, "depositEx", rhsDepositEx), lhsDepositEx, rhsDepositEx, (this.depositEx!= null), (that.depositEx!= null))) { return false; } } @@ -308,47 +308,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theDepositToAccountRef; theDepositToAccountRef = this.getDepositToAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef, (this.depositToAccountRef!= null)); } { CashBackInfo theCashBack; theCashBack = this.getCashBack(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cashBack", theCashBack), currentHashCode, theCashBack); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cashBack", theCashBack), currentHashCode, theCashBack, (this.cashBack!= null)); } { GlobalTaxCalculationEnum theGlobalTaxCalculation; theGlobalTaxCalculation = this.getGlobalTaxCalculation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation, (this.globalTaxCalculation!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { BigDecimal theHomeTotalAmt; theHomeTotalAmt = this.getHomeTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt, (this.homeTotalAmt!= null)); } { IntuitAnyType theDepositEx; theDepositEx = this.getDepositEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositEx", theDepositEx), currentHashCode, theDepositEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositEx", theDepositEx), currentHashCode, theDepositEx, (this.depositEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DepositLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DepositLineDetail.java index 36b90996..28e87afe 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DepositLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DepositLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -83,8 +83,7 @@ "taxApplicableOn", "depositLineDetailEx" }) -public class DepositLineDetail - implements Serializable, Equals, HashCode +public class DepositLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -323,8 +322,8 @@ public void setDepositLineDetailEx(IntuitAnyType value) { this.depositLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof DepositLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -336,7 +335,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntity = this.getEntity(); ReferenceType rhsEntity; rhsEntity = that.getEntity(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entity", lhsEntity), LocatorUtils.property(thatLocator, "entity", rhsEntity), lhsEntity, rhsEntity)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entity", lhsEntity), LocatorUtils.property(thatLocator, "entity", rhsEntity), lhsEntity, rhsEntity, (this.entity!= null), (that.entity!= null))) { return false; } } @@ -345,7 +344,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; } } @@ -354,7 +353,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; } } @@ -363,7 +362,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -372,7 +371,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckNum = this.getCheckNum(); String rhsCheckNum; rhsCheckNum = that.getCheckNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkNum", lhsCheckNum), LocatorUtils.property(thatLocator, "checkNum", rhsCheckNum), lhsCheckNum, rhsCheckNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkNum", lhsCheckNum), LocatorUtils.property(thatLocator, "checkNum", rhsCheckNum), lhsCheckNum, rhsCheckNum, (this.checkNum!= null), (that.checkNum!= null))) { return false; } } @@ -381,7 +380,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnType = this.getTxnType(); TxnTypeEnum rhsTxnType; rhsTxnType = that.getTxnType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnType", lhsTxnType), LocatorUtils.property(thatLocator, "txnType", rhsTxnType), lhsTxnType, rhsTxnType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnType", lhsTxnType), LocatorUtils.property(thatLocator, "txnType", rhsTxnType), lhsTxnType, rhsTxnType, (this.txnType!= null), (that.txnType!= null))) { return false; } } @@ -390,7 +389,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; } } @@ -399,7 +398,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxApplicableOn = this.getTaxApplicableOn(); TaxApplicableOnEnum rhsTaxApplicableOn; rhsTaxApplicableOn = that.getTaxApplicableOn(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn, (this.taxApplicableOn!= null), (that.taxApplicableOn!= null))) { return false; } } @@ -408,7 +407,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositLineDetailEx = this.getDepositLineDetailEx(); IntuitAnyType rhsDepositLineDetailEx; rhsDepositLineDetailEx = that.getDepositLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositLineDetailEx", lhsDepositLineDetailEx), LocatorUtils.property(thatLocator, "depositLineDetailEx", rhsDepositLineDetailEx), lhsDepositLineDetailEx, rhsDepositLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositLineDetailEx", lhsDepositLineDetailEx), LocatorUtils.property(thatLocator, "depositLineDetailEx", rhsDepositLineDetailEx), lhsDepositLineDetailEx, rhsDepositLineDetailEx, (this.depositLineDetailEx!= null), (that.depositLineDetailEx!= null))) { return false; } } @@ -416,62 +415,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theEntity; theEntity = this.getEntity(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entity", theEntity), currentHashCode, theEntity); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entity", theEntity), currentHashCode, theEntity, (this.entity!= 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)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { String theCheckNum; theCheckNum = this.getCheckNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkNum", theCheckNum), currentHashCode, theCheckNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkNum", theCheckNum), currentHashCode, theCheckNum, (this.checkNum!= null)); } { TxnTypeEnum theTxnType; theTxnType = this.getTxnType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnType", theTxnType), currentHashCode, theTxnType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnType", theTxnType), currentHashCode, theTxnType, (this.txnType!= 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)); } { TaxApplicableOnEnum theTaxApplicableOn; theTaxApplicableOn = this.getTaxApplicableOn(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn, (this.taxApplicableOn!= null)); } { IntuitAnyType theDepositLineDetailEx; theDepositLineDetailEx = this.getDepositLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositLineDetailEx", theDepositLineDetailEx), currentHashCode, theDepositLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositLineDetailEx", theDepositLineDetailEx), currentHashCode, theDepositLineDetailEx, (this.depositLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DescriptionLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DescriptionLineDetail.java index 28058fa4..eacba4c5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DescriptionLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DescriptionLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -75,8 +75,7 @@ "taxCodeRef", "descriptionLineDetailEx" }) -public class DescriptionLineDetail - implements Serializable, Equals, HashCode +public class DescriptionLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -161,8 +160,8 @@ public void setDescriptionLineDetailEx(IntuitAnyType value) { this.descriptionLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof DescriptionLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -174,7 +173,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -183,7 +182,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; } } @@ -192,7 +191,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescriptionLineDetailEx = this.getDescriptionLineDetailEx(); IntuitAnyType rhsDescriptionLineDetailEx; rhsDescriptionLineDetailEx = that.getDescriptionLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "descriptionLineDetailEx", lhsDescriptionLineDetailEx), LocatorUtils.property(thatLocator, "descriptionLineDetailEx", rhsDescriptionLineDetailEx), lhsDescriptionLineDetailEx, rhsDescriptionLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "descriptionLineDetailEx", lhsDescriptionLineDetailEx), LocatorUtils.property(thatLocator, "descriptionLineDetailEx", rhsDescriptionLineDetailEx), lhsDescriptionLineDetailEx, rhsDescriptionLineDetailEx, (this.descriptionLineDetailEx!= null), (that.descriptionLineDetailEx!= null))) { return false; } } @@ -200,32 +199,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= 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)); } { IntuitAnyType theDescriptionLineDetailEx; theDescriptionLineDetailEx = this.getDescriptionLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "descriptionLineDetailEx", theDescriptionLineDetailEx), currentHashCode, theDescriptionLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "descriptionLineDetailEx", theDescriptionLineDetailEx), currentHashCode, theDescriptionLineDetailEx, (this.descriptionLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DesktopEntityTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DesktopEntityTypeEnum.java index dd8c7f66..26e35d00 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DesktopEntityTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DesktopEntityTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountLineDetail.java index 4480eff4..1de79ef0 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -82,7 +82,7 @@ }) public class DiscountLineDetail extends DiscountOverride - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -193,8 +193,8 @@ public void setDiscountLineDetailEx(IntuitAnyType value) { this.discountLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof DiscountLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -209,7 +209,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -218,7 +218,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; } } @@ -227,7 +227,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; } } @@ -236,7 +236,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountLineDetailEx = this.getDiscountLineDetailEx(); IntuitAnyType rhsDiscountLineDetailEx; rhsDiscountLineDetailEx = that.getDiscountLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountLineDetailEx", lhsDiscountLineDetailEx), LocatorUtils.property(thatLocator, "discountLineDetailEx", rhsDiscountLineDetailEx), lhsDiscountLineDetailEx, rhsDiscountLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountLineDetailEx", lhsDiscountLineDetailEx), LocatorUtils.property(thatLocator, "discountLineDetailEx", rhsDiscountLineDetailEx), lhsDiscountLineDetailEx, rhsDiscountLineDetailEx, (this.discountLineDetailEx!= null), (that.discountLineDetailEx!= null))) { return false; } } @@ -244,37 +244,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= 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 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)); } { IntuitAnyType theDiscountLineDetailEx; theDiscountLineDetailEx = this.getDiscountLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountLineDetailEx", theDiscountLineDetailEx), currentHashCode, theDiscountLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountLineDetailEx", theDiscountLineDetailEx), currentHashCode, theDiscountLineDetailEx, (this.discountLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountOverride.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountOverride.java index 4cbc37d2..abafe5f1 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountOverride.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountOverride.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; 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; @@ -72,8 +72,7 @@ @XmlSeeAlso({ DiscountLineDetail.class }) -public class DiscountOverride - implements Serializable, Equals, HashCode +public class DiscountOverride implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -182,8 +181,8 @@ public void setDiscountAccountRef(ReferenceType value) { this.discountAccountRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof DiscountOverride)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -195,7 +194,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountRef = this.getDiscountRef(); ReferenceType rhsDiscountRef; rhsDiscountRef = that.getDiscountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRef", lhsDiscountRef), LocatorUtils.property(thatLocator, "discountRef", rhsDiscountRef), lhsDiscountRef, rhsDiscountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRef", lhsDiscountRef), LocatorUtils.property(thatLocator, "discountRef", rhsDiscountRef), lhsDiscountRef, rhsDiscountRef, (this.discountRef!= null), (that.discountRef!= null))) { return false; } } @@ -204,7 +203,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPercentBased = this.isPercentBased(); Boolean rhsPercentBased; rhsPercentBased = that.isPercentBased(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased, (this.percentBased!= null), (that.percentBased!= null))) { return false; } } @@ -213,7 +212,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountPercent = this.getDiscountPercent(); BigDecimal rhsDiscountPercent; rhsDiscountPercent = that.getDiscountPercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountPercent", lhsDiscountPercent), LocatorUtils.property(thatLocator, "discountPercent", rhsDiscountPercent), lhsDiscountPercent, rhsDiscountPercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountPercent", lhsDiscountPercent), LocatorUtils.property(thatLocator, "discountPercent", rhsDiscountPercent), lhsDiscountPercent, rhsDiscountPercent, (this.discountPercent!= null), (that.discountPercent!= null))) { return false; } } @@ -222,7 +221,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountAccountRef = this.getDiscountAccountRef(); ReferenceType rhsDiscountAccountRef; rhsDiscountAccountRef = that.getDiscountAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAccountRef", lhsDiscountAccountRef), LocatorUtils.property(thatLocator, "discountAccountRef", rhsDiscountAccountRef), lhsDiscountAccountRef, rhsDiscountAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAccountRef", lhsDiscountAccountRef), LocatorUtils.property(thatLocator, "discountAccountRef", rhsDiscountAccountRef), lhsDiscountAccountRef, rhsDiscountAccountRef, (this.discountAccountRef!= null), (that.discountAccountRef!= null))) { return false; } } @@ -230,37 +229,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theDiscountRef; theDiscountRef = this.getDiscountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRef", theDiscountRef), currentHashCode, theDiscountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRef", theDiscountRef), currentHashCode, theDiscountRef, (this.discountRef!= null)); } { Boolean thePercentBased; thePercentBased = this.isPercentBased(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased, (this.percentBased!= null)); } { BigDecimal theDiscountPercent; theDiscountPercent = this.getDiscountPercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountPercent", theDiscountPercent), currentHashCode, theDiscountPercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountPercent", theDiscountPercent), currentHashCode, theDiscountPercent, (this.discountPercent!= null)); } { ReferenceType theDiscountAccountRef; theDiscountAccountRef = this.getDiscountAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAccountRef", theDiscountAccountRef), currentHashCode, theDiscountAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAccountRef", theDiscountAccountRef), currentHashCode, theDiscountAccountRef, (this.discountAccountRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountTypeEnum.java index b9da69b5..e6836cc4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DiscountTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionEnabledStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionEnabledStatusEnum.java index 88ca8f14..e2d1a6df 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionEnabledStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionEnabledStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionStatusEnum.java index dbfa49e7..5db0d984 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ETransactionStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EffectiveTaxRate.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EffectiveTaxRate.java index 4016b154..fc44cafa 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EffectiveTaxRate.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EffectiveTaxRate.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -77,8 +77,7 @@ "endDate", "effectiveTaxRateEx" }) -public class EffectiveTaxRate - implements Serializable, Equals, HashCode +public class EffectiveTaxRate implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -191,8 +190,8 @@ public void setEffectiveTaxRateEx(IntuitAnyType value) { this.effectiveTaxRateEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EffectiveTaxRate)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -204,7 +203,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRateValue = this.getRateValue(); BigDecimal rhsRateValue; rhsRateValue = that.getRateValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue, (this.rateValue!= null), (that.rateValue!= null))) { return false; } } @@ -213,7 +212,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEffectiveDate = this.getEffectiveDate(); Date rhsEffectiveDate; rhsEffectiveDate = that.getEffectiveDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveDate", lhsEffectiveDate), LocatorUtils.property(thatLocator, "effectiveDate", rhsEffectiveDate), lhsEffectiveDate, rhsEffectiveDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveDate", lhsEffectiveDate), LocatorUtils.property(thatLocator, "effectiveDate", rhsEffectiveDate), lhsEffectiveDate, rhsEffectiveDate, (this.effectiveDate!= null), (that.effectiveDate!= null))) { return false; } } @@ -222,7 +221,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndDate = this.getEndDate(); Date rhsEndDate; rhsEndDate = that.getEndDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate, (this.endDate!= null), (that.endDate!= null))) { return false; } } @@ -231,7 +230,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEffectiveTaxRateEx = this.getEffectiveTaxRateEx(); IntuitAnyType rhsEffectiveTaxRateEx; rhsEffectiveTaxRateEx = that.getEffectiveTaxRateEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveTaxRateEx", lhsEffectiveTaxRateEx), LocatorUtils.property(thatLocator, "effectiveTaxRateEx", rhsEffectiveTaxRateEx), lhsEffectiveTaxRateEx, rhsEffectiveTaxRateEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveTaxRateEx", lhsEffectiveTaxRateEx), LocatorUtils.property(thatLocator, "effectiveTaxRateEx", rhsEffectiveTaxRateEx), lhsEffectiveTaxRateEx, rhsEffectiveTaxRateEx, (this.effectiveTaxRateEx!= null), (that.effectiveTaxRateEx!= null))) { return false; } } @@ -239,37 +238,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { BigDecimal theRateValue; theRateValue = this.getRateValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue, (this.rateValue!= null)); } { Date theEffectiveDate; theEffectiveDate = this.getEffectiveDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveDate", theEffectiveDate), currentHashCode, theEffectiveDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveDate", theEffectiveDate), currentHashCode, theEffectiveDate, (this.effectiveDate!= null)); } { Date theEndDate; theEndDate = this.getEndDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate, (this.endDate!= null)); } { IntuitAnyType theEffectiveTaxRateEx; theEffectiveTaxRateEx = this.getEffectiveTaxRateEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveTaxRateEx", theEffectiveTaxRateEx), currentHashCode, theEffectiveTaxRateEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveTaxRateEx", theEffectiveTaxRateEx), currentHashCode, theEffectiveTaxRateEx, (this.effectiveTaxRateEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddress.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddress.java index c2af322b..80f23d45 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddress.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddress.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -72,8 +72,7 @@ "_default", "tag" }) -public class EmailAddress - implements Serializable, Equals, HashCode +public class EmailAddress implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -182,8 +181,8 @@ public void setTag(String value) { this.tag = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EmailAddress)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -195,7 +194,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -204,7 +203,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAddress = this.getAddress(); String rhsAddress; rhsAddress = that.getAddress(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "address", lhsAddress), LocatorUtils.property(thatLocator, "address", rhsAddress), lhsAddress, rhsAddress)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "address", lhsAddress), LocatorUtils.property(thatLocator, "address", rhsAddress), lhsAddress, rhsAddress, (this.address!= null), (that.address!= null))) { return false; } } @@ -213,7 +212,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefault = this.isDefault(); Boolean rhsDefault; rhsDefault = that.isDefault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault, (this._default!= null), (that._default!= null))) { return false; } } @@ -222,7 +221,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -230,37 +229,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theAddress; theAddress = this.getAddress(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "address", theAddress), currentHashCode, theAddress); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "address", theAddress), currentHashCode, theAddress, (this.address!= null)); } { Boolean theDefault; theDefault = this.isDefault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault, (this._default!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddressTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddressTypeEnum.java index a6f64af8..114cc92b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddressTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailAddressTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailDeliveryInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailDeliveryInfo.java index b6a606e1..5b67ba35 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailDeliveryInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailDeliveryInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -85,7 +85,7 @@ }) public class EmailDeliveryInfo extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -324,8 +324,8 @@ public void setETransactionStatus(ETransactionStatusEnum value) { this.eTransactionStatus = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EmailDeliveryInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -340,7 +340,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryAddress = this.getDeliveryAddress(); EmailAddress rhsDeliveryAddress; rhsDeliveryAddress = that.getDeliveryAddress(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddress", lhsDeliveryAddress), LocatorUtils.property(thatLocator, "deliveryAddress", rhsDeliveryAddress), lhsDeliveryAddress, rhsDeliveryAddress)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddress", lhsDeliveryAddress), LocatorUtils.property(thatLocator, "deliveryAddress", rhsDeliveryAddress), lhsDeliveryAddress, rhsDeliveryAddress, (this.deliveryAddress!= null), (that.deliveryAddress!= null))) { return false; } } @@ -349,7 +349,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryAddressCc = this.getDeliveryAddressCc(); EmailAddress rhsDeliveryAddressCc; rhsDeliveryAddressCc = that.getDeliveryAddressCc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddressCc", lhsDeliveryAddressCc), LocatorUtils.property(thatLocator, "deliveryAddressCc", rhsDeliveryAddressCc), lhsDeliveryAddressCc, rhsDeliveryAddressCc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddressCc", lhsDeliveryAddressCc), LocatorUtils.property(thatLocator, "deliveryAddressCc", rhsDeliveryAddressCc), lhsDeliveryAddressCc, rhsDeliveryAddressCc, (this.deliveryAddressCc!= null), (that.deliveryAddressCc!= null))) { return false; } } @@ -358,7 +358,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryAddressBcc = this.getDeliveryAddressBcc(); EmailAddress rhsDeliveryAddressBcc; rhsDeliveryAddressBcc = that.getDeliveryAddressBcc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddressBcc", lhsDeliveryAddressBcc), LocatorUtils.property(thatLocator, "deliveryAddressBcc", rhsDeliveryAddressBcc), lhsDeliveryAddressBcc, rhsDeliveryAddressBcc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryAddressBcc", lhsDeliveryAddressBcc), LocatorUtils.property(thatLocator, "deliveryAddressBcc", rhsDeliveryAddressBcc), lhsDeliveryAddressBcc, rhsDeliveryAddressBcc, (this.deliveryAddressBcc!= null), (that.deliveryAddressBcc!= null))) { return false; } } @@ -367,7 +367,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailMessage = this.getEmailMessage(); EmailMessage rhsEmailMessage; rhsEmailMessage = that.getEmailMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailMessage", lhsEmailMessage), LocatorUtils.property(thatLocator, "emailMessage", rhsEmailMessage), lhsEmailMessage, rhsEmailMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailMessage", lhsEmailMessage), LocatorUtils.property(thatLocator, "emailMessage", rhsEmailMessage), lhsEmailMessage, rhsEmailMessage, (this.emailMessage!= null), (that.emailMessage!= null))) { return false; } } @@ -376,7 +376,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlinePayment = this.isAllowOnlinePayment(); Boolean rhsAllowOnlinePayment; rhsAllowOnlinePayment = that.isAllowOnlinePayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlinePayment", lhsAllowOnlinePayment), LocatorUtils.property(thatLocator, "allowOnlinePayment", rhsAllowOnlinePayment), lhsAllowOnlinePayment, rhsAllowOnlinePayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlinePayment", lhsAllowOnlinePayment), LocatorUtils.property(thatLocator, "allowOnlinePayment", rhsAllowOnlinePayment), lhsAllowOnlinePayment, rhsAllowOnlinePayment, (this.allowOnlinePayment!= null), (that.allowOnlinePayment!= null))) { return false; } } @@ -385,7 +385,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlineCreditCardPayment = this.isAllowOnlineCreditCardPayment(); Boolean rhsAllowOnlineCreditCardPayment; rhsAllowOnlineCreditCardPayment = that.isAllowOnlineCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineCreditCardPayment", lhsAllowOnlineCreditCardPayment), LocatorUtils.property(thatLocator, "allowOnlineCreditCardPayment", rhsAllowOnlineCreditCardPayment), lhsAllowOnlineCreditCardPayment, rhsAllowOnlineCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineCreditCardPayment", lhsAllowOnlineCreditCardPayment), LocatorUtils.property(thatLocator, "allowOnlineCreditCardPayment", rhsAllowOnlineCreditCardPayment), lhsAllowOnlineCreditCardPayment, rhsAllowOnlineCreditCardPayment, (this.allowOnlineCreditCardPayment!= null), (that.allowOnlineCreditCardPayment!= null))) { return false; } } @@ -394,7 +394,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlineACHPayment = this.isAllowOnlineACHPayment(); Boolean rhsAllowOnlineACHPayment; rhsAllowOnlineACHPayment = that.isAllowOnlineACHPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineACHPayment", lhsAllowOnlineACHPayment), LocatorUtils.property(thatLocator, "allowOnlineACHPayment", rhsAllowOnlineACHPayment), lhsAllowOnlineACHPayment, rhsAllowOnlineACHPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineACHPayment", lhsAllowOnlineACHPayment), LocatorUtils.property(thatLocator, "allowOnlineACHPayment", rhsAllowOnlineACHPayment), lhsAllowOnlineACHPayment, rhsAllowOnlineACHPayment, (this.allowOnlineACHPayment!= null), (that.allowOnlineACHPayment!= null))) { return false; } } @@ -403,7 +403,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryInfo = this.getDeliveryInfo(); TransactionDeliveryInfo rhsDeliveryInfo; rhsDeliveryInfo = that.getDeliveryInfo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryInfo", lhsDeliveryInfo), LocatorUtils.property(thatLocator, "deliveryInfo", rhsDeliveryInfo), lhsDeliveryInfo, rhsDeliveryInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryInfo", lhsDeliveryInfo), LocatorUtils.property(thatLocator, "deliveryInfo", rhsDeliveryInfo), lhsDeliveryInfo, rhsDeliveryInfo, (this.deliveryInfo!= null), (that.deliveryInfo!= null))) { return false; } } @@ -412,7 +412,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsETransactionStatus = this.getETransactionStatus(); ETransactionStatusEnum rhsETransactionStatus; rhsETransactionStatus = that.getETransactionStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionStatus", lhsETransactionStatus), LocatorUtils.property(thatLocator, "eTransactionStatus", rhsETransactionStatus), lhsETransactionStatus, rhsETransactionStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionStatus", lhsETransactionStatus), LocatorUtils.property(thatLocator, "eTransactionStatus", rhsETransactionStatus), lhsETransactionStatus, rhsETransactionStatus, (this.eTransactionStatus!= null), (that.eTransactionStatus!= null))) { return false; } } @@ -420,62 +420,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { EmailAddress theDeliveryAddress; theDeliveryAddress = this.getDeliveryAddress(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddress", theDeliveryAddress), currentHashCode, theDeliveryAddress); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddress", theDeliveryAddress), currentHashCode, theDeliveryAddress, (this.deliveryAddress!= null)); } { EmailAddress theDeliveryAddressCc; theDeliveryAddressCc = this.getDeliveryAddressCc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddressCc", theDeliveryAddressCc), currentHashCode, theDeliveryAddressCc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddressCc", theDeliveryAddressCc), currentHashCode, theDeliveryAddressCc, (this.deliveryAddressCc!= null)); } { EmailAddress theDeliveryAddressBcc; theDeliveryAddressBcc = this.getDeliveryAddressBcc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddressBcc", theDeliveryAddressBcc), currentHashCode, theDeliveryAddressBcc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryAddressBcc", theDeliveryAddressBcc), currentHashCode, theDeliveryAddressBcc, (this.deliveryAddressBcc!= null)); } { EmailMessage theEmailMessage; theEmailMessage = this.getEmailMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailMessage", theEmailMessage), currentHashCode, theEmailMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailMessage", theEmailMessage), currentHashCode, theEmailMessage, (this.emailMessage!= null)); } { Boolean theAllowOnlinePayment; theAllowOnlinePayment = this.isAllowOnlinePayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlinePayment", theAllowOnlinePayment), currentHashCode, theAllowOnlinePayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlinePayment", theAllowOnlinePayment), currentHashCode, theAllowOnlinePayment, (this.allowOnlinePayment!= null)); } { Boolean theAllowOnlineCreditCardPayment; theAllowOnlineCreditCardPayment = this.isAllowOnlineCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineCreditCardPayment", theAllowOnlineCreditCardPayment), currentHashCode, theAllowOnlineCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineCreditCardPayment", theAllowOnlineCreditCardPayment), currentHashCode, theAllowOnlineCreditCardPayment, (this.allowOnlineCreditCardPayment!= null)); } { Boolean theAllowOnlineACHPayment; theAllowOnlineACHPayment = this.isAllowOnlineACHPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineACHPayment", theAllowOnlineACHPayment), currentHashCode, theAllowOnlineACHPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineACHPayment", theAllowOnlineACHPayment), currentHashCode, theAllowOnlineACHPayment, (this.allowOnlineACHPayment!= null)); } { TransactionDeliveryInfo theDeliveryInfo; theDeliveryInfo = this.getDeliveryInfo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryInfo", theDeliveryInfo), currentHashCode, theDeliveryInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryInfo", theDeliveryInfo), currentHashCode, theDeliveryInfo, (this.deliveryInfo!= null)); } { ETransactionStatusEnum theETransactionStatus; theETransactionStatus = this.getETransactionStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionStatus", theETransactionStatus), currentHashCode, theETransactionStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionStatus", theETransactionStatus), currentHashCode, theETransactionStatus, (this.eTransactionStatus!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessage.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessage.java index 25676428..43098087 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessage.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessage.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -68,8 +68,7 @@ "subject", "message" }) -public class EmailMessage - implements Serializable, Equals, HashCode +public class EmailMessage implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -126,8 +125,8 @@ public void setMessage(String value) { this.message = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EmailMessage)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -139,7 +138,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubject = this.getSubject(); String rhsSubject; rhsSubject = that.getSubject(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subject", lhsSubject), LocatorUtils.property(thatLocator, "subject", rhsSubject), lhsSubject, rhsSubject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subject", lhsSubject), LocatorUtils.property(thatLocator, "subject", rhsSubject), lhsSubject, rhsSubject, (this.subject!= null), (that.subject!= null))) { return false; } } @@ -148,7 +147,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMessage = this.getMessage(); String rhsMessage; rhsMessage = that.getMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage, (this.message!= null), (that.message!= null))) { return false; } } @@ -156,27 +155,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theSubject; theSubject = this.getSubject(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subject", theSubject), currentHashCode, theSubject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subject", theSubject), currentHashCode, theSubject, (this.subject!= null)); } { String theMessage; theMessage = this.getMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage, (this.message!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessagesPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessagesPrefs.java index 1ee68ab6..bd0551d4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessagesPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailMessagesPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -73,8 +73,7 @@ "salesReceiptMessage", "statementMessage" }) -public class EmailMessagesPrefs - implements Serializable, Equals, HashCode +public class EmailMessagesPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -226,8 +225,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EmailMessagesPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -239,7 +238,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -248,7 +247,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvoiceMessage = this.getInvoiceMessage(); EmailMessage rhsInvoiceMessage; rhsInvoiceMessage = that.getInvoiceMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceMessage", lhsInvoiceMessage), LocatorUtils.property(thatLocator, "invoiceMessage", rhsInvoiceMessage), lhsInvoiceMessage, rhsInvoiceMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceMessage", lhsInvoiceMessage), LocatorUtils.property(thatLocator, "invoiceMessage", rhsInvoiceMessage), lhsInvoiceMessage, rhsInvoiceMessage, (this.invoiceMessage!= null), (that.invoiceMessage!= null))) { return false; } } @@ -257,7 +256,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEstimateMessage = this.getEstimateMessage(); EmailMessage rhsEstimateMessage; rhsEstimateMessage = that.getEstimateMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateMessage", lhsEstimateMessage), LocatorUtils.property(thatLocator, "estimateMessage", rhsEstimateMessage), lhsEstimateMessage, rhsEstimateMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateMessage", lhsEstimateMessage), LocatorUtils.property(thatLocator, "estimateMessage", rhsEstimateMessage), lhsEstimateMessage, rhsEstimateMessage, (this.estimateMessage!= null), (that.estimateMessage!= null))) { return false; } } @@ -266,7 +265,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesReceiptMessage = this.getSalesReceiptMessage(); EmailMessage rhsSalesReceiptMessage; rhsSalesReceiptMessage = that.getSalesReceiptMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesReceiptMessage", lhsSalesReceiptMessage), LocatorUtils.property(thatLocator, "salesReceiptMessage", rhsSalesReceiptMessage), lhsSalesReceiptMessage, rhsSalesReceiptMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesReceiptMessage", lhsSalesReceiptMessage), LocatorUtils.property(thatLocator, "salesReceiptMessage", rhsSalesReceiptMessage), lhsSalesReceiptMessage, rhsSalesReceiptMessage, (this.salesReceiptMessage!= null), (that.salesReceiptMessage!= null))) { return false; } } @@ -275,7 +274,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatementMessage = this.getStatementMessage(); EmailMessage rhsStatementMessage; rhsStatementMessage = that.getStatementMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "statementMessage", lhsStatementMessage), LocatorUtils.property(thatLocator, "statementMessage", rhsStatementMessage), lhsStatementMessage, rhsStatementMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "statementMessage", lhsStatementMessage), LocatorUtils.property(thatLocator, "statementMessage", rhsStatementMessage), lhsStatementMessage, rhsStatementMessage, (this.statementMessage!= null), (that.statementMessage!= null))) { return false; } } @@ -283,42 +282,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } { EmailMessage theInvoiceMessage; theInvoiceMessage = this.getInvoiceMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceMessage", theInvoiceMessage), currentHashCode, theInvoiceMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceMessage", theInvoiceMessage), currentHashCode, theInvoiceMessage, (this.invoiceMessage!= null)); } { EmailMessage theEstimateMessage; theEstimateMessage = this.getEstimateMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateMessage", theEstimateMessage), currentHashCode, theEstimateMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateMessage", theEstimateMessage), currentHashCode, theEstimateMessage, (this.estimateMessage!= null)); } { EmailMessage theSalesReceiptMessage; theSalesReceiptMessage = this.getSalesReceiptMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesReceiptMessage", theSalesReceiptMessage), currentHashCode, theSalesReceiptMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesReceiptMessage", theSalesReceiptMessage), currentHashCode, theSalesReceiptMessage, (this.salesReceiptMessage!= null)); } { EmailMessage theStatementMessage; theStatementMessage = this.getStatementMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statementMessage", theStatementMessage), currentHashCode, theStatementMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statementMessage", theStatementMessage), currentHashCode, theStatementMessage, (this.statementMessage!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailStatusEnum.java index 23a54cd6..6a69c740 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmailStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Employee.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Employee.java index c29244c6..80198e9c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Employee.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Employee.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -96,7 +96,7 @@ }) public class Employee extends NameBase - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -462,8 +462,8 @@ public void setOtherAddr(List otherAddr) { this.otherAddr = otherAddr; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Employee)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -478,7 +478,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployeeType = this.getEmployeeType(); String rhsEmployeeType; rhsEmployeeType = that.getEmployeeType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeType", lhsEmployeeType), LocatorUtils.property(thatLocator, "employeeType", rhsEmployeeType), lhsEmployeeType, rhsEmployeeType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeType", lhsEmployeeType), LocatorUtils.property(thatLocator, "employeeType", rhsEmployeeType), lhsEmployeeType, rhsEmployeeType, (this.employeeType!= null), (that.employeeType!= null))) { return false; } } @@ -487,7 +487,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployeeNumber = this.getEmployeeNumber(); String rhsEmployeeNumber; rhsEmployeeNumber = that.getEmployeeNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeNumber", lhsEmployeeNumber), LocatorUtils.property(thatLocator, "employeeNumber", rhsEmployeeNumber), lhsEmployeeNumber, rhsEmployeeNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeNumber", lhsEmployeeNumber), LocatorUtils.property(thatLocator, "employeeNumber", rhsEmployeeNumber), lhsEmployeeNumber, rhsEmployeeNumber, (this.employeeNumber!= null), (that.employeeNumber!= null))) { return false; } } @@ -496,7 +496,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSSN = this.getSSN(); String rhsSSN; rhsSSN = that.getSSN(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ssn", lhsSSN), LocatorUtils.property(thatLocator, "ssn", rhsSSN), lhsSSN, rhsSSN)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ssn", lhsSSN), LocatorUtils.property(thatLocator, "ssn", rhsSSN), lhsSSN, rhsSSN, (this.ssn!= null), (that.ssn!= null))) { return false; } } @@ -505,7 +505,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryAddr = this.getPrimaryAddr(); PhysicalAddress rhsPrimaryAddr; rhsPrimaryAddr = that.getPrimaryAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryAddr", lhsPrimaryAddr), LocatorUtils.property(thatLocator, "primaryAddr", rhsPrimaryAddr), lhsPrimaryAddr, rhsPrimaryAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryAddr", lhsPrimaryAddr), LocatorUtils.property(thatLocator, "primaryAddr", rhsPrimaryAddr), lhsPrimaryAddr, rhsPrimaryAddr, (this.primaryAddr!= null), (that.primaryAddr!= null))) { return false; } } @@ -514,7 +514,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -523,7 +523,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillableTime = this.isBillableTime(); Boolean rhsBillableTime; rhsBillableTime = that.isBillableTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billableTime", lhsBillableTime), LocatorUtils.property(thatLocator, "billableTime", rhsBillableTime), lhsBillableTime, rhsBillableTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billableTime", lhsBillableTime), LocatorUtils.property(thatLocator, "billableTime", rhsBillableTime), lhsBillableTime, rhsBillableTime, (this.billableTime!= null), (that.billableTime!= null))) { return false; } } @@ -532,7 +532,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillRate = this.getBillRate(); BigDecimal rhsBillRate; rhsBillRate = that.getBillRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billRate", lhsBillRate), LocatorUtils.property(thatLocator, "billRate", rhsBillRate), lhsBillRate, rhsBillRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billRate", lhsBillRate), LocatorUtils.property(thatLocator, "billRate", rhsBillRate), lhsBillRate, rhsBillRate, (this.billRate!= null), (that.billRate!= null))) { return false; } } @@ -541,7 +541,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBirthDate = this.getBirthDate(); Date rhsBirthDate; rhsBirthDate = that.getBirthDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "birthDate", lhsBirthDate), LocatorUtils.property(thatLocator, "birthDate", rhsBirthDate), lhsBirthDate, rhsBirthDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "birthDate", lhsBirthDate), LocatorUtils.property(thatLocator, "birthDate", rhsBirthDate), lhsBirthDate, rhsBirthDate, (this.birthDate!= null), (that.birthDate!= null))) { return false; } } @@ -550,7 +550,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGender = this.getGender(); Gender rhsGender; rhsGender = that.getGender(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "gender", lhsGender), LocatorUtils.property(thatLocator, "gender", rhsGender), lhsGender, rhsGender)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "gender", lhsGender), LocatorUtils.property(thatLocator, "gender", rhsGender), lhsGender, rhsGender, (this.gender!= null), (that.gender!= null))) { return false; } } @@ -559,7 +559,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHiredDate = this.getHiredDate(); Date rhsHiredDate; rhsHiredDate = that.getHiredDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "hiredDate", lhsHiredDate), LocatorUtils.property(thatLocator, "hiredDate", rhsHiredDate), lhsHiredDate, rhsHiredDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "hiredDate", lhsHiredDate), LocatorUtils.property(thatLocator, "hiredDate", rhsHiredDate), lhsHiredDate, rhsHiredDate, (this.hiredDate!= null), (that.hiredDate!= null))) { return false; } } @@ -568,7 +568,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReleasedDate = this.getReleasedDate(); Date rhsReleasedDate; rhsReleasedDate = that.getReleasedDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "releasedDate", lhsReleasedDate), LocatorUtils.property(thatLocator, "releasedDate", rhsReleasedDate), lhsReleasedDate, rhsReleasedDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "releasedDate", lhsReleasedDate), LocatorUtils.property(thatLocator, "releasedDate", rhsReleasedDate), lhsReleasedDate, rhsReleasedDate, (this.releasedDate!= null), (that.releasedDate!= null))) { return false; } } @@ -577,7 +577,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUseTimeEntry = this.getUseTimeEntry(); TimeEntryUsedForPaychecksEnum rhsUseTimeEntry; rhsUseTimeEntry = that.getUseTimeEntry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "useTimeEntry", lhsUseTimeEntry), LocatorUtils.property(thatLocator, "useTimeEntry", rhsUseTimeEntry), lhsUseTimeEntry, rhsUseTimeEntry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "useTimeEntry", lhsUseTimeEntry), LocatorUtils.property(thatLocator, "useTimeEntry", rhsUseTimeEntry), lhsUseTimeEntry, rhsUseTimeEntry, (this.useTimeEntry!= null), (that.useTimeEntry!= null))) { return false; } } @@ -586,7 +586,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployeeEx = this.getEmployeeEx(); IntuitAnyType rhsEmployeeEx; rhsEmployeeEx = that.getEmployeeEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeEx", lhsEmployeeEx), LocatorUtils.property(thatLocator, "employeeEx", rhsEmployeeEx), lhsEmployeeEx, rhsEmployeeEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeEx", lhsEmployeeEx), LocatorUtils.property(thatLocator, "employeeEx", rhsEmployeeEx), lhsEmployeeEx, rhsEmployeeEx, (this.employeeEx!= null), (that.employeeEx!= null))) { return false; } } @@ -594,82 +594,82 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theEmployeeType; theEmployeeType = this.getEmployeeType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeType", theEmployeeType), currentHashCode, theEmployeeType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeType", theEmployeeType), currentHashCode, theEmployeeType, (this.employeeType!= null)); } { String theEmployeeNumber; theEmployeeNumber = this.getEmployeeNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeNumber", theEmployeeNumber), currentHashCode, theEmployeeNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeNumber", theEmployeeNumber), currentHashCode, theEmployeeNumber, (this.employeeNumber!= null)); } { String theSSN; theSSN = this.getSSN(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ssn", theSSN), currentHashCode, theSSN); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ssn", theSSN), currentHashCode, theSSN, (this.ssn!= null)); } { PhysicalAddress thePrimaryAddr; thePrimaryAddr = this.getPrimaryAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryAddr", thePrimaryAddr), currentHashCode, thePrimaryAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryAddr", thePrimaryAddr), currentHashCode, thePrimaryAddr, (this.primaryAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { Boolean theBillableTime; theBillableTime = this.isBillableTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableTime", theBillableTime), currentHashCode, theBillableTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableTime", theBillableTime), currentHashCode, theBillableTime, (this.billableTime!= null)); } { BigDecimal theBillRate; theBillRate = this.getBillRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billRate", theBillRate), currentHashCode, theBillRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billRate", theBillRate), currentHashCode, theBillRate, (this.billRate!= null)); } { Date theBirthDate; theBirthDate = this.getBirthDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "birthDate", theBirthDate), currentHashCode, theBirthDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "birthDate", theBirthDate), currentHashCode, theBirthDate, (this.birthDate!= null)); } { Gender theGender; theGender = this.getGender(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "gender", theGender), currentHashCode, theGender); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "gender", theGender), currentHashCode, theGender, (this.gender!= null)); } { Date theHiredDate; theHiredDate = this.getHiredDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hiredDate", theHiredDate), currentHashCode, theHiredDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hiredDate", theHiredDate), currentHashCode, theHiredDate, (this.hiredDate!= null)); } { Date theReleasedDate; theReleasedDate = this.getReleasedDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "releasedDate", theReleasedDate), currentHashCode, theReleasedDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "releasedDate", theReleasedDate), currentHashCode, theReleasedDate, (this.releasedDate!= null)); } { TimeEntryUsedForPaychecksEnum theUseTimeEntry; theUseTimeEntry = this.getUseTimeEntry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useTimeEntry", theUseTimeEntry), currentHashCode, theUseTimeEntry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useTimeEntry", theUseTimeEntry), currentHashCode, theUseTimeEntry, (this.useTimeEntry!= null)); } { IntuitAnyType theEmployeeEx; theEmployeeEx = this.getEmployeeEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeEx", theEmployeeEx), currentHashCode, theEmployeeEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeEx", theEmployeeEx), currentHashCode, theEmployeeEx, (this.employeeEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmployeeTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmployeeTypeEnum.java index 83b565d6..bd6e24e2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmployeeTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EmployeeTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityStatusEnum.java index dd99c8e8..f3713533 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeEnum.java index 2cb07437..74cc692a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeRef.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeRef.java index 93c5de43..0b03fec6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeRef.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EntityTypeRef.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -69,8 +69,7 @@ "type", "entityRef" }) -public class EntityTypeRef - implements Serializable, Equals, HashCode +public class EntityTypeRef implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +126,8 @@ public void setEntityRef(ReferenceType value) { this.entityRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof EntityTypeRef)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -140,7 +139,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); EntityTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -149,7 +148,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityRef = this.getEntityRef(); ReferenceType rhsEntityRef; rhsEntityRef = that.getEntityRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef, (this.entityRef!= null), (that.entityRef!= null))) { return false; } } @@ -157,27 +156,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { EntityTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { ReferenceType theEntityRef; theEntityRef = this.getEntityRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef, (this.entityRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Error.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Error.java index bf9fe087..58d63fe0 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Error.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Error.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; 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; @@ -68,8 +68,7 @@ "message", "detail" }) -public class Error - implements Serializable, Equals, HashCode +public class Error implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -178,8 +177,8 @@ public void setElement(String value) { this.element = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Error)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -191,7 +190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMessage = this.getMessage(); String rhsMessage; rhsMessage = that.getMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage, (this.message!= null), (that.message!= null))) { return false; } } @@ -200,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDetail = this.getDetail(); String rhsDetail; rhsDetail = that.getDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "detail", lhsDetail), LocatorUtils.property(thatLocator, "detail", rhsDetail), lhsDetail, rhsDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "detail", lhsDetail), LocatorUtils.property(thatLocator, "detail", rhsDetail), lhsDetail, rhsDetail, (this.detail!= null), (that.detail!= null))) { return false; } } @@ -209,7 +208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCode = this.getCode(); String rhsCode; rhsCode = that.getCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode, (this.code!= null), (that.code!= null))) { return false; } } @@ -218,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsElement = this.getElement(); String rhsElement; rhsElement = that.getElement(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "element", lhsElement), LocatorUtils.property(thatLocator, "element", rhsElement), lhsElement, rhsElement)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "element", lhsElement), LocatorUtils.property(thatLocator, "element", rhsElement), lhsElement, rhsElement, (this.element!= null), (that.element!= null))) { return false; } } @@ -226,37 +225,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theMessage; theMessage = this.getMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage, (this.message!= null)); } { String theDetail; theDetail = this.getDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detail", theDetail), currentHashCode, theDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detail", theDetail), currentHashCode, theDetail, (this.detail!= null)); } { String theCode; theCode = this.getCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode, (this.code!= null)); } { String theElement; theElement = this.getElement(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "element", theElement), currentHashCode, theElement); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "element", theElement), currentHashCode, theElement, (this.element!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Estimate.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Estimate.java index a47077b6..98f97d8a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Estimate.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Estimate.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -76,7 +76,7 @@ }) public class Estimate extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -189,8 +189,8 @@ public void setEstimateEx(IntuitAnyType value) { this.estimateEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Estimate)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -205,7 +205,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExpirationDate = this.getExpirationDate(); Date rhsExpirationDate; rhsExpirationDate = that.getExpirationDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "expirationDate", lhsExpirationDate), LocatorUtils.property(thatLocator, "expirationDate", rhsExpirationDate), lhsExpirationDate, rhsExpirationDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "expirationDate", lhsExpirationDate), LocatorUtils.property(thatLocator, "expirationDate", rhsExpirationDate), lhsExpirationDate, rhsExpirationDate, (this.expirationDate!= null), (that.expirationDate!= null))) { return false; } } @@ -214,7 +214,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcceptedBy = this.getAcceptedBy(); String rhsAcceptedBy; rhsAcceptedBy = that.getAcceptedBy(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acceptedBy", lhsAcceptedBy), LocatorUtils.property(thatLocator, "acceptedBy", rhsAcceptedBy), lhsAcceptedBy, rhsAcceptedBy)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acceptedBy", lhsAcceptedBy), LocatorUtils.property(thatLocator, "acceptedBy", rhsAcceptedBy), lhsAcceptedBy, rhsAcceptedBy, (this.acceptedBy!= null), (that.acceptedBy!= null))) { return false; } } @@ -223,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcceptedDate = this.getAcceptedDate(); Date rhsAcceptedDate; rhsAcceptedDate = that.getAcceptedDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acceptedDate", lhsAcceptedDate), LocatorUtils.property(thatLocator, "acceptedDate", rhsAcceptedDate), lhsAcceptedDate, rhsAcceptedDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acceptedDate", lhsAcceptedDate), LocatorUtils.property(thatLocator, "acceptedDate", rhsAcceptedDate), lhsAcceptedDate, rhsAcceptedDate, (this.acceptedDate!= null), (that.acceptedDate!= null))) { return false; } } @@ -232,7 +232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEstimateEx = this.getEstimateEx(); IntuitAnyType rhsEstimateEx; rhsEstimateEx = that.getEstimateEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateEx", lhsEstimateEx), LocatorUtils.property(thatLocator, "estimateEx", rhsEstimateEx), lhsEstimateEx, rhsEstimateEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateEx", lhsEstimateEx), LocatorUtils.property(thatLocator, "estimateEx", rhsEstimateEx), lhsEstimateEx, rhsEstimateEx, (this.estimateEx!= null), (that.estimateEx!= null))) { return false; } } @@ -240,37 +240,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Date theExpirationDate; theExpirationDate = this.getExpirationDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expirationDate", theExpirationDate), currentHashCode, theExpirationDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expirationDate", theExpirationDate), currentHashCode, theExpirationDate, (this.expirationDate!= null)); } { String theAcceptedBy; theAcceptedBy = this.getAcceptedBy(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acceptedBy", theAcceptedBy), currentHashCode, theAcceptedBy); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acceptedBy", theAcceptedBy), currentHashCode, theAcceptedBy, (this.acceptedBy!= null)); } { Date theAcceptedDate; theAcceptedDate = this.getAcceptedDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acceptedDate", theAcceptedDate), currentHashCode, theAcceptedDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acceptedDate", theAcceptedDate), currentHashCode, theAcceptedDate, (this.acceptedDate!= null)); } { IntuitAnyType theEstimateEx; theEstimateEx = this.getEstimateEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateEx", theEstimateEx), currentHashCode, theEstimateEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateEx", theEstimateEx), currentHashCode, theEstimateEx, (this.estimateEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EstimateStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EstimateStatusEnum.java index d55778c3..dae71d51 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EstimateStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EstimateStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ExchangeRate.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ExchangeRate.java index 88a884e0..00306e6e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ExchangeRate.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ExchangeRate.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -79,7 +79,7 @@ }) public class ExchangeRate extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -216,8 +216,8 @@ public void setExchangeRateEx(IntuitAnyType value) { this.exchangeRateEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ExchangeRate)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -232,7 +232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSourceCurrencyCode = this.getSourceCurrencyCode(); String rhsSourceCurrencyCode; rhsSourceCurrencyCode = that.getSourceCurrencyCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "sourceCurrencyCode", lhsSourceCurrencyCode), LocatorUtils.property(thatLocator, "sourceCurrencyCode", rhsSourceCurrencyCode), lhsSourceCurrencyCode, rhsSourceCurrencyCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "sourceCurrencyCode", lhsSourceCurrencyCode), LocatorUtils.property(thatLocator, "sourceCurrencyCode", rhsSourceCurrencyCode), lhsSourceCurrencyCode, rhsSourceCurrencyCode, (this.sourceCurrencyCode!= null), (that.sourceCurrencyCode!= null))) { return false; } } @@ -241,7 +241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTargetCurrencyCode = this.getTargetCurrencyCode(); String rhsTargetCurrencyCode; rhsTargetCurrencyCode = that.getTargetCurrencyCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "targetCurrencyCode", lhsTargetCurrencyCode), LocatorUtils.property(thatLocator, "targetCurrencyCode", rhsTargetCurrencyCode), lhsTargetCurrencyCode, rhsTargetCurrencyCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "targetCurrencyCode", lhsTargetCurrencyCode), LocatorUtils.property(thatLocator, "targetCurrencyCode", rhsTargetCurrencyCode), lhsTargetCurrencyCode, rhsTargetCurrencyCode, (this.targetCurrencyCode!= null), (that.targetCurrencyCode!= null))) { return false; } } @@ -250,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRate = this.getRate(); BigDecimal rhsRate; rhsRate = that.getRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rate", lhsRate), LocatorUtils.property(thatLocator, "rate", rhsRate), lhsRate, rhsRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rate", lhsRate), LocatorUtils.property(thatLocator, "rate", rhsRate), lhsRate, rhsRate, (this.rate!= null), (that.rate!= null))) { return false; } } @@ -259,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAsOfDate = this.getAsOfDate(); Date rhsAsOfDate; rhsAsOfDate = that.getAsOfDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "asOfDate", lhsAsOfDate), LocatorUtils.property(thatLocator, "asOfDate", rhsAsOfDate), lhsAsOfDate, rhsAsOfDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "asOfDate", lhsAsOfDate), LocatorUtils.property(thatLocator, "asOfDate", rhsAsOfDate), lhsAsOfDate, rhsAsOfDate, (this.asOfDate!= null), (that.asOfDate!= null))) { return false; } } @@ -268,7 +268,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExchangeRateEx = this.getExchangeRateEx(); IntuitAnyType rhsExchangeRateEx; rhsExchangeRateEx = that.getExchangeRateEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRateEx", lhsExchangeRateEx), LocatorUtils.property(thatLocator, "exchangeRateEx", rhsExchangeRateEx), lhsExchangeRateEx, rhsExchangeRateEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRateEx", lhsExchangeRateEx), LocatorUtils.property(thatLocator, "exchangeRateEx", rhsExchangeRateEx), lhsExchangeRateEx, rhsExchangeRateEx, (this.exchangeRateEx!= null), (that.exchangeRateEx!= null))) { return false; } } @@ -276,42 +276,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theSourceCurrencyCode; theSourceCurrencyCode = this.getSourceCurrencyCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sourceCurrencyCode", theSourceCurrencyCode), currentHashCode, theSourceCurrencyCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sourceCurrencyCode", theSourceCurrencyCode), currentHashCode, theSourceCurrencyCode, (this.sourceCurrencyCode!= null)); } { String theTargetCurrencyCode; theTargetCurrencyCode = this.getTargetCurrencyCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "targetCurrencyCode", theTargetCurrencyCode), currentHashCode, theTargetCurrencyCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "targetCurrencyCode", theTargetCurrencyCode), currentHashCode, theTargetCurrencyCode, (this.targetCurrencyCode!= null)); } { BigDecimal theRate; theRate = this.getRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rate", theRate), currentHashCode, theRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rate", theRate), currentHashCode, theRate, (this.rate!= null)); } { Date theAsOfDate; theAsOfDate = this.getAsOfDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "asOfDate", theAsOfDate), currentHashCode, theAsOfDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "asOfDate", theAsOfDate), currentHashCode, theAsOfDate, (this.asOfDate!= null)); } { IntuitAnyType theExchangeRateEx; theExchangeRateEx = this.getExchangeRateEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRateEx", theExchangeRateEx), currentHashCode, theExchangeRateEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRateEx", theExchangeRateEx), currentHashCode, theExchangeRateEx, (this.exchangeRateEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Fault.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Fault.java index de776651..4b4fbb79 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Fault.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Fault.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlAttribute; 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; @@ -67,8 +67,7 @@ @XmlType(name = "Fault", propOrder = { "error" }) -public class Fault - implements Serializable, Equals, HashCode +public class Fault implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -142,8 +141,8 @@ public void setError(List error) { this.error = error; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Fault)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -155,7 +154,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsError = (((this.error!= null)&&(!this.error.isEmpty()))?this.getError():null); List rhsError; rhsError = (((that.error!= null)&&(!that.error.isEmpty()))?that.getError():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "error", lhsError), LocatorUtils.property(thatLocator, "error", rhsError), lhsError, rhsError)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "error", lhsError), LocatorUtils.property(thatLocator, "error", rhsError), lhsError, rhsError, ((this.error!= null)&&(!this.error.isEmpty())), ((that.error!= null)&&(!that.error.isEmpty())))) { return false; } } @@ -164,7 +163,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -172,27 +171,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theError; theError = (((this.error!= null)&&(!this.error.isEmpty()))?this.getError():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "error", theError), currentHashCode, theError); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "error", theError), currentHashCode, theError, ((this.error!= null)&&(!this.error.isEmpty()))); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FaultTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FaultTypeEnum.java index ed76af21..c506f6f4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FaultTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FaultTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FinanceChargePrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FinanceChargePrefs.java index f3993d3a..6e326fc5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FinanceChargePrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FinanceChargePrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; 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; @@ -74,8 +74,7 @@ "assessFinChrgForOverdueCharges", "finChrgAccountRef" }) -public class FinanceChargePrefs - implements Serializable, Equals, HashCode +public class FinanceChargePrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -237,8 +236,8 @@ public void setFinChrgAccountRef(ReferenceType value) { this.finChrgAccountRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof FinanceChargePrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -250,7 +249,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAnnualInterestRate = this.getAnnualInterestRate(); BigDecimal rhsAnnualInterestRate; rhsAnnualInterestRate = that.getAnnualInterestRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "annualInterestRate", lhsAnnualInterestRate), LocatorUtils.property(thatLocator, "annualInterestRate", rhsAnnualInterestRate), lhsAnnualInterestRate, rhsAnnualInterestRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "annualInterestRate", lhsAnnualInterestRate), LocatorUtils.property(thatLocator, "annualInterestRate", rhsAnnualInterestRate), lhsAnnualInterestRate, rhsAnnualInterestRate, (this.annualInterestRate!= null), (that.annualInterestRate!= null))) { return false; } } @@ -259,7 +258,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMinFinChrg = this.getMinFinChrg(); BigDecimal rhsMinFinChrg; rhsMinFinChrg = that.getMinFinChrg(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "minFinChrg", lhsMinFinChrg), LocatorUtils.property(thatLocator, "minFinChrg", rhsMinFinChrg), lhsMinFinChrg, rhsMinFinChrg)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "minFinChrg", lhsMinFinChrg), LocatorUtils.property(thatLocator, "minFinChrg", rhsMinFinChrg), lhsMinFinChrg, rhsMinFinChrg, (this.minFinChrg!= null), (that.minFinChrg!= null))) { return false; } } @@ -268,7 +267,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGracePeriod = this.getGracePeriod(); BigInteger rhsGracePeriod; rhsGracePeriod = that.getGracePeriod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "gracePeriod", lhsGracePeriod), LocatorUtils.property(thatLocator, "gracePeriod", rhsGracePeriod), lhsGracePeriod, rhsGracePeriod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "gracePeriod", lhsGracePeriod), LocatorUtils.property(thatLocator, "gracePeriod", rhsGracePeriod), lhsGracePeriod, rhsGracePeriod, (this.gracePeriod!= null), (that.gracePeriod!= null))) { return false; } } @@ -277,7 +276,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCalcFinChrgFromTxnDate = this.isCalcFinChrgFromTxnDate(); Boolean rhsCalcFinChrgFromTxnDate; rhsCalcFinChrgFromTxnDate = that.isCalcFinChrgFromTxnDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "calcFinChrgFromTxnDate", lhsCalcFinChrgFromTxnDate), LocatorUtils.property(thatLocator, "calcFinChrgFromTxnDate", rhsCalcFinChrgFromTxnDate), lhsCalcFinChrgFromTxnDate, rhsCalcFinChrgFromTxnDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "calcFinChrgFromTxnDate", lhsCalcFinChrgFromTxnDate), LocatorUtils.property(thatLocator, "calcFinChrgFromTxnDate", rhsCalcFinChrgFromTxnDate), lhsCalcFinChrgFromTxnDate, rhsCalcFinChrgFromTxnDate, (this.calcFinChrgFromTxnDate!= null), (that.calcFinChrgFromTxnDate!= null))) { return false; } } @@ -286,7 +285,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAssessFinChrgForOverdueCharges = this.isAssessFinChrgForOverdueCharges(); Boolean rhsAssessFinChrgForOverdueCharges; rhsAssessFinChrgForOverdueCharges = that.isAssessFinChrgForOverdueCharges(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "assessFinChrgForOverdueCharges", lhsAssessFinChrgForOverdueCharges), LocatorUtils.property(thatLocator, "assessFinChrgForOverdueCharges", rhsAssessFinChrgForOverdueCharges), lhsAssessFinChrgForOverdueCharges, rhsAssessFinChrgForOverdueCharges)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "assessFinChrgForOverdueCharges", lhsAssessFinChrgForOverdueCharges), LocatorUtils.property(thatLocator, "assessFinChrgForOverdueCharges", rhsAssessFinChrgForOverdueCharges), lhsAssessFinChrgForOverdueCharges, rhsAssessFinChrgForOverdueCharges, (this.assessFinChrgForOverdueCharges!= null), (that.assessFinChrgForOverdueCharges!= null))) { return false; } } @@ -295,7 +294,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFinChrgAccountRef = this.getFinChrgAccountRef(); ReferenceType rhsFinChrgAccountRef; rhsFinChrgAccountRef = that.getFinChrgAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "finChrgAccountRef", lhsFinChrgAccountRef), LocatorUtils.property(thatLocator, "finChrgAccountRef", rhsFinChrgAccountRef), lhsFinChrgAccountRef, rhsFinChrgAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "finChrgAccountRef", lhsFinChrgAccountRef), LocatorUtils.property(thatLocator, "finChrgAccountRef", rhsFinChrgAccountRef), lhsFinChrgAccountRef, rhsFinChrgAccountRef, (this.finChrgAccountRef!= null), (that.finChrgAccountRef!= null))) { return false; } } @@ -303,47 +302,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { BigDecimal theAnnualInterestRate; theAnnualInterestRate = this.getAnnualInterestRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "annualInterestRate", theAnnualInterestRate), currentHashCode, theAnnualInterestRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "annualInterestRate", theAnnualInterestRate), currentHashCode, theAnnualInterestRate, (this.annualInterestRate!= null)); } { BigDecimal theMinFinChrg; theMinFinChrg = this.getMinFinChrg(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minFinChrg", theMinFinChrg), currentHashCode, theMinFinChrg); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minFinChrg", theMinFinChrg), currentHashCode, theMinFinChrg, (this.minFinChrg!= null)); } { BigInteger theGracePeriod; theGracePeriod = this.getGracePeriod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "gracePeriod", theGracePeriod), currentHashCode, theGracePeriod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "gracePeriod", theGracePeriod), currentHashCode, theGracePeriod, (this.gracePeriod!= null)); } { Boolean theCalcFinChrgFromTxnDate; theCalcFinChrgFromTxnDate = this.isCalcFinChrgFromTxnDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "calcFinChrgFromTxnDate", theCalcFinChrgFromTxnDate), currentHashCode, theCalcFinChrgFromTxnDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "calcFinChrgFromTxnDate", theCalcFinChrgFromTxnDate), currentHashCode, theCalcFinChrgFromTxnDate, (this.calcFinChrgFromTxnDate!= null)); } { Boolean theAssessFinChrgForOverdueCharges; theAssessFinChrgForOverdueCharges = this.isAssessFinChrgForOverdueCharges(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assessFinChrgForOverdueCharges", theAssessFinChrgForOverdueCharges), currentHashCode, theAssessFinChrgForOverdueCharges); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assessFinChrgForOverdueCharges", theAssessFinChrgForOverdueCharges), currentHashCode, theAssessFinChrgForOverdueCharges, (this.assessFinChrgForOverdueCharges!= null)); } { ReferenceType theFinChrgAccountRef; theFinChrgAccountRef = this.getFinChrgAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "finChrgAccountRef", theFinChrgAccountRef), currentHashCode, theFinChrgAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "finChrgAccountRef", theFinChrgAccountRef), currentHashCode, theFinChrgAccountRef, (this.finChrgAccountRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FixedAsset.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FixedAsset.java index 36b0c395..c4f22f0a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FixedAsset.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/FixedAsset.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -119,7 +119,7 @@ }) public class FixedAsset extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -728,8 +728,8 @@ public void setFixedAssetEx(IntuitAnyType value) { this.fixedAssetEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof FixedAsset)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -744,7 +744,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -753,7 +753,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -762,7 +762,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcquiredAs = this.getAcquiredAs(); AcquiredAsEnum rhsAcquiredAs; rhsAcquiredAs = that.getAcquiredAs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acquiredAs", lhsAcquiredAs), LocatorUtils.property(thatLocator, "acquiredAs", rhsAcquiredAs), lhsAcquiredAs, rhsAcquiredAs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acquiredAs", lhsAcquiredAs), LocatorUtils.property(thatLocator, "acquiredAs", rhsAcquiredAs), lhsAcquiredAs, rhsAcquiredAs, (this.acquiredAs!= null), (that.acquiredAs!= null))) { return false; } } @@ -771,7 +771,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseDesc = this.getPurchaseDesc(); String rhsPurchaseDesc; rhsPurchaseDesc = that.getPurchaseDesc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDesc", lhsPurchaseDesc), LocatorUtils.property(thatLocator, "purchaseDesc", rhsPurchaseDesc), lhsPurchaseDesc, rhsPurchaseDesc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDesc", lhsPurchaseDesc), LocatorUtils.property(thatLocator, "purchaseDesc", rhsPurchaseDesc), lhsPurchaseDesc, rhsPurchaseDesc, (this.purchaseDesc!= null), (that.purchaseDesc!= null))) { return false; } } @@ -780,7 +780,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseDate = this.getPurchaseDate(); Date rhsPurchaseDate; rhsPurchaseDate = that.getPurchaseDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDate", lhsPurchaseDate), LocatorUtils.property(thatLocator, "purchaseDate", rhsPurchaseDate), lhsPurchaseDate, rhsPurchaseDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDate", lhsPurchaseDate), LocatorUtils.property(thatLocator, "purchaseDate", rhsPurchaseDate), lhsPurchaseDate, rhsPurchaseDate, (this.purchaseDate!= null), (that.purchaseDate!= null))) { return false; } } @@ -789,7 +789,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseCost = this.getPurchaseCost(); BigDecimal rhsPurchaseCost; rhsPurchaseCost = that.getPurchaseCost(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseCost", lhsPurchaseCost), LocatorUtils.property(thatLocator, "purchaseCost", rhsPurchaseCost), lhsPurchaseCost, rhsPurchaseCost)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseCost", lhsPurchaseCost), LocatorUtils.property(thatLocator, "purchaseCost", rhsPurchaseCost), lhsPurchaseCost, rhsPurchaseCost, (this.purchaseCost!= null), (that.purchaseCost!= null))) { return false; } } @@ -798,7 +798,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendor = this.getVendor(); String rhsVendor; rhsVendor = that.getVendor(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor", lhsVendor), LocatorUtils.property(thatLocator, "vendor", rhsVendor), lhsVendor, rhsVendor)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor", lhsVendor), LocatorUtils.property(thatLocator, "vendor", rhsVendor), lhsVendor, rhsVendor, (this.vendor!= null), (that.vendor!= null))) { return false; } } @@ -807,7 +807,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAssetAccountRef = this.getAssetAccountRef(); ReferenceType rhsAssetAccountRef; rhsAssetAccountRef = that.getAssetAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "assetAccountRef", lhsAssetAccountRef), LocatorUtils.property(thatLocator, "assetAccountRef", rhsAssetAccountRef), lhsAssetAccountRef, rhsAssetAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "assetAccountRef", lhsAssetAccountRef), LocatorUtils.property(thatLocator, "assetAccountRef", rhsAssetAccountRef), lhsAssetAccountRef, rhsAssetAccountRef, (this.assetAccountRef!= null), (that.assetAccountRef!= null))) { return false; } } @@ -816,7 +816,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesDesc = this.getSalesDesc(); String rhsSalesDesc; rhsSalesDesc = that.getSalesDesc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesDesc", lhsSalesDesc), LocatorUtils.property(thatLocator, "salesDesc", rhsSalesDesc), lhsSalesDesc, rhsSalesDesc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesDesc", lhsSalesDesc), LocatorUtils.property(thatLocator, "salesDesc", rhsSalesDesc), lhsSalesDesc, rhsSalesDesc, (this.salesDesc!= null), (that.salesDesc!= null))) { return false; } } @@ -825,7 +825,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesDate = this.getSalesDate(); Date rhsSalesDate; rhsSalesDate = that.getSalesDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesDate", lhsSalesDate), LocatorUtils.property(thatLocator, "salesDate", rhsSalesDate), lhsSalesDate, rhsSalesDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesDate", lhsSalesDate), LocatorUtils.property(thatLocator, "salesDate", rhsSalesDate), lhsSalesDate, rhsSalesDate, (this.salesDate!= null), (that.salesDate!= null))) { return false; } } @@ -834,7 +834,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesPrice = this.getSalesPrice(); BigDecimal rhsSalesPrice; rhsSalesPrice = that.getSalesPrice(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesPrice", lhsSalesPrice), LocatorUtils.property(thatLocator, "salesPrice", rhsSalesPrice), lhsSalesPrice, rhsSalesPrice)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesPrice", lhsSalesPrice), LocatorUtils.property(thatLocator, "salesPrice", rhsSalesPrice), lhsSalesPrice, rhsSalesPrice, (this.salesPrice!= null), (that.salesPrice!= null))) { return false; } } @@ -843,7 +843,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesExpense = this.getSalesExpense(); BigDecimal rhsSalesExpense; rhsSalesExpense = that.getSalesExpense(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesExpense", lhsSalesExpense), LocatorUtils.property(thatLocator, "salesExpense", rhsSalesExpense), lhsSalesExpense, rhsSalesExpense)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesExpense", lhsSalesExpense), LocatorUtils.property(thatLocator, "salesExpense", rhsSalesExpense), lhsSalesExpense, rhsSalesExpense, (this.salesExpense!= null), (that.salesExpense!= null))) { return false; } } @@ -852,7 +852,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLocation = this.getLocation(); String rhsLocation; rhsLocation = that.getLocation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "location", lhsLocation), LocatorUtils.property(thatLocator, "location", rhsLocation), lhsLocation, rhsLocation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "location", lhsLocation), LocatorUtils.property(thatLocator, "location", rhsLocation), lhsLocation, rhsLocation, (this.location!= null), (that.location!= null))) { return false; } } @@ -861,7 +861,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPONumber = this.getPONumber(); String rhsPONumber; rhsPONumber = that.getPONumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "poNumber", lhsPONumber), LocatorUtils.property(thatLocator, "poNumber", rhsPONumber), lhsPONumber, rhsPONumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "poNumber", lhsPONumber), LocatorUtils.property(thatLocator, "poNumber", rhsPONumber), lhsPONumber, rhsPONumber, (this.poNumber!= null), (that.poNumber!= null))) { return false; } } @@ -870,7 +870,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSerialNumber = this.getSerialNumber(); String rhsSerialNumber; rhsSerialNumber = that.getSerialNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serialNumber", lhsSerialNumber), LocatorUtils.property(thatLocator, "serialNumber", rhsSerialNumber), lhsSerialNumber, rhsSerialNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serialNumber", lhsSerialNumber), LocatorUtils.property(thatLocator, "serialNumber", rhsSerialNumber), lhsSerialNumber, rhsSerialNumber, (this.serialNumber!= null), (that.serialNumber!= null))) { return false; } } @@ -879,7 +879,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWarrantyExpDate = this.getWarrantyExpDate(); Date rhsWarrantyExpDate; rhsWarrantyExpDate = that.getWarrantyExpDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "warrantyExpDate", lhsWarrantyExpDate), LocatorUtils.property(thatLocator, "warrantyExpDate", rhsWarrantyExpDate), lhsWarrantyExpDate, rhsWarrantyExpDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "warrantyExpDate", lhsWarrantyExpDate), LocatorUtils.property(thatLocator, "warrantyExpDate", rhsWarrantyExpDate), lhsWarrantyExpDate, rhsWarrantyExpDate, (this.warrantyExpDate!= null), (that.warrantyExpDate!= null))) { return false; } } @@ -888,7 +888,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -897,7 +897,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNotes = this.getNotes(); String rhsNotes; rhsNotes = that.getNotes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes, (this.notes!= null), (that.notes!= null))) { return false; } } @@ -906,7 +906,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAssetNum = this.getAssetNum(); Integer rhsAssetNum; rhsAssetNum = that.getAssetNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "assetNum", lhsAssetNum), LocatorUtils.property(thatLocator, "assetNum", rhsAssetNum), lhsAssetNum, rhsAssetNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "assetNum", lhsAssetNum), LocatorUtils.property(thatLocator, "assetNum", rhsAssetNum), lhsAssetNum, rhsAssetNum, (this.assetNum!= null), (that.assetNum!= null))) { return false; } } @@ -915,7 +915,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCostBasis = this.getCostBasis(); BigDecimal rhsCostBasis; rhsCostBasis = that.getCostBasis(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "costBasis", lhsCostBasis), LocatorUtils.property(thatLocator, "costBasis", rhsCostBasis), lhsCostBasis, rhsCostBasis)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "costBasis", lhsCostBasis), LocatorUtils.property(thatLocator, "costBasis", rhsCostBasis), lhsCostBasis, rhsCostBasis, (this.costBasis!= null), (that.costBasis!= null))) { return false; } } @@ -924,7 +924,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepreciation = this.getDepreciation(); BigDecimal rhsDepreciation; rhsDepreciation = that.getDepreciation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depreciation", lhsDepreciation), LocatorUtils.property(thatLocator, "depreciation", rhsDepreciation), lhsDepreciation, rhsDepreciation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depreciation", lhsDepreciation), LocatorUtils.property(thatLocator, "depreciation", rhsDepreciation), lhsDepreciation, rhsDepreciation, (this.depreciation!= null), (that.depreciation!= null))) { return false; } } @@ -933,7 +933,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBookValue = this.getBookValue(); BigDecimal rhsBookValue; rhsBookValue = that.getBookValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "bookValue", lhsBookValue), LocatorUtils.property(thatLocator, "bookValue", rhsBookValue), lhsBookValue, rhsBookValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "bookValue", lhsBookValue), LocatorUtils.property(thatLocator, "bookValue", rhsBookValue), lhsBookValue, rhsBookValue, (this.bookValue!= null), (that.bookValue!= null))) { return false; } } @@ -942,7 +942,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFixedAssetEx = this.getFixedAssetEx(); IntuitAnyType rhsFixedAssetEx; rhsFixedAssetEx = that.getFixedAssetEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fixedAssetEx", lhsFixedAssetEx), LocatorUtils.property(thatLocator, "fixedAssetEx", rhsFixedAssetEx), lhsFixedAssetEx, rhsFixedAssetEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fixedAssetEx", lhsFixedAssetEx), LocatorUtils.property(thatLocator, "fixedAssetEx", rhsFixedAssetEx), lhsFixedAssetEx, rhsFixedAssetEx, (this.fixedAssetEx!= null), (that.fixedAssetEx!= null))) { return false; } } @@ -950,132 +950,132 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { AcquiredAsEnum theAcquiredAs; theAcquiredAs = this.getAcquiredAs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acquiredAs", theAcquiredAs), currentHashCode, theAcquiredAs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acquiredAs", theAcquiredAs), currentHashCode, theAcquiredAs, (this.acquiredAs!= null)); } { String thePurchaseDesc; thePurchaseDesc = this.getPurchaseDesc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDesc", thePurchaseDesc), currentHashCode, thePurchaseDesc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDesc", thePurchaseDesc), currentHashCode, thePurchaseDesc, (this.purchaseDesc!= null)); } { Date thePurchaseDate; thePurchaseDate = this.getPurchaseDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDate", thePurchaseDate), currentHashCode, thePurchaseDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDate", thePurchaseDate), currentHashCode, thePurchaseDate, (this.purchaseDate!= null)); } { BigDecimal thePurchaseCost; thePurchaseCost = this.getPurchaseCost(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseCost", thePurchaseCost), currentHashCode, thePurchaseCost); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseCost", thePurchaseCost), currentHashCode, thePurchaseCost, (this.purchaseCost!= null)); } { String theVendor; theVendor = this.getVendor(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor", theVendor), currentHashCode, theVendor); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor", theVendor), currentHashCode, theVendor, (this.vendor!= null)); } { ReferenceType theAssetAccountRef; theAssetAccountRef = this.getAssetAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetAccountRef", theAssetAccountRef), currentHashCode, theAssetAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetAccountRef", theAssetAccountRef), currentHashCode, theAssetAccountRef, (this.assetAccountRef!= null)); } { String theSalesDesc; theSalesDesc = this.getSalesDesc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesDesc", theSalesDesc), currentHashCode, theSalesDesc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesDesc", theSalesDesc), currentHashCode, theSalesDesc, (this.salesDesc!= null)); } { Date theSalesDate; theSalesDate = this.getSalesDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesDate", theSalesDate), currentHashCode, theSalesDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesDate", theSalesDate), currentHashCode, theSalesDate, (this.salesDate!= null)); } { BigDecimal theSalesPrice; theSalesPrice = this.getSalesPrice(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesPrice", theSalesPrice), currentHashCode, theSalesPrice); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesPrice", theSalesPrice), currentHashCode, theSalesPrice, (this.salesPrice!= null)); } { BigDecimal theSalesExpense; theSalesExpense = this.getSalesExpense(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesExpense", theSalesExpense), currentHashCode, theSalesExpense); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesExpense", theSalesExpense), currentHashCode, theSalesExpense, (this.salesExpense!= null)); } { String theLocation; theLocation = this.getLocation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "location", theLocation), currentHashCode, theLocation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "location", theLocation), currentHashCode, theLocation, (this.location!= null)); } { String thePONumber; thePONumber = this.getPONumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poNumber", thePONumber), currentHashCode, thePONumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poNumber", thePONumber), currentHashCode, thePONumber, (this.poNumber!= null)); } { String theSerialNumber; theSerialNumber = this.getSerialNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serialNumber", theSerialNumber), currentHashCode, theSerialNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serialNumber", theSerialNumber), currentHashCode, theSerialNumber, (this.serialNumber!= null)); } { Date theWarrantyExpDate; theWarrantyExpDate = this.getWarrantyExpDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warrantyExpDate", theWarrantyExpDate), currentHashCode, theWarrantyExpDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warrantyExpDate", theWarrantyExpDate), currentHashCode, theWarrantyExpDate, (this.warrantyExpDate!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { String theNotes; theNotes = this.getNotes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes, (this.notes!= null)); } { Integer theAssetNum; theAssetNum = this.getAssetNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetNum", theAssetNum), currentHashCode, theAssetNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetNum", theAssetNum), currentHashCode, theAssetNum, (this.assetNum!= null)); } { BigDecimal theCostBasis; theCostBasis = this.getCostBasis(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "costBasis", theCostBasis), currentHashCode, theCostBasis); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "costBasis", theCostBasis), currentHashCode, theCostBasis, (this.costBasis!= null)); } { BigDecimal theDepreciation; theDepreciation = this.getDepreciation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depreciation", theDepreciation), currentHashCode, theDepreciation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depreciation", theDepreciation), currentHashCode, theDepreciation, (this.depreciation!= null)); } { BigDecimal theBookValue; theBookValue = this.getBookValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bookValue", theBookValue), currentHashCode, theBookValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bookValue", theBookValue), currentHashCode, theBookValue, (this.bookValue!= null)); } { IntuitAnyType theFixedAssetEx; theFixedAssetEx = this.getFixedAssetEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fixedAssetEx", theFixedAssetEx), currentHashCode, theFixedAssetEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fixedAssetEx", theFixedAssetEx), currentHashCode, theFixedAssetEx, (this.fixedAssetEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Gender.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Gender.java index 7983cf39..33c4da69 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Gender.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Gender.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GenericContactType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GenericContactType.java index 966153c9..7e919999 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GenericContactType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GenericContactType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -76,8 +76,7 @@ "_default", "tag" }) -public class GenericContactType - implements Serializable, Equals, HashCode +public class GenericContactType implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -238,8 +237,8 @@ public void setTag(String value) { this.tag = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof GenericContactType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -251,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -260,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -269,7 +268,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -278,7 +277,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -287,7 +286,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefault = this.isDefault(); Boolean rhsDefault; rhsDefault = that.isDefault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault, (this._default!= null), (that._default!= null))) { return false; } } @@ -296,7 +295,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -304,47 +303,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { Boolean theDefault; theDefault = this.isDefault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault, (this._default!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GlobalTaxCalculationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GlobalTaxCalculationEnum.java index 1bce0b9c..fad4e9a8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GlobalTaxCalculationEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GlobalTaxCalculationEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GroupLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GroupLineDetail.java index 43e0a185..583e51d2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GroupLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/GroupLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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 @@ "line", "groupLineDetailEx" }) -public class GroupLineDetail - implements Serializable, Equals, HashCode +public class GroupLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -265,8 +264,8 @@ public void setLine(List line) { this.line = line; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof GroupLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -278,7 +277,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGroupItemRef = this.getGroupItemRef(); ReferenceType rhsGroupItemRef; rhsGroupItemRef = that.getGroupItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "groupItemRef", lhsGroupItemRef), LocatorUtils.property(thatLocator, "groupItemRef", rhsGroupItemRef), lhsGroupItemRef, rhsGroupItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "groupItemRef", lhsGroupItemRef), LocatorUtils.property(thatLocator, "groupItemRef", rhsGroupItemRef), lhsGroupItemRef, rhsGroupItemRef, (this.groupItemRef!= null), (that.groupItemRef!= null))) { return false; } } @@ -287,7 +286,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQuantity = this.getQuantity(); BigDecimal rhsQuantity; rhsQuantity = that.getQuantity(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "quantity", lhsQuantity), LocatorUtils.property(thatLocator, "quantity", rhsQuantity), lhsQuantity, rhsQuantity)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "quantity", lhsQuantity), LocatorUtils.property(thatLocator, "quantity", rhsQuantity), lhsQuantity, rhsQuantity, (this.quantity!= null), (that.quantity!= null))) { return false; } } @@ -296,7 +295,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOMRef = this.getUOMRef(); UOMRef rhsUOMRef; rhsUOMRef = that.getUOMRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef, (this.uomRef!= null), (that.uomRef!= null))) { return false; } } @@ -305,7 +304,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -314,7 +313,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine = (((this.line!= null)&&(!this.line.isEmpty()))?this.getLine():null); List rhsLine; rhsLine = (((that.line!= null)&&(!that.line.isEmpty()))?that.getLine():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line", lhsLine), LocatorUtils.property(thatLocator, "line", rhsLine), lhsLine, rhsLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line", lhsLine), LocatorUtils.property(thatLocator, "line", rhsLine), lhsLine, rhsLine, ((this.line!= null)&&(!this.line.isEmpty())), ((that.line!= null)&&(!that.line.isEmpty())))) { return false; } } @@ -323,7 +322,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGroupLineDetailEx = this.getGroupLineDetailEx(); IntuitAnyType rhsGroupLineDetailEx; rhsGroupLineDetailEx = that.getGroupLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "groupLineDetailEx", lhsGroupLineDetailEx), LocatorUtils.property(thatLocator, "groupLineDetailEx", rhsGroupLineDetailEx), lhsGroupLineDetailEx, rhsGroupLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "groupLineDetailEx", lhsGroupLineDetailEx), LocatorUtils.property(thatLocator, "groupLineDetailEx", rhsGroupLineDetailEx), lhsGroupLineDetailEx, rhsGroupLineDetailEx, (this.groupLineDetailEx!= null), (that.groupLineDetailEx!= null))) { return false; } } @@ -331,47 +330,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theGroupItemRef; theGroupItemRef = this.getGroupItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupItemRef", theGroupItemRef), currentHashCode, theGroupItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupItemRef", theGroupItemRef), currentHashCode, theGroupItemRef, (this.groupItemRef!= null)); } { BigDecimal theQuantity; theQuantity = this.getQuantity(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantity", theQuantity), currentHashCode, theQuantity); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantity", theQuantity), currentHashCode, theQuantity, (this.quantity!= null)); } { UOMRef theUOMRef; theUOMRef = this.getUOMRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef, (this.uomRef!= null)); } { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= null)); } { List theLine; theLine = (((this.line!= null)&&(!this.line.isEmpty()))?this.getLine():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line", theLine), currentHashCode, theLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line", theLine), currentHashCode, theLine, ((this.line!= null)&&(!this.line.isEmpty()))); } { IntuitAnyType theGroupLineDetailEx; theGroupLineDetailEx = this.getGroupLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupLineDetailEx", theGroupLineDetailEx), currentHashCode, theGroupLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupLineDetailEx", theGroupLineDetailEx), currentHashCode, theGroupLineDetailEx, (this.groupLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Header.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Header.java index f333acfc..c5ca2073 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Header.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Header.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "Header", propOrder = { "colData" }) -public class Header - implements Serializable, Equals, HashCode +public class Header implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setColData(List colData) { this.colData = colData; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Header)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); List rhsColData; rhsColData = (((that.colData!= null)&&(!that.colData.isEmpty()))?that.getColData():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData, ((this.colData!= null)&&(!this.colData.isEmpty())), ((that.colData!= null)&&(!that.colData.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theColData; theColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData, ((this.colData!= null)&&(!this.colData.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IdDomainEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IdDomainEnum.java index 44936d42..e6ca7994 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IdDomainEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IdDomainEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitAnyType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitAnyType.java index 96837966..3bec7264 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitAnyType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitAnyType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; 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; @@ -69,8 +69,7 @@ @XmlType(name = "IntuitAnyType", propOrder = { "any" }) -public class IntuitAnyType - implements Serializable, Equals, HashCode +public class IntuitAnyType implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -95,8 +94,8 @@ public class IntuitAnyType * *

* Objects of the following type(s) are allowed in the list - * {@link Element } * {@link Object } + * {@link Element } * * */ @@ -112,16 +111,16 @@ public List getAny() { * * @param any * allowed object is - * {@link Element } * {@link Object } + * {@link Element } * */ public void setAny(List any) { this.any = any; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof IntuitAnyType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -133,7 +132,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAny = (((this.any!= null)&&(!this.any.isEmpty()))?this.getAny():null); List rhsAny; rhsAny = (((that.any!= null)&&(!that.any.isEmpty()))?that.getAny():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "any", lhsAny), LocatorUtils.property(thatLocator, "any", rhsAny), lhsAny, rhsAny)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "any", lhsAny), LocatorUtils.property(thatLocator, "any", rhsAny), lhsAny, rhsAny, ((this.any!= null)&&(!this.any.isEmpty())), ((that.any!= null)&&(!that.any.isEmpty())))) { return false; } } @@ -141,22 +140,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theAny; theAny = (((this.any!= null)&&(!this.any.isEmpty()))?this.getAny():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "any", theAny), currentHashCode, theAny); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "any", theAny), currentHashCode, theAny, ((this.any!= null)&&(!this.any.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitBatchRequest.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitBatchRequest.java index 42c97a67..f30d34b2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitBatchRequest.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitBatchRequest.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "IntuitBatchRequest", propOrder = { "batchItemRequest" }) -public class IntuitBatchRequest - implements Serializable, Equals, HashCode +public class IntuitBatchRequest implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setBatchItemRequest(List batchItemRequest) { this.batchItemRequest = batchItemRequest; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof IntuitBatchRequest)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBatchItemRequest = (((this.batchItemRequest!= null)&&(!this.batchItemRequest.isEmpty()))?this.getBatchItemRequest():null); List rhsBatchItemRequest; rhsBatchItemRequest = (((that.batchItemRequest!= null)&&(!that.batchItemRequest.isEmpty()))?that.getBatchItemRequest():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "batchItemRequest", lhsBatchItemRequest), LocatorUtils.property(thatLocator, "batchItemRequest", rhsBatchItemRequest), lhsBatchItemRequest, rhsBatchItemRequest)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "batchItemRequest", lhsBatchItemRequest), LocatorUtils.property(thatLocator, "batchItemRequest", rhsBatchItemRequest), lhsBatchItemRequest, rhsBatchItemRequest, ((this.batchItemRequest!= null)&&(!this.batchItemRequest.isEmpty())), ((that.batchItemRequest!= null)&&(!that.batchItemRequest.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theBatchItemRequest; theBatchItemRequest = (((this.batchItemRequest!= null)&&(!this.batchItemRequest.isEmpty()))?this.getBatchItemRequest():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchItemRequest", theBatchItemRequest), currentHashCode, theBatchItemRequest); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchItemRequest", theBatchItemRequest), currentHashCode, theBatchItemRequest, ((this.batchItemRequest!= null)&&(!this.batchItemRequest.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitEntity.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitEntity.java index 40cac622..896c0720 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitEntity.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitEntity.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import com.intuit.ipp.core.IEntity; -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; @@ -127,7 +127,7 @@ Transaction.class, JobType.class }) -public abstract class IntuitEntity implements Serializable, IEntity, Equals, HashCode +public abstract class IntuitEntity implements Serializable, IEntity, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -374,8 +374,8 @@ public void setAttachableRef(List attachableRef) { this.attachableRef = attachableRef; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof IntuitEntity)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -387,7 +387,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -396,7 +396,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSyncToken = this.getSyncToken(); String rhsSyncToken; rhsSyncToken = that.getSyncToken(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "syncToken", lhsSyncToken), LocatorUtils.property(thatLocator, "syncToken", rhsSyncToken), lhsSyncToken, rhsSyncToken)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "syncToken", lhsSyncToken), LocatorUtils.property(thatLocator, "syncToken", rhsSyncToken), lhsSyncToken, rhsSyncToken, (this.syncToken!= null), (that.syncToken!= null))) { return false; } } @@ -405,7 +405,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMetaData = this.getMetaData(); ModificationMetaData rhsMetaData; rhsMetaData = that.getMetaData(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "metaData", lhsMetaData), LocatorUtils.property(thatLocator, "metaData", rhsMetaData), lhsMetaData, rhsMetaData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "metaData", lhsMetaData), LocatorUtils.property(thatLocator, "metaData", rhsMetaData), lhsMetaData, rhsMetaData, (this.metaData!= null), (that.metaData!= null))) { return false; } } @@ -414,7 +414,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); List rhsCustomField; rhsCustomField = (((that.customField!= null)&&(!that.customField.isEmpty()))?that.getCustomField():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField, ((this.customField!= null)&&(!this.customField.isEmpty())), ((that.customField!= null)&&(!that.customField.isEmpty())))) { return false; } } @@ -423,7 +423,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttachableRef = (((this.attachableRef!= null)&&(!this.attachableRef.isEmpty()))?this.getAttachableRef():null); List rhsAttachableRef; rhsAttachableRef = (((that.attachableRef!= null)&&(!that.attachableRef.isEmpty()))?that.getAttachableRef():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableRef", lhsAttachableRef), LocatorUtils.property(thatLocator, "attachableRef", rhsAttachableRef), lhsAttachableRef, rhsAttachableRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableRef", lhsAttachableRef), LocatorUtils.property(thatLocator, "attachableRef", rhsAttachableRef), lhsAttachableRef, rhsAttachableRef, ((this.attachableRef!= null)&&(!this.attachableRef.isEmpty())), ((that.attachableRef!= null)&&(!that.attachableRef.isEmpty())))) { return false; } } @@ -432,7 +432,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDomain = this.getDomain(); String rhsDomain; rhsDomain = that.getDomain(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "domain", lhsDomain), LocatorUtils.property(thatLocator, "domain", rhsDomain), lhsDomain, rhsDomain)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "domain", lhsDomain), LocatorUtils.property(thatLocator, "domain", rhsDomain), lhsDomain, rhsDomain, (this.domain!= null), (that.domain!= null))) { return false; } } @@ -441,7 +441,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); EntityStatusEnum rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -450,7 +450,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSparse = this.isSparse(); Boolean rhsSparse; rhsSparse = that.isSparse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "sparse", lhsSparse), LocatorUtils.property(thatLocator, "sparse", rhsSparse), lhsSparse, rhsSparse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "sparse", lhsSparse), LocatorUtils.property(thatLocator, "sparse", rhsSparse), lhsSparse, rhsSparse, (this.sparse!= null), (that.sparse!= null))) { return false; } } @@ -458,57 +458,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theSyncToken; theSyncToken = this.getSyncToken(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncToken", theSyncToken), currentHashCode, theSyncToken); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncToken", theSyncToken), currentHashCode, theSyncToken, (this.syncToken!= null)); } { ModificationMetaData theMetaData; theMetaData = this.getMetaData(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "metaData", theMetaData), currentHashCode, theMetaData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "metaData", theMetaData), currentHashCode, theMetaData, (this.metaData!= null)); } { List theCustomField; theCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField, ((this.customField!= null)&&(!this.customField.isEmpty()))); } { List theAttachableRef; theAttachableRef = (((this.attachableRef!= null)&&(!this.attachableRef.isEmpty()))?this.getAttachableRef():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableRef", theAttachableRef), currentHashCode, theAttachableRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableRef", theAttachableRef), currentHashCode, theAttachableRef, ((this.attachableRef!= null)&&(!this.attachableRef.isEmpty()))); } { String theDomain; theDomain = this.getDomain(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "domain", theDomain), currentHashCode, theDomain); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "domain", theDomain), currentHashCode, theDomain, (this.domain!= null)); } { EntityStatusEnum theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } { Boolean theSparse; theSparse = this.isSparse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sparse", theSparse), currentHashCode, theSparse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sparse", theSparse), currentHashCode, theSparse, (this.sparse!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitResponse.java index 5a39383f..6949fc2a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/IntuitResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -38,10 +38,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.ipp.core.Response; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -98,8 +98,7 @@ "olbTransaction", "olbStatus" }) -public class IntuitResponse - implements Serializable, Response, Equals, HashCode +public class IntuitResponse implements Serializable, Response, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -163,68 +162,68 @@ public void setWarnings(Warnings value) { * * @return * possible object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public JAXBElement getIntuitObject() { @@ -236,68 +235,68 @@ public JAXBElement getIntuitObject() { * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public void setIntuitObject(JAXBElement value) { @@ -643,8 +642,8 @@ public void setAttachableResponse(List attachableResponse) { this.attachableResponse = attachableResponse; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof IntuitResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -656,7 +655,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWarnings = this.getWarnings(); Warnings rhsWarnings; rhsWarnings = that.getWarnings(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings, (this.warnings!= null), (that.warnings!= null))) { return false; } } @@ -665,7 +664,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitObject = this.getIntuitObject(); JAXBElement rhsIntuitObject; rhsIntuitObject = that.getIntuitObject(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject, (this.intuitObject!= null), (that.intuitObject!= null))) { return false; } } @@ -674,7 +673,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -683,7 +682,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReport = this.getReport(); Report rhsReport; rhsReport = that.getReport(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "report", lhsReport), LocatorUtils.property(thatLocator, "report", rhsReport), lhsReport, rhsReport)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "report", lhsReport), LocatorUtils.property(thatLocator, "report", rhsReport), lhsReport, rhsReport, (this.report!= null), (that.report!= null))) { return false; } } @@ -692,7 +691,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQueryResponse = this.getQueryResponse(); QueryResponse rhsQueryResponse; rhsQueryResponse = that.getQueryResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "queryResponse", lhsQueryResponse), LocatorUtils.property(thatLocator, "queryResponse", rhsQueryResponse), lhsQueryResponse, rhsQueryResponse, (this.queryResponse!= null), (that.queryResponse!= null))) { return false; } } @@ -701,7 +700,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBatchItemResponse = (((this.batchItemResponse!= null)&&(!this.batchItemResponse.isEmpty()))?this.getBatchItemResponse():null); List rhsBatchItemResponse; rhsBatchItemResponse = (((that.batchItemResponse!= null)&&(!that.batchItemResponse.isEmpty()))?that.getBatchItemResponse():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "batchItemResponse", lhsBatchItemResponse), LocatorUtils.property(thatLocator, "batchItemResponse", rhsBatchItemResponse), lhsBatchItemResponse, rhsBatchItemResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "batchItemResponse", lhsBatchItemResponse), LocatorUtils.property(thatLocator, "batchItemResponse", rhsBatchItemResponse), lhsBatchItemResponse, rhsBatchItemResponse, ((this.batchItemResponse!= null)&&(!this.batchItemResponse.isEmpty())), ((that.batchItemResponse!= null)&&(!that.batchItemResponse.isEmpty())))) { return false; } } @@ -710,7 +709,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCDCResponse = (((this.cdcResponse!= null)&&(!this.cdcResponse.isEmpty()))?this.getCDCResponse():null); List rhsCDCResponse; rhsCDCResponse = (((that.cdcResponse!= null)&&(!that.cdcResponse.isEmpty()))?that.getCDCResponse():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcResponse", lhsCDCResponse), LocatorUtils.property(thatLocator, "cdcResponse", rhsCDCResponse), lhsCDCResponse, rhsCDCResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cdcResponse", lhsCDCResponse), LocatorUtils.property(thatLocator, "cdcResponse", rhsCDCResponse), lhsCDCResponse, rhsCDCResponse, ((this.cdcResponse!= null)&&(!this.cdcResponse.isEmpty())), ((that.cdcResponse!= null)&&(!that.cdcResponse.isEmpty())))) { return false; } } @@ -719,7 +718,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAttachableResponse = (((this.attachableResponse!= null)&&(!this.attachableResponse.isEmpty()))?this.getAttachableResponse():null); List rhsAttachableResponse; rhsAttachableResponse = (((that.attachableResponse!= null)&&(!that.attachableResponse.isEmpty()))?that.getAttachableResponse():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableResponse", lhsAttachableResponse), LocatorUtils.property(thatLocator, "attachableResponse", rhsAttachableResponse), lhsAttachableResponse, rhsAttachableResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "attachableResponse", lhsAttachableResponse), LocatorUtils.property(thatLocator, "attachableResponse", rhsAttachableResponse), lhsAttachableResponse, rhsAttachableResponse, ((this.attachableResponse!= null)&&(!this.attachableResponse.isEmpty())), ((that.attachableResponse!= null)&&(!that.attachableResponse.isEmpty())))) { return false; } } @@ -728,7 +727,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSyncErrorResponse = this.getSyncErrorResponse(); SyncErrorResponse rhsSyncErrorResponse; rhsSyncErrorResponse = that.getSyncErrorResponse(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "syncErrorResponse", lhsSyncErrorResponse), LocatorUtils.property(thatLocator, "syncErrorResponse", rhsSyncErrorResponse), lhsSyncErrorResponse, rhsSyncErrorResponse)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "syncErrorResponse", lhsSyncErrorResponse), LocatorUtils.property(thatLocator, "syncErrorResponse", rhsSyncErrorResponse), lhsSyncErrorResponse, rhsSyncErrorResponse, (this.syncErrorResponse!= null), (that.syncErrorResponse!= null))) { return false; } } @@ -737,7 +736,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBTransaction = this.getOLBTransaction(); OLBTransaction rhsOLBTransaction; rhsOLBTransaction = that.getOLBTransaction(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTransaction", lhsOLBTransaction), LocatorUtils.property(thatLocator, "olbTransaction", rhsOLBTransaction), lhsOLBTransaction, rhsOLBTransaction)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTransaction", lhsOLBTransaction), LocatorUtils.property(thatLocator, "olbTransaction", rhsOLBTransaction), lhsOLBTransaction, rhsOLBTransaction, (this.olbTransaction!= null), (that.olbTransaction!= null))) { return false; } } @@ -746,7 +745,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBStatus = this.getOLBStatus(); OLBStatus rhsOLBStatus; rhsOLBStatus = that.getOLBStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbStatus", lhsOLBStatus), LocatorUtils.property(thatLocator, "olbStatus", rhsOLBStatus), lhsOLBStatus, rhsOLBStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbStatus", lhsOLBStatus), LocatorUtils.property(thatLocator, "olbStatus", rhsOLBStatus), lhsOLBStatus, rhsOLBStatus, (this.olbStatus!= null), (that.olbStatus!= null))) { return false; } } @@ -755,7 +754,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRequestId = this.getRequestId(); String rhsRequestId; rhsRequestId = that.getRequestId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "requestId", lhsRequestId), LocatorUtils.property(thatLocator, "requestId", rhsRequestId), lhsRequestId, rhsRequestId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "requestId", lhsRequestId), LocatorUtils.property(thatLocator, "requestId", rhsRequestId), lhsRequestId, rhsRequestId, (this.requestId!= null), (that.requestId!= null))) { return false; } } @@ -764,7 +763,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTime = this.getTime(); Date rhsTime; rhsTime = that.getTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "time", lhsTime), LocatorUtils.property(thatLocator, "time", rhsTime), lhsTime, rhsTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "time", lhsTime), LocatorUtils.property(thatLocator, "time", rhsTime), lhsTime, rhsTime, (this.time!= null), (that.time!= null))) { return false; } } @@ -773,7 +772,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); String rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -781,87 +780,87 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Warnings theWarnings; theWarnings = this.getWarnings(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings, (this.warnings!= null)); } { JAXBElement theIntuitObject; theIntuitObject = this.getIntuitObject(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject, (this.intuitObject!= null)); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } { Report theReport; theReport = this.getReport(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "report", theReport), currentHashCode, theReport); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "report", theReport), currentHashCode, theReport, (this.report!= null)); } { QueryResponse theQueryResponse; theQueryResponse = this.getQueryResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "queryResponse", theQueryResponse), currentHashCode, theQueryResponse, (this.queryResponse!= null)); } { List theBatchItemResponse; theBatchItemResponse = (((this.batchItemResponse!= null)&&(!this.batchItemResponse.isEmpty()))?this.getBatchItemResponse():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchItemResponse", theBatchItemResponse), currentHashCode, theBatchItemResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchItemResponse", theBatchItemResponse), currentHashCode, theBatchItemResponse, ((this.batchItemResponse!= null)&&(!this.batchItemResponse.isEmpty()))); } { List theCDCResponse; theCDCResponse = (((this.cdcResponse!= null)&&(!this.cdcResponse.isEmpty()))?this.getCDCResponse():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcResponse", theCDCResponse), currentHashCode, theCDCResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cdcResponse", theCDCResponse), currentHashCode, theCDCResponse, ((this.cdcResponse!= null)&&(!this.cdcResponse.isEmpty()))); } { List theAttachableResponse; theAttachableResponse = (((this.attachableResponse!= null)&&(!this.attachableResponse.isEmpty()))?this.getAttachableResponse():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableResponse", theAttachableResponse), currentHashCode, theAttachableResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attachableResponse", theAttachableResponse), currentHashCode, theAttachableResponse, ((this.attachableResponse!= null)&&(!this.attachableResponse.isEmpty()))); } { SyncErrorResponse theSyncErrorResponse; theSyncErrorResponse = this.getSyncErrorResponse(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncErrorResponse", theSyncErrorResponse), currentHashCode, theSyncErrorResponse); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncErrorResponse", theSyncErrorResponse), currentHashCode, theSyncErrorResponse, (this.syncErrorResponse!= null)); } { OLBTransaction theOLBTransaction; theOLBTransaction = this.getOLBTransaction(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTransaction", theOLBTransaction), currentHashCode, theOLBTransaction); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTransaction", theOLBTransaction), currentHashCode, theOLBTransaction, (this.olbTransaction!= null)); } { OLBStatus theOLBStatus; theOLBStatus = this.getOLBStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbStatus", theOLBStatus), currentHashCode, theOLBStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbStatus", theOLBStatus), currentHashCode, theOLBStatus, (this.olbStatus!= null)); } { String theRequestId; theRequestId = this.getRequestId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requestId", theRequestId), currentHashCode, theRequestId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requestId", theRequestId), currentHashCode, theRequestId, (this.requestId!= null)); } { Date theTime; theTime = this.getTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "time", theTime), currentHashCode, theTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "time", theTime), currentHashCode, theTime, (this.time!= null)); } { String theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/InventorySite.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/InventorySite.java index 323461fe..249e51c6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/InventorySite.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/InventorySite.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -88,7 +88,7 @@ }) public class InventorySite extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -335,8 +335,8 @@ public void setContactInfo(List contactInfo) { this.contactInfo = contactInfo; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof InventorySite)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -351,7 +351,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -360,7 +360,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -369,7 +369,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultSite = this.isDefaultSite(); Boolean rhsDefaultSite; rhsDefaultSite = that.isDefaultSite(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultSite", lhsDefaultSite), LocatorUtils.property(thatLocator, "defaultSite", rhsDefaultSite), lhsDefaultSite, rhsDefaultSite)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultSite", lhsDefaultSite), LocatorUtils.property(thatLocator, "defaultSite", rhsDefaultSite), lhsDefaultSite, rhsDefaultSite, (this.defaultSite!= null), (that.defaultSite!= null))) { return false; } } @@ -378,7 +378,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -387,7 +387,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsContact = this.getContact(); String rhsContact; rhsContact = that.getContact(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "contact", lhsContact), LocatorUtils.property(thatLocator, "contact", rhsContact), lhsContact, rhsContact)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "contact", lhsContact), LocatorUtils.property(thatLocator, "contact", rhsContact), lhsContact, rhsContact, (this.contact!= null), (that.contact!= null))) { return false; } } @@ -396,7 +396,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAddr = (((this.addr!= null)&&(!this.addr.isEmpty()))?this.getAddr():null); List rhsAddr; rhsAddr = (((that.addr!= null)&&(!that.addr.isEmpty()))?that.getAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "addr", lhsAddr), LocatorUtils.property(thatLocator, "addr", rhsAddr), lhsAddr, rhsAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "addr", lhsAddr), LocatorUtils.property(thatLocator, "addr", rhsAddr), lhsAddr, rhsAddr, ((this.addr!= null)&&(!this.addr.isEmpty())), ((that.addr!= null)&&(!that.addr.isEmpty())))) { return false; } } @@ -405,7 +405,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsContactInfo = (((this.contactInfo!= null)&&(!this.contactInfo.isEmpty()))?this.getContactInfo():null); List rhsContactInfo; rhsContactInfo = (((that.contactInfo!= null)&&(!that.contactInfo.isEmpty()))?that.getContactInfo():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "contactInfo", lhsContactInfo), LocatorUtils.property(thatLocator, "contactInfo", rhsContactInfo), lhsContactInfo, rhsContactInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "contactInfo", lhsContactInfo), LocatorUtils.property(thatLocator, "contactInfo", rhsContactInfo), lhsContactInfo, rhsContactInfo, ((this.contactInfo!= null)&&(!this.contactInfo.isEmpty())), ((that.contactInfo!= null)&&(!that.contactInfo.isEmpty())))) { return false; } } @@ -414,7 +414,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInventorySiteEx = this.getInventorySiteEx(); IntuitAnyType rhsInventorySiteEx; rhsInventorySiteEx = that.getInventorySiteEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteEx", lhsInventorySiteEx), LocatorUtils.property(thatLocator, "inventorySiteEx", rhsInventorySiteEx), lhsInventorySiteEx, rhsInventorySiteEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteEx", lhsInventorySiteEx), LocatorUtils.property(thatLocator, "inventorySiteEx", rhsInventorySiteEx), lhsInventorySiteEx, rhsInventorySiteEx, (this.inventorySiteEx!= null), (that.inventorySiteEx!= null))) { return false; } } @@ -422,57 +422,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { Boolean theDefaultSite; theDefaultSite = this.isDefaultSite(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultSite", theDefaultSite), currentHashCode, theDefaultSite); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultSite", theDefaultSite), currentHashCode, theDefaultSite, (this.defaultSite!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { String theContact; theContact = this.getContact(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contact", theContact), currentHashCode, theContact); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contact", theContact), currentHashCode, theContact, (this.contact!= null)); } { List theAddr; theAddr = (((this.addr!= null)&&(!this.addr.isEmpty()))?this.getAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "addr", theAddr), currentHashCode, theAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "addr", theAddr), currentHashCode, theAddr, ((this.addr!= null)&&(!this.addr.isEmpty()))); } { List theContactInfo; theContactInfo = (((this.contactInfo!= null)&&(!this.contactInfo.isEmpty()))?this.getContactInfo():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactInfo", theContactInfo), currentHashCode, theContactInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactInfo", theContactInfo), currentHashCode, theContactInfo, ((this.contactInfo!= null)&&(!this.contactInfo.isEmpty()))); } { IntuitAnyType theInventorySiteEx; theInventorySiteEx = this.getInventorySiteEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteEx", theInventorySiteEx), currentHashCode, theInventorySiteEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteEx", theInventorySiteEx), currentHashCode, theInventorySiteEx, (this.inventorySiteEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Invoice.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Invoice.java index b5fdc8f2..7473b395 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Invoice.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Invoice.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -127,7 +127,7 @@ }) public class Invoice extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -434,8 +434,8 @@ public void setInvoiceStatusLog(List invoiceStatusLog) { this.invoiceStatusLog = invoiceStatusLog; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Invoice)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -450,7 +450,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeposit = this.getDeposit(); BigDecimal rhsDeposit; rhsDeposit = that.getDeposit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deposit", lhsDeposit), LocatorUtils.property(thatLocator, "deposit", rhsDeposit), lhsDeposit, rhsDeposit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deposit", lhsDeposit), LocatorUtils.property(thatLocator, "deposit", rhsDeposit), lhsDeposit, rhsDeposit, (this.deposit!= null), (that.deposit!= null))) { return false; } } @@ -459,7 +459,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowIPNPayment = this.isAllowIPNPayment(); Boolean rhsAllowIPNPayment; rhsAllowIPNPayment = that.isAllowIPNPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowIPNPayment", lhsAllowIPNPayment), LocatorUtils.property(thatLocator, "allowIPNPayment", rhsAllowIPNPayment), lhsAllowIPNPayment, rhsAllowIPNPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowIPNPayment", lhsAllowIPNPayment), LocatorUtils.property(thatLocator, "allowIPNPayment", rhsAllowIPNPayment), lhsAllowIPNPayment, rhsAllowIPNPayment, (this.allowIPNPayment!= null), (that.allowIPNPayment!= null))) { return false; } } @@ -468,7 +468,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlinePayment = this.isAllowOnlinePayment(); Boolean rhsAllowOnlinePayment; rhsAllowOnlinePayment = that.isAllowOnlinePayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlinePayment", lhsAllowOnlinePayment), LocatorUtils.property(thatLocator, "allowOnlinePayment", rhsAllowOnlinePayment), lhsAllowOnlinePayment, rhsAllowOnlinePayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlinePayment", lhsAllowOnlinePayment), LocatorUtils.property(thatLocator, "allowOnlinePayment", rhsAllowOnlinePayment), lhsAllowOnlinePayment, rhsAllowOnlinePayment, (this.allowOnlinePayment!= null), (that.allowOnlinePayment!= null))) { return false; } } @@ -477,7 +477,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlineCreditCardPayment = this.isAllowOnlineCreditCardPayment(); Boolean rhsAllowOnlineCreditCardPayment; rhsAllowOnlineCreditCardPayment = that.isAllowOnlineCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineCreditCardPayment", lhsAllowOnlineCreditCardPayment), LocatorUtils.property(thatLocator, "allowOnlineCreditCardPayment", rhsAllowOnlineCreditCardPayment), lhsAllowOnlineCreditCardPayment, rhsAllowOnlineCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineCreditCardPayment", lhsAllowOnlineCreditCardPayment), LocatorUtils.property(thatLocator, "allowOnlineCreditCardPayment", rhsAllowOnlineCreditCardPayment), lhsAllowOnlineCreditCardPayment, rhsAllowOnlineCreditCardPayment, (this.allowOnlineCreditCardPayment!= null), (that.allowOnlineCreditCardPayment!= null))) { return false; } } @@ -486,7 +486,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowOnlineACHPayment = this.isAllowOnlineACHPayment(); Boolean rhsAllowOnlineACHPayment; rhsAllowOnlineACHPayment = that.isAllowOnlineACHPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineACHPayment", lhsAllowOnlineACHPayment), LocatorUtils.property(thatLocator, "allowOnlineACHPayment", rhsAllowOnlineACHPayment), lhsAllowOnlineACHPayment, rhsAllowOnlineACHPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowOnlineACHPayment", lhsAllowOnlineACHPayment), LocatorUtils.property(thatLocator, "allowOnlineACHPayment", rhsAllowOnlineACHPayment), lhsAllowOnlineACHPayment, rhsAllowOnlineACHPayment, (this.allowOnlineACHPayment!= null), (that.allowOnlineACHPayment!= null))) { return false; } } @@ -495,7 +495,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEInvoiceStatus = this.getEInvoiceStatus(); ETransactionStatusEnum rhsEInvoiceStatus; rhsEInvoiceStatus = that.getEInvoiceStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eInvoiceStatus", lhsEInvoiceStatus), LocatorUtils.property(thatLocator, "eInvoiceStatus", rhsEInvoiceStatus), lhsEInvoiceStatus, rhsEInvoiceStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eInvoiceStatus", lhsEInvoiceStatus), LocatorUtils.property(thatLocator, "eInvoiceStatus", rhsEInvoiceStatus), lhsEInvoiceStatus, rhsEInvoiceStatus, (this.eInvoiceStatus!= null), (that.eInvoiceStatus!= null))) { return false; } } @@ -504,7 +504,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsECloudStatusTimeStamp = this.getECloudStatusTimeStamp(); Date rhsECloudStatusTimeStamp; rhsECloudStatusTimeStamp = that.getECloudStatusTimeStamp(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eCloudStatusTimeStamp", lhsECloudStatusTimeStamp), LocatorUtils.property(thatLocator, "eCloudStatusTimeStamp", rhsECloudStatusTimeStamp), lhsECloudStatusTimeStamp, rhsECloudStatusTimeStamp)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eCloudStatusTimeStamp", lhsECloudStatusTimeStamp), LocatorUtils.property(thatLocator, "eCloudStatusTimeStamp", rhsECloudStatusTimeStamp), lhsECloudStatusTimeStamp, rhsECloudStatusTimeStamp, (this.eCloudStatusTimeStamp!= null), (that.eCloudStatusTimeStamp!= null))) { return false; } } @@ -513,7 +513,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvoiceStatus = this.getInvoiceStatus(); String rhsInvoiceStatus; rhsInvoiceStatus = that.getInvoiceStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceStatus", lhsInvoiceStatus), LocatorUtils.property(thatLocator, "invoiceStatus", rhsInvoiceStatus), lhsInvoiceStatus, rhsInvoiceStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceStatus", lhsInvoiceStatus), LocatorUtils.property(thatLocator, "invoiceStatus", rhsInvoiceStatus), lhsInvoiceStatus, rhsInvoiceStatus, (this.invoiceStatus!= null), (that.invoiceStatus!= null))) { return false; } } @@ -522,7 +522,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCallToAction = this.getCallToAction(); String rhsCallToAction; rhsCallToAction = that.getCallToAction(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "callToAction", lhsCallToAction), LocatorUtils.property(thatLocator, "callToAction", rhsCallToAction), lhsCallToAction, rhsCallToAction)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "callToAction", lhsCallToAction), LocatorUtils.property(thatLocator, "callToAction", rhsCallToAction), lhsCallToAction, rhsCallToAction, (this.callToAction!= null), (that.callToAction!= null))) { return false; } } @@ -531,7 +531,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvoiceStatusLog = (((this.invoiceStatusLog!= null)&&(!this.invoiceStatusLog.isEmpty()))?this.getInvoiceStatusLog():null); List rhsInvoiceStatusLog; rhsInvoiceStatusLog = (((that.invoiceStatusLog!= null)&&(!that.invoiceStatusLog.isEmpty()))?that.getInvoiceStatusLog():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceStatusLog", lhsInvoiceStatusLog), LocatorUtils.property(thatLocator, "invoiceStatusLog", rhsInvoiceStatusLog), lhsInvoiceStatusLog, rhsInvoiceStatusLog)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceStatusLog", lhsInvoiceStatusLog), LocatorUtils.property(thatLocator, "invoiceStatusLog", rhsInvoiceStatusLog), lhsInvoiceStatusLog, rhsInvoiceStatusLog, ((this.invoiceStatusLog!= null)&&(!this.invoiceStatusLog.isEmpty())), ((that.invoiceStatusLog!= null)&&(!that.invoiceStatusLog.isEmpty())))) { return false; } } @@ -540,7 +540,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvoiceEx = this.getInvoiceEx(); IntuitAnyType rhsInvoiceEx; rhsInvoiceEx = that.getInvoiceEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceEx", lhsInvoiceEx), LocatorUtils.property(thatLocator, "invoiceEx", rhsInvoiceEx), lhsInvoiceEx, rhsInvoiceEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceEx", lhsInvoiceEx), LocatorUtils.property(thatLocator, "invoiceEx", rhsInvoiceEx), lhsInvoiceEx, rhsInvoiceEx, (this.invoiceEx!= null), (that.invoiceEx!= null))) { return false; } } @@ -548,72 +548,72 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { BigDecimal theDeposit; theDeposit = this.getDeposit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deposit", theDeposit), currentHashCode, theDeposit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deposit", theDeposit), currentHashCode, theDeposit, (this.deposit!= null)); } { Boolean theAllowIPNPayment; theAllowIPNPayment = this.isAllowIPNPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowIPNPayment", theAllowIPNPayment), currentHashCode, theAllowIPNPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowIPNPayment", theAllowIPNPayment), currentHashCode, theAllowIPNPayment, (this.allowIPNPayment!= null)); } { Boolean theAllowOnlinePayment; theAllowOnlinePayment = this.isAllowOnlinePayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlinePayment", theAllowOnlinePayment), currentHashCode, theAllowOnlinePayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlinePayment", theAllowOnlinePayment), currentHashCode, theAllowOnlinePayment, (this.allowOnlinePayment!= null)); } { Boolean theAllowOnlineCreditCardPayment; theAllowOnlineCreditCardPayment = this.isAllowOnlineCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineCreditCardPayment", theAllowOnlineCreditCardPayment), currentHashCode, theAllowOnlineCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineCreditCardPayment", theAllowOnlineCreditCardPayment), currentHashCode, theAllowOnlineCreditCardPayment, (this.allowOnlineCreditCardPayment!= null)); } { Boolean theAllowOnlineACHPayment; theAllowOnlineACHPayment = this.isAllowOnlineACHPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineACHPayment", theAllowOnlineACHPayment), currentHashCode, theAllowOnlineACHPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowOnlineACHPayment", theAllowOnlineACHPayment), currentHashCode, theAllowOnlineACHPayment, (this.allowOnlineACHPayment!= null)); } { ETransactionStatusEnum theEInvoiceStatus; theEInvoiceStatus = this.getEInvoiceStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eInvoiceStatus", theEInvoiceStatus), currentHashCode, theEInvoiceStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eInvoiceStatus", theEInvoiceStatus), currentHashCode, theEInvoiceStatus, (this.eInvoiceStatus!= null)); } { Date theECloudStatusTimeStamp; theECloudStatusTimeStamp = this.getECloudStatusTimeStamp(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eCloudStatusTimeStamp", theECloudStatusTimeStamp), currentHashCode, theECloudStatusTimeStamp); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eCloudStatusTimeStamp", theECloudStatusTimeStamp), currentHashCode, theECloudStatusTimeStamp, (this.eCloudStatusTimeStamp!= null)); } { String theInvoiceStatus; theInvoiceStatus = this.getInvoiceStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceStatus", theInvoiceStatus), currentHashCode, theInvoiceStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceStatus", theInvoiceStatus), currentHashCode, theInvoiceStatus, (this.invoiceStatus!= null)); } { String theCallToAction; theCallToAction = this.getCallToAction(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "callToAction", theCallToAction), currentHashCode, theCallToAction); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "callToAction", theCallToAction), currentHashCode, theCallToAction, (this.callToAction!= null)); } { List theInvoiceStatusLog; theInvoiceStatusLog = (((this.invoiceStatusLog!= null)&&(!this.invoiceStatusLog.isEmpty()))?this.getInvoiceStatusLog():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceStatusLog", theInvoiceStatusLog), currentHashCode, theInvoiceStatusLog); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceStatusLog", theInvoiceStatusLog), currentHashCode, theInvoiceStatusLog, ((this.invoiceStatusLog!= null)&&(!this.invoiceStatusLog.isEmpty()))); } { IntuitAnyType theInvoiceEx; theInvoiceEx = this.getInvoiceEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceEx", theInvoiceEx), currentHashCode, theInvoiceEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceEx", theInvoiceEx), currentHashCode, theInvoiceEx, (this.invoiceEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Item.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Item.java index f3d20d22..29630321 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Item.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Item.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -216,7 +216,7 @@ }) public class Item extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1419,8 +1419,8 @@ public void setItemEx(IntuitAnyType value) { this.itemEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Item)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1435,7 +1435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -1444,7 +1444,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSku = this.getSku(); String rhsSku; rhsSku = that.getSku(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "sku", lhsSku), LocatorUtils.property(thatLocator, "sku", rhsSku), lhsSku, rhsSku)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "sku", lhsSku), LocatorUtils.property(thatLocator, "sku", rhsSku), lhsSku, rhsSku, (this.sku!= null), (that.sku!= null))) { return false; } } @@ -1453,7 +1453,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -1462,7 +1462,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -1471,7 +1471,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubItem = this.isSubItem(); Boolean rhsSubItem; rhsSubItem = that.isSubItem(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subItem", lhsSubItem), LocatorUtils.property(thatLocator, "subItem", rhsSubItem), lhsSubItem, rhsSubItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subItem", lhsSubItem), LocatorUtils.property(thatLocator, "subItem", rhsSubItem), lhsSubItem, rhsSubItem, (this.subItem!= null), (that.subItem!= null))) { return false; } } @@ -1480,7 +1480,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -1489,7 +1489,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLevel = this.getLevel(); Integer rhsLevel; rhsLevel = that.getLevel(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "level", lhsLevel), LocatorUtils.property(thatLocator, "level", rhsLevel), lhsLevel, rhsLevel)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "level", lhsLevel), LocatorUtils.property(thatLocator, "level", rhsLevel), lhsLevel, rhsLevel, (this.level!= null), (that.level!= null))) { return false; } } @@ -1498,7 +1498,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -1507,7 +1507,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxable = this.isTaxable(); Boolean rhsTaxable; rhsTaxable = that.isTaxable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable, (this.taxable!= null), (that.taxable!= null))) { return false; } } @@ -1516,7 +1516,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxIncluded = this.isSalesTaxIncluded(); Boolean rhsSalesTaxIncluded; rhsSalesTaxIncluded = that.isSalesTaxIncluded(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxIncluded", lhsSalesTaxIncluded), LocatorUtils.property(thatLocator, "salesTaxIncluded", rhsSalesTaxIncluded), lhsSalesTaxIncluded, rhsSalesTaxIncluded)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxIncluded", lhsSalesTaxIncluded), LocatorUtils.property(thatLocator, "salesTaxIncluded", rhsSalesTaxIncluded), lhsSalesTaxIncluded, rhsSalesTaxIncluded, (this.salesTaxIncluded!= null), (that.salesTaxIncluded!= null))) { return false; } } @@ -1525,7 +1525,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPercentBased = this.isPercentBased(); Boolean rhsPercentBased; rhsPercentBased = that.isPercentBased(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased, (this.percentBased!= null), (that.percentBased!= null))) { return false; } } @@ -1534,7 +1534,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUnitPrice = this.getUnitPrice(); BigDecimal rhsUnitPrice; rhsUnitPrice = that.getUnitPrice(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "unitPrice", lhsUnitPrice), LocatorUtils.property(thatLocator, "unitPrice", rhsUnitPrice), lhsUnitPrice, rhsUnitPrice)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "unitPrice", lhsUnitPrice), LocatorUtils.property(thatLocator, "unitPrice", rhsUnitPrice), lhsUnitPrice, rhsUnitPrice, (this.unitPrice!= null), (that.unitPrice!= null))) { return false; } } @@ -1543,7 +1543,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRatePercent = this.getRatePercent(); BigDecimal rhsRatePercent; rhsRatePercent = that.getRatePercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ratePercent", lhsRatePercent), LocatorUtils.property(thatLocator, "ratePercent", rhsRatePercent), lhsRatePercent, rhsRatePercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ratePercent", lhsRatePercent), LocatorUtils.property(thatLocator, "ratePercent", rhsRatePercent), lhsRatePercent, rhsRatePercent, (this.ratePercent!= null), (that.ratePercent!= null))) { return false; } } @@ -1552,7 +1552,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); ItemTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -1561,7 +1561,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -1570,7 +1570,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOMSetRef = this.getUOMSetRef(); ReferenceType rhsUOMSetRef; rhsUOMSetRef = that.getUOMSetRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uomSetRef", lhsUOMSetRef), LocatorUtils.property(thatLocator, "uomSetRef", rhsUOMSetRef), lhsUOMSetRef, rhsUOMSetRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uomSetRef", lhsUOMSetRef), LocatorUtils.property(thatLocator, "uomSetRef", rhsUOMSetRef), lhsUOMSetRef, rhsUOMSetRef, (this.uomSetRef!= null), (that.uomSetRef!= null))) { return false; } } @@ -1579,7 +1579,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIncomeAccountRef = this.getIncomeAccountRef(); ReferenceType rhsIncomeAccountRef; rhsIncomeAccountRef = that.getIncomeAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "incomeAccountRef", lhsIncomeAccountRef), LocatorUtils.property(thatLocator, "incomeAccountRef", rhsIncomeAccountRef), lhsIncomeAccountRef, rhsIncomeAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "incomeAccountRef", lhsIncomeAccountRef), LocatorUtils.property(thatLocator, "incomeAccountRef", rhsIncomeAccountRef), lhsIncomeAccountRef, rhsIncomeAccountRef, (this.incomeAccountRef!= null), (that.incomeAccountRef!= null))) { return false; } } @@ -1588,7 +1588,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseDesc = this.getPurchaseDesc(); String rhsPurchaseDesc; rhsPurchaseDesc = that.getPurchaseDesc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDesc", lhsPurchaseDesc), LocatorUtils.property(thatLocator, "purchaseDesc", rhsPurchaseDesc), lhsPurchaseDesc, rhsPurchaseDesc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseDesc", lhsPurchaseDesc), LocatorUtils.property(thatLocator, "purchaseDesc", rhsPurchaseDesc), lhsPurchaseDesc, rhsPurchaseDesc, (this.purchaseDesc!= null), (that.purchaseDesc!= null))) { return false; } } @@ -1597,7 +1597,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseTaxIncluded = this.isPurchaseTaxIncluded(); Boolean rhsPurchaseTaxIncluded; rhsPurchaseTaxIncluded = that.isPurchaseTaxIncluded(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxIncluded", lhsPurchaseTaxIncluded), LocatorUtils.property(thatLocator, "purchaseTaxIncluded", rhsPurchaseTaxIncluded), lhsPurchaseTaxIncluded, rhsPurchaseTaxIncluded)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxIncluded", lhsPurchaseTaxIncluded), LocatorUtils.property(thatLocator, "purchaseTaxIncluded", rhsPurchaseTaxIncluded), lhsPurchaseTaxIncluded, rhsPurchaseTaxIncluded, (this.purchaseTaxIncluded!= null), (that.purchaseTaxIncluded!= null))) { return false; } } @@ -1606,7 +1606,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseCost = this.getPurchaseCost(); BigDecimal rhsPurchaseCost; rhsPurchaseCost = that.getPurchaseCost(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseCost", lhsPurchaseCost), LocatorUtils.property(thatLocator, "purchaseCost", rhsPurchaseCost), lhsPurchaseCost, rhsPurchaseCost)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseCost", lhsPurchaseCost), LocatorUtils.property(thatLocator, "purchaseCost", rhsPurchaseCost), lhsPurchaseCost, rhsPurchaseCost, (this.purchaseCost!= null), (that.purchaseCost!= null))) { return false; } } @@ -1615,7 +1615,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExpenseAccountRef = this.getExpenseAccountRef(); ReferenceType rhsExpenseAccountRef; rhsExpenseAccountRef = that.getExpenseAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "expenseAccountRef", lhsExpenseAccountRef), LocatorUtils.property(thatLocator, "expenseAccountRef", rhsExpenseAccountRef), lhsExpenseAccountRef, rhsExpenseAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "expenseAccountRef", lhsExpenseAccountRef), LocatorUtils.property(thatLocator, "expenseAccountRef", rhsExpenseAccountRef), lhsExpenseAccountRef, rhsExpenseAccountRef, (this.expenseAccountRef!= null), (that.expenseAccountRef!= null))) { return false; } } @@ -1624,7 +1624,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCOGSAccountRef = this.getCOGSAccountRef(); ReferenceType rhsCOGSAccountRef; rhsCOGSAccountRef = that.getCOGSAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cogsAccountRef", lhsCOGSAccountRef), LocatorUtils.property(thatLocator, "cogsAccountRef", rhsCOGSAccountRef), lhsCOGSAccountRef, rhsCOGSAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cogsAccountRef", lhsCOGSAccountRef), LocatorUtils.property(thatLocator, "cogsAccountRef", rhsCOGSAccountRef), lhsCOGSAccountRef, rhsCOGSAccountRef, (this.cogsAccountRef!= null), (that.cogsAccountRef!= null))) { return false; } } @@ -1633,7 +1633,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAssetAccountRef = this.getAssetAccountRef(); ReferenceType rhsAssetAccountRef; rhsAssetAccountRef = that.getAssetAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "assetAccountRef", lhsAssetAccountRef), LocatorUtils.property(thatLocator, "assetAccountRef", rhsAssetAccountRef), lhsAssetAccountRef, rhsAssetAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "assetAccountRef", lhsAssetAccountRef), LocatorUtils.property(thatLocator, "assetAccountRef", rhsAssetAccountRef), lhsAssetAccountRef, rhsAssetAccountRef, (this.assetAccountRef!= null), (that.assetAccountRef!= null))) { return false; } } @@ -1642,7 +1642,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrefVendorRef = this.getPrefVendorRef(); ReferenceType rhsPrefVendorRef; rhsPrefVendorRef = that.getPrefVendorRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "prefVendorRef", lhsPrefVendorRef), LocatorUtils.property(thatLocator, "prefVendorRef", rhsPrefVendorRef), lhsPrefVendorRef, rhsPrefVendorRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "prefVendorRef", lhsPrefVendorRef), LocatorUtils.property(thatLocator, "prefVendorRef", rhsPrefVendorRef), lhsPrefVendorRef, rhsPrefVendorRef, (this.prefVendorRef!= null), (that.prefVendorRef!= null))) { return false; } } @@ -1651,7 +1651,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAvgCost = this.getAvgCost(); BigDecimal rhsAvgCost; rhsAvgCost = that.getAvgCost(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "avgCost", lhsAvgCost), LocatorUtils.property(thatLocator, "avgCost", rhsAvgCost), lhsAvgCost, rhsAvgCost)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "avgCost", lhsAvgCost), LocatorUtils.property(thatLocator, "avgCost", rhsAvgCost), lhsAvgCost, rhsAvgCost, (this.avgCost!= null), (that.avgCost!= null))) { return false; } } @@ -1660,7 +1660,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackQtyOnHand = this.isTrackQtyOnHand(); Boolean rhsTrackQtyOnHand; rhsTrackQtyOnHand = that.isTrackQtyOnHand(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackQtyOnHand", lhsTrackQtyOnHand), LocatorUtils.property(thatLocator, "trackQtyOnHand", rhsTrackQtyOnHand), lhsTrackQtyOnHand, rhsTrackQtyOnHand)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackQtyOnHand", lhsTrackQtyOnHand), LocatorUtils.property(thatLocator, "trackQtyOnHand", rhsTrackQtyOnHand), lhsTrackQtyOnHand, rhsTrackQtyOnHand, (this.trackQtyOnHand!= null), (that.trackQtyOnHand!= null))) { return false; } } @@ -1669,7 +1669,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQtyOnHand = this.getQtyOnHand(); BigDecimal rhsQtyOnHand; rhsQtyOnHand = that.getQtyOnHand(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnHand", lhsQtyOnHand), LocatorUtils.property(thatLocator, "qtyOnHand", rhsQtyOnHand), lhsQtyOnHand, rhsQtyOnHand)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnHand", lhsQtyOnHand), LocatorUtils.property(thatLocator, "qtyOnHand", rhsQtyOnHand), lhsQtyOnHand, rhsQtyOnHand, (this.qtyOnHand!= null), (that.qtyOnHand!= null))) { return false; } } @@ -1678,7 +1678,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQtyOnPurchaseOrder = this.getQtyOnPurchaseOrder(); BigDecimal rhsQtyOnPurchaseOrder; rhsQtyOnPurchaseOrder = that.getQtyOnPurchaseOrder(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnPurchaseOrder", lhsQtyOnPurchaseOrder), LocatorUtils.property(thatLocator, "qtyOnPurchaseOrder", rhsQtyOnPurchaseOrder), lhsQtyOnPurchaseOrder, rhsQtyOnPurchaseOrder)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnPurchaseOrder", lhsQtyOnPurchaseOrder), LocatorUtils.property(thatLocator, "qtyOnPurchaseOrder", rhsQtyOnPurchaseOrder), lhsQtyOnPurchaseOrder, rhsQtyOnPurchaseOrder, (this.qtyOnPurchaseOrder!= null), (that.qtyOnPurchaseOrder!= null))) { return false; } } @@ -1687,7 +1687,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQtyOnSalesOrder = this.getQtyOnSalesOrder(); BigDecimal rhsQtyOnSalesOrder; rhsQtyOnSalesOrder = that.getQtyOnSalesOrder(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnSalesOrder", lhsQtyOnSalesOrder), LocatorUtils.property(thatLocator, "qtyOnSalesOrder", rhsQtyOnSalesOrder), lhsQtyOnSalesOrder, rhsQtyOnSalesOrder)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qtyOnSalesOrder", lhsQtyOnSalesOrder), LocatorUtils.property(thatLocator, "qtyOnSalesOrder", rhsQtyOnSalesOrder), lhsQtyOnSalesOrder, rhsQtyOnSalesOrder, (this.qtyOnSalesOrder!= null), (that.qtyOnSalesOrder!= null))) { return false; } } @@ -1696,7 +1696,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReorderPoint = this.getReorderPoint(); BigDecimal rhsReorderPoint; rhsReorderPoint = that.getReorderPoint(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reorderPoint", lhsReorderPoint), LocatorUtils.property(thatLocator, "reorderPoint", rhsReorderPoint), lhsReorderPoint, rhsReorderPoint)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reorderPoint", lhsReorderPoint), LocatorUtils.property(thatLocator, "reorderPoint", rhsReorderPoint), lhsReorderPoint, rhsReorderPoint, (this.reorderPoint!= null), (that.reorderPoint!= null))) { return false; } } @@ -1705,7 +1705,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManPartNum = this.getManPartNum(); String rhsManPartNum; rhsManPartNum = that.getManPartNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manPartNum", lhsManPartNum), LocatorUtils.property(thatLocator, "manPartNum", rhsManPartNum), lhsManPartNum, rhsManPartNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manPartNum", lhsManPartNum), LocatorUtils.property(thatLocator, "manPartNum", rhsManPartNum), lhsManPartNum, rhsManPartNum, (this.manPartNum!= null), (that.manPartNum!= null))) { return false; } } @@ -1714,7 +1714,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositToAccountRef = this.getDepositToAccountRef(); ReferenceType rhsDepositToAccountRef; rhsDepositToAccountRef = that.getDepositToAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef, (this.depositToAccountRef!= null), (that.depositToAccountRef!= null))) { return false; } } @@ -1723,7 +1723,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxCodeRef = this.getSalesTaxCodeRef(); ReferenceType rhsSalesTaxCodeRef; rhsSalesTaxCodeRef = that.getSalesTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCodeRef", lhsSalesTaxCodeRef), LocatorUtils.property(thatLocator, "salesTaxCodeRef", rhsSalesTaxCodeRef), lhsSalesTaxCodeRef, rhsSalesTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCodeRef", lhsSalesTaxCodeRef), LocatorUtils.property(thatLocator, "salesTaxCodeRef", rhsSalesTaxCodeRef), lhsSalesTaxCodeRef, rhsSalesTaxCodeRef, (this.salesTaxCodeRef!= null), (that.salesTaxCodeRef!= null))) { return false; } } @@ -1732,7 +1732,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseTaxCodeRef = this.getPurchaseTaxCodeRef(); ReferenceType rhsPurchaseTaxCodeRef; rhsPurchaseTaxCodeRef = that.getPurchaseTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxCodeRef", lhsPurchaseTaxCodeRef), LocatorUtils.property(thatLocator, "purchaseTaxCodeRef", rhsPurchaseTaxCodeRef), lhsPurchaseTaxCodeRef, rhsPurchaseTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxCodeRef", lhsPurchaseTaxCodeRef), LocatorUtils.property(thatLocator, "purchaseTaxCodeRef", rhsPurchaseTaxCodeRef), lhsPurchaseTaxCodeRef, rhsPurchaseTaxCodeRef, (this.purchaseTaxCodeRef!= null), (that.purchaseTaxCodeRef!= null))) { return false; } } @@ -1741,7 +1741,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvStartDate = this.getInvStartDate(); Date rhsInvStartDate; rhsInvStartDate = that.getInvStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invStartDate", lhsInvStartDate), LocatorUtils.property(thatLocator, "invStartDate", rhsInvStartDate), lhsInvStartDate, rhsInvStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invStartDate", lhsInvStartDate), LocatorUtils.property(thatLocator, "invStartDate", rhsInvStartDate), lhsInvStartDate, rhsInvStartDate, (this.invStartDate!= null), (that.invStartDate!= null))) { return false; } } @@ -1750,7 +1750,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBuildPoint = this.getBuildPoint(); BigDecimal rhsBuildPoint; rhsBuildPoint = that.getBuildPoint(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "buildPoint", lhsBuildPoint), LocatorUtils.property(thatLocator, "buildPoint", rhsBuildPoint), lhsBuildPoint, rhsBuildPoint)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "buildPoint", lhsBuildPoint), LocatorUtils.property(thatLocator, "buildPoint", rhsBuildPoint), lhsBuildPoint, rhsBuildPoint, (this.buildPoint!= null), (that.buildPoint!= null))) { return false; } } @@ -1759,7 +1759,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintGroupedItems = this.isPrintGroupedItems(); Boolean rhsPrintGroupedItems; rhsPrintGroupedItems = that.isPrintGroupedItems(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printGroupedItems", lhsPrintGroupedItems), LocatorUtils.property(thatLocator, "printGroupedItems", rhsPrintGroupedItems), lhsPrintGroupedItems, rhsPrintGroupedItems)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printGroupedItems", lhsPrintGroupedItems), LocatorUtils.property(thatLocator, "printGroupedItems", rhsPrintGroupedItems), lhsPrintGroupedItems, rhsPrintGroupedItems, (this.printGroupedItems!= null), (that.printGroupedItems!= null))) { return false; } } @@ -1768,7 +1768,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSpecialItem = this.isSpecialItem(); Boolean rhsSpecialItem; rhsSpecialItem = that.isSpecialItem(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "specialItem", lhsSpecialItem), LocatorUtils.property(thatLocator, "specialItem", rhsSpecialItem), lhsSpecialItem, rhsSpecialItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "specialItem", lhsSpecialItem), LocatorUtils.property(thatLocator, "specialItem", rhsSpecialItem), lhsSpecialItem, rhsSpecialItem, (this.specialItem!= null), (that.specialItem!= null))) { return false; } } @@ -1777,7 +1777,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSpecialItemType = this.getSpecialItemType(); SpecialItemTypeEnum rhsSpecialItemType; rhsSpecialItemType = that.getSpecialItemType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "specialItemType", lhsSpecialItemType), LocatorUtils.property(thatLocator, "specialItemType", rhsSpecialItemType), lhsSpecialItemType, rhsSpecialItemType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "specialItemType", lhsSpecialItemType), LocatorUtils.property(thatLocator, "specialItemType", rhsSpecialItemType), lhsSpecialItemType, rhsSpecialItemType, (this.specialItemType!= null), (that.specialItemType!= null))) { return false; } } @@ -1786,7 +1786,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemGroupDetail = this.getItemGroupDetail(); ItemGroupDetail rhsItemGroupDetail; rhsItemGroupDetail = that.getItemGroupDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemGroupDetail", lhsItemGroupDetail), LocatorUtils.property(thatLocator, "itemGroupDetail", rhsItemGroupDetail), lhsItemGroupDetail, rhsItemGroupDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemGroupDetail", lhsItemGroupDetail), LocatorUtils.property(thatLocator, "itemGroupDetail", rhsItemGroupDetail), lhsItemGroupDetail, rhsItemGroupDetail, (this.itemGroupDetail!= null), (that.itemGroupDetail!= null))) { return false; } } @@ -1795,7 +1795,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemAssemblyDetail = this.getItemAssemblyDetail(); ItemAssemblyDetail rhsItemAssemblyDetail; rhsItemAssemblyDetail = that.getItemAssemblyDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAssemblyDetail", lhsItemAssemblyDetail), LocatorUtils.property(thatLocator, "itemAssemblyDetail", rhsItemAssemblyDetail), lhsItemAssemblyDetail, rhsItemAssemblyDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAssemblyDetail", lhsItemAssemblyDetail), LocatorUtils.property(thatLocator, "itemAssemblyDetail", rhsItemAssemblyDetail), lhsItemAssemblyDetail, rhsItemAssemblyDetail, (this.itemAssemblyDetail!= null), (that.itemAssemblyDetail!= null))) { return false; } } @@ -1804,7 +1804,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAbatementRate = this.getAbatementRate(); BigDecimal rhsAbatementRate; rhsAbatementRate = that.getAbatementRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "abatementRate", lhsAbatementRate), LocatorUtils.property(thatLocator, "abatementRate", rhsAbatementRate), lhsAbatementRate, rhsAbatementRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "abatementRate", lhsAbatementRate), LocatorUtils.property(thatLocator, "abatementRate", rhsAbatementRate), lhsAbatementRate, rhsAbatementRate, (this.abatementRate!= null), (that.abatementRate!= null))) { return false; } } @@ -1813,7 +1813,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReverseChargeRate = this.getReverseChargeRate(); BigDecimal rhsReverseChargeRate; rhsReverseChargeRate = that.getReverseChargeRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reverseChargeRate", lhsReverseChargeRate), LocatorUtils.property(thatLocator, "reverseChargeRate", rhsReverseChargeRate), lhsReverseChargeRate, rhsReverseChargeRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reverseChargeRate", lhsReverseChargeRate), LocatorUtils.property(thatLocator, "reverseChargeRate", rhsReverseChargeRate), lhsReverseChargeRate, rhsReverseChargeRate, (this.reverseChargeRate!= null), (that.reverseChargeRate!= null))) { return false; } } @@ -1822,7 +1822,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceType = this.getServiceType(); String rhsServiceType; rhsServiceType = that.getServiceType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceType", lhsServiceType), LocatorUtils.property(thatLocator, "serviceType", rhsServiceType), lhsServiceType, rhsServiceType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceType", lhsServiceType), LocatorUtils.property(thatLocator, "serviceType", rhsServiceType), lhsServiceType, rhsServiceType, (this.serviceType!= null), (that.serviceType!= null))) { return false; } } @@ -1831,7 +1831,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemCategoryType = this.getItemCategoryType(); String rhsItemCategoryType; rhsItemCategoryType = that.getItemCategoryType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemCategoryType", lhsItemCategoryType), LocatorUtils.property(thatLocator, "itemCategoryType", rhsItemCategoryType), lhsItemCategoryType, rhsItemCategoryType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemCategoryType", lhsItemCategoryType), LocatorUtils.property(thatLocator, "itemCategoryType", rhsItemCategoryType), lhsItemCategoryType, rhsItemCategoryType, (this.itemCategoryType!= null), (that.itemCategoryType!= null))) { return false; } } @@ -1840,7 +1840,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemEx = this.getItemEx(); IntuitAnyType rhsItemEx; rhsItemEx = that.getItemEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemEx", lhsItemEx), LocatorUtils.property(thatLocator, "itemEx", rhsItemEx), lhsItemEx, rhsItemEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemEx", lhsItemEx), LocatorUtils.property(thatLocator, "itemEx", rhsItemEx), lhsItemEx, rhsItemEx, (this.itemEx!= null), (that.itemEx!= null))) { return false; } } @@ -1848,247 +1848,247 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theSku; theSku = this.getSku(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sku", theSku), currentHashCode, theSku); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sku", theSku), currentHashCode, theSku, (this.sku!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { Boolean theSubItem; theSubItem = this.isSubItem(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subItem", theSubItem), currentHashCode, theSubItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subItem", theSubItem), currentHashCode, theSubItem, (this.subItem!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { Integer theLevel; theLevel = this.getLevel(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "level", theLevel), currentHashCode, theLevel); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "level", theLevel), currentHashCode, theLevel, (this.level!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theTaxable; theTaxable = this.isTaxable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable, (this.taxable!= null)); } { Boolean theSalesTaxIncluded; theSalesTaxIncluded = this.isSalesTaxIncluded(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxIncluded", theSalesTaxIncluded), currentHashCode, theSalesTaxIncluded); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxIncluded", theSalesTaxIncluded), currentHashCode, theSalesTaxIncluded, (this.salesTaxIncluded!= null)); } { Boolean thePercentBased; thePercentBased = this.isPercentBased(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased, (this.percentBased!= null)); } { BigDecimal theUnitPrice; theUnitPrice = this.getUnitPrice(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unitPrice", theUnitPrice), currentHashCode, theUnitPrice); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unitPrice", theUnitPrice), currentHashCode, theUnitPrice, (this.unitPrice!= null)); } { BigDecimal theRatePercent; theRatePercent = this.getRatePercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ratePercent", theRatePercent), currentHashCode, theRatePercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ratePercent", theRatePercent), currentHashCode, theRatePercent, (this.ratePercent!= null)); } { ItemTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { ReferenceType theUOMSetRef; theUOMSetRef = this.getUOMSetRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomSetRef", theUOMSetRef), currentHashCode, theUOMSetRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomSetRef", theUOMSetRef), currentHashCode, theUOMSetRef, (this.uomSetRef!= null)); } { ReferenceType theIncomeAccountRef; theIncomeAccountRef = this.getIncomeAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "incomeAccountRef", theIncomeAccountRef), currentHashCode, theIncomeAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "incomeAccountRef", theIncomeAccountRef), currentHashCode, theIncomeAccountRef, (this.incomeAccountRef!= null)); } { String thePurchaseDesc; thePurchaseDesc = this.getPurchaseDesc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDesc", thePurchaseDesc), currentHashCode, thePurchaseDesc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseDesc", thePurchaseDesc), currentHashCode, thePurchaseDesc, (this.purchaseDesc!= null)); } { Boolean thePurchaseTaxIncluded; thePurchaseTaxIncluded = this.isPurchaseTaxIncluded(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxIncluded", thePurchaseTaxIncluded), currentHashCode, thePurchaseTaxIncluded); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxIncluded", thePurchaseTaxIncluded), currentHashCode, thePurchaseTaxIncluded, (this.purchaseTaxIncluded!= null)); } { BigDecimal thePurchaseCost; thePurchaseCost = this.getPurchaseCost(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseCost", thePurchaseCost), currentHashCode, thePurchaseCost); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseCost", thePurchaseCost), currentHashCode, thePurchaseCost, (this.purchaseCost!= null)); } { ReferenceType theExpenseAccountRef; theExpenseAccountRef = this.getExpenseAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expenseAccountRef", theExpenseAccountRef), currentHashCode, theExpenseAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expenseAccountRef", theExpenseAccountRef), currentHashCode, theExpenseAccountRef, (this.expenseAccountRef!= null)); } { ReferenceType theCOGSAccountRef; theCOGSAccountRef = this.getCOGSAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cogsAccountRef", theCOGSAccountRef), currentHashCode, theCOGSAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cogsAccountRef", theCOGSAccountRef), currentHashCode, theCOGSAccountRef, (this.cogsAccountRef!= null)); } { ReferenceType theAssetAccountRef; theAssetAccountRef = this.getAssetAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetAccountRef", theAssetAccountRef), currentHashCode, theAssetAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assetAccountRef", theAssetAccountRef), currentHashCode, theAssetAccountRef, (this.assetAccountRef!= null)); } { ReferenceType thePrefVendorRef; thePrefVendorRef = this.getPrefVendorRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prefVendorRef", thePrefVendorRef), currentHashCode, thePrefVendorRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prefVendorRef", thePrefVendorRef), currentHashCode, thePrefVendorRef, (this.prefVendorRef!= null)); } { BigDecimal theAvgCost; theAvgCost = this.getAvgCost(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avgCost", theAvgCost), currentHashCode, theAvgCost); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "avgCost", theAvgCost), currentHashCode, theAvgCost, (this.avgCost!= null)); } { Boolean theTrackQtyOnHand; theTrackQtyOnHand = this.isTrackQtyOnHand(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackQtyOnHand", theTrackQtyOnHand), currentHashCode, theTrackQtyOnHand); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackQtyOnHand", theTrackQtyOnHand), currentHashCode, theTrackQtyOnHand, (this.trackQtyOnHand!= null)); } { BigDecimal theQtyOnHand; theQtyOnHand = this.getQtyOnHand(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnHand", theQtyOnHand), currentHashCode, theQtyOnHand); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnHand", theQtyOnHand), currentHashCode, theQtyOnHand, (this.qtyOnHand!= null)); } { BigDecimal theQtyOnPurchaseOrder; theQtyOnPurchaseOrder = this.getQtyOnPurchaseOrder(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnPurchaseOrder", theQtyOnPurchaseOrder), currentHashCode, theQtyOnPurchaseOrder); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnPurchaseOrder", theQtyOnPurchaseOrder), currentHashCode, theQtyOnPurchaseOrder, (this.qtyOnPurchaseOrder!= null)); } { BigDecimal theQtyOnSalesOrder; theQtyOnSalesOrder = this.getQtyOnSalesOrder(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnSalesOrder", theQtyOnSalesOrder), currentHashCode, theQtyOnSalesOrder); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qtyOnSalesOrder", theQtyOnSalesOrder), currentHashCode, theQtyOnSalesOrder, (this.qtyOnSalesOrder!= null)); } { BigDecimal theReorderPoint; theReorderPoint = this.getReorderPoint(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reorderPoint", theReorderPoint), currentHashCode, theReorderPoint); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reorderPoint", theReorderPoint), currentHashCode, theReorderPoint, (this.reorderPoint!= null)); } { String theManPartNum; theManPartNum = this.getManPartNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manPartNum", theManPartNum), currentHashCode, theManPartNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manPartNum", theManPartNum), currentHashCode, theManPartNum, (this.manPartNum!= null)); } { ReferenceType theDepositToAccountRef; theDepositToAccountRef = this.getDepositToAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef, (this.depositToAccountRef!= null)); } { ReferenceType theSalesTaxCodeRef; theSalesTaxCodeRef = this.getSalesTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCodeRef", theSalesTaxCodeRef), currentHashCode, theSalesTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCodeRef", theSalesTaxCodeRef), currentHashCode, theSalesTaxCodeRef, (this.salesTaxCodeRef!= null)); } { ReferenceType thePurchaseTaxCodeRef; thePurchaseTaxCodeRef = this.getPurchaseTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxCodeRef", thePurchaseTaxCodeRef), currentHashCode, thePurchaseTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxCodeRef", thePurchaseTaxCodeRef), currentHashCode, thePurchaseTaxCodeRef, (this.purchaseTaxCodeRef!= null)); } { Date theInvStartDate; theInvStartDate = this.getInvStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invStartDate", theInvStartDate), currentHashCode, theInvStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invStartDate", theInvStartDate), currentHashCode, theInvStartDate, (this.invStartDate!= null)); } { BigDecimal theBuildPoint; theBuildPoint = this.getBuildPoint(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "buildPoint", theBuildPoint), currentHashCode, theBuildPoint); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "buildPoint", theBuildPoint), currentHashCode, theBuildPoint, (this.buildPoint!= null)); } { Boolean thePrintGroupedItems; thePrintGroupedItems = this.isPrintGroupedItems(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printGroupedItems", thePrintGroupedItems), currentHashCode, thePrintGroupedItems); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printGroupedItems", thePrintGroupedItems), currentHashCode, thePrintGroupedItems, (this.printGroupedItems!= null)); } { Boolean theSpecialItem; theSpecialItem = this.isSpecialItem(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialItem", theSpecialItem), currentHashCode, theSpecialItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialItem", theSpecialItem), currentHashCode, theSpecialItem, (this.specialItem!= null)); } { SpecialItemTypeEnum theSpecialItemType; theSpecialItemType = this.getSpecialItemType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialItemType", theSpecialItemType), currentHashCode, theSpecialItemType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialItemType", theSpecialItemType), currentHashCode, theSpecialItemType, (this.specialItemType!= null)); } { ItemGroupDetail theItemGroupDetail; theItemGroupDetail = this.getItemGroupDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemGroupDetail", theItemGroupDetail), currentHashCode, theItemGroupDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemGroupDetail", theItemGroupDetail), currentHashCode, theItemGroupDetail, (this.itemGroupDetail!= null)); } { ItemAssemblyDetail theItemAssemblyDetail; theItemAssemblyDetail = this.getItemAssemblyDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAssemblyDetail", theItemAssemblyDetail), currentHashCode, theItemAssemblyDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAssemblyDetail", theItemAssemblyDetail), currentHashCode, theItemAssemblyDetail, (this.itemAssemblyDetail!= null)); } { BigDecimal theAbatementRate; theAbatementRate = this.getAbatementRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abatementRate", theAbatementRate), currentHashCode, theAbatementRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abatementRate", theAbatementRate), currentHashCode, theAbatementRate, (this.abatementRate!= null)); } { BigDecimal theReverseChargeRate; theReverseChargeRate = this.getReverseChargeRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reverseChargeRate", theReverseChargeRate), currentHashCode, theReverseChargeRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reverseChargeRate", theReverseChargeRate), currentHashCode, theReverseChargeRate, (this.reverseChargeRate!= null)); } { String theServiceType; theServiceType = this.getServiceType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceType", theServiceType), currentHashCode, theServiceType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceType", theServiceType), currentHashCode, theServiceType, (this.serviceType!= null)); } { String theItemCategoryType; theItemCategoryType = this.getItemCategoryType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemCategoryType", theItemCategoryType), currentHashCode, theItemCategoryType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemCategoryType", theItemCategoryType), currentHashCode, theItemCategoryType, (this.itemCategoryType!= null)); } { IntuitAnyType theItemEx; theItemEx = this.getItemEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemEx", theItemEx), currentHashCode, theItemEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemEx", theItemEx), currentHashCode, theItemEx, (this.itemEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemAssemblyDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemAssemblyDetail.java index b89c4fc7..e70faf8a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemAssemblyDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemAssemblyDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -69,8 +69,7 @@ @XmlType(name = "ItemAssemblyDetail", propOrder = { "itemAssemblyLine" }) -public class ItemAssemblyDetail - implements Serializable, Equals, HashCode +public class ItemAssemblyDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -118,8 +117,8 @@ public void setItemAssemblyLine(List itemAssemblyLine) { this.itemAssemblyLine = itemAssemblyLine; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemAssemblyDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -131,7 +130,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemAssemblyLine = (((this.itemAssemblyLine!= null)&&(!this.itemAssemblyLine.isEmpty()))?this.getItemAssemblyLine():null); List rhsItemAssemblyLine; rhsItemAssemblyLine = (((that.itemAssemblyLine!= null)&&(!that.itemAssemblyLine.isEmpty()))?that.getItemAssemblyLine():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAssemblyLine", lhsItemAssemblyLine), LocatorUtils.property(thatLocator, "itemAssemblyLine", rhsItemAssemblyLine), lhsItemAssemblyLine, rhsItemAssemblyLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAssemblyLine", lhsItemAssemblyLine), LocatorUtils.property(thatLocator, "itemAssemblyLine", rhsItemAssemblyLine), lhsItemAssemblyLine, rhsItemAssemblyLine, ((this.itemAssemblyLine!= null)&&(!this.itemAssemblyLine.isEmpty())), ((that.itemAssemblyLine!= null)&&(!that.itemAssemblyLine.isEmpty())))) { return false; } } @@ -139,22 +138,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theItemAssemblyLine; theItemAssemblyLine = (((this.itemAssemblyLine!= null)&&(!this.itemAssemblyLine.isEmpty()))?this.getItemAssemblyLine():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAssemblyLine", theItemAssemblyLine), currentHashCode, theItemAssemblyLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAssemblyLine", theItemAssemblyLine), currentHashCode, theItemAssemblyLine, ((this.itemAssemblyLine!= null)&&(!this.itemAssemblyLine.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemBasedExpenseLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemBasedExpenseLineDetail.java index 4acd637d..449d3bdb 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemBasedExpenseLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemBasedExpenseLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -76,7 +76,7 @@ }) public class ItemBasedExpenseLineDetail extends ItemLineDetail - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -185,8 +185,8 @@ public void setItemBasedExpenseLineDetailEx(IntuitAnyType value) { this.itemBasedExpenseLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemBasedExpenseLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -201,7 +201,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; } } @@ -210,7 +210,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; } } @@ -219,7 +219,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; } } @@ -228,7 +228,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemBasedExpenseLineDetailEx = this.getItemBasedExpenseLineDetailEx(); IntuitAnyType rhsItemBasedExpenseLineDetailEx; rhsItemBasedExpenseLineDetailEx = that.getItemBasedExpenseLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemBasedExpenseLineDetailEx", lhsItemBasedExpenseLineDetailEx), LocatorUtils.property(thatLocator, "itemBasedExpenseLineDetailEx", rhsItemBasedExpenseLineDetailEx), lhsItemBasedExpenseLineDetailEx, rhsItemBasedExpenseLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemBasedExpenseLineDetailEx", lhsItemBasedExpenseLineDetailEx), LocatorUtils.property(thatLocator, "itemBasedExpenseLineDetailEx", rhsItemBasedExpenseLineDetailEx), lhsItemBasedExpenseLineDetailEx, rhsItemBasedExpenseLineDetailEx, (this.itemBasedExpenseLineDetailEx!= null), (that.itemBasedExpenseLineDetailEx!= null))) { return false; } } @@ -236,37 +236,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { 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)); } { 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)); } { 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 theItemBasedExpenseLineDetailEx; theItemBasedExpenseLineDetailEx = this.getItemBasedExpenseLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemBasedExpenseLineDetailEx", theItemBasedExpenseLineDetailEx), currentHashCode, theItemBasedExpenseLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemBasedExpenseLineDetailEx", theItemBasedExpenseLineDetailEx), currentHashCode, theItemBasedExpenseLineDetailEx, (this.itemBasedExpenseLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemCategoryTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemCategoryTypeEnum.java index e206a160..7fbc0ce4 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemCategoryTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemCategoryTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemComponentLine.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemComponentLine.java index dd328394..6da83b46 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemComponentLine.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemComponentLine.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -72,8 +72,7 @@ "qty", "uomRef" }) -public class ItemComponentLine - implements Serializable, Equals, HashCode +public class ItemComponentLine implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -156,8 +155,8 @@ public void setUOMRef(UOMRef value) { this.uomRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemComponentLine)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -169,7 +168,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -178,7 +177,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQty = this.getQty(); BigDecimal rhsQty; rhsQty = that.getQty(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qty", lhsQty), LocatorUtils.property(thatLocator, "qty", rhsQty), lhsQty, rhsQty)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qty", lhsQty), LocatorUtils.property(thatLocator, "qty", rhsQty), lhsQty, rhsQty, (this.qty!= null), (that.qty!= null))) { return false; } } @@ -187,7 +186,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOMRef = this.getUOMRef(); UOMRef rhsUOMRef; rhsUOMRef = that.getUOMRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef, (this.uomRef!= null), (that.uomRef!= null))) { return false; } } @@ -195,32 +194,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= null)); } { BigDecimal theQty; theQty = this.getQty(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qty", theQty), currentHashCode, theQty); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qty", theQty), currentHashCode, theQty, (this.qty!= null)); } { UOMRef theUOMRef; theUOMRef = this.getUOMRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef, (this.uomRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemGroupDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemGroupDetail.java index e3eb558d..142a4247 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemGroupDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemGroupDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -69,8 +69,7 @@ @XmlType(name = "ItemGroupDetail", propOrder = { "itemGroupLine" }) -public class ItemGroupDetail - implements Serializable, Equals, HashCode +public class ItemGroupDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -118,8 +117,8 @@ public void setItemGroupLine(List itemGroupLine) { this.itemGroupLine = itemGroupLine; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemGroupDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -131,7 +130,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemGroupLine = (((this.itemGroupLine!= null)&&(!this.itemGroupLine.isEmpty()))?this.getItemGroupLine():null); List rhsItemGroupLine; rhsItemGroupLine = (((that.itemGroupLine!= null)&&(!that.itemGroupLine.isEmpty()))?that.getItemGroupLine():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemGroupLine", lhsItemGroupLine), LocatorUtils.property(thatLocator, "itemGroupLine", rhsItemGroupLine), lhsItemGroupLine, rhsItemGroupLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemGroupLine", lhsItemGroupLine), LocatorUtils.property(thatLocator, "itemGroupLine", rhsItemGroupLine), lhsItemGroupLine, rhsItemGroupLine, ((this.itemGroupLine!= null)&&(!this.itemGroupLine.isEmpty())), ((that.itemGroupLine!= null)&&(!that.itemGroupLine.isEmpty())))) { return false; } } @@ -139,22 +138,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theItemGroupLine; theItemGroupLine = (((this.itemGroupLine!= null)&&(!this.itemGroupLine.isEmpty()))?this.getItemGroupLine():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemGroupLine", theItemGroupLine), currentHashCode, theItemGroupLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemGroupLine", theItemGroupLine), currentHashCode, theItemGroupLine, ((this.itemGroupLine!= null)&&(!this.itemGroupLine.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemLineDetail.java index c204c7b1..d79c0954 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; 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; @@ -95,8 +95,7 @@ ItemBasedExpenseLineDetail.class, SalesItemLineDetail.class }) -public abstract class ItemLineDetail - implements Serializable, Equals, HashCode +public abstract class ItemLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -387,8 +386,8 @@ public void setTaxCodeRef(ReferenceType value) { this.taxCodeRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -400,7 +399,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -409,7 +408,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; } } @@ -418,7 +417,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUnitPrice = this.getUnitPrice(); BigDecimal rhsUnitPrice; rhsUnitPrice = that.getUnitPrice(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "unitPrice", lhsUnitPrice), LocatorUtils.property(thatLocator, "unitPrice", rhsUnitPrice), lhsUnitPrice, rhsUnitPrice)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "unitPrice", lhsUnitPrice), LocatorUtils.property(thatLocator, "unitPrice", rhsUnitPrice), lhsUnitPrice, rhsUnitPrice, (this.unitPrice!= null), (that.unitPrice!= null))) { return false; } } @@ -427,7 +426,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRatePercent = this.getRatePercent(); BigDecimal rhsRatePercent; rhsRatePercent = that.getRatePercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ratePercent", lhsRatePercent), LocatorUtils.property(thatLocator, "ratePercent", rhsRatePercent), lhsRatePercent, rhsRatePercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ratePercent", lhsRatePercent), LocatorUtils.property(thatLocator, "ratePercent", rhsRatePercent), lhsRatePercent, rhsRatePercent, (this.ratePercent!= null), (that.ratePercent!= null))) { return false; } } @@ -436,7 +435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelRef = this.getPriceLevelRef(); ReferenceType rhsPriceLevelRef; rhsPriceLevelRef = that.getPriceLevelRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef, (this.priceLevelRef!= null), (that.priceLevelRef!= null))) { return false; } } @@ -445,7 +444,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; } } @@ -454,7 +453,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQty = this.getQty(); BigDecimal rhsQty; rhsQty = that.getQty(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qty", lhsQty), LocatorUtils.property(thatLocator, "qty", rhsQty), lhsQty, rhsQty)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qty", lhsQty), LocatorUtils.property(thatLocator, "qty", rhsQty), lhsQty, rhsQty, (this.qty!= null), (that.qty!= null))) { return false; } } @@ -463,7 +462,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOMRef = this.getUOMRef(); UOMRef rhsUOMRef; rhsUOMRef = that.getUOMRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uomRef", lhsUOMRef), LocatorUtils.property(thatLocator, "uomRef", rhsUOMRef), lhsUOMRef, rhsUOMRef, (this.uomRef!= null), (that.uomRef!= null))) { return false; } } @@ -472,7 +471,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemAccountRef = this.getItemAccountRef(); ReferenceType rhsItemAccountRef; rhsItemAccountRef = that.getItemAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAccountRef", lhsItemAccountRef), LocatorUtils.property(thatLocator, "itemAccountRef", rhsItemAccountRef), lhsItemAccountRef, rhsItemAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemAccountRef", lhsItemAccountRef), LocatorUtils.property(thatLocator, "itemAccountRef", rhsItemAccountRef), lhsItemAccountRef, rhsItemAccountRef, (this.itemAccountRef!= null), (that.itemAccountRef!= null))) { return false; } } @@ -481,7 +480,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInventorySiteRef = this.getInventorySiteRef(); ReferenceType rhsInventorySiteRef; rhsInventorySiteRef = that.getInventorySiteRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteRef", lhsInventorySiteRef), LocatorUtils.property(thatLocator, "inventorySiteRef", rhsInventorySiteRef), lhsInventorySiteRef, rhsInventorySiteRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteRef", lhsInventorySiteRef), LocatorUtils.property(thatLocator, "inventorySiteRef", rhsInventorySiteRef), lhsInventorySiteRef, rhsInventorySiteRef, (this.inventorySiteRef!= null), (that.inventorySiteRef!= null))) { return false; } } @@ -490,7 +489,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; } } @@ -498,72 +497,72 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= 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)); } { BigDecimal theUnitPrice; theUnitPrice = this.getUnitPrice(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unitPrice", theUnitPrice), currentHashCode, theUnitPrice); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unitPrice", theUnitPrice), currentHashCode, theUnitPrice, (this.unitPrice!= null)); } { BigDecimal theRatePercent; theRatePercent = this.getRatePercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ratePercent", theRatePercent), currentHashCode, theRatePercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ratePercent", theRatePercent), currentHashCode, theRatePercent, (this.ratePercent!= null)); } { ReferenceType thePriceLevelRef; thePriceLevelRef = this.getPriceLevelRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef, (this.priceLevelRef!= 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 theQty; theQty = this.getQty(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qty", theQty), currentHashCode, theQty); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qty", theQty), currentHashCode, theQty, (this.qty!= null)); } { UOMRef theUOMRef; theUOMRef = this.getUOMRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomRef", theUOMRef), currentHashCode, theUOMRef, (this.uomRef!= null)); } { ReferenceType theItemAccountRef; theItemAccountRef = this.getItemAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAccountRef", theItemAccountRef), currentHashCode, theItemAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemAccountRef", theItemAccountRef), currentHashCode, theItemAccountRef, (this.itemAccountRef!= null)); } { ReferenceType theInventorySiteRef; theInventorySiteRef = this.getInventorySiteRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteRef", theInventorySiteRef), currentHashCode, theInventorySiteRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteRef", theInventorySiteRef), currentHashCode, theInventorySiteRef, (this.inventorySiteRef!= 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)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemReceiptLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemReceiptLineDetail.java index 3b44816c..96f91da5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemReceiptLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemReceiptLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -67,8 +67,7 @@ @XmlType(name = "ItemReceiptLineDetail", propOrder = { "itemReceiptLineDetailEx" }) -public class ItemReceiptLineDetail - implements Serializable, Equals, HashCode +public class ItemReceiptLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -99,8 +98,8 @@ public void setItemReceiptLineDetailEx(IntuitAnyType value) { this.itemReceiptLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ItemReceiptLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -112,7 +111,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemReceiptLineDetailEx = this.getItemReceiptLineDetailEx(); IntuitAnyType rhsItemReceiptLineDetailEx; rhsItemReceiptLineDetailEx = that.getItemReceiptLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemReceiptLineDetailEx", lhsItemReceiptLineDetailEx), LocatorUtils.property(thatLocator, "itemReceiptLineDetailEx", rhsItemReceiptLineDetailEx), lhsItemReceiptLineDetailEx, rhsItemReceiptLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemReceiptLineDetailEx", lhsItemReceiptLineDetailEx), LocatorUtils.property(thatLocator, "itemReceiptLineDetailEx", rhsItemReceiptLineDetailEx), lhsItemReceiptLineDetailEx, rhsItemReceiptLineDetailEx, (this.itemReceiptLineDetailEx!= null), (that.itemReceiptLineDetailEx!= null))) { return false; } } @@ -120,22 +119,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { IntuitAnyType theItemReceiptLineDetailEx; theItemReceiptLineDetailEx = this.getItemReceiptLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemReceiptLineDetailEx", theItemReceiptLineDetailEx), currentHashCode, theItemReceiptLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemReceiptLineDetailEx", theItemReceiptLineDetailEx), currentHashCode, theItemReceiptLineDetailEx, (this.itemReceiptLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemTypeEnum.java index 0464d64a..0ba8af9b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ItemTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobInfo.java index 0af9a658..914d3851 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -80,8 +80,7 @@ "description", "jobTypeRef" }) -public class JobInfo - implements Serializable, Equals, HashCode +public class JobInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -248,8 +247,8 @@ public void setJobTypeRef(ReferenceType value) { this.jobTypeRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof JobInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -261,7 +260,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); JobStatusEnum rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -270,7 +269,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartDate = this.getStartDate(); Date rhsStartDate; rhsStartDate = that.getStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate, (this.startDate!= null), (that.startDate!= null))) { return false; } } @@ -279,7 +278,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsProjectedEndDate = this.getProjectedEndDate(); Date rhsProjectedEndDate; rhsProjectedEndDate = that.getProjectedEndDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "projectedEndDate", lhsProjectedEndDate), LocatorUtils.property(thatLocator, "projectedEndDate", rhsProjectedEndDate), lhsProjectedEndDate, rhsProjectedEndDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "projectedEndDate", lhsProjectedEndDate), LocatorUtils.property(thatLocator, "projectedEndDate", rhsProjectedEndDate), lhsProjectedEndDate, rhsProjectedEndDate, (this.projectedEndDate!= null), (that.projectedEndDate!= null))) { return false; } } @@ -288,7 +287,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndDate = this.getEndDate(); Date rhsEndDate; rhsEndDate = that.getEndDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate, (this.endDate!= null), (that.endDate!= null))) { return false; } } @@ -297,7 +296,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -306,7 +305,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJobTypeRef = this.getJobTypeRef(); ReferenceType rhsJobTypeRef; rhsJobTypeRef = that.getJobTypeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "jobTypeRef", lhsJobTypeRef), LocatorUtils.property(thatLocator, "jobTypeRef", rhsJobTypeRef), lhsJobTypeRef, rhsJobTypeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "jobTypeRef", lhsJobTypeRef), LocatorUtils.property(thatLocator, "jobTypeRef", rhsJobTypeRef), lhsJobTypeRef, rhsJobTypeRef, (this.jobTypeRef!= null), (that.jobTypeRef!= null))) { return false; } } @@ -314,47 +313,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { JobStatusEnum theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } { Date theStartDate; theStartDate = this.getStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate, (this.startDate!= null)); } { Date theProjectedEndDate; theProjectedEndDate = this.getProjectedEndDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "projectedEndDate", theProjectedEndDate), currentHashCode, theProjectedEndDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "projectedEndDate", theProjectedEndDate), currentHashCode, theProjectedEndDate, (this.projectedEndDate!= null)); } { Date theEndDate; theEndDate = this.getEndDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate, (this.endDate!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { ReferenceType theJobTypeRef; theJobTypeRef = this.getJobTypeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "jobTypeRef", theJobTypeRef), currentHashCode, theJobTypeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "jobTypeRef", theJobTypeRef), currentHashCode, theJobTypeRef, (this.jobTypeRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobStatusEnum.java index 49b27358..619791d7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobType.java index 3abe4a9d..b0ca5c7d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JobType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -74,7 +74,7 @@ }) public class JobType extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -183,8 +183,8 @@ public void setActive(Boolean value) { this.active = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof JobType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -199,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -208,7 +208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -217,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -226,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -234,37 +234,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCode.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCode.java index 01b14624..84753676 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCode.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCode.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -75,7 +75,7 @@ }) public class JournalCode extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -210,8 +210,8 @@ public void setJournalCodeEx(IntuitAnyType value) { this.journalCodeEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof JournalCode)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -226,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -235,7 +235,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -244,7 +244,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -253,7 +253,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -262,7 +262,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalCodeEx = this.getJournalCodeEx(); IntuitAnyType rhsJournalCodeEx; rhsJournalCodeEx = that.getJournalCodeEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeEx", lhsJournalCodeEx), LocatorUtils.property(thatLocator, "journalCodeEx", rhsJournalCodeEx), lhsJournalCodeEx, rhsJournalCodeEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeEx", lhsJournalCodeEx), LocatorUtils.property(thatLocator, "journalCodeEx", rhsJournalCodeEx), lhsJournalCodeEx, rhsJournalCodeEx, (this.journalCodeEx!= null), (that.journalCodeEx!= null))) { return false; } } @@ -270,42 +270,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { IntuitAnyType theJournalCodeEx; theJournalCodeEx = this.getJournalCodeEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeEx", theJournalCodeEx), currentHashCode, theJournalCodeEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeEx", theJournalCodeEx), currentHashCode, theJournalCodeEx, (this.journalCodeEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCodeTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCodeTypeEnum.java index 7763e552..de9be061 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCodeTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalCodeTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntry.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntry.java index 45968e68..2b80657c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntry.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntry.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -78,7 +78,7 @@ }) public class JournalEntry extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -239,8 +239,8 @@ public void setJournalEntryEx(IntuitAnyType value) { this.journalEntryEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof JournalEntry)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -255,7 +255,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAdjustment = this.isAdjustment(); Boolean rhsAdjustment; rhsAdjustment = that.isAdjustment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "adjustment", lhsAdjustment), LocatorUtils.property(thatLocator, "adjustment", rhsAdjustment), lhsAdjustment, rhsAdjustment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "adjustment", lhsAdjustment), LocatorUtils.property(thatLocator, "adjustment", rhsAdjustment), lhsAdjustment, rhsAdjustment, (this.adjustment!= null), (that.adjustment!= null))) { return false; } } @@ -264,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeCurrencyAdjustment = this.isHomeCurrencyAdjustment(); Boolean rhsHomeCurrencyAdjustment; rhsHomeCurrencyAdjustment = that.isHomeCurrencyAdjustment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeCurrencyAdjustment", lhsHomeCurrencyAdjustment), LocatorUtils.property(thatLocator, "homeCurrencyAdjustment", rhsHomeCurrencyAdjustment), lhsHomeCurrencyAdjustment, rhsHomeCurrencyAdjustment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeCurrencyAdjustment", lhsHomeCurrencyAdjustment), LocatorUtils.property(thatLocator, "homeCurrencyAdjustment", rhsHomeCurrencyAdjustment), lhsHomeCurrencyAdjustment, rhsHomeCurrencyAdjustment, (this.homeCurrencyAdjustment!= null), (that.homeCurrencyAdjustment!= null))) { return false; } } @@ -273,7 +273,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEnteredInHomeCurrency = this.isEnteredInHomeCurrency(); Boolean rhsEnteredInHomeCurrency; rhsEnteredInHomeCurrency = that.isEnteredInHomeCurrency(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "enteredInHomeCurrency", lhsEnteredInHomeCurrency), LocatorUtils.property(thatLocator, "enteredInHomeCurrency", rhsEnteredInHomeCurrency), lhsEnteredInHomeCurrency, rhsEnteredInHomeCurrency)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "enteredInHomeCurrency", lhsEnteredInHomeCurrency), LocatorUtils.property(thatLocator, "enteredInHomeCurrency", rhsEnteredInHomeCurrency), lhsEnteredInHomeCurrency, rhsEnteredInHomeCurrency, (this.enteredInHomeCurrency!= null), (that.enteredInHomeCurrency!= null))) { return false; } } @@ -282,7 +282,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -291,7 +291,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeTotalAmt = this.getHomeTotalAmt(); BigDecimal rhsHomeTotalAmt; rhsHomeTotalAmt = that.getHomeTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt, (this.homeTotalAmt!= null), (that.homeTotalAmt!= null))) { return false; } } @@ -300,7 +300,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalEntryEx = this.getJournalEntryEx(); IntuitAnyType rhsJournalEntryEx; rhsJournalEntryEx = that.getJournalEntryEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryEx", lhsJournalEntryEx), LocatorUtils.property(thatLocator, "journalEntryEx", rhsJournalEntryEx), lhsJournalEntryEx, rhsJournalEntryEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryEx", lhsJournalEntryEx), LocatorUtils.property(thatLocator, "journalEntryEx", rhsJournalEntryEx), lhsJournalEntryEx, rhsJournalEntryEx, (this.journalEntryEx!= null), (that.journalEntryEx!= null))) { return false; } } @@ -308,47 +308,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theAdjustment; theAdjustment = this.isAdjustment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "adjustment", theAdjustment), currentHashCode, theAdjustment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "adjustment", theAdjustment), currentHashCode, theAdjustment, (this.adjustment!= null)); } { Boolean theHomeCurrencyAdjustment; theHomeCurrencyAdjustment = this.isHomeCurrencyAdjustment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeCurrencyAdjustment", theHomeCurrencyAdjustment), currentHashCode, theHomeCurrencyAdjustment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeCurrencyAdjustment", theHomeCurrencyAdjustment), currentHashCode, theHomeCurrencyAdjustment, (this.homeCurrencyAdjustment!= null)); } { Boolean theEnteredInHomeCurrency; theEnteredInHomeCurrency = this.isEnteredInHomeCurrency(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enteredInHomeCurrency", theEnteredInHomeCurrency), currentHashCode, theEnteredInHomeCurrency); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enteredInHomeCurrency", theEnteredInHomeCurrency), currentHashCode, theEnteredInHomeCurrency, (this.enteredInHomeCurrency!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { BigDecimal theHomeTotalAmt; theHomeTotalAmt = this.getHomeTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt, (this.homeTotalAmt!= null)); } { IntuitAnyType theJournalEntryEx; theJournalEntryEx = this.getJournalEntryEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryEx", theJournalEntryEx), currentHashCode, theJournalEntryEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryEx", theJournalEntryEx), currentHashCode, theJournalEntryEx, (this.journalEntryEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntryLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntryLineDetail.java index 9fc34789..6de9688d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntryLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/JournalEntryLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -88,8 +88,7 @@ "journalCodeRef", "journalEntryLineDetailEx" }) -public class JournalEntryLineDetail - implements Serializable, Equals, HashCode +public class JournalEntryLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -380,8 +379,8 @@ public void setJournalEntryLineDetailEx(IntuitAnyType value) { this.journalEntryLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof JournalEntryLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -393,7 +392,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPostingType = this.getPostingType(); PostingTypeEnum rhsPostingType; rhsPostingType = that.getPostingType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "postingType", lhsPostingType), LocatorUtils.property(thatLocator, "postingType", rhsPostingType), lhsPostingType, rhsPostingType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "postingType", lhsPostingType), LocatorUtils.property(thatLocator, "postingType", rhsPostingType), lhsPostingType, rhsPostingType, (this.postingType!= null), (that.postingType!= null))) { return false; } } @@ -402,7 +401,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntity = this.getEntity(); EntityTypeRef rhsEntity; rhsEntity = that.getEntity(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entity", lhsEntity), LocatorUtils.property(thatLocator, "entity", rhsEntity), lhsEntity, rhsEntity)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entity", lhsEntity), LocatorUtils.property(thatLocator, "entity", rhsEntity), lhsEntity, rhsEntity, (this.entity!= null), (that.entity!= null))) { return false; } } @@ -411,7 +410,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; } } @@ -420,7 +419,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; } } @@ -429,7 +428,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentRef = this.getDepartmentRef(); ReferenceType rhsDepartmentRef; rhsDepartmentRef = that.getDepartmentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef, (this.departmentRef!= null), (that.departmentRef!= null))) { return false; } } @@ -438,7 +437,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; } } @@ -447,7 +446,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxApplicableOn = this.getTaxApplicableOn(); TaxApplicableOnEnum rhsTaxApplicableOn; rhsTaxApplicableOn = that.getTaxApplicableOn(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn, (this.taxApplicableOn!= null), (that.taxApplicableOn!= null))) { return false; } } @@ -456,7 +455,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; } } @@ -465,7 +464,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; } } @@ -474,7 +473,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalCodeRef = this.getJournalCodeRef(); ReferenceType rhsJournalCodeRef; rhsJournalCodeRef = that.getJournalCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeRef", lhsJournalCodeRef), LocatorUtils.property(thatLocator, "journalCodeRef", rhsJournalCodeRef), lhsJournalCodeRef, rhsJournalCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalCodeRef", lhsJournalCodeRef), LocatorUtils.property(thatLocator, "journalCodeRef", rhsJournalCodeRef), lhsJournalCodeRef, rhsJournalCodeRef, (this.journalCodeRef!= null), (that.journalCodeRef!= null))) { return false; } } @@ -483,7 +482,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalEntryLineDetailEx = this.getJournalEntryLineDetailEx(); IntuitAnyType rhsJournalEntryLineDetailEx; rhsJournalEntryLineDetailEx = that.getJournalEntryLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryLineDetailEx", lhsJournalEntryLineDetailEx), LocatorUtils.property(thatLocator, "journalEntryLineDetailEx", rhsJournalEntryLineDetailEx), lhsJournalEntryLineDetailEx, rhsJournalEntryLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryLineDetailEx", lhsJournalEntryLineDetailEx), LocatorUtils.property(thatLocator, "journalEntryLineDetailEx", rhsJournalEntryLineDetailEx), lhsJournalEntryLineDetailEx, rhsJournalEntryLineDetailEx, (this.journalEntryLineDetailEx!= null), (that.journalEntryLineDetailEx!= null))) { return false; } } @@ -491,72 +490,72 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { PostingTypeEnum thePostingType; thePostingType = this.getPostingType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postingType", thePostingType), currentHashCode, thePostingType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postingType", thePostingType), currentHashCode, thePostingType, (this.postingType!= null)); } { EntityTypeRef theEntity; theEntity = this.getEntity(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entity", theEntity), currentHashCode, theEntity); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entity", theEntity), currentHashCode, theEntity, (this.entity!= 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)); } { 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 theDepartmentRef; theDepartmentRef = this.getDepartmentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef, (this.departmentRef!= 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)); } { TaxApplicableOnEnum theTaxApplicableOn; theTaxApplicableOn = this.getTaxApplicableOn(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn, (this.taxApplicableOn!= 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)); } { 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)); } { ReferenceType theJournalCodeRef; theJournalCodeRef = this.getJournalCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeRef", theJournalCodeRef), currentHashCode, theJournalCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalCodeRef", theJournalCodeRef), currentHashCode, theJournalCodeRef, (this.journalCodeRef!= null)); } { IntuitAnyType theJournalEntryLineDetailEx; theJournalEntryLineDetailEx = this.getJournalEntryLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryLineDetailEx", theJournalEntryLineDetailEx), currentHashCode, theJournalEntryLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryLineDetailEx", theJournalEntryLineDetailEx), currentHashCode, theJournalEntryLineDetailEx, (this.journalEntryLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Line.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Line.java index 6371bc06..4e24489f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Line.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Line.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; 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; @@ -118,8 +118,7 @@ "customField", "lineEx" }) -public class Line - implements Serializable, Equals, HashCode +public class Line implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -757,8 +756,8 @@ public void setCustomField(List customField) { this.customField = customField; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Line)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -770,7 +769,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -779,7 +778,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLineNum = this.getLineNum(); BigInteger rhsLineNum; rhsLineNum = that.getLineNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lineNum", lhsLineNum), LocatorUtils.property(thatLocator, "lineNum", rhsLineNum), lhsLineNum, rhsLineNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lineNum", lhsLineNum), LocatorUtils.property(thatLocator, "lineNum", rhsLineNum), lhsLineNum, rhsLineNum, (this.lineNum!= null), (that.lineNum!= null))) { return false; } } @@ -788,7 +787,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -797,7 +796,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -806,7 +805,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLinkedTxn = (((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))?this.getLinkedTxn():null); List rhsLinkedTxn; rhsLinkedTxn = (((that.linkedTxn!= null)&&(!that.linkedTxn.isEmpty()))?that.getLinkedTxn():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "linkedTxn", lhsLinkedTxn), LocatorUtils.property(thatLocator, "linkedTxn", rhsLinkedTxn), lhsLinkedTxn, rhsLinkedTxn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "linkedTxn", lhsLinkedTxn), LocatorUtils.property(thatLocator, "linkedTxn", rhsLinkedTxn), lhsLinkedTxn, rhsLinkedTxn, ((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty())), ((that.linkedTxn!= null)&&(!that.linkedTxn.isEmpty())))) { return false; } } @@ -815,7 +814,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDetailType = this.getDetailType(); LineDetailTypeEnum rhsDetailType; rhsDetailType = that.getDetailType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "detailType", lhsDetailType), LocatorUtils.property(thatLocator, "detailType", rhsDetailType), lhsDetailType, rhsDetailType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "detailType", lhsDetailType), LocatorUtils.property(thatLocator, "detailType", rhsDetailType), lhsDetailType, rhsDetailType, (this.detailType!= null), (that.detailType!= null))) { return false; } } @@ -824,7 +823,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentLineDetail = this.getPaymentLineDetail(); PaymentLineDetail rhsPaymentLineDetail; rhsPaymentLineDetail = that.getPaymentLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentLineDetail", lhsPaymentLineDetail), LocatorUtils.property(thatLocator, "paymentLineDetail", rhsPaymentLineDetail), lhsPaymentLineDetail, rhsPaymentLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentLineDetail", lhsPaymentLineDetail), LocatorUtils.property(thatLocator, "paymentLineDetail", rhsPaymentLineDetail), lhsPaymentLineDetail, rhsPaymentLineDetail, (this.paymentLineDetail!= null), (that.paymentLineDetail!= null))) { return false; } } @@ -833,7 +832,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountLineDetail = this.getDiscountLineDetail(); DiscountLineDetail rhsDiscountLineDetail; rhsDiscountLineDetail = that.getDiscountLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountLineDetail", lhsDiscountLineDetail), LocatorUtils.property(thatLocator, "discountLineDetail", rhsDiscountLineDetail), lhsDiscountLineDetail, rhsDiscountLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountLineDetail", lhsDiscountLineDetail), LocatorUtils.property(thatLocator, "discountLineDetail", rhsDiscountLineDetail), lhsDiscountLineDetail, rhsDiscountLineDetail, (this.discountLineDetail!= null), (that.discountLineDetail!= null))) { return false; } } @@ -842,7 +841,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxLineDetail = this.getTaxLineDetail(); TaxLineDetail rhsTaxLineDetail; rhsTaxLineDetail = that.getTaxLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLineDetail", lhsTaxLineDetail), LocatorUtils.property(thatLocator, "taxLineDetail", rhsTaxLineDetail), lhsTaxLineDetail, rhsTaxLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLineDetail", lhsTaxLineDetail), LocatorUtils.property(thatLocator, "taxLineDetail", rhsTaxLineDetail), lhsTaxLineDetail, rhsTaxLineDetail, (this.taxLineDetail!= null), (that.taxLineDetail!= null))) { return false; } } @@ -851,7 +850,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesItemLineDetail = this.getSalesItemLineDetail(); SalesItemLineDetail rhsSalesItemLineDetail; rhsSalesItemLineDetail = that.getSalesItemLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesItemLineDetail", lhsSalesItemLineDetail), LocatorUtils.property(thatLocator, "salesItemLineDetail", rhsSalesItemLineDetail), lhsSalesItemLineDetail, rhsSalesItemLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesItemLineDetail", lhsSalesItemLineDetail), LocatorUtils.property(thatLocator, "salesItemLineDetail", rhsSalesItemLineDetail), lhsSalesItemLineDetail, rhsSalesItemLineDetail, (this.salesItemLineDetail!= null), (that.salesItemLineDetail!= null))) { return false; } } @@ -860,7 +859,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescriptionLineDetail = this.getDescriptionLineDetail(); DescriptionLineDetail rhsDescriptionLineDetail; rhsDescriptionLineDetail = that.getDescriptionLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "descriptionLineDetail", lhsDescriptionLineDetail), LocatorUtils.property(thatLocator, "descriptionLineDetail", rhsDescriptionLineDetail), lhsDescriptionLineDetail, rhsDescriptionLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "descriptionLineDetail", lhsDescriptionLineDetail), LocatorUtils.property(thatLocator, "descriptionLineDetail", rhsDescriptionLineDetail), lhsDescriptionLineDetail, rhsDescriptionLineDetail, (this.descriptionLineDetail!= null), (that.descriptionLineDetail!= null))) { return false; } } @@ -869,7 +868,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemBasedExpenseLineDetail = this.getItemBasedExpenseLineDetail(); ItemBasedExpenseLineDetail rhsItemBasedExpenseLineDetail; rhsItemBasedExpenseLineDetail = that.getItemBasedExpenseLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemBasedExpenseLineDetail", lhsItemBasedExpenseLineDetail), LocatorUtils.property(thatLocator, "itemBasedExpenseLineDetail", rhsItemBasedExpenseLineDetail), lhsItemBasedExpenseLineDetail, rhsItemBasedExpenseLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemBasedExpenseLineDetail", lhsItemBasedExpenseLineDetail), LocatorUtils.property(thatLocator, "itemBasedExpenseLineDetail", rhsItemBasedExpenseLineDetail), lhsItemBasedExpenseLineDetail, rhsItemBasedExpenseLineDetail, (this.itemBasedExpenseLineDetail!= null), (that.itemBasedExpenseLineDetail!= null))) { return false; } } @@ -878,7 +877,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountBasedExpenseLineDetail = this.getAccountBasedExpenseLineDetail(); AccountBasedExpenseLineDetail rhsAccountBasedExpenseLineDetail; rhsAccountBasedExpenseLineDetail = that.getAccountBasedExpenseLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountBasedExpenseLineDetail", lhsAccountBasedExpenseLineDetail), LocatorUtils.property(thatLocator, "accountBasedExpenseLineDetail", rhsAccountBasedExpenseLineDetail), lhsAccountBasedExpenseLineDetail, rhsAccountBasedExpenseLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountBasedExpenseLineDetail", lhsAccountBasedExpenseLineDetail), LocatorUtils.property(thatLocator, "accountBasedExpenseLineDetail", rhsAccountBasedExpenseLineDetail), lhsAccountBasedExpenseLineDetail, rhsAccountBasedExpenseLineDetail, (this.accountBasedExpenseLineDetail!= null), (that.accountBasedExpenseLineDetail!= null))) { return false; } } @@ -887,7 +886,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositLineDetail = this.getDepositLineDetail(); DepositLineDetail rhsDepositLineDetail; rhsDepositLineDetail = that.getDepositLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositLineDetail", lhsDepositLineDetail), LocatorUtils.property(thatLocator, "depositLineDetail", rhsDepositLineDetail), lhsDepositLineDetail, rhsDepositLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositLineDetail", lhsDepositLineDetail), LocatorUtils.property(thatLocator, "depositLineDetail", rhsDepositLineDetail), lhsDepositLineDetail, rhsDepositLineDetail, (this.depositLineDetail!= null), (that.depositLineDetail!= null))) { return false; } } @@ -896,7 +895,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseOrderItemLineDetail = this.getPurchaseOrderItemLineDetail(); PurchaseOrderItemLineDetail rhsPurchaseOrderItemLineDetail; rhsPurchaseOrderItemLineDetail = that.getPurchaseOrderItemLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderItemLineDetail", lhsPurchaseOrderItemLineDetail), LocatorUtils.property(thatLocator, "purchaseOrderItemLineDetail", rhsPurchaseOrderItemLineDetail), lhsPurchaseOrderItemLineDetail, rhsPurchaseOrderItemLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderItemLineDetail", lhsPurchaseOrderItemLineDetail), LocatorUtils.property(thatLocator, "purchaseOrderItemLineDetail", rhsPurchaseOrderItemLineDetail), lhsPurchaseOrderItemLineDetail, rhsPurchaseOrderItemLineDetail, (this.purchaseOrderItemLineDetail!= null), (that.purchaseOrderItemLineDetail!= null))) { return false; } } @@ -905,7 +904,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesOrderItemLineDetail = this.getSalesOrderItemLineDetail(); SalesOrderItemLineDetail rhsSalesOrderItemLineDetail; rhsSalesOrderItemLineDetail = that.getSalesOrderItemLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesOrderItemLineDetail", lhsSalesOrderItemLineDetail), LocatorUtils.property(thatLocator, "salesOrderItemLineDetail", rhsSalesOrderItemLineDetail), lhsSalesOrderItemLineDetail, rhsSalesOrderItemLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesOrderItemLineDetail", lhsSalesOrderItemLineDetail), LocatorUtils.property(thatLocator, "salesOrderItemLineDetail", rhsSalesOrderItemLineDetail), lhsSalesOrderItemLineDetail, rhsSalesOrderItemLineDetail, (this.salesOrderItemLineDetail!= null), (that.salesOrderItemLineDetail!= null))) { return false; } } @@ -914,7 +913,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemReceiptLineDetail = this.getItemReceiptLineDetail(); ItemReceiptLineDetail rhsItemReceiptLineDetail; rhsItemReceiptLineDetail = that.getItemReceiptLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemReceiptLineDetail", lhsItemReceiptLineDetail), LocatorUtils.property(thatLocator, "itemReceiptLineDetail", rhsItemReceiptLineDetail), lhsItemReceiptLineDetail, rhsItemReceiptLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemReceiptLineDetail", lhsItemReceiptLineDetail), LocatorUtils.property(thatLocator, "itemReceiptLineDetail", rhsItemReceiptLineDetail), lhsItemReceiptLineDetail, rhsItemReceiptLineDetail, (this.itemReceiptLineDetail!= null), (that.itemReceiptLineDetail!= null))) { return false; } } @@ -923,7 +922,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsJournalEntryLineDetail = this.getJournalEntryLineDetail(); JournalEntryLineDetail rhsJournalEntryLineDetail; rhsJournalEntryLineDetail = that.getJournalEntryLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryLineDetail", lhsJournalEntryLineDetail), LocatorUtils.property(thatLocator, "journalEntryLineDetail", rhsJournalEntryLineDetail), lhsJournalEntryLineDetail, rhsJournalEntryLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "journalEntryLineDetail", lhsJournalEntryLineDetail), LocatorUtils.property(thatLocator, "journalEntryLineDetail", rhsJournalEntryLineDetail), lhsJournalEntryLineDetail, rhsJournalEntryLineDetail, (this.journalEntryLineDetail!= null), (that.journalEntryLineDetail!= null))) { return false; } } @@ -932,7 +931,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGroupLineDetail = this.getGroupLineDetail(); GroupLineDetail rhsGroupLineDetail; rhsGroupLineDetail = that.getGroupLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "groupLineDetail", lhsGroupLineDetail), LocatorUtils.property(thatLocator, "groupLineDetail", rhsGroupLineDetail), lhsGroupLineDetail, rhsGroupLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "groupLineDetail", lhsGroupLineDetail), LocatorUtils.property(thatLocator, "groupLineDetail", rhsGroupLineDetail), lhsGroupLineDetail, rhsGroupLineDetail, (this.groupLineDetail!= null), (that.groupLineDetail!= null))) { return false; } } @@ -941,7 +940,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubTotalLineDetail = this.getSubTotalLineDetail(); SubTotalLineDetail rhsSubTotalLineDetail; rhsSubTotalLineDetail = that.getSubTotalLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subTotalLineDetail", lhsSubTotalLineDetail), LocatorUtils.property(thatLocator, "subTotalLineDetail", rhsSubTotalLineDetail), lhsSubTotalLineDetail, rhsSubTotalLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subTotalLineDetail", lhsSubTotalLineDetail), LocatorUtils.property(thatLocator, "subTotalLineDetail", rhsSubTotalLineDetail), lhsSubTotalLineDetail, rhsSubTotalLineDetail, (this.subTotalLineDetail!= null), (that.subTotalLineDetail!= null))) { return false; } } @@ -950,7 +949,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSLineDetail = this.getTDSLineDetail(); TDSLineDetail rhsTDSLineDetail; rhsTDSLineDetail = that.getTDSLineDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsLineDetail", lhsTDSLineDetail), LocatorUtils.property(thatLocator, "tdsLineDetail", rhsTDSLineDetail), lhsTDSLineDetail, rhsTDSLineDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsLineDetail", lhsTDSLineDetail), LocatorUtils.property(thatLocator, "tdsLineDetail", rhsTDSLineDetail), lhsTDSLineDetail, rhsTDSLineDetail, (this.tdsLineDetail!= null), (that.tdsLineDetail!= null))) { return false; } } @@ -959,7 +958,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); List rhsCustomField; rhsCustomField = (((that.customField!= null)&&(!that.customField.isEmpty()))?that.getCustomField():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField, ((this.customField!= null)&&(!this.customField.isEmpty())), ((that.customField!= null)&&(!that.customField.isEmpty())))) { return false; } } @@ -968,7 +967,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLineEx = this.getLineEx(); IntuitAnyType rhsLineEx; rhsLineEx = that.getLineEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lineEx", lhsLineEx), LocatorUtils.property(thatLocator, "lineEx", rhsLineEx), lhsLineEx, rhsLineEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lineEx", lhsLineEx), LocatorUtils.property(thatLocator, "lineEx", rhsLineEx), lhsLineEx, rhsLineEx, (this.lineEx!= null), (that.lineEx!= null))) { return false; } } @@ -976,132 +975,132 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { BigInteger theLineNum; theLineNum = this.getLineNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineNum", theLineNum), currentHashCode, theLineNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineNum", theLineNum), currentHashCode, theLineNum, (this.lineNum!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } { List theLinkedTxn; theLinkedTxn = (((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))?this.getLinkedTxn():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "linkedTxn", theLinkedTxn), currentHashCode, theLinkedTxn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "linkedTxn", theLinkedTxn), currentHashCode, theLinkedTxn, ((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))); } { LineDetailTypeEnum theDetailType; theDetailType = this.getDetailType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detailType", theDetailType), currentHashCode, theDetailType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detailType", theDetailType), currentHashCode, theDetailType, (this.detailType!= null)); } { PaymentLineDetail thePaymentLineDetail; thePaymentLineDetail = this.getPaymentLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentLineDetail", thePaymentLineDetail), currentHashCode, thePaymentLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentLineDetail", thePaymentLineDetail), currentHashCode, thePaymentLineDetail, (this.paymentLineDetail!= null)); } { DiscountLineDetail theDiscountLineDetail; theDiscountLineDetail = this.getDiscountLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountLineDetail", theDiscountLineDetail), currentHashCode, theDiscountLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountLineDetail", theDiscountLineDetail), currentHashCode, theDiscountLineDetail, (this.discountLineDetail!= null)); } { TaxLineDetail theTaxLineDetail; theTaxLineDetail = this.getTaxLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLineDetail", theTaxLineDetail), currentHashCode, theTaxLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLineDetail", theTaxLineDetail), currentHashCode, theTaxLineDetail, (this.taxLineDetail!= null)); } { SalesItemLineDetail theSalesItemLineDetail; theSalesItemLineDetail = this.getSalesItemLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesItemLineDetail", theSalesItemLineDetail), currentHashCode, theSalesItemLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesItemLineDetail", theSalesItemLineDetail), currentHashCode, theSalesItemLineDetail, (this.salesItemLineDetail!= null)); } { DescriptionLineDetail theDescriptionLineDetail; theDescriptionLineDetail = this.getDescriptionLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "descriptionLineDetail", theDescriptionLineDetail), currentHashCode, theDescriptionLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "descriptionLineDetail", theDescriptionLineDetail), currentHashCode, theDescriptionLineDetail, (this.descriptionLineDetail!= null)); } { ItemBasedExpenseLineDetail theItemBasedExpenseLineDetail; theItemBasedExpenseLineDetail = this.getItemBasedExpenseLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemBasedExpenseLineDetail", theItemBasedExpenseLineDetail), currentHashCode, theItemBasedExpenseLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemBasedExpenseLineDetail", theItemBasedExpenseLineDetail), currentHashCode, theItemBasedExpenseLineDetail, (this.itemBasedExpenseLineDetail!= null)); } { AccountBasedExpenseLineDetail theAccountBasedExpenseLineDetail; theAccountBasedExpenseLineDetail = this.getAccountBasedExpenseLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountBasedExpenseLineDetail", theAccountBasedExpenseLineDetail), currentHashCode, theAccountBasedExpenseLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountBasedExpenseLineDetail", theAccountBasedExpenseLineDetail), currentHashCode, theAccountBasedExpenseLineDetail, (this.accountBasedExpenseLineDetail!= null)); } { DepositLineDetail theDepositLineDetail; theDepositLineDetail = this.getDepositLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositLineDetail", theDepositLineDetail), currentHashCode, theDepositLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositLineDetail", theDepositLineDetail), currentHashCode, theDepositLineDetail, (this.depositLineDetail!= null)); } { PurchaseOrderItemLineDetail thePurchaseOrderItemLineDetail; thePurchaseOrderItemLineDetail = this.getPurchaseOrderItemLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderItemLineDetail", thePurchaseOrderItemLineDetail), currentHashCode, thePurchaseOrderItemLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderItemLineDetail", thePurchaseOrderItemLineDetail), currentHashCode, thePurchaseOrderItemLineDetail, (this.purchaseOrderItemLineDetail!= null)); } { SalesOrderItemLineDetail theSalesOrderItemLineDetail; theSalesOrderItemLineDetail = this.getSalesOrderItemLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesOrderItemLineDetail", theSalesOrderItemLineDetail), currentHashCode, theSalesOrderItemLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesOrderItemLineDetail", theSalesOrderItemLineDetail), currentHashCode, theSalesOrderItemLineDetail, (this.salesOrderItemLineDetail!= null)); } { ItemReceiptLineDetail theItemReceiptLineDetail; theItemReceiptLineDetail = this.getItemReceiptLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemReceiptLineDetail", theItemReceiptLineDetail), currentHashCode, theItemReceiptLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemReceiptLineDetail", theItemReceiptLineDetail), currentHashCode, theItemReceiptLineDetail, (this.itemReceiptLineDetail!= null)); } { JournalEntryLineDetail theJournalEntryLineDetail; theJournalEntryLineDetail = this.getJournalEntryLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryLineDetail", theJournalEntryLineDetail), currentHashCode, theJournalEntryLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "journalEntryLineDetail", theJournalEntryLineDetail), currentHashCode, theJournalEntryLineDetail, (this.journalEntryLineDetail!= null)); } { GroupLineDetail theGroupLineDetail; theGroupLineDetail = this.getGroupLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupLineDetail", theGroupLineDetail), currentHashCode, theGroupLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "groupLineDetail", theGroupLineDetail), currentHashCode, theGroupLineDetail, (this.groupLineDetail!= null)); } { SubTotalLineDetail theSubTotalLineDetail; theSubTotalLineDetail = this.getSubTotalLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subTotalLineDetail", theSubTotalLineDetail), currentHashCode, theSubTotalLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subTotalLineDetail", theSubTotalLineDetail), currentHashCode, theSubTotalLineDetail, (this.subTotalLineDetail!= null)); } { TDSLineDetail theTDSLineDetail; theTDSLineDetail = this.getTDSLineDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsLineDetail", theTDSLineDetail), currentHashCode, theTDSLineDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsLineDetail", theTDSLineDetail), currentHashCode, theTDSLineDetail, (this.tdsLineDetail!= null)); } { List theCustomField; theCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField, ((this.customField!= null)&&(!this.customField.isEmpty()))); } { IntuitAnyType theLineEx; theLineEx = this.getLineEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineEx", theLineEx), currentHashCode, theLineEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lineEx", theLineEx), currentHashCode, theLineEx, (this.lineEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LineDetailTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LineDetailTypeEnum.java index 4a270109..4f3dcfe1 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LineDetailTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LineDetailTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LinkedTxn.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LinkedTxn.java index dab896e3..287272e3 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LinkedTxn.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/LinkedTxn.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -71,8 +71,7 @@ "txnType", "txnLineId" }) -public class LinkedTxn - implements Serializable, Equals, HashCode +public class LinkedTxn implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -155,8 +154,8 @@ public void setTxnLineId(String value) { this.txnLineId = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof LinkedTxn)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -168,7 +167,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnId = this.getTxnId(); String rhsTxnId; rhsTxnId = that.getTxnId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnId", lhsTxnId), LocatorUtils.property(thatLocator, "txnId", rhsTxnId), lhsTxnId, rhsTxnId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnId", lhsTxnId), LocatorUtils.property(thatLocator, "txnId", rhsTxnId), lhsTxnId, rhsTxnId, (this.txnId!= null), (that.txnId!= null))) { return false; } } @@ -177,7 +176,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnType = this.getTxnType(); String rhsTxnType; rhsTxnType = that.getTxnType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnType", lhsTxnType), LocatorUtils.property(thatLocator, "txnType", rhsTxnType), lhsTxnType, rhsTxnType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnType", lhsTxnType), LocatorUtils.property(thatLocator, "txnType", rhsTxnType), lhsTxnType, rhsTxnType, (this.txnType!= null), (that.txnType!= null))) { return false; } } @@ -186,7 +185,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnLineId = this.getTxnLineId(); String rhsTxnLineId; rhsTxnLineId = that.getTxnLineId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnLineId", lhsTxnLineId), LocatorUtils.property(thatLocator, "txnLineId", rhsTxnLineId), lhsTxnLineId, rhsTxnLineId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnLineId", lhsTxnLineId), LocatorUtils.property(thatLocator, "txnLineId", rhsTxnLineId), lhsTxnLineId, rhsTxnLineId, (this.txnLineId!= null), (that.txnLineId!= null))) { return false; } } @@ -194,32 +193,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theTxnId; theTxnId = this.getTxnId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnId", theTxnId), currentHashCode, theTxnId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnId", theTxnId), currentHashCode, theTxnId, (this.txnId!= null)); } { String theTxnType; theTxnType = this.getTxnType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnType", theTxnType), currentHashCode, theTxnType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnType", theTxnType), currentHashCode, theTxnType, (this.txnType!= null)); } { String theTxnLineId; theTxnLineId = this.getTxnLineId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnLineId", theTxnLineId), currentHashCode, theTxnLineId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnLineId", theTxnLineId), currentHashCode, theTxnLineId, (this.txnLineId!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MarkupInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MarkupInfo.java index 2a7099ca..fb140b2c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MarkupInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MarkupInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -75,8 +75,7 @@ "priceLevelRef", "markUpIncomeAccountRef" }) -public class MarkupInfo - implements Serializable, Equals, HashCode +public class MarkupInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -211,8 +210,8 @@ public void setMarkUpIncomeAccountRef(ReferenceType value) { this.markUpIncomeAccountRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof MarkupInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -224,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPercentBased = this.isPercentBased(); Boolean rhsPercentBased; rhsPercentBased = that.isPercentBased(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased, (this.percentBased!= null), (that.percentBased!= null))) { return false; } } @@ -233,7 +232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); BigDecimal rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -242,7 +241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPercent = this.getPercent(); BigDecimal rhsPercent; rhsPercent = that.getPercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "percent", lhsPercent), LocatorUtils.property(thatLocator, "percent", rhsPercent), lhsPercent, rhsPercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "percent", lhsPercent), LocatorUtils.property(thatLocator, "percent", rhsPercent), lhsPercent, rhsPercent, (this.percent!= null), (that.percent!= null))) { return false; } } @@ -251,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelRef = this.getPriceLevelRef(); ReferenceType rhsPriceLevelRef; rhsPriceLevelRef = that.getPriceLevelRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelRef", lhsPriceLevelRef), LocatorUtils.property(thatLocator, "priceLevelRef", rhsPriceLevelRef), lhsPriceLevelRef, rhsPriceLevelRef, (this.priceLevelRef!= null), (that.priceLevelRef!= null))) { return false; } } @@ -260,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMarkUpIncomeAccountRef = this.getMarkUpIncomeAccountRef(); ReferenceType rhsMarkUpIncomeAccountRef; rhsMarkUpIncomeAccountRef = that.getMarkUpIncomeAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "markUpIncomeAccountRef", lhsMarkUpIncomeAccountRef), LocatorUtils.property(thatLocator, "markUpIncomeAccountRef", rhsMarkUpIncomeAccountRef), lhsMarkUpIncomeAccountRef, rhsMarkUpIncomeAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "markUpIncomeAccountRef", lhsMarkUpIncomeAccountRef), LocatorUtils.property(thatLocator, "markUpIncomeAccountRef", rhsMarkUpIncomeAccountRef), lhsMarkUpIncomeAccountRef, rhsMarkUpIncomeAccountRef, (this.markUpIncomeAccountRef!= null), (that.markUpIncomeAccountRef!= null))) { return false; } } @@ -268,42 +267,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean thePercentBased; thePercentBased = this.isPercentBased(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased, (this.percentBased!= null)); } { BigDecimal theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } { BigDecimal thePercent; thePercent = this.getPercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percent", thePercent), currentHashCode, thePercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percent", thePercent), currentHashCode, thePercent, (this.percent!= null)); } { ReferenceType thePriceLevelRef; thePriceLevelRef = this.getPriceLevelRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelRef", thePriceLevelRef), currentHashCode, thePriceLevelRef, (this.priceLevelRef!= null)); } { ReferenceType theMarkUpIncomeAccountRef; theMarkUpIncomeAccountRef = this.getMarkUpIncomeAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markUpIncomeAccountRef", theMarkUpIncomeAccountRef), currentHashCode, theMarkUpIncomeAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markUpIncomeAccountRef", theMarkUpIncomeAccountRef), currentHashCode, theMarkUpIncomeAccountRef, (this.markUpIncomeAccountRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MasterAccount.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MasterAccount.java index 55402e97..1565ffa7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MasterAccount.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MasterAccount.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -69,7 +69,7 @@ }) public class MasterAccount extends Account - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -100,8 +100,8 @@ public void setAccountExistsInCompany(Boolean value) { this.accountExistsInCompany = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof MasterAccount)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -116,7 +116,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountExistsInCompany = this.isAccountExistsInCompany(); Boolean rhsAccountExistsInCompany; rhsAccountExistsInCompany = that.isAccountExistsInCompany(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountExistsInCompany", lhsAccountExistsInCompany), LocatorUtils.property(thatLocator, "accountExistsInCompany", rhsAccountExistsInCompany), lhsAccountExistsInCompany, rhsAccountExistsInCompany)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountExistsInCompany", lhsAccountExistsInCompany), LocatorUtils.property(thatLocator, "accountExistsInCompany", rhsAccountExistsInCompany), lhsAccountExistsInCompany, rhsAccountExistsInCompany, (this.accountExistsInCompany!= null), (that.accountExistsInCompany!= null))) { return false; } } @@ -124,22 +124,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theAccountExistsInCompany; theAccountExistsInCompany = this.isAccountExistsInCompany(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountExistsInCompany", theAccountExistsInCompany), currentHashCode, theAccountExistsInCompany); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountExistsInCompany", theAccountExistsInCompany), currentHashCode, theAccountExistsInCompany, (this.accountExistsInCompany!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MemoRef.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MemoRef.java index a51ace41..c4d56bdf 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MemoRef.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MemoRef.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -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; @@ -67,8 +67,7 @@ @XmlType(name = "MemoRef", propOrder = { "value" }) -public class MemoRef - implements Serializable, Equals, HashCode +public class MemoRef implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -125,8 +124,8 @@ public void setId(String value) { this.id = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof MemoRef)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -138,7 +137,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -147,7 +146,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -155,27 +154,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ModificationMetaData.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ModificationMetaData.java index 9571d8c8..0688042d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ModificationMetaData.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ModificationMetaData.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -80,8 +80,7 @@ "lastChangedInQB", "_synchronized" }) -public class ModificationMetaData - implements Serializable, Equals, HashCode +public class ModificationMetaData implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -248,8 +247,8 @@ public void setSynchronized(Boolean value) { this._synchronized = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ModificationMetaData)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -261,7 +260,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreatedByRef = this.getCreatedByRef(); ReferenceType rhsCreatedByRef; rhsCreatedByRef = that.getCreatedByRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "createdByRef", lhsCreatedByRef), LocatorUtils.property(thatLocator, "createdByRef", rhsCreatedByRef), lhsCreatedByRef, rhsCreatedByRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "createdByRef", lhsCreatedByRef), LocatorUtils.property(thatLocator, "createdByRef", rhsCreatedByRef), lhsCreatedByRef, rhsCreatedByRef, (this.createdByRef!= null), (that.createdByRef!= null))) { return false; } } @@ -270,7 +269,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreateTime = this.getCreateTime(); Date rhsCreateTime; rhsCreateTime = that.getCreateTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "createTime", lhsCreateTime), LocatorUtils.property(thatLocator, "createTime", rhsCreateTime), lhsCreateTime, rhsCreateTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "createTime", lhsCreateTime), LocatorUtils.property(thatLocator, "createTime", rhsCreateTime), lhsCreateTime, rhsCreateTime, (this.createTime!= null), (that.createTime!= null))) { return false; } } @@ -279,7 +278,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastModifiedByRef = this.getLastModifiedByRef(); ReferenceType rhsLastModifiedByRef; rhsLastModifiedByRef = that.getLastModifiedByRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastModifiedByRef", lhsLastModifiedByRef), LocatorUtils.property(thatLocator, "lastModifiedByRef", rhsLastModifiedByRef), lhsLastModifiedByRef, rhsLastModifiedByRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastModifiedByRef", lhsLastModifiedByRef), LocatorUtils.property(thatLocator, "lastModifiedByRef", rhsLastModifiedByRef), lhsLastModifiedByRef, rhsLastModifiedByRef, (this.lastModifiedByRef!= null), (that.lastModifiedByRef!= null))) { return false; } } @@ -288,7 +287,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastUpdatedTime = this.getLastUpdatedTime(); Date rhsLastUpdatedTime; rhsLastUpdatedTime = that.getLastUpdatedTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastUpdatedTime", lhsLastUpdatedTime), LocatorUtils.property(thatLocator, "lastUpdatedTime", rhsLastUpdatedTime), lhsLastUpdatedTime, rhsLastUpdatedTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastUpdatedTime", lhsLastUpdatedTime), LocatorUtils.property(thatLocator, "lastUpdatedTime", rhsLastUpdatedTime), lhsLastUpdatedTime, rhsLastUpdatedTime, (this.lastUpdatedTime!= null), (that.lastUpdatedTime!= null))) { return false; } } @@ -297,7 +296,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastChangedInQB = this.getLastChangedInQB(); Date rhsLastChangedInQB; rhsLastChangedInQB = that.getLastChangedInQB(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastChangedInQB", lhsLastChangedInQB), LocatorUtils.property(thatLocator, "lastChangedInQB", rhsLastChangedInQB), lhsLastChangedInQB, rhsLastChangedInQB)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastChangedInQB", lhsLastChangedInQB), LocatorUtils.property(thatLocator, "lastChangedInQB", rhsLastChangedInQB), lhsLastChangedInQB, rhsLastChangedInQB, (this.lastChangedInQB!= null), (that.lastChangedInQB!= null))) { return false; } } @@ -306,7 +305,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSynchronized = this.isSynchronized(); Boolean rhsSynchronized; rhsSynchronized = that.isSynchronized(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_synchronized", lhsSynchronized), LocatorUtils.property(thatLocator, "_synchronized", rhsSynchronized), lhsSynchronized, rhsSynchronized)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_synchronized", lhsSynchronized), LocatorUtils.property(thatLocator, "_synchronized", rhsSynchronized), lhsSynchronized, rhsSynchronized, (this._synchronized!= null), (that._synchronized!= null))) { return false; } } @@ -314,47 +313,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theCreatedByRef; theCreatedByRef = this.getCreatedByRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "createdByRef", theCreatedByRef), currentHashCode, theCreatedByRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "createdByRef", theCreatedByRef), currentHashCode, theCreatedByRef, (this.createdByRef!= null)); } { Date theCreateTime; theCreateTime = this.getCreateTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "createTime", theCreateTime), currentHashCode, theCreateTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "createTime", theCreateTime), currentHashCode, theCreateTime, (this.createTime!= null)); } { ReferenceType theLastModifiedByRef; theLastModifiedByRef = this.getLastModifiedByRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastModifiedByRef", theLastModifiedByRef), currentHashCode, theLastModifiedByRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastModifiedByRef", theLastModifiedByRef), currentHashCode, theLastModifiedByRef, (this.lastModifiedByRef!= null)); } { Date theLastUpdatedTime; theLastUpdatedTime = this.getLastUpdatedTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastUpdatedTime", theLastUpdatedTime), currentHashCode, theLastUpdatedTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastUpdatedTime", theLastUpdatedTime), currentHashCode, theLastUpdatedTime, (this.lastUpdatedTime!= null)); } { Date theLastChangedInQB; theLastChangedInQB = this.getLastChangedInQB(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastChangedInQB", theLastChangedInQB), currentHashCode, theLastChangedInQB); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastChangedInQB", theLastChangedInQB), currentHashCode, theLastChangedInQB, (this.lastChangedInQB!= null)); } { Boolean theSynchronized; theSynchronized = this.isSynchronized(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_synchronized", theSynchronized), currentHashCode, theSynchronized); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_synchronized", theSynchronized), currentHashCode, theSynchronized, (this._synchronized!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Money.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Money.java index 294cbff8..fa7c8baa 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Money.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Money.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -69,8 +69,7 @@ "curCode", "amount" }) -public class Money - implements Serializable, Equals, HashCode +public class Money implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +126,8 @@ public void setAmount(BigDecimal value) { this.amount = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Money)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -140,7 +139,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurCode = this.getCurCode(); String rhsCurCode; rhsCurCode = that.getCurCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "curCode", lhsCurCode), LocatorUtils.property(thatLocator, "curCode", rhsCurCode), lhsCurCode, rhsCurCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "curCode", lhsCurCode), LocatorUtils.property(thatLocator, "curCode", rhsCurCode), lhsCurCode, rhsCurCode, (this.curCode!= null), (that.curCode!= null))) { return false; } } @@ -149,7 +148,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -157,27 +156,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theCurCode; theCurCode = this.getCurCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "curCode", theCurCode), currentHashCode, theCurCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "curCode", theCurCode), currentHashCode, theCurCode, (this.curCode!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MonthEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MonthEnum.java index f8888984..84a12493 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MonthEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MonthEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameBase.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameBase.java index 413b659d..174ad99d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameBase.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameBase.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; 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; @@ -117,7 +117,7 @@ }) public class NameBase extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -685,8 +685,8 @@ public void setOtherContactInfo(List otherContactInfo) { this.otherContactInfo = otherContactInfo; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof NameBase)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -701,7 +701,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitId = this.getIntuitId(); String rhsIntuitId; rhsIntuitId = that.getIntuitId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitId", lhsIntuitId), LocatorUtils.property(thatLocator, "intuitId", rhsIntuitId), lhsIntuitId, rhsIntuitId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitId", lhsIntuitId), LocatorUtils.property(thatLocator, "intuitId", rhsIntuitId), lhsIntuitId, rhsIntuitId, (this.intuitId!= null), (that.intuitId!= null))) { return false; } } @@ -710,7 +710,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOrganization = this.isOrganization(); Boolean rhsOrganization; rhsOrganization = that.isOrganization(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "organization", lhsOrganization), LocatorUtils.property(thatLocator, "organization", rhsOrganization), lhsOrganization, rhsOrganization)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "organization", lhsOrganization), LocatorUtils.property(thatLocator, "organization", rhsOrganization), lhsOrganization, rhsOrganization, (this.organization!= null), (that.organization!= null))) { return false; } } @@ -719,7 +719,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTitle = this.getTitle(); String rhsTitle; rhsTitle = that.getTitle(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "title", lhsTitle), LocatorUtils.property(thatLocator, "title", rhsTitle), lhsTitle, rhsTitle)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "title", lhsTitle), LocatorUtils.property(thatLocator, "title", rhsTitle), lhsTitle, rhsTitle, (this.title!= null), (that.title!= null))) { return false; } } @@ -728,7 +728,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGivenName = this.getGivenName(); String rhsGivenName; rhsGivenName = that.getGivenName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "givenName", lhsGivenName), LocatorUtils.property(thatLocator, "givenName", rhsGivenName), lhsGivenName, rhsGivenName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "givenName", lhsGivenName), LocatorUtils.property(thatLocator, "givenName", rhsGivenName), lhsGivenName, rhsGivenName, (this.givenName!= null), (that.givenName!= null))) { return false; } } @@ -737,7 +737,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMiddleName = this.getMiddleName(); String rhsMiddleName; rhsMiddleName = that.getMiddleName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "middleName", lhsMiddleName), LocatorUtils.property(thatLocator, "middleName", rhsMiddleName), lhsMiddleName, rhsMiddleName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "middleName", lhsMiddleName), LocatorUtils.property(thatLocator, "middleName", rhsMiddleName), lhsMiddleName, rhsMiddleName, (this.middleName!= null), (that.middleName!= null))) { return false; } } @@ -746,7 +746,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFamilyName = this.getFamilyName(); String rhsFamilyName; rhsFamilyName = that.getFamilyName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "familyName", lhsFamilyName), LocatorUtils.property(thatLocator, "familyName", rhsFamilyName), lhsFamilyName, rhsFamilyName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "familyName", lhsFamilyName), LocatorUtils.property(thatLocator, "familyName", rhsFamilyName), lhsFamilyName, rhsFamilyName, (this.familyName!= null), (that.familyName!= null))) { return false; } } @@ -755,7 +755,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSuffix = this.getSuffix(); String rhsSuffix; rhsSuffix = that.getSuffix(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "suffix", lhsSuffix), LocatorUtils.property(thatLocator, "suffix", rhsSuffix), lhsSuffix, rhsSuffix)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "suffix", lhsSuffix), LocatorUtils.property(thatLocator, "suffix", rhsSuffix), lhsSuffix, rhsSuffix, (this.suffix!= null), (that.suffix!= null))) { return false; } } @@ -764,7 +764,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -773,7 +773,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCompanyName = this.getCompanyName(); String rhsCompanyName; rhsCompanyName = that.getCompanyName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "companyName", lhsCompanyName), LocatorUtils.property(thatLocator, "companyName", rhsCompanyName), lhsCompanyName, rhsCompanyName, (this.companyName!= null), (that.companyName!= null))) { return false; } } @@ -782,7 +782,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDisplayName = this.getDisplayName(); String rhsDisplayName; rhsDisplayName = that.getDisplayName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "displayName", lhsDisplayName), LocatorUtils.property(thatLocator, "displayName", rhsDisplayName), lhsDisplayName, rhsDisplayName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "displayName", lhsDisplayName), LocatorUtils.property(thatLocator, "displayName", rhsDisplayName), lhsDisplayName, rhsDisplayName, (this.displayName!= null), (that.displayName!= null))) { return false; } } @@ -791,7 +791,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintOnCheckName = this.getPrintOnCheckName(); String rhsPrintOnCheckName; rhsPrintOnCheckName = that.getPrintOnCheckName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printOnCheckName", lhsPrintOnCheckName), LocatorUtils.property(thatLocator, "printOnCheckName", rhsPrintOnCheckName), lhsPrintOnCheckName, rhsPrintOnCheckName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printOnCheckName", lhsPrintOnCheckName), LocatorUtils.property(thatLocator, "printOnCheckName", rhsPrintOnCheckName), lhsPrintOnCheckName, rhsPrintOnCheckName, (this.printOnCheckName!= null), (that.printOnCheckName!= null))) { return false; } } @@ -800,7 +800,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUserId = this.getUserId(); String rhsUserId; rhsUserId = that.getUserId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "userId", lhsUserId), LocatorUtils.property(thatLocator, "userId", rhsUserId), lhsUserId, rhsUserId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "userId", lhsUserId), LocatorUtils.property(thatLocator, "userId", rhsUserId), lhsUserId, rhsUserId, (this.userId!= null), (that.userId!= null))) { return false; } } @@ -809,7 +809,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -818,7 +818,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryPhone = this.getPrimaryPhone(); TelephoneNumber rhsPrimaryPhone; rhsPrimaryPhone = that.getPrimaryPhone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryPhone", lhsPrimaryPhone), LocatorUtils.property(thatLocator, "primaryPhone", rhsPrimaryPhone), lhsPrimaryPhone, rhsPrimaryPhone, (this.primaryPhone!= null), (that.primaryPhone!= null))) { return false; } } @@ -827,7 +827,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAlternatePhone = this.getAlternatePhone(); TelephoneNumber rhsAlternatePhone; rhsAlternatePhone = that.getAlternatePhone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "alternatePhone", lhsAlternatePhone), LocatorUtils.property(thatLocator, "alternatePhone", rhsAlternatePhone), lhsAlternatePhone, rhsAlternatePhone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "alternatePhone", lhsAlternatePhone), LocatorUtils.property(thatLocator, "alternatePhone", rhsAlternatePhone), lhsAlternatePhone, rhsAlternatePhone, (this.alternatePhone!= null), (that.alternatePhone!= null))) { return false; } } @@ -836,7 +836,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMobile = this.getMobile(); TelephoneNumber rhsMobile; rhsMobile = that.getMobile(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "mobile", lhsMobile), LocatorUtils.property(thatLocator, "mobile", rhsMobile), lhsMobile, rhsMobile, (this.mobile!= null), (that.mobile!= null))) { return false; } } @@ -845,7 +845,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFax = this.getFax(); TelephoneNumber rhsFax; rhsFax = that.getFax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fax", lhsFax), LocatorUtils.property(thatLocator, "fax", rhsFax), lhsFax, rhsFax, (this.fax!= null), (that.fax!= null))) { return false; } } @@ -854,7 +854,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryEmailAddr = this.getPrimaryEmailAddr(); EmailAddress rhsPrimaryEmailAddr; rhsPrimaryEmailAddr = that.getPrimaryEmailAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryEmailAddr", lhsPrimaryEmailAddr), LocatorUtils.property(thatLocator, "primaryEmailAddr", rhsPrimaryEmailAddr), lhsPrimaryEmailAddr, rhsPrimaryEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryEmailAddr", lhsPrimaryEmailAddr), LocatorUtils.property(thatLocator, "primaryEmailAddr", rhsPrimaryEmailAddr), lhsPrimaryEmailAddr, rhsPrimaryEmailAddr, (this.primaryEmailAddr!= null), (that.primaryEmailAddr!= null))) { return false; } } @@ -863,7 +863,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWebAddr = this.getWebAddr(); WebSiteAddress rhsWebAddr; rhsWebAddr = that.getWebAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "webAddr", lhsWebAddr), LocatorUtils.property(thatLocator, "webAddr", rhsWebAddr), lhsWebAddr, rhsWebAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "webAddr", lhsWebAddr), LocatorUtils.property(thatLocator, "webAddr", rhsWebAddr), lhsWebAddr, rhsWebAddr, (this.webAddr!= null), (that.webAddr!= null))) { return false; } } @@ -872,7 +872,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); List rhsOtherContactInfo; rhsOtherContactInfo = (((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty()))?that.getOtherContactInfo():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherContactInfo", lhsOtherContactInfo), LocatorUtils.property(thatLocator, "otherContactInfo", rhsOtherContactInfo), lhsOtherContactInfo, rhsOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty())), ((that.otherContactInfo!= null)&&(!that.otherContactInfo.isEmpty())))) { return false; } } @@ -881,7 +881,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTaxCodeRef = this.getDefaultTaxCodeRef(); ReferenceType rhsDefaultTaxCodeRef; rhsDefaultTaxCodeRef = that.getDefaultTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTaxCodeRef", lhsDefaultTaxCodeRef), LocatorUtils.property(thatLocator, "defaultTaxCodeRef", rhsDefaultTaxCodeRef), lhsDefaultTaxCodeRef, rhsDefaultTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTaxCodeRef", lhsDefaultTaxCodeRef), LocatorUtils.property(thatLocator, "defaultTaxCodeRef", rhsDefaultTaxCodeRef), lhsDefaultTaxCodeRef, rhsDefaultTaxCodeRef, (this.defaultTaxCodeRef!= null), (that.defaultTaxCodeRef!= null))) { return false; } } @@ -889,122 +889,122 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theIntuitId; theIntuitId = this.getIntuitId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitId", theIntuitId), currentHashCode, theIntuitId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitId", theIntuitId), currentHashCode, theIntuitId, (this.intuitId!= null)); } { Boolean theOrganization; theOrganization = this.isOrganization(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "organization", theOrganization), currentHashCode, theOrganization); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "organization", theOrganization), currentHashCode, theOrganization, (this.organization!= null)); } { String theTitle; theTitle = this.getTitle(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "title", theTitle), currentHashCode, theTitle); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "title", theTitle), currentHashCode, theTitle, (this.title!= null)); } { String theGivenName; theGivenName = this.getGivenName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenName", theGivenName), currentHashCode, theGivenName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenName", theGivenName), currentHashCode, theGivenName, (this.givenName!= null)); } { String theMiddleName; theMiddleName = this.getMiddleName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "middleName", theMiddleName), currentHashCode, theMiddleName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "middleName", theMiddleName), currentHashCode, theMiddleName, (this.middleName!= null)); } { String theFamilyName; theFamilyName = this.getFamilyName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "familyName", theFamilyName), currentHashCode, theFamilyName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "familyName", theFamilyName), currentHashCode, theFamilyName, (this.familyName!= null)); } { String theSuffix; theSuffix = this.getSuffix(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "suffix", theSuffix), currentHashCode, theSuffix); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "suffix", theSuffix), currentHashCode, theSuffix, (this.suffix!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { String theCompanyName; theCompanyName = this.getCompanyName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "companyName", theCompanyName), currentHashCode, theCompanyName, (this.companyName!= null)); } { String theDisplayName; theDisplayName = this.getDisplayName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayName", theDisplayName), currentHashCode, theDisplayName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayName", theDisplayName), currentHashCode, theDisplayName, (this.displayName!= null)); } { String thePrintOnCheckName; thePrintOnCheckName = this.getPrintOnCheckName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printOnCheckName", thePrintOnCheckName), currentHashCode, thePrintOnCheckName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printOnCheckName", thePrintOnCheckName), currentHashCode, thePrintOnCheckName, (this.printOnCheckName!= null)); } { String theUserId; theUserId = this.getUserId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userId", theUserId), currentHashCode, theUserId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userId", theUserId), currentHashCode, theUserId, (this.userId!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { TelephoneNumber thePrimaryPhone; thePrimaryPhone = this.getPrimaryPhone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryPhone", thePrimaryPhone), currentHashCode, thePrimaryPhone, (this.primaryPhone!= null)); } { TelephoneNumber theAlternatePhone; theAlternatePhone = this.getAlternatePhone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "alternatePhone", theAlternatePhone), currentHashCode, theAlternatePhone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "alternatePhone", theAlternatePhone), currentHashCode, theAlternatePhone, (this.alternatePhone!= null)); } { TelephoneNumber theMobile; theMobile = this.getMobile(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mobile", theMobile), currentHashCode, theMobile, (this.mobile!= null)); } { TelephoneNumber theFax; theFax = this.getFax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fax", theFax), currentHashCode, theFax, (this.fax!= null)); } { EmailAddress thePrimaryEmailAddr; thePrimaryEmailAddr = this.getPrimaryEmailAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryEmailAddr", thePrimaryEmailAddr), currentHashCode, thePrimaryEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryEmailAddr", thePrimaryEmailAddr), currentHashCode, thePrimaryEmailAddr, (this.primaryEmailAddr!= null)); } { WebSiteAddress theWebAddr; theWebAddr = this.getWebAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webAddr", theWebAddr), currentHashCode, theWebAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "webAddr", theWebAddr), currentHashCode, theWebAddr, (this.webAddr!= null)); } { List theOtherContactInfo; theOtherContactInfo = (((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))?this.getOtherContactInfo():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherContactInfo", theOtherContactInfo), currentHashCode, theOtherContactInfo, ((this.otherContactInfo!= null)&&(!this.otherContactInfo.isEmpty()))); } { ReferenceType theDefaultTaxCodeRef; theDefaultTaxCodeRef = this.getDefaultTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTaxCodeRef", theDefaultTaxCodeRef), currentHashCode, theDefaultTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTaxCodeRef", theDefaultTaxCodeRef), currentHashCode, theDefaultTaxCodeRef, (this.defaultTaxCodeRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameValue.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameValue.java index c5eaaf4b..2a22a8f6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameValue.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NameValue.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlElement; import javax.xml.bind.annotation.XmlType; import com.intuit.ipp.core.IEntity; -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; @@ -69,8 +69,7 @@ "name", "value" }) -public class NameValue - implements Serializable, IEntity, Equals, HashCode +public class NameValue implements Serializable, IEntity, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +126,8 @@ public void setValue(String value) { this.value = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof NameValue)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -140,7 +139,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -149,7 +148,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -157,27 +156,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NumberTypeCustomFieldDefinition.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NumberTypeCustomFieldDefinition.java index d0f9daab..37d351c8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NumberTypeCustomFieldDefinition.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/NumberTypeCustomFieldDefinition.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -73,7 +73,7 @@ }) public class NumberTypeCustomFieldDefinition extends CustomFieldDefinition - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -156,8 +156,8 @@ public void setMaxValue(BigDecimal value) { this.maxValue = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof NumberTypeCustomFieldDefinition)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -172,7 +172,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultValue = this.getDefaultValue(); BigDecimal rhsDefaultValue; rhsDefaultValue = that.getDefaultValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultValue", lhsDefaultValue), LocatorUtils.property(thatLocator, "defaultValue", rhsDefaultValue), lhsDefaultValue, rhsDefaultValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultValue", lhsDefaultValue), LocatorUtils.property(thatLocator, "defaultValue", rhsDefaultValue), lhsDefaultValue, rhsDefaultValue, (this.defaultValue!= null), (that.defaultValue!= null))) { return false; } } @@ -181,7 +181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMinValue = this.getMinValue(); BigDecimal rhsMinValue; rhsMinValue = that.getMinValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "minValue", lhsMinValue), LocatorUtils.property(thatLocator, "minValue", rhsMinValue), lhsMinValue, rhsMinValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "minValue", lhsMinValue), LocatorUtils.property(thatLocator, "minValue", rhsMinValue), lhsMinValue, rhsMinValue, (this.minValue!= null), (that.minValue!= null))) { return false; } } @@ -190,7 +190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxValue = this.getMaxValue(); BigDecimal rhsMaxValue; rhsMaxValue = that.getMaxValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxValue", lhsMaxValue), LocatorUtils.property(thatLocator, "maxValue", rhsMaxValue), lhsMaxValue, rhsMaxValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxValue", lhsMaxValue), LocatorUtils.property(thatLocator, "maxValue", rhsMaxValue), lhsMaxValue, rhsMaxValue, (this.maxValue!= null), (that.maxValue!= null))) { return false; } } @@ -198,32 +198,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { BigDecimal theDefaultValue; theDefaultValue = this.getDefaultValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultValue", theDefaultValue), currentHashCode, theDefaultValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultValue", theDefaultValue), currentHashCode, theDefaultValue, (this.defaultValue!= null)); } { BigDecimal theMinValue; theMinValue = this.getMinValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minValue", theMinValue), currentHashCode, theMinValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minValue", theMinValue), currentHashCode, theMinValue, (this.minValue!= null)); } { BigDecimal theMaxValue; theMaxValue = this.getMaxValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxValue", theMaxValue), currentHashCode, theMaxValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxValue", theMaxValue), currentHashCode, theMaxValue, (this.maxValue!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBAccount.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBAccount.java index ba87b5d4..1d0921e0 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBAccount.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBAccount.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import com.intuit.ipp.core.IEntity; -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; @@ -73,8 +73,7 @@ "appVersion", "lastBankBalance" }) -public class OLBAccount - implements Serializable, IEntity, Equals, HashCode +public class OLBAccount implements Serializable, IEntity, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -209,8 +208,8 @@ public void setLastBankBalance(BigDecimal value) { this.lastBankBalance = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OLBAccount)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -222,7 +221,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountId = this.getAccountId(); ReferenceType rhsAccountId; rhsAccountId = that.getAccountId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountId", lhsAccountId), LocatorUtils.property(thatLocator, "accountId", rhsAccountId), lhsAccountId, rhsAccountId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountId", lhsAccountId), LocatorUtils.property(thatLocator, "accountId", rhsAccountId), lhsAccountId, rhsAccountId, (this.accountId!= null), (that.accountId!= null))) { return false; } } @@ -231,7 +230,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountDetails = this.getAccountDetails(); String rhsAccountDetails; rhsAccountDetails = that.getAccountDetails(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountDetails", lhsAccountDetails), LocatorUtils.property(thatLocator, "accountDetails", rhsAccountDetails), lhsAccountDetails, rhsAccountDetails)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountDetails", lhsAccountDetails), LocatorUtils.property(thatLocator, "accountDetails", rhsAccountDetails), lhsAccountDetails, rhsAccountDetails, (this.accountDetails!= null), (that.accountDetails!= null))) { return false; } } @@ -240,7 +239,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSubscribedToApp = this.isSubscribedToApp(); Boolean rhsSubscribedToApp; rhsSubscribedToApp = that.isSubscribedToApp(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "subscribedToApp", lhsSubscribedToApp), LocatorUtils.property(thatLocator, "subscribedToApp", rhsSubscribedToApp), lhsSubscribedToApp, rhsSubscribedToApp)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "subscribedToApp", lhsSubscribedToApp), LocatorUtils.property(thatLocator, "subscribedToApp", rhsSubscribedToApp), lhsSubscribedToApp, rhsSubscribedToApp, (this.subscribedToApp!= null), (that.subscribedToApp!= null))) { return false; } } @@ -249,7 +248,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAppVersion = this.getAppVersion(); String rhsAppVersion; rhsAppVersion = that.getAppVersion(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "appVersion", lhsAppVersion), LocatorUtils.property(thatLocator, "appVersion", rhsAppVersion), lhsAppVersion, rhsAppVersion)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "appVersion", lhsAppVersion), LocatorUtils.property(thatLocator, "appVersion", rhsAppVersion), lhsAppVersion, rhsAppVersion, (this.appVersion!= null), (that.appVersion!= null))) { return false; } } @@ -258,7 +257,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastBankBalance = this.getLastBankBalance(); BigDecimal rhsLastBankBalance; rhsLastBankBalance = that.getLastBankBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastBankBalance", lhsLastBankBalance), LocatorUtils.property(thatLocator, "lastBankBalance", rhsLastBankBalance), lhsLastBankBalance, rhsLastBankBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastBankBalance", lhsLastBankBalance), LocatorUtils.property(thatLocator, "lastBankBalance", rhsLastBankBalance), lhsLastBankBalance, rhsLastBankBalance, (this.lastBankBalance!= null), (that.lastBankBalance!= null))) { return false; } } @@ -266,42 +265,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theAccountId; theAccountId = this.getAccountId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountId", theAccountId), currentHashCode, theAccountId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountId", theAccountId), currentHashCode, theAccountId, (this.accountId!= null)); } { String theAccountDetails; theAccountDetails = this.getAccountDetails(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountDetails", theAccountDetails), currentHashCode, theAccountDetails); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountDetails", theAccountDetails), currentHashCode, theAccountDetails, (this.accountDetails!= null)); } { Boolean theSubscribedToApp; theSubscribedToApp = this.isSubscribedToApp(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subscribedToApp", theSubscribedToApp), currentHashCode, theSubscribedToApp); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "subscribedToApp", theSubscribedToApp), currentHashCode, theSubscribedToApp, (this.subscribedToApp!= null)); } { String theAppVersion; theAppVersion = this.getAppVersion(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appVersion", theAppVersion), currentHashCode, theAppVersion); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appVersion", theAppVersion), currentHashCode, theAppVersion, (this.appVersion!= null)); } { BigDecimal theLastBankBalance; theLastBankBalance = this.getLastBankBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastBankBalance", theLastBankBalance), currentHashCode, theLastBankBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastBankBalance", theLastBankBalance), currentHashCode, theLastBankBalance, (this.lastBankBalance!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBStatus.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBStatus.java index 28ed0f67..16d69b7f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBStatus.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBStatus.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import com.intuit.ipp.core.IEntity; -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; @@ -67,8 +67,7 @@ @XmlType(name = "OLBStatus", propOrder = { "olbAccount" }) -public class OLBStatus - implements Serializable, IEntity, Equals, HashCode +public class OLBStatus implements Serializable, IEntity, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -116,8 +115,8 @@ public void setOLBAccount(List olbAccount) { this.olbAccount = olbAccount; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OLBStatus)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -129,7 +128,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBAccount = (((this.olbAccount!= null)&&(!this.olbAccount.isEmpty()))?this.getOLBAccount():null); List rhsOLBAccount; rhsOLBAccount = (((that.olbAccount!= null)&&(!that.olbAccount.isEmpty()))?that.getOLBAccount():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbAccount", lhsOLBAccount), LocatorUtils.property(thatLocator, "olbAccount", rhsOLBAccount), lhsOLBAccount, rhsOLBAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbAccount", lhsOLBAccount), LocatorUtils.property(thatLocator, "olbAccount", rhsOLBAccount), lhsOLBAccount, rhsOLBAccount, ((this.olbAccount!= null)&&(!this.olbAccount.isEmpty())), ((that.olbAccount!= null)&&(!that.olbAccount.isEmpty())))) { return false; } } @@ -137,22 +136,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theOLBAccount; theOLBAccount = (((this.olbAccount!= null)&&(!this.olbAccount.isEmpty()))?this.getOLBAccount():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbAccount", theOLBAccount), currentHashCode, theOLBAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbAccount", theOLBAccount), currentHashCode, theOLBAccount, ((this.olbAccount!= null)&&(!this.olbAccount.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTransaction.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTransaction.java index d3519a46..223ac571 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTransaction.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTransaction.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.ipp.core.IEntity; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -73,8 +73,7 @@ "olbDownloadTime", "olbTxn" }) -public class OLBTransaction - implements Serializable, IEntity, Equals, HashCode +public class OLBTransaction implements Serializable, IEntity, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -150,8 +149,8 @@ public void setOLBTxn(List olbTxn) { this.olbTxn = olbTxn; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OLBTransaction)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -163,7 +162,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBDownloadTime = this.getOLBDownloadTime(); Date rhsOLBDownloadTime; rhsOLBDownloadTime = that.getOLBDownloadTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbDownloadTime", lhsOLBDownloadTime), LocatorUtils.property(thatLocator, "olbDownloadTime", rhsOLBDownloadTime), lhsOLBDownloadTime, rhsOLBDownloadTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbDownloadTime", lhsOLBDownloadTime), LocatorUtils.property(thatLocator, "olbDownloadTime", rhsOLBDownloadTime), lhsOLBDownloadTime, rhsOLBDownloadTime, (this.olbDownloadTime!= null), (that.olbDownloadTime!= null))) { return false; } } @@ -172,7 +171,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBTxn = (((this.olbTxn!= null)&&(!this.olbTxn.isEmpty()))?this.getOLBTxn():null); List rhsOLBTxn; rhsOLBTxn = (((that.olbTxn!= null)&&(!that.olbTxn.isEmpty()))?that.getOLBTxn():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTxn", lhsOLBTxn), LocatorUtils.property(thatLocator, "olbTxn", rhsOLBTxn), lhsOLBTxn, rhsOLBTxn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTxn", lhsOLBTxn), LocatorUtils.property(thatLocator, "olbTxn", rhsOLBTxn), lhsOLBTxn, rhsOLBTxn, ((this.olbTxn!= null)&&(!this.olbTxn.isEmpty())), ((that.olbTxn!= null)&&(!that.olbTxn.isEmpty())))) { return false; } } @@ -180,27 +179,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Date theOLBDownloadTime; theOLBDownloadTime = this.getOLBDownloadTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbDownloadTime", theOLBDownloadTime), currentHashCode, theOLBDownloadTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbDownloadTime", theOLBDownloadTime), currentHashCode, theOLBDownloadTime, (this.olbDownloadTime!= null)); } { List theOLBTxn; theOLBTxn = (((this.olbTxn!= null)&&(!this.olbTxn.isEmpty()))?this.getOLBTxn():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTxn", theOLBTxn), currentHashCode, theOLBTxn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTxn", theOLBTxn), currentHashCode, theOLBTxn, ((this.olbTxn!= null)&&(!this.olbTxn.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxn.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxn.java index c49eedd0..84f43905 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxn.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxn.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -36,10 +36,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -81,8 +81,7 @@ "txnsDownloadTime", "olbTxnDetail" }) -public class OLBTxn - implements Serializable, Equals, HashCode +public class OLBTxn implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -290,8 +289,8 @@ public void setOLBTxnDetail(List olbTxnDetail) { this.olbTxnDetail = olbTxnDetail; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OLBTxn)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -303,7 +302,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountId = this.getAccountId(); ReferenceType rhsAccountId; rhsAccountId = that.getAccountId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountId", lhsAccountId), LocatorUtils.property(thatLocator, "accountId", rhsAccountId), lhsAccountId, rhsAccountId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountId", lhsAccountId), LocatorUtils.property(thatLocator, "accountId", rhsAccountId), lhsAccountId, rhsAccountId, (this.accountId!= null), (that.accountId!= null))) { return false; } } @@ -312,7 +311,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastPostingDate = this.getLastPostingDate(); Date rhsLastPostingDate; rhsLastPostingDate = that.getLastPostingDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastPostingDate", lhsLastPostingDate), LocatorUtils.property(thatLocator, "lastPostingDate", rhsLastPostingDate), lhsLastPostingDate, rhsLastPostingDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastPostingDate", lhsLastPostingDate), LocatorUtils.property(thatLocator, "lastPostingDate", rhsLastPostingDate), lhsLastPostingDate, rhsLastPostingDate, (this.lastPostingDate!= null), (that.lastPostingDate!= null))) { return false; } } @@ -321,7 +320,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnsDownloadTime = this.getTxnsDownloadTime(); Date rhsTxnsDownloadTime; rhsTxnsDownloadTime = that.getTxnsDownloadTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnsDownloadTime", lhsTxnsDownloadTime), LocatorUtils.property(thatLocator, "txnsDownloadTime", rhsTxnsDownloadTime), lhsTxnsDownloadTime, rhsTxnsDownloadTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnsDownloadTime", lhsTxnsDownloadTime), LocatorUtils.property(thatLocator, "txnsDownloadTime", rhsTxnsDownloadTime), lhsTxnsDownloadTime, rhsTxnsDownloadTime, (this.txnsDownloadTime!= null), (that.txnsDownloadTime!= null))) { return false; } } @@ -330,7 +329,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOLBTxnDetail = (((this.olbTxnDetail!= null)&&(!this.olbTxnDetail.isEmpty()))?this.getOLBTxnDetail():null); List rhsOLBTxnDetail; rhsOLBTxnDetail = (((that.olbTxnDetail!= null)&&(!that.olbTxnDetail.isEmpty()))?that.getOLBTxnDetail():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTxnDetail", lhsOLBTxnDetail), LocatorUtils.property(thatLocator, "olbTxnDetail", rhsOLBTxnDetail), lhsOLBTxnDetail, rhsOLBTxnDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "olbTxnDetail", lhsOLBTxnDetail), LocatorUtils.property(thatLocator, "olbTxnDetail", rhsOLBTxnDetail), lhsOLBTxnDetail, rhsOLBTxnDetail, ((this.olbTxnDetail!= null)&&(!this.olbTxnDetail.isEmpty())), ((that.olbTxnDetail!= null)&&(!that.olbTxnDetail.isEmpty())))) { return false; } } @@ -339,7 +338,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartPosition = this.getStartPosition(); Integer rhsStartPosition; rhsStartPosition = that.getStartPosition(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition, (this.startPosition!= null), (that.startPosition!= null))) { return false; } } @@ -348,7 +347,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxResults = this.getMaxResults(); Integer rhsMaxResults; rhsMaxResults = that.getMaxResults(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults, (this.maxResults!= null), (that.maxResults!= null))) { return false; } } @@ -357,7 +356,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalCount = this.getTotalCount(); Integer rhsTotalCount; rhsTotalCount = that.getTotalCount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount, (this.totalCount!= null), (that.totalCount!= null))) { return false; } } @@ -365,52 +364,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theAccountId; theAccountId = this.getAccountId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountId", theAccountId), currentHashCode, theAccountId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountId", theAccountId), currentHashCode, theAccountId, (this.accountId!= null)); } { Date theLastPostingDate; theLastPostingDate = this.getLastPostingDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastPostingDate", theLastPostingDate), currentHashCode, theLastPostingDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastPostingDate", theLastPostingDate), currentHashCode, theLastPostingDate, (this.lastPostingDate!= null)); } { Date theTxnsDownloadTime; theTxnsDownloadTime = this.getTxnsDownloadTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnsDownloadTime", theTxnsDownloadTime), currentHashCode, theTxnsDownloadTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnsDownloadTime", theTxnsDownloadTime), currentHashCode, theTxnsDownloadTime, (this.txnsDownloadTime!= null)); } { List theOLBTxnDetail; theOLBTxnDetail = (((this.olbTxnDetail!= null)&&(!this.olbTxnDetail.isEmpty()))?this.getOLBTxnDetail():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTxnDetail", theOLBTxnDetail), currentHashCode, theOLBTxnDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "olbTxnDetail", theOLBTxnDetail), currentHashCode, theOLBTxnDetail, ((this.olbTxnDetail!= null)&&(!this.olbTxnDetail.isEmpty()))); } { Integer theStartPosition; theStartPosition = this.getStartPosition(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition, (this.startPosition!= null)); } { Integer theMaxResults; theMaxResults = this.getMaxResults(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults, (this.maxResults!= null)); } { Integer theTotalCount; theTotalCount = this.getTotalCount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount, (this.totalCount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnDetail.java index e3077446..c188f7c5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -77,8 +77,7 @@ "referenceNumber", "txnStatus" }) -public class OLBTxnDetail - implements Serializable, Equals, HashCode +public class OLBTxnDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -217,8 +216,8 @@ public void setTxnStatus(String value) { this.txnStatus = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OLBTxnDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -230,7 +229,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPostDate = this.getPostDate(); Date rhsPostDate; rhsPostDate = that.getPostDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "postDate", lhsPostDate), LocatorUtils.property(thatLocator, "postDate", rhsPostDate), lhsPostDate, rhsPostDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "postDate", lhsPostDate), LocatorUtils.property(thatLocator, "postDate", rhsPostDate), lhsPostDate, rhsPostDate, (this.postDate!= null), (that.postDate!= null))) { return false; } } @@ -239,7 +238,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnDate = this.getTxnDate(); Date rhsTxnDate; rhsTxnDate = that.getTxnDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate, (this.txnDate!= null), (that.txnDate!= null))) { return false; } } @@ -248,7 +247,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -257,7 +256,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReferenceNumber = this.getReferenceNumber(); String rhsReferenceNumber; rhsReferenceNumber = that.getReferenceNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "referenceNumber", lhsReferenceNumber), LocatorUtils.property(thatLocator, "referenceNumber", rhsReferenceNumber), lhsReferenceNumber, rhsReferenceNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "referenceNumber", lhsReferenceNumber), LocatorUtils.property(thatLocator, "referenceNumber", rhsReferenceNumber), lhsReferenceNumber, rhsReferenceNumber, (this.referenceNumber!= null), (that.referenceNumber!= null))) { return false; } } @@ -266,7 +265,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnStatus = this.getTxnStatus(); String rhsTxnStatus; rhsTxnStatus = that.getTxnStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnStatus", lhsTxnStatus), LocatorUtils.property(thatLocator, "txnStatus", rhsTxnStatus), lhsTxnStatus, rhsTxnStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnStatus", lhsTxnStatus), LocatorUtils.property(thatLocator, "txnStatus", rhsTxnStatus), lhsTxnStatus, rhsTxnStatus, (this.txnStatus!= null), (that.txnStatus!= null))) { return false; } } @@ -274,42 +273,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Date thePostDate; thePostDate = this.getPostDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postDate", thePostDate), currentHashCode, thePostDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postDate", thePostDate), currentHashCode, thePostDate, (this.postDate!= null)); } { Date theTxnDate; theTxnDate = this.getTxnDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate, (this.txnDate!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } { String theReferenceNumber; theReferenceNumber = this.getReferenceNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "referenceNumber", theReferenceNumber), currentHashCode, theReferenceNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "referenceNumber", theReferenceNumber), currentHashCode, theReferenceNumber, (this.referenceNumber!= null)); } { String theTxnStatus; theTxnStatus = this.getTxnStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnStatus", theTxnStatus), currentHashCode, theTxnStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnStatus", theTxnStatus), currentHashCode, theTxnStatus, (this.txnStatus!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnStatusEnum.java index 34e5cde9..5cb0eb6e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OLBTxnStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectFactory.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectFactory.java index 3356cdbd..b93ae112 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectFactory.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectFactory.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -1442,19 +1442,19 @@ public DiscountOverride createDiscountOverride() { } /** - * Create an instance of {@link GroupLineDetail } + * Create an instance of {@link Column } * */ - public GroupLineDetail createGroupLineDetail() { - return new GroupLineDetail(); + public Column createColumn() { + return new Column(); } /** - * Create an instance of {@link Column } + * Create an instance of {@link GroupLineDetail } * */ - public Column createColumn() { - return new Column(); + public GroupLineDetail createGroupLineDetail() { + return new GroupLineDetail(); } /** diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectNameEnumType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectNameEnumType.java index 67824839..4842c075 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectNameEnumType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ObjectNameEnumType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OperationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OperationEnum.java index 0a331c9c..4fcc7d91 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OperationEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OperationEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherName.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherName.java index a979851a..27b4a83e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherName.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherName.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -73,7 +73,7 @@ }) public class OtherName extends NameBase - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -199,8 +199,8 @@ public void setOtherAddr(List otherAddr) { this.otherAddr = otherAddr; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OtherName)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -215,7 +215,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNum = this.getAcctNum(); String rhsAcctNum; rhsAcctNum = that.getAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum, (this.acctNum!= null), (that.acctNum!= null))) { return false; } } @@ -224,7 +224,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrimaryAddr = this.getPrimaryAddr(); PhysicalAddress rhsPrimaryAddr; rhsPrimaryAddr = that.getPrimaryAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryAddr", lhsPrimaryAddr), LocatorUtils.property(thatLocator, "primaryAddr", rhsPrimaryAddr), lhsPrimaryAddr, rhsPrimaryAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "primaryAddr", lhsPrimaryAddr), LocatorUtils.property(thatLocator, "primaryAddr", rhsPrimaryAddr), lhsPrimaryAddr, rhsPrimaryAddr, (this.primaryAddr!= null), (that.primaryAddr!= null))) { return false; } } @@ -233,7 +233,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -242,7 +242,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherNameEx = this.getOtherNameEx(); IntuitAnyType rhsOtherNameEx; rhsOtherNameEx = that.getOtherNameEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameEx", lhsOtherNameEx), LocatorUtils.property(thatLocator, "otherNameEx", rhsOtherNameEx), lhsOtherNameEx, rhsOtherNameEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameEx", lhsOtherNameEx), LocatorUtils.property(thatLocator, "otherNameEx", rhsOtherNameEx), lhsOtherNameEx, rhsOtherNameEx, (this.otherNameEx!= null), (that.otherNameEx!= null))) { return false; } } @@ -250,37 +250,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theAcctNum; theAcctNum = this.getAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum, (this.acctNum!= null)); } { PhysicalAddress thePrimaryAddr; thePrimaryAddr = this.getPrimaryAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryAddr", thePrimaryAddr), currentHashCode, thePrimaryAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "primaryAddr", thePrimaryAddr), currentHashCode, thePrimaryAddr, (this.primaryAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { IntuitAnyType theOtherNameEx; theOtherNameEx = this.getOtherNameEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameEx", theOtherNameEx), currentHashCode, theOtherNameEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameEx", theOtherNameEx), currentHashCode, theOtherNameEx, (this.otherNameEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherPrefs.java index 2f081fb9..99331c7c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/OtherPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -67,8 +67,7 @@ @XmlType(name = "OtherPrefs", propOrder = { "nameValue" }) -public class OtherPrefs - implements Serializable, Equals, HashCode +public class OtherPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -116,8 +115,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof OtherPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -129,7 +128,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -137,22 +136,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaySalesTaxEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaySalesTaxEnum.java index a36415e7..18d524f6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaySalesTaxEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaySalesTaxEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Payment.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Payment.java index 10ef31ad..858fbb67 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Payment.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Payment.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -94,7 +94,7 @@ }) public class Payment extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -437,8 +437,8 @@ public void setPaymentEx(IntuitAnyType value) { this.paymentEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Payment)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -453,7 +453,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; } } @@ -462,7 +462,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToRef = this.getRemitToRef(); ReferenceType rhsRemitToRef; rhsRemitToRef = that.getRemitToRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef, (this.remitToRef!= null), (that.remitToRef!= null))) { return false; } } @@ -471,7 +471,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsARAccountRef = this.getARAccountRef(); ReferenceType rhsARAccountRef; rhsARAccountRef = that.getARAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef, (this.arAccountRef!= null), (that.arAccountRef!= null))) { return false; } } @@ -480,7 +480,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositToAccountRef = this.getDepositToAccountRef(); ReferenceType rhsDepositToAccountRef; rhsDepositToAccountRef = that.getDepositToAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef, (this.depositToAccountRef!= null), (that.depositToAccountRef!= null))) { return false; } } @@ -489,7 +489,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -498,7 +498,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentRefNum = this.getPaymentRefNum(); String rhsPaymentRefNum; rhsPaymentRefNum = that.getPaymentRefNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum, (this.paymentRefNum!= null), (that.paymentRefNum!= null))) { return false; } } @@ -507,7 +507,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentType = this.getPaymentType(); PaymentTypeEnum rhsPaymentType; rhsPaymentType = that.getPaymentType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType, (this.paymentType!= null), (that.paymentType!= null))) { return false; } } @@ -516,7 +516,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckPayment = this.getCheckPayment(); CheckPayment rhsCheckPayment; rhsCheckPayment = that.getCheckPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment, (this.checkPayment!= null), (that.checkPayment!= null))) { return false; } } @@ -525,7 +525,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditCardPayment = this.getCreditCardPayment(); CreditCardPayment rhsCreditCardPayment; rhsCreditCardPayment = that.getCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment, (this.creditCardPayment!= null), (that.creditCardPayment!= null))) { return false; } } @@ -534,7 +534,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -543,7 +543,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUnappliedAmt = this.getUnappliedAmt(); BigDecimal rhsUnappliedAmt; rhsUnappliedAmt = that.getUnappliedAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "unappliedAmt", lhsUnappliedAmt), LocatorUtils.property(thatLocator, "unappliedAmt", rhsUnappliedAmt), lhsUnappliedAmt, rhsUnappliedAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "unappliedAmt", lhsUnappliedAmt), LocatorUtils.property(thatLocator, "unappliedAmt", rhsUnappliedAmt), lhsUnappliedAmt, rhsUnappliedAmt, (this.unappliedAmt!= null), (that.unappliedAmt!= null))) { return false; } } @@ -552,7 +552,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsProcessPayment = this.isProcessPayment(); Boolean rhsProcessPayment; rhsProcessPayment = that.isProcessPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "processPayment", lhsProcessPayment), LocatorUtils.property(thatLocator, "processPayment", rhsProcessPayment), lhsProcessPayment, rhsProcessPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "processPayment", lhsProcessPayment), LocatorUtils.property(thatLocator, "processPayment", rhsProcessPayment), lhsProcessPayment, rhsProcessPayment, (this.processPayment!= null), (that.processPayment!= null))) { return false; } } @@ -561,7 +561,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentEx = this.getPaymentEx(); IntuitAnyType rhsPaymentEx; rhsPaymentEx = that.getPaymentEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentEx", lhsPaymentEx), LocatorUtils.property(thatLocator, "paymentEx", rhsPaymentEx), lhsPaymentEx, rhsPaymentEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentEx", lhsPaymentEx), LocatorUtils.property(thatLocator, "paymentEx", rhsPaymentEx), lhsPaymentEx, rhsPaymentEx, (this.paymentEx!= null), (that.paymentEx!= null))) { return false; } } @@ -569,82 +569,82 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { 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 theRemitToRef; theRemitToRef = this.getRemitToRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef, (this.remitToRef!= null)); } { ReferenceType theARAccountRef; theARAccountRef = this.getARAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef, (this.arAccountRef!= null)); } { ReferenceType theDepositToAccountRef; theDepositToAccountRef = this.getDepositToAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef, (this.depositToAccountRef!= null)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { String thePaymentRefNum; thePaymentRefNum = this.getPaymentRefNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum, (this.paymentRefNum!= null)); } { PaymentTypeEnum thePaymentType; thePaymentType = this.getPaymentType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType, (this.paymentType!= null)); } { CheckPayment theCheckPayment; theCheckPayment = this.getCheckPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment, (this.checkPayment!= null)); } { CreditCardPayment theCreditCardPayment; theCreditCardPayment = this.getCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment, (this.creditCardPayment!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { BigDecimal theUnappliedAmt; theUnappliedAmt = this.getUnappliedAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unappliedAmt", theUnappliedAmt), currentHashCode, theUnappliedAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unappliedAmt", theUnappliedAmt), currentHashCode, theUnappliedAmt, (this.unappliedAmt!= null)); } { Boolean theProcessPayment; theProcessPayment = this.isProcessPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "processPayment", theProcessPayment), currentHashCode, theProcessPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "processPayment", theProcessPayment), currentHashCode, theProcessPayment, (this.processPayment!= null)); } { IntuitAnyType thePaymentEx; thePaymentEx = this.getPaymentEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentEx", thePaymentEx), currentHashCode, thePaymentEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentEx", thePaymentEx), currentHashCode, thePaymentEx, (this.paymentEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentLineDetail.java index 773a8075..08c7c6f6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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 @@ "discount", "paymentLineEx" }) -public class PaymentLineDetail - implements Serializable, Equals, HashCode +public class PaymentLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -274,8 +273,8 @@ public void setPaymentLineEx(IntuitAnyType value) { this.paymentLineEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PaymentLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -287,7 +286,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -296,7 +295,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -305,7 +304,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; } } @@ -314,7 +313,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalance = this.getBalance(); BigDecimal rhsBalance; rhsBalance = that.getBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -323,7 +322,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeBalance = this.getHomeBalance(); BigDecimal rhsHomeBalance; rhsHomeBalance = that.getHomeBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance, (this.homeBalance!= null), (that.homeBalance!= null))) { return false; } } @@ -332,7 +331,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscount = this.getDiscount(); DiscountOverride rhsDiscount; rhsDiscount = that.getDiscount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discount", lhsDiscount), LocatorUtils.property(thatLocator, "discount", rhsDiscount), lhsDiscount, rhsDiscount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discount", lhsDiscount), LocatorUtils.property(thatLocator, "discount", rhsDiscount), lhsDiscount, rhsDiscount, (this.discount!= null), (that.discount!= null))) { return false; } } @@ -341,7 +340,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentLineEx = this.getPaymentLineEx(); IntuitAnyType rhsPaymentLineEx; rhsPaymentLineEx = that.getPaymentLineEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentLineEx", lhsPaymentLineEx), LocatorUtils.property(thatLocator, "paymentLineEx", rhsPaymentLineEx), lhsPaymentLineEx, rhsPaymentLineEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentLineEx", lhsPaymentLineEx), LocatorUtils.property(thatLocator, "paymentLineEx", rhsPaymentLineEx), lhsPaymentLineEx, rhsPaymentLineEx, (this.paymentLineEx!= null), (that.paymentLineEx!= null))) { return false; } } @@ -349,52 +348,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= null)); } { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= 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)); } { BigDecimal theBalance; theBalance = this.getBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } { BigDecimal theHomeBalance; theHomeBalance = this.getHomeBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance, (this.homeBalance!= null)); } { DiscountOverride theDiscount; theDiscount = this.getDiscount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discount", theDiscount), currentHashCode, theDiscount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discount", theDiscount), currentHashCode, theDiscount, (this.discount!= null)); } { IntuitAnyType thePaymentLineEx; thePaymentLineEx = this.getPaymentLineEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentLineEx", thePaymentLineEx), currentHashCode, thePaymentLineEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentLineEx", thePaymentLineEx), currentHashCode, thePaymentLineEx, (this.paymentLineEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethod.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethod.java index 8fa250ee..a823c9cd 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethod.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethod.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -72,7 +72,7 @@ }) public class PaymentMethod extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -181,8 +181,8 @@ public void setPaymentMethodEx(IntuitAnyType value) { this.paymentMethodEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PaymentMethod)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -197,7 +197,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -206,7 +206,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -215,7 +215,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -224,7 +224,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodEx = this.getPaymentMethodEx(); IntuitAnyType rhsPaymentMethodEx; rhsPaymentMethodEx = that.getPaymentMethodEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodEx", lhsPaymentMethodEx), LocatorUtils.property(thatLocator, "paymentMethodEx", rhsPaymentMethodEx), lhsPaymentMethodEx, rhsPaymentMethodEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodEx", lhsPaymentMethodEx), LocatorUtils.property(thatLocator, "paymentMethodEx", rhsPaymentMethodEx), lhsPaymentMethodEx, rhsPaymentMethodEx, (this.paymentMethodEx!= null), (that.paymentMethodEx!= null))) { return false; } } @@ -232,37 +232,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { IntuitAnyType thePaymentMethodEx; thePaymentMethodEx = this.getPaymentMethodEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodEx", thePaymentMethodEx), currentHashCode, thePaymentMethodEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodEx", thePaymentMethodEx), currentHashCode, thePaymentMethodEx, (this.paymentMethodEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethodEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethodEnum.java index 084c768d..7252ebe5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethodEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentMethodEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentStatusEnum.java index ff9cc972..11948f2a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentTypeEnum.java index 52abd0ed..f2048983 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PaymentTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PerItemAdjustEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PerItemAdjustEnum.java index 8dc76116..fdda6f1a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PerItemAdjustEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PerItemAdjustEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddress.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddress.java index 6fdfd5a1..e0f4e44e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddress.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddress.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -96,8 +96,7 @@ "tag", "note" }) -public class PhysicalAddress - implements Serializable, Equals, HashCode +public class PhysicalAddress implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -518,8 +517,8 @@ public void setNote(String value) { this.note = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PhysicalAddress)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -531,7 +530,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -540,7 +539,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine1 = this.getLine1(); String rhsLine1; rhsLine1 = that.getLine1(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line1", lhsLine1), LocatorUtils.property(thatLocator, "line1", rhsLine1), lhsLine1, rhsLine1)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line1", lhsLine1), LocatorUtils.property(thatLocator, "line1", rhsLine1), lhsLine1, rhsLine1, (this.line1 != null), (that.line1 != null))) { return false; } } @@ -549,7 +548,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine2 = this.getLine2(); String rhsLine2; rhsLine2 = that.getLine2(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line2", lhsLine2), LocatorUtils.property(thatLocator, "line2", rhsLine2), lhsLine2, rhsLine2)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line2", lhsLine2), LocatorUtils.property(thatLocator, "line2", rhsLine2), lhsLine2, rhsLine2, (this.line2 != null), (that.line2 != null))) { return false; } } @@ -558,7 +557,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine3 = this.getLine3(); String rhsLine3; rhsLine3 = that.getLine3(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line3", lhsLine3), LocatorUtils.property(thatLocator, "line3", rhsLine3), lhsLine3, rhsLine3)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line3", lhsLine3), LocatorUtils.property(thatLocator, "line3", rhsLine3), lhsLine3, rhsLine3, (this.line3 != null), (that.line3 != null))) { return false; } } @@ -567,7 +566,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine4 = this.getLine4(); String rhsLine4; rhsLine4 = that.getLine4(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line4", lhsLine4), LocatorUtils.property(thatLocator, "line4", rhsLine4), lhsLine4, rhsLine4)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line4", lhsLine4), LocatorUtils.property(thatLocator, "line4", rhsLine4), lhsLine4, rhsLine4, (this.line4 != null), (that.line4 != null))) { return false; } } @@ -576,7 +575,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine5 = this.getLine5(); String rhsLine5; rhsLine5 = that.getLine5(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line5", lhsLine5), LocatorUtils.property(thatLocator, "line5", rhsLine5), lhsLine5, rhsLine5)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line5", lhsLine5), LocatorUtils.property(thatLocator, "line5", rhsLine5), lhsLine5, rhsLine5, (this.line5 != null), (that.line5 != null))) { return false; } } @@ -585,7 +584,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCity = this.getCity(); String rhsCity; rhsCity = that.getCity(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "city", lhsCity), LocatorUtils.property(thatLocator, "city", rhsCity), lhsCity, rhsCity)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "city", lhsCity), LocatorUtils.property(thatLocator, "city", rhsCity), lhsCity, rhsCity, (this.city!= null), (that.city!= null))) { return false; } } @@ -594,7 +593,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountry = this.getCountry(); String rhsCountry; rhsCountry = that.getCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "country", lhsCountry), LocatorUtils.property(thatLocator, "country", rhsCountry), lhsCountry, rhsCountry, (this.country!= null), (that.country!= null))) { return false; } } @@ -603,7 +602,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountryCode = this.getCountryCode(); String rhsCountryCode; rhsCountryCode = that.getCountryCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "countryCode", lhsCountryCode), LocatorUtils.property(thatLocator, "countryCode", rhsCountryCode), lhsCountryCode, rhsCountryCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "countryCode", lhsCountryCode), LocatorUtils.property(thatLocator, "countryCode", rhsCountryCode), lhsCountryCode, rhsCountryCode, (this.countryCode!= null), (that.countryCode!= null))) { return false; } } @@ -612,7 +611,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountrySubDivisionCode = this.getCountrySubDivisionCode(); String rhsCountrySubDivisionCode; rhsCountrySubDivisionCode = that.getCountrySubDivisionCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "countrySubDivisionCode", lhsCountrySubDivisionCode), LocatorUtils.property(thatLocator, "countrySubDivisionCode", rhsCountrySubDivisionCode), lhsCountrySubDivisionCode, rhsCountrySubDivisionCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "countrySubDivisionCode", lhsCountrySubDivisionCode), LocatorUtils.property(thatLocator, "countrySubDivisionCode", rhsCountrySubDivisionCode), lhsCountrySubDivisionCode, rhsCountrySubDivisionCode, (this.countrySubDivisionCode!= null), (that.countrySubDivisionCode!= null))) { return false; } } @@ -621,7 +620,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPostalCode = this.getPostalCode(); String rhsPostalCode; rhsPostalCode = that.getPostalCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCode", lhsPostalCode), LocatorUtils.property(thatLocator, "postalCode", rhsPostalCode), lhsPostalCode, rhsPostalCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCode", lhsPostalCode), LocatorUtils.property(thatLocator, "postalCode", rhsPostalCode), lhsPostalCode, rhsPostalCode, (this.postalCode!= null), (that.postalCode!= null))) { return false; } } @@ -630,7 +629,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPostalCodeSuffix = this.getPostalCodeSuffix(); String rhsPostalCodeSuffix; rhsPostalCodeSuffix = that.getPostalCodeSuffix(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCodeSuffix", lhsPostalCodeSuffix), LocatorUtils.property(thatLocator, "postalCodeSuffix", rhsPostalCodeSuffix), lhsPostalCodeSuffix, rhsPostalCodeSuffix)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "postalCodeSuffix", lhsPostalCodeSuffix), LocatorUtils.property(thatLocator, "postalCodeSuffix", rhsPostalCodeSuffix), lhsPostalCodeSuffix, rhsPostalCodeSuffix, (this.postalCodeSuffix!= null), (that.postalCodeSuffix!= null))) { return false; } } @@ -639,7 +638,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLat = this.getLat(); String rhsLat; rhsLat = that.getLat(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lat", lhsLat), LocatorUtils.property(thatLocator, "lat", rhsLat), lhsLat, rhsLat)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lat", lhsLat), LocatorUtils.property(thatLocator, "lat", rhsLat), lhsLat, rhsLat, (this.lat!= null), (that.lat!= null))) { return false; } } @@ -648,7 +647,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLong = this.getLong(); String rhsLong; rhsLong = that.getLong(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_long", lhsLong), LocatorUtils.property(thatLocator, "_long", rhsLong), lhsLong, rhsLong)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_long", lhsLong), LocatorUtils.property(thatLocator, "_long", rhsLong), lhsLong, rhsLong, (this._long!= null), (that._long!= null))) { return false; } } @@ -657,7 +656,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -666,7 +665,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNote = this.getNote(); String rhsNote; rhsNote = that.getNote(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "note", lhsNote), LocatorUtils.property(thatLocator, "note", rhsNote), lhsNote, rhsNote)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "note", lhsNote), LocatorUtils.property(thatLocator, "note", rhsNote), lhsNote, rhsNote, (this.note!= null), (that.note!= null))) { return false; } } @@ -674,97 +673,97 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theLine1; theLine1 = this.getLine1(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line1", theLine1), currentHashCode, theLine1); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line1", theLine1), currentHashCode, theLine1, (this.line1 != null)); } { String theLine2; theLine2 = this.getLine2(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line2", theLine2), currentHashCode, theLine2); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line2", theLine2), currentHashCode, theLine2, (this.line2 != null)); } { String theLine3; theLine3 = this.getLine3(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line3", theLine3), currentHashCode, theLine3); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line3", theLine3), currentHashCode, theLine3, (this.line3 != null)); } { String theLine4; theLine4 = this.getLine4(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line4", theLine4), currentHashCode, theLine4); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line4", theLine4), currentHashCode, theLine4, (this.line4 != null)); } { String theLine5; theLine5 = this.getLine5(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line5", theLine5), currentHashCode, theLine5); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line5", theLine5), currentHashCode, theLine5, (this.line5 != null)); } { String theCity; theCity = this.getCity(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "city", theCity), currentHashCode, theCity); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "city", theCity), currentHashCode, theCity, (this.city!= null)); } { String theCountry; theCountry = this.getCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "country", theCountry), currentHashCode, theCountry, (this.country!= null)); } { String theCountryCode; theCountryCode = this.getCountryCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countryCode", theCountryCode), currentHashCode, theCountryCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countryCode", theCountryCode), currentHashCode, theCountryCode, (this.countryCode!= null)); } { String theCountrySubDivisionCode; theCountrySubDivisionCode = this.getCountrySubDivisionCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countrySubDivisionCode", theCountrySubDivisionCode), currentHashCode, theCountrySubDivisionCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countrySubDivisionCode", theCountrySubDivisionCode), currentHashCode, theCountrySubDivisionCode, (this.countrySubDivisionCode!= null)); } { String thePostalCode; thePostalCode = this.getPostalCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCode", thePostalCode), currentHashCode, thePostalCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCode", thePostalCode), currentHashCode, thePostalCode, (this.postalCode!= null)); } { String thePostalCodeSuffix; thePostalCodeSuffix = this.getPostalCodeSuffix(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCodeSuffix", thePostalCodeSuffix), currentHashCode, thePostalCodeSuffix); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "postalCodeSuffix", thePostalCodeSuffix), currentHashCode, thePostalCodeSuffix, (this.postalCodeSuffix!= null)); } { String theLat; theLat = this.getLat(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lat", theLat), currentHashCode, theLat); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lat", theLat), currentHashCode, theLat, (this.lat!= null)); } { String theLong; theLong = this.getLong(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_long", theLong), currentHashCode, theLong); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_long", theLong), currentHashCode, theLong, (this._long!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } { String theNote; theNote = this.getNote(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "note", theNote), currentHashCode, theNote); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "note", theNote), currentHashCode, theNote, (this.note!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddressTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddressTypeEnum.java index 6b903172..8f00ba8d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddressTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PhysicalAddressTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PostingTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PostingTypeEnum.java index 69c35003..b340da7c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PostingTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PostingTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Preferences.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Preferences.java index 9e2db5f7..05708f80 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Preferences.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Preferences.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -90,7 +90,7 @@ }) public class Preferences extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -433,8 +433,8 @@ public void setOtherPrefs(OtherPrefs value) { this.otherPrefs = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Preferences)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -449,7 +449,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAccountingInfoPrefs = this.getAccountingInfoPrefs(); CompanyAccountingPrefs rhsAccountingInfoPrefs; rhsAccountingInfoPrefs = that.getAccountingInfoPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "accountingInfoPrefs", lhsAccountingInfoPrefs), LocatorUtils.property(thatLocator, "accountingInfoPrefs", rhsAccountingInfoPrefs), lhsAccountingInfoPrefs, rhsAccountingInfoPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "accountingInfoPrefs", lhsAccountingInfoPrefs), LocatorUtils.property(thatLocator, "accountingInfoPrefs", rhsAccountingInfoPrefs), lhsAccountingInfoPrefs, rhsAccountingInfoPrefs, (this.accountingInfoPrefs!= null), (that.accountingInfoPrefs!= null))) { return false; } } @@ -458,7 +458,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAdvancedInventoryPrefs = this.getAdvancedInventoryPrefs(); AdvancedInventoryPrefs rhsAdvancedInventoryPrefs; rhsAdvancedInventoryPrefs = that.getAdvancedInventoryPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "advancedInventoryPrefs", lhsAdvancedInventoryPrefs), LocatorUtils.property(thatLocator, "advancedInventoryPrefs", rhsAdvancedInventoryPrefs), lhsAdvancedInventoryPrefs, rhsAdvancedInventoryPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "advancedInventoryPrefs", lhsAdvancedInventoryPrefs), LocatorUtils.property(thatLocator, "advancedInventoryPrefs", rhsAdvancedInventoryPrefs), lhsAdvancedInventoryPrefs, rhsAdvancedInventoryPrefs, (this.advancedInventoryPrefs!= null), (that.advancedInventoryPrefs!= null))) { return false; } } @@ -467,7 +467,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsProductAndServicesPrefs = this.getProductAndServicesPrefs(); ProductAndServicesPrefs rhsProductAndServicesPrefs; rhsProductAndServicesPrefs = that.getProductAndServicesPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "productAndServicesPrefs", lhsProductAndServicesPrefs), LocatorUtils.property(thatLocator, "productAndServicesPrefs", rhsProductAndServicesPrefs), lhsProductAndServicesPrefs, rhsProductAndServicesPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "productAndServicesPrefs", lhsProductAndServicesPrefs), LocatorUtils.property(thatLocator, "productAndServicesPrefs", rhsProductAndServicesPrefs), lhsProductAndServicesPrefs, rhsProductAndServicesPrefs, (this.productAndServicesPrefs!= null), (that.productAndServicesPrefs!= null))) { return false; } } @@ -476,7 +476,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesFormsPrefs = this.getSalesFormsPrefs(); SalesFormsPrefs rhsSalesFormsPrefs; rhsSalesFormsPrefs = that.getSalesFormsPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesFormsPrefs", lhsSalesFormsPrefs), LocatorUtils.property(thatLocator, "salesFormsPrefs", rhsSalesFormsPrefs), lhsSalesFormsPrefs, rhsSalesFormsPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesFormsPrefs", lhsSalesFormsPrefs), LocatorUtils.property(thatLocator, "salesFormsPrefs", rhsSalesFormsPrefs), lhsSalesFormsPrefs, rhsSalesFormsPrefs, (this.salesFormsPrefs!= null), (that.salesFormsPrefs!= null))) { return false; } } @@ -485,7 +485,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailMessagesPrefs = this.getEmailMessagesPrefs(); EmailMessagesPrefs rhsEmailMessagesPrefs; rhsEmailMessagesPrefs = that.getEmailMessagesPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailMessagesPrefs", lhsEmailMessagesPrefs), LocatorUtils.property(thatLocator, "emailMessagesPrefs", rhsEmailMessagesPrefs), lhsEmailMessagesPrefs, rhsEmailMessagesPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailMessagesPrefs", lhsEmailMessagesPrefs), LocatorUtils.property(thatLocator, "emailMessagesPrefs", rhsEmailMessagesPrefs), lhsEmailMessagesPrefs, rhsEmailMessagesPrefs, (this.emailMessagesPrefs!= null), (that.emailMessagesPrefs!= null))) { return false; } } @@ -494,7 +494,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintDocumentPrefs = this.getPrintDocumentPrefs(); PrintDocumentPrefs rhsPrintDocumentPrefs; rhsPrintDocumentPrefs = that.getPrintDocumentPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printDocumentPrefs", lhsPrintDocumentPrefs), LocatorUtils.property(thatLocator, "printDocumentPrefs", rhsPrintDocumentPrefs), lhsPrintDocumentPrefs, rhsPrintDocumentPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printDocumentPrefs", lhsPrintDocumentPrefs), LocatorUtils.property(thatLocator, "printDocumentPrefs", rhsPrintDocumentPrefs), lhsPrintDocumentPrefs, rhsPrintDocumentPrefs, (this.printDocumentPrefs!= null), (that.printDocumentPrefs!= null))) { return false; } } @@ -503,7 +503,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorAndPurchasesPrefs = this.getVendorAndPurchasesPrefs(); VendorAndPurchasesPrefs rhsVendorAndPurchasesPrefs; rhsVendorAndPurchasesPrefs = that.getVendorAndPurchasesPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorAndPurchasesPrefs", lhsVendorAndPurchasesPrefs), LocatorUtils.property(thatLocator, "vendorAndPurchasesPrefs", rhsVendorAndPurchasesPrefs), lhsVendorAndPurchasesPrefs, rhsVendorAndPurchasesPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorAndPurchasesPrefs", lhsVendorAndPurchasesPrefs), LocatorUtils.property(thatLocator, "vendorAndPurchasesPrefs", rhsVendorAndPurchasesPrefs), lhsVendorAndPurchasesPrefs, rhsVendorAndPurchasesPrefs, (this.vendorAndPurchasesPrefs!= null), (that.vendorAndPurchasesPrefs!= null))) { return false; } } @@ -512,7 +512,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTimeTrackingPrefs = this.getTimeTrackingPrefs(); TimeTrackingPrefs rhsTimeTrackingPrefs; rhsTimeTrackingPrefs = that.getTimeTrackingPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "timeTrackingPrefs", lhsTimeTrackingPrefs), LocatorUtils.property(thatLocator, "timeTrackingPrefs", rhsTimeTrackingPrefs), lhsTimeTrackingPrefs, rhsTimeTrackingPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "timeTrackingPrefs", lhsTimeTrackingPrefs), LocatorUtils.property(thatLocator, "timeTrackingPrefs", rhsTimeTrackingPrefs), lhsTimeTrackingPrefs, rhsTimeTrackingPrefs, (this.timeTrackingPrefs!= null), (that.timeTrackingPrefs!= null))) { return false; } } @@ -521,7 +521,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxPrefs = this.getTaxPrefs(); TaxPrefs rhsTaxPrefs; rhsTaxPrefs = that.getTaxPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxPrefs", lhsTaxPrefs), LocatorUtils.property(thatLocator, "taxPrefs", rhsTaxPrefs), lhsTaxPrefs, rhsTaxPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxPrefs", lhsTaxPrefs), LocatorUtils.property(thatLocator, "taxPrefs", rhsTaxPrefs), lhsTaxPrefs, rhsTaxPrefs, (this.taxPrefs!= null), (that.taxPrefs!= null))) { return false; } } @@ -530,7 +530,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFinanceChargesPrefs = this.getFinanceChargesPrefs(); FinanceChargePrefs rhsFinanceChargesPrefs; rhsFinanceChargesPrefs = that.getFinanceChargesPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "financeChargesPrefs", lhsFinanceChargesPrefs), LocatorUtils.property(thatLocator, "financeChargesPrefs", rhsFinanceChargesPrefs), lhsFinanceChargesPrefs, rhsFinanceChargesPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "financeChargesPrefs", lhsFinanceChargesPrefs), LocatorUtils.property(thatLocator, "financeChargesPrefs", rhsFinanceChargesPrefs), lhsFinanceChargesPrefs, rhsFinanceChargesPrefs, (this.financeChargesPrefs!= null), (that.financeChargesPrefs!= null))) { return false; } } @@ -539,7 +539,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyPrefs = this.getCurrencyPrefs(); CurrencyPrefs rhsCurrencyPrefs; rhsCurrencyPrefs = that.getCurrencyPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyPrefs", lhsCurrencyPrefs), LocatorUtils.property(thatLocator, "currencyPrefs", rhsCurrencyPrefs), lhsCurrencyPrefs, rhsCurrencyPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyPrefs", lhsCurrencyPrefs), LocatorUtils.property(thatLocator, "currencyPrefs", rhsCurrencyPrefs), lhsCurrencyPrefs, rhsCurrencyPrefs, (this.currencyPrefs!= null), (that.currencyPrefs!= null))) { return false; } } @@ -548,7 +548,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportPrefs = this.getReportPrefs(); ReportPrefs rhsReportPrefs; rhsReportPrefs = that.getReportPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportPrefs", lhsReportPrefs), LocatorUtils.property(thatLocator, "reportPrefs", rhsReportPrefs), lhsReportPrefs, rhsReportPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportPrefs", lhsReportPrefs), LocatorUtils.property(thatLocator, "reportPrefs", rhsReportPrefs), lhsReportPrefs, rhsReportPrefs, (this.reportPrefs!= null), (that.reportPrefs!= null))) { return false; } } @@ -557,7 +557,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherPrefs = this.getOtherPrefs(); OtherPrefs rhsOtherPrefs; rhsOtherPrefs = that.getOtherPrefs(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherPrefs", lhsOtherPrefs), LocatorUtils.property(thatLocator, "otherPrefs", rhsOtherPrefs), lhsOtherPrefs, rhsOtherPrefs)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherPrefs", lhsOtherPrefs), LocatorUtils.property(thatLocator, "otherPrefs", rhsOtherPrefs), lhsOtherPrefs, rhsOtherPrefs, (this.otherPrefs!= null), (that.otherPrefs!= null))) { return false; } } @@ -565,82 +565,82 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { CompanyAccountingPrefs theAccountingInfoPrefs; theAccountingInfoPrefs = this.getAccountingInfoPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountingInfoPrefs", theAccountingInfoPrefs), currentHashCode, theAccountingInfoPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "accountingInfoPrefs", theAccountingInfoPrefs), currentHashCode, theAccountingInfoPrefs, (this.accountingInfoPrefs!= null)); } { AdvancedInventoryPrefs theAdvancedInventoryPrefs; theAdvancedInventoryPrefs = this.getAdvancedInventoryPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "advancedInventoryPrefs", theAdvancedInventoryPrefs), currentHashCode, theAdvancedInventoryPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "advancedInventoryPrefs", theAdvancedInventoryPrefs), currentHashCode, theAdvancedInventoryPrefs, (this.advancedInventoryPrefs!= null)); } { ProductAndServicesPrefs theProductAndServicesPrefs; theProductAndServicesPrefs = this.getProductAndServicesPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "productAndServicesPrefs", theProductAndServicesPrefs), currentHashCode, theProductAndServicesPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "productAndServicesPrefs", theProductAndServicesPrefs), currentHashCode, theProductAndServicesPrefs, (this.productAndServicesPrefs!= null)); } { SalesFormsPrefs theSalesFormsPrefs; theSalesFormsPrefs = this.getSalesFormsPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesFormsPrefs", theSalesFormsPrefs), currentHashCode, theSalesFormsPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesFormsPrefs", theSalesFormsPrefs), currentHashCode, theSalesFormsPrefs, (this.salesFormsPrefs!= null)); } { EmailMessagesPrefs theEmailMessagesPrefs; theEmailMessagesPrefs = this.getEmailMessagesPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailMessagesPrefs", theEmailMessagesPrefs), currentHashCode, theEmailMessagesPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailMessagesPrefs", theEmailMessagesPrefs), currentHashCode, theEmailMessagesPrefs, (this.emailMessagesPrefs!= null)); } { PrintDocumentPrefs thePrintDocumentPrefs; thePrintDocumentPrefs = this.getPrintDocumentPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printDocumentPrefs", thePrintDocumentPrefs), currentHashCode, thePrintDocumentPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printDocumentPrefs", thePrintDocumentPrefs), currentHashCode, thePrintDocumentPrefs, (this.printDocumentPrefs!= null)); } { VendorAndPurchasesPrefs theVendorAndPurchasesPrefs; theVendorAndPurchasesPrefs = this.getVendorAndPurchasesPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorAndPurchasesPrefs", theVendorAndPurchasesPrefs), currentHashCode, theVendorAndPurchasesPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorAndPurchasesPrefs", theVendorAndPurchasesPrefs), currentHashCode, theVendorAndPurchasesPrefs, (this.vendorAndPurchasesPrefs!= null)); } { TimeTrackingPrefs theTimeTrackingPrefs; theTimeTrackingPrefs = this.getTimeTrackingPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeTrackingPrefs", theTimeTrackingPrefs), currentHashCode, theTimeTrackingPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeTrackingPrefs", theTimeTrackingPrefs), currentHashCode, theTimeTrackingPrefs, (this.timeTrackingPrefs!= null)); } { TaxPrefs theTaxPrefs; theTaxPrefs = this.getTaxPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxPrefs", theTaxPrefs), currentHashCode, theTaxPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxPrefs", theTaxPrefs), currentHashCode, theTaxPrefs, (this.taxPrefs!= null)); } { FinanceChargePrefs theFinanceChargesPrefs; theFinanceChargesPrefs = this.getFinanceChargesPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "financeChargesPrefs", theFinanceChargesPrefs), currentHashCode, theFinanceChargesPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "financeChargesPrefs", theFinanceChargesPrefs), currentHashCode, theFinanceChargesPrefs, (this.financeChargesPrefs!= null)); } { CurrencyPrefs theCurrencyPrefs; theCurrencyPrefs = this.getCurrencyPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyPrefs", theCurrencyPrefs), currentHashCode, theCurrencyPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyPrefs", theCurrencyPrefs), currentHashCode, theCurrencyPrefs, (this.currencyPrefs!= null)); } { ReportPrefs theReportPrefs; theReportPrefs = this.getReportPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportPrefs", theReportPrefs), currentHashCode, theReportPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportPrefs", theReportPrefs), currentHashCode, theReportPrefs, (this.reportPrefs!= null)); } { OtherPrefs theOtherPrefs; theOtherPrefs = this.getOtherPrefs(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherPrefs", theOtherPrefs), currentHashCode, theOtherPrefs); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherPrefs", theOtherPrefs), currentHashCode, theOtherPrefs, (this.otherPrefs!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevel.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevel.java index 12c55172..7a1b57b9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevel.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevel.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,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; @@ -96,7 +96,7 @@ }) public class PriceLevel extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -292,8 +292,8 @@ public void setPriceLevelPerItem(List priceLevelPerItem) { this.priceLevelPerItem = priceLevelPerItem; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PriceLevel)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -308,16 +308,16 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); Object rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } { boolean lhsActive; - lhsActive = (true?this.isActive():false); + lhsActive = this.isActive(); boolean rhsActive; - rhsActive = (true?that.isActive():false); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + rhsActive = that.isActive(); + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, true, true)) { return false; } } @@ -326,7 +326,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelType = this.getPriceLevelType(); PriceLevelTypeEnum rhsPriceLevelType; rhsPriceLevelType = that.getPriceLevelType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelType", lhsPriceLevelType), LocatorUtils.property(thatLocator, "priceLevelType", rhsPriceLevelType), lhsPriceLevelType, rhsPriceLevelType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelType", lhsPriceLevelType), LocatorUtils.property(thatLocator, "priceLevelType", rhsPriceLevelType), lhsPriceLevelType, rhsPriceLevelType, (this.priceLevelType!= null), (that.priceLevelType!= null))) { return false; } } @@ -335,7 +335,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFixedPercentage = this.getFixedPercentage(); BigDecimal rhsFixedPercentage; rhsFixedPercentage = that.getFixedPercentage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fixedPercentage", lhsFixedPercentage), LocatorUtils.property(thatLocator, "fixedPercentage", rhsFixedPercentage), lhsFixedPercentage, rhsFixedPercentage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fixedPercentage", lhsFixedPercentage), LocatorUtils.property(thatLocator, "fixedPercentage", rhsFixedPercentage), lhsFixedPercentage, rhsFixedPercentage, (this.fixedPercentage!= null), (that.fixedPercentage!= null))) { return false; } } @@ -344,7 +344,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelPerItem = (((this.priceLevelPerItem!= null)&&(!this.priceLevelPerItem.isEmpty()))?this.getPriceLevelPerItem():null); List rhsPriceLevelPerItem; rhsPriceLevelPerItem = (((that.priceLevelPerItem!= null)&&(!that.priceLevelPerItem.isEmpty()))?that.getPriceLevelPerItem():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelPerItem", lhsPriceLevelPerItem), LocatorUtils.property(thatLocator, "priceLevelPerItem", rhsPriceLevelPerItem), lhsPriceLevelPerItem, rhsPriceLevelPerItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelPerItem", lhsPriceLevelPerItem), LocatorUtils.property(thatLocator, "priceLevelPerItem", rhsPriceLevelPerItem), lhsPriceLevelPerItem, rhsPriceLevelPerItem, ((this.priceLevelPerItem!= null)&&(!this.priceLevelPerItem.isEmpty())), ((that.priceLevelPerItem!= null)&&(!that.priceLevelPerItem.isEmpty())))) { return false; } } @@ -353,7 +353,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyRef = this.getCurrencyRef(); ReferenceType rhsCurrencyRef; rhsCurrencyRef = that.getCurrencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef, (this.currencyRef!= null), (that.currencyRef!= null))) { return false; } } @@ -362,7 +362,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelEx = this.getPriceLevelEx(); IntuitAnyType rhsPriceLevelEx; rhsPriceLevelEx = that.getPriceLevelEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelEx", lhsPriceLevelEx), LocatorUtils.property(thatLocator, "priceLevelEx", rhsPriceLevelEx), lhsPriceLevelEx, rhsPriceLevelEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelEx", lhsPriceLevelEx), LocatorUtils.property(thatLocator, "priceLevelEx", rhsPriceLevelEx), lhsPriceLevelEx, rhsPriceLevelEx, (this.priceLevelEx!= null), (that.priceLevelEx!= null))) { return false; } } @@ -370,52 +370,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Object theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { boolean theActive; - theActive = (true?this.isActive():false); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + theActive = this.isActive(); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, true); } { PriceLevelTypeEnum thePriceLevelType; thePriceLevelType = this.getPriceLevelType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelType", thePriceLevelType), currentHashCode, thePriceLevelType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelType", thePriceLevelType), currentHashCode, thePriceLevelType, (this.priceLevelType!= null)); } { BigDecimal theFixedPercentage; theFixedPercentage = this.getFixedPercentage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fixedPercentage", theFixedPercentage), currentHashCode, theFixedPercentage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fixedPercentage", theFixedPercentage), currentHashCode, theFixedPercentage, (this.fixedPercentage!= null)); } { List thePriceLevelPerItem; thePriceLevelPerItem = (((this.priceLevelPerItem!= null)&&(!this.priceLevelPerItem.isEmpty()))?this.getPriceLevelPerItem():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelPerItem", thePriceLevelPerItem), currentHashCode, thePriceLevelPerItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelPerItem", thePriceLevelPerItem), currentHashCode, thePriceLevelPerItem, ((this.priceLevelPerItem!= null)&&(!this.priceLevelPerItem.isEmpty()))); } { ReferenceType theCurrencyRef; theCurrencyRef = this.getCurrencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef, (this.currencyRef!= null)); } { IntuitAnyType thePriceLevelEx; thePriceLevelEx = this.getPriceLevelEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelEx", thePriceLevelEx), currentHashCode, thePriceLevelEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelEx", thePriceLevelEx), currentHashCode, thePriceLevelEx, (this.priceLevelEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelPerItem.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelPerItem.java index 20522930..72430c89 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelPerItem.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelPerItem.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -79,7 +79,7 @@ }) public class PriceLevelPerItem extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -188,8 +188,8 @@ public void setPriceLevelPerItemEx(IntuitAnyType value) { this.priceLevelPerItemEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PriceLevelPerItem)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -204,7 +204,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -213,7 +213,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomPrice = this.getCustomPrice(); BigDecimal rhsCustomPrice; rhsCustomPrice = that.getCustomPrice(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customPrice", lhsCustomPrice), LocatorUtils.property(thatLocator, "customPrice", rhsCustomPrice), lhsCustomPrice, rhsCustomPrice)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customPrice", lhsCustomPrice), LocatorUtils.property(thatLocator, "customPrice", rhsCustomPrice), lhsCustomPrice, rhsCustomPrice, (this.customPrice!= null), (that.customPrice!= null))) { return false; } } @@ -222,7 +222,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomPricePercent = this.getCustomPricePercent(); BigDecimal rhsCustomPricePercent; rhsCustomPricePercent = that.getCustomPricePercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customPricePercent", lhsCustomPricePercent), LocatorUtils.property(thatLocator, "customPricePercent", rhsCustomPricePercent), lhsCustomPricePercent, rhsCustomPricePercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customPricePercent", lhsCustomPricePercent), LocatorUtils.property(thatLocator, "customPricePercent", rhsCustomPricePercent), lhsCustomPricePercent, rhsCustomPricePercent, (this.customPricePercent!= null), (that.customPricePercent!= null))) { return false; } } @@ -231,7 +231,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPriceLevelPerItemEx = this.getPriceLevelPerItemEx(); IntuitAnyType rhsPriceLevelPerItemEx; rhsPriceLevelPerItemEx = that.getPriceLevelPerItemEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelPerItemEx", lhsPriceLevelPerItemEx), LocatorUtils.property(thatLocator, "priceLevelPerItemEx", rhsPriceLevelPerItemEx), lhsPriceLevelPerItemEx, rhsPriceLevelPerItemEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "priceLevelPerItemEx", lhsPriceLevelPerItemEx), LocatorUtils.property(thatLocator, "priceLevelPerItemEx", rhsPriceLevelPerItemEx), lhsPriceLevelPerItemEx, rhsPriceLevelPerItemEx, (this.priceLevelPerItemEx!= null), (that.priceLevelPerItemEx!= null))) { return false; } } @@ -239,37 +239,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= null)); } { BigDecimal theCustomPrice; theCustomPrice = this.getCustomPrice(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customPrice", theCustomPrice), currentHashCode, theCustomPrice); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customPrice", theCustomPrice), currentHashCode, theCustomPrice, (this.customPrice!= null)); } { BigDecimal theCustomPricePercent; theCustomPricePercent = this.getCustomPricePercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customPricePercent", theCustomPricePercent), currentHashCode, theCustomPricePercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customPricePercent", theCustomPricePercent), currentHashCode, theCustomPricePercent, (this.customPricePercent!= null)); } { IntuitAnyType thePriceLevelPerItemEx; thePriceLevelPerItemEx = this.getPriceLevelPerItemEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelPerItemEx", thePriceLevelPerItemEx), currentHashCode, thePriceLevelPerItemEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "priceLevelPerItemEx", thePriceLevelPerItemEx), currentHashCode, thePriceLevelPerItemEx, (this.priceLevelPerItemEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelTypeEnum.java index 6eff1e25..e6d9fbac 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PriceLevelTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintDocumentPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintDocumentPrefs.java index 8353e292..11f1e56a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintDocumentPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintDocumentPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "PrintDocumentPrefs", propOrder = { "nameValue" }) -public class PrintDocumentPrefs - implements Serializable, Equals, HashCode +public class PrintDocumentPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PrintDocumentPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintStatusEnum.java index 9cd854d9..eafb6bdb 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PrintStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ProductAndServicesPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ProductAndServicesPrefs.java index ee89e3b0..44199c32 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ProductAndServicesPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ProductAndServicesPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -74,8 +74,7 @@ "quantityOnHand", "uom" }) -public class ProductAndServicesPrefs - implements Serializable, Equals, HashCode +public class ProductAndServicesPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -236,8 +235,8 @@ public void setUOM(UOMFeatureTypeEnum value) { this.uom = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ProductAndServicesPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -249,7 +248,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsForSales = this.isForSales(); Boolean rhsForSales; rhsForSales = that.isForSales(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "forSales", lhsForSales), LocatorUtils.property(thatLocator, "forSales", rhsForSales), lhsForSales, rhsForSales)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "forSales", lhsForSales), LocatorUtils.property(thatLocator, "forSales", rhsForSales), lhsForSales, rhsForSales, (this.forSales!= null), (that.forSales!= null))) { return false; } } @@ -258,7 +257,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsForPurchase = this.isForPurchase(); Boolean rhsForPurchase; rhsForPurchase = that.isForPurchase(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "forPurchase", lhsForPurchase), LocatorUtils.property(thatLocator, "forPurchase", rhsForPurchase), lhsForPurchase, rhsForPurchase)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "forPurchase", lhsForPurchase), LocatorUtils.property(thatLocator, "forPurchase", rhsForPurchase), lhsForPurchase, rhsForPurchase, (this.forPurchase!= null), (that.forPurchase!= null))) { return false; } } @@ -267,7 +266,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInventoryAndPurchaseOrder = this.isInventoryAndPurchaseOrder(); Boolean rhsInventoryAndPurchaseOrder; rhsInventoryAndPurchaseOrder = that.isInventoryAndPurchaseOrder(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "inventoryAndPurchaseOrder", lhsInventoryAndPurchaseOrder), LocatorUtils.property(thatLocator, "inventoryAndPurchaseOrder", rhsInventoryAndPurchaseOrder), lhsInventoryAndPurchaseOrder, rhsInventoryAndPurchaseOrder)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "inventoryAndPurchaseOrder", lhsInventoryAndPurchaseOrder), LocatorUtils.property(thatLocator, "inventoryAndPurchaseOrder", rhsInventoryAndPurchaseOrder), lhsInventoryAndPurchaseOrder, rhsInventoryAndPurchaseOrder, (this.inventoryAndPurchaseOrder!= null), (that.inventoryAndPurchaseOrder!= null))) { return false; } } @@ -276,7 +275,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQuantityWithPriceAndRate = this.isQuantityWithPriceAndRate(); Boolean rhsQuantityWithPriceAndRate; rhsQuantityWithPriceAndRate = that.isQuantityWithPriceAndRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "quantityWithPriceAndRate", lhsQuantityWithPriceAndRate), LocatorUtils.property(thatLocator, "quantityWithPriceAndRate", rhsQuantityWithPriceAndRate), lhsQuantityWithPriceAndRate, rhsQuantityWithPriceAndRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "quantityWithPriceAndRate", lhsQuantityWithPriceAndRate), LocatorUtils.property(thatLocator, "quantityWithPriceAndRate", rhsQuantityWithPriceAndRate), lhsQuantityWithPriceAndRate, rhsQuantityWithPriceAndRate, (this.quantityWithPriceAndRate!= null), (that.quantityWithPriceAndRate!= null))) { return false; } } @@ -285,7 +284,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQuantityOnHand = this.isQuantityOnHand(); Boolean rhsQuantityOnHand; rhsQuantityOnHand = that.isQuantityOnHand(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "quantityOnHand", lhsQuantityOnHand), LocatorUtils.property(thatLocator, "quantityOnHand", rhsQuantityOnHand), lhsQuantityOnHand, rhsQuantityOnHand)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "quantityOnHand", lhsQuantityOnHand), LocatorUtils.property(thatLocator, "quantityOnHand", rhsQuantityOnHand), lhsQuantityOnHand, rhsQuantityOnHand, (this.quantityOnHand!= null), (that.quantityOnHand!= null))) { return false; } } @@ -294,7 +293,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOM = this.getUOM(); UOMFeatureTypeEnum rhsUOM; rhsUOM = that.getUOM(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uom", lhsUOM), LocatorUtils.property(thatLocator, "uom", rhsUOM), lhsUOM, rhsUOM)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uom", lhsUOM), LocatorUtils.property(thatLocator, "uom", rhsUOM), lhsUOM, rhsUOM, (this.uom!= null), (that.uom!= null))) { return false; } } @@ -302,47 +301,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theForSales; theForSales = this.isForSales(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forSales", theForSales), currentHashCode, theForSales); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forSales", theForSales), currentHashCode, theForSales, (this.forSales!= null)); } { Boolean theForPurchase; theForPurchase = this.isForPurchase(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forPurchase", theForPurchase), currentHashCode, theForPurchase); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forPurchase", theForPurchase), currentHashCode, theForPurchase, (this.forPurchase!= null)); } { Boolean theInventoryAndPurchaseOrder; theInventoryAndPurchaseOrder = this.isInventoryAndPurchaseOrder(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventoryAndPurchaseOrder", theInventoryAndPurchaseOrder), currentHashCode, theInventoryAndPurchaseOrder); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventoryAndPurchaseOrder", theInventoryAndPurchaseOrder), currentHashCode, theInventoryAndPurchaseOrder, (this.inventoryAndPurchaseOrder!= null)); } { Boolean theQuantityWithPriceAndRate; theQuantityWithPriceAndRate = this.isQuantityWithPriceAndRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantityWithPriceAndRate", theQuantityWithPriceAndRate), currentHashCode, theQuantityWithPriceAndRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantityWithPriceAndRate", theQuantityWithPriceAndRate), currentHashCode, theQuantityWithPriceAndRate, (this.quantityWithPriceAndRate!= null)); } { Boolean theQuantityOnHand; theQuantityOnHand = this.isQuantityOnHand(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantityOnHand", theQuantityOnHand), currentHashCode, theQuantityOnHand); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "quantityOnHand", theQuantityOnHand), currentHashCode, theQuantityOnHand, (this.quantityOnHand!= null)); } { UOMFeatureTypeEnum theUOM; theUOM = this.getUOM(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uom", theUOM), currentHashCode, theUOM); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uom", theUOM), currentHashCode, theUOM, (this.uom!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Purchase.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Purchase.java index 9fe86876..9ce162cb 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Purchase.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Purchase.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -98,7 +98,7 @@ }) public class Purchase extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -519,8 +519,8 @@ public void setPurchaseEx(IntuitAnyType value) { this.purchaseEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Purchase)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -535,7 +535,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; } } @@ -544,7 +544,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -553,7 +553,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentRefNum = this.getPaymentRefNum(); String rhsPaymentRefNum; rhsPaymentRefNum = that.getPaymentRefNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum, (this.paymentRefNum!= null), (that.paymentRefNum!= null))) { return false; } } @@ -562,7 +562,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentType = this.getPaymentType(); PaymentTypeEnum rhsPaymentType; rhsPaymentType = that.getPaymentType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType, (this.paymentType!= null), (that.paymentType!= null))) { return false; } } @@ -571,7 +571,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckPayment = this.getCheckPayment(); CheckPayment rhsCheckPayment; rhsCheckPayment = that.getCheckPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment, (this.checkPayment!= null), (that.checkPayment!= null))) { return false; } } @@ -580,7 +580,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditCardPayment = this.getCreditCardPayment(); CreditCardPayment rhsCreditCardPayment; rhsCreditCardPayment = that.getCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment, (this.creditCardPayment!= null), (that.creditCardPayment!= null))) { return false; } } @@ -589,7 +589,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityRef = this.getEntityRef(); ReferenceType rhsEntityRef; rhsEntityRef = that.getEntityRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRef", lhsEntityRef), LocatorUtils.property(thatLocator, "entityRef", rhsEntityRef), lhsEntityRef, rhsEntityRef, (this.entityRef!= null), (that.entityRef!= null))) { return false; } } @@ -598,7 +598,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCredit = this.isCredit(); Boolean rhsCredit; rhsCredit = that.isCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit, (this.credit!= null), (that.credit!= null))) { return false; } } @@ -607,7 +607,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToAddr = this.getRemitToAddr(); PhysicalAddress rhsRemitToAddr; rhsRemitToAddr = that.getRemitToAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToAddr", lhsRemitToAddr), LocatorUtils.property(thatLocator, "remitToAddr", rhsRemitToAddr), lhsRemitToAddr, rhsRemitToAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToAddr", lhsRemitToAddr), LocatorUtils.property(thatLocator, "remitToAddr", rhsRemitToAddr), lhsRemitToAddr, rhsRemitToAddr, (this.remitToAddr!= null), (that.remitToAddr!= null))) { return false; } } @@ -616,7 +616,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -625,7 +625,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnId = this.getTxnId(); String rhsTxnId; rhsTxnId = that.getTxnId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnId", lhsTxnId), LocatorUtils.property(thatLocator, "txnId", rhsTxnId), lhsTxnId, rhsTxnId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnId", lhsTxnId), LocatorUtils.property(thatLocator, "txnId", rhsTxnId), lhsTxnId, rhsTxnId, (this.txnId!= null), (that.txnId!= null))) { return false; } } @@ -634,7 +634,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnNum = this.getTxnNum(); String rhsTxnNum; rhsTxnNum = that.getTxnNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnNum", lhsTxnNum), LocatorUtils.property(thatLocator, "txnNum", rhsTxnNum), lhsTxnNum, rhsTxnNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnNum", lhsTxnNum), LocatorUtils.property(thatLocator, "txnNum", rhsTxnNum), lhsTxnNum, rhsTxnNum, (this.txnNum!= null), (that.txnNum!= null))) { return false; } } @@ -643,7 +643,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMemo = this.getMemo(); String rhsMemo; rhsMemo = that.getMemo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo, (this.memo!= null), (that.memo!= null))) { return false; } } @@ -652,7 +652,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintStatus = this.getPrintStatus(); PrintStatusEnum rhsPrintStatus; rhsPrintStatus = that.getPrintStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus, (this.printStatus!= null), (that.printStatus!= null))) { return false; } } @@ -661,7 +661,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGlobalTaxCalculation = this.getGlobalTaxCalculation(); GlobalTaxCalculationEnum rhsGlobalTaxCalculation; rhsGlobalTaxCalculation = that.getGlobalTaxCalculation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation, (this.globalTaxCalculation!= null), (that.globalTaxCalculation!= null))) { return false; } } @@ -670,7 +670,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseEx = this.getPurchaseEx(); IntuitAnyType rhsPurchaseEx; rhsPurchaseEx = that.getPurchaseEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseEx", lhsPurchaseEx), LocatorUtils.property(thatLocator, "purchaseEx", rhsPurchaseEx), lhsPurchaseEx, rhsPurchaseEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseEx", lhsPurchaseEx), LocatorUtils.property(thatLocator, "purchaseEx", rhsPurchaseEx), lhsPurchaseEx, rhsPurchaseEx, (this.purchaseEx!= null), (that.purchaseEx!= null))) { return false; } } @@ -678,97 +678,97 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { 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)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { String thePaymentRefNum; thePaymentRefNum = this.getPaymentRefNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum, (this.paymentRefNum!= null)); } { PaymentTypeEnum thePaymentType; thePaymentType = this.getPaymentType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType, (this.paymentType!= null)); } { CheckPayment theCheckPayment; theCheckPayment = this.getCheckPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment, (this.checkPayment!= null)); } { CreditCardPayment theCreditCardPayment; theCreditCardPayment = this.getCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment, (this.creditCardPayment!= null)); } { ReferenceType theEntityRef; theEntityRef = this.getEntityRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRef", theEntityRef), currentHashCode, theEntityRef, (this.entityRef!= null)); } { Boolean theCredit; theCredit = this.isCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit, (this.credit!= null)); } { PhysicalAddress theRemitToAddr; theRemitToAddr = this.getRemitToAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToAddr", theRemitToAddr), currentHashCode, theRemitToAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToAddr", theRemitToAddr), currentHashCode, theRemitToAddr, (this.remitToAddr!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { String theTxnId; theTxnId = this.getTxnId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnId", theTxnId), currentHashCode, theTxnId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnId", theTxnId), currentHashCode, theTxnId, (this.txnId!= null)); } { String theTxnNum; theTxnNum = this.getTxnNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnNum", theTxnNum), currentHashCode, theTxnNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnNum", theTxnNum), currentHashCode, theTxnNum, (this.txnNum!= null)); } { String theMemo; theMemo = this.getMemo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo, (this.memo!= null)); } { PrintStatusEnum thePrintStatus; thePrintStatus = this.getPrintStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus, (this.printStatus!= null)); } { GlobalTaxCalculationEnum theGlobalTaxCalculation; theGlobalTaxCalculation = this.getGlobalTaxCalculation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation, (this.globalTaxCalculation!= null)); } { IntuitAnyType thePurchaseEx; thePurchaseEx = this.getPurchaseEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseEx", thePurchaseEx), currentHashCode, thePurchaseEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseEx", thePurchaseEx), currentHashCode, thePurchaseEx, (this.purchaseEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseByVendor.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseByVendor.java index d3c3fcae..2db37c35 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseByVendor.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseByVendor.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; 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; @@ -85,7 +85,7 @@ }) public class PurchaseByVendor extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -272,8 +272,8 @@ public void setGlobalTaxCalculation(GlobalTaxCalculationEnum value) { this.globalTaxCalculation = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PurchaseByVendor)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -288,7 +288,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorRef = this.getVendorRef(); ReferenceType rhsVendorRef; rhsVendorRef = that.getVendorRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef, (this.vendorRef!= null), (that.vendorRef!= null))) { return false; } } @@ -297,7 +297,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAPAccountRef = this.getAPAccountRef(); ReferenceType rhsAPAccountRef; rhsAPAccountRef = that.getAPAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef, (this.apAccountRef!= null), (that.apAccountRef!= null))) { return false; } } @@ -306,7 +306,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -315,7 +315,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillEmail = this.getBillEmail(); EmailAddress rhsBillEmail; rhsBillEmail = that.getBillEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmail", lhsBillEmail), LocatorUtils.property(thatLocator, "billEmail", rhsBillEmail), lhsBillEmail, rhsBillEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmail", lhsBillEmail), LocatorUtils.property(thatLocator, "billEmail", rhsBillEmail), lhsBillEmail, rhsBillEmail, (this.billEmail!= null), (that.billEmail!= null))) { return false; } } @@ -324,7 +324,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReplyEmail = this.getReplyEmail(); EmailAddress rhsReplyEmail; rhsReplyEmail = that.getReplyEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "replyEmail", lhsReplyEmail), LocatorUtils.property(thatLocator, "replyEmail", rhsReplyEmail), lhsReplyEmail, rhsReplyEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "replyEmail", lhsReplyEmail), LocatorUtils.property(thatLocator, "replyEmail", rhsReplyEmail), lhsReplyEmail, rhsReplyEmail, (this.replyEmail!= null), (that.replyEmail!= null))) { return false; } } @@ -333,7 +333,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMemo = this.getMemo(); String rhsMemo; rhsMemo = that.getMemo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "memo", lhsMemo), LocatorUtils.property(thatLocator, "memo", rhsMemo), lhsMemo, rhsMemo, (this.memo!= null), (that.memo!= null))) { return false; } } @@ -342,7 +342,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGlobalTaxCalculation = this.getGlobalTaxCalculation(); GlobalTaxCalculationEnum rhsGlobalTaxCalculation; rhsGlobalTaxCalculation = that.getGlobalTaxCalculation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation, (this.globalTaxCalculation!= null), (that.globalTaxCalculation!= null))) { return false; } } @@ -350,52 +350,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theVendorRef; theVendorRef = this.getVendorRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef, (this.vendorRef!= null)); } { ReferenceType theAPAccountRef; theAPAccountRef = this.getAPAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef, (this.apAccountRef!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { EmailAddress theBillEmail; theBillEmail = this.getBillEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmail", theBillEmail), currentHashCode, theBillEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmail", theBillEmail), currentHashCode, theBillEmail, (this.billEmail!= null)); } { EmailAddress theReplyEmail; theReplyEmail = this.getReplyEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "replyEmail", theReplyEmail), currentHashCode, theReplyEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "replyEmail", theReplyEmail), currentHashCode, theReplyEmail, (this.replyEmail!= null)); } { String theMemo; theMemo = this.getMemo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "memo", theMemo), currentHashCode, theMemo, (this.memo!= null)); } { GlobalTaxCalculationEnum theGlobalTaxCalculation; theGlobalTaxCalculation = this.getGlobalTaxCalculation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation, (this.globalTaxCalculation!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrder.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrder.java index dce3ac59..16232de5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrder.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrder.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -109,7 +109,7 @@ }) public class PurchaseOrder extends PurchaseByVendor - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -612,8 +612,8 @@ public void setPurchaseOrderEx(IntuitAnyType value) { this.purchaseOrderEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PurchaseOrder)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -628,7 +628,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; } } @@ -637,7 +637,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; } } @@ -646,7 +646,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReimbursableInfoRef = this.getReimbursableInfoRef(); ReferenceType rhsReimbursableInfoRef; rhsReimbursableInfoRef = that.getReimbursableInfoRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reimbursableInfoRef", lhsReimbursableInfoRef), LocatorUtils.property(thatLocator, "reimbursableInfoRef", rhsReimbursableInfoRef), lhsReimbursableInfoRef, rhsReimbursableInfoRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reimbursableInfoRef", lhsReimbursableInfoRef), LocatorUtils.property(thatLocator, "reimbursableInfoRef", rhsReimbursableInfoRef), lhsReimbursableInfoRef, rhsReimbursableInfoRef, (this.reimbursableInfoRef!= null), (that.reimbursableInfoRef!= null))) { return false; } } @@ -655,7 +655,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTermRef = this.getSalesTermRef(); ReferenceType rhsSalesTermRef; rhsSalesTermRef = that.getSalesTermRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef, (this.salesTermRef!= null), (that.salesTermRef!= null))) { return false; } } @@ -664,7 +664,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -673,7 +673,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExpectedDate = this.getExpectedDate(); Date rhsExpectedDate; rhsExpectedDate = that.getExpectedDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "expectedDate", lhsExpectedDate), LocatorUtils.property(thatLocator, "expectedDate", rhsExpectedDate), lhsExpectedDate, rhsExpectedDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "expectedDate", lhsExpectedDate), LocatorUtils.property(thatLocator, "expectedDate", rhsExpectedDate), lhsExpectedDate, rhsExpectedDate, (this.expectedDate!= null), (that.expectedDate!= null))) { return false; } } @@ -682,7 +682,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorAddr = this.getVendorAddr(); PhysicalAddress rhsVendorAddr; rhsVendorAddr = that.getVendorAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorAddr", lhsVendorAddr), LocatorUtils.property(thatLocator, "vendorAddr", rhsVendorAddr), lhsVendorAddr, rhsVendorAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorAddr", lhsVendorAddr), LocatorUtils.property(thatLocator, "vendorAddr", rhsVendorAddr), lhsVendorAddr, rhsVendorAddr, (this.vendorAddr!= null), (that.vendorAddr!= null))) { return false; } } @@ -691,7 +691,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDropShipToEntity = this.getDropShipToEntity(); ReferenceType rhsDropShipToEntity; rhsDropShipToEntity = that.getDropShipToEntity(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dropShipToEntity", lhsDropShipToEntity), LocatorUtils.property(thatLocator, "dropShipToEntity", rhsDropShipToEntity), lhsDropShipToEntity, rhsDropShipToEntity)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dropShipToEntity", lhsDropShipToEntity), LocatorUtils.property(thatLocator, "dropShipToEntity", rhsDropShipToEntity), lhsDropShipToEntity, rhsDropShipToEntity, (this.dropShipToEntity!= null), (that.dropShipToEntity!= null))) { return false; } } @@ -700,7 +700,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInventorySiteRef = this.getInventorySiteRef(); ReferenceType rhsInventorySiteRef; rhsInventorySiteRef = that.getInventorySiteRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteRef", lhsInventorySiteRef), LocatorUtils.property(thatLocator, "inventorySiteRef", rhsInventorySiteRef), lhsInventorySiteRef, rhsInventorySiteRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "inventorySiteRef", lhsInventorySiteRef), LocatorUtils.property(thatLocator, "inventorySiteRef", rhsInventorySiteRef), lhsInventorySiteRef, rhsInventorySiteRef, (this.inventorySiteRef!= null), (that.inventorySiteRef!= null))) { return false; } } @@ -709,7 +709,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -718,7 +718,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipMethodRef = this.getShipMethodRef(); ReferenceType rhsShipMethodRef; rhsShipMethodRef = that.getShipMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodRef", lhsShipMethodRef), LocatorUtils.property(thatLocator, "shipMethodRef", rhsShipMethodRef), lhsShipMethodRef, rhsShipMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodRef", lhsShipMethodRef), LocatorUtils.property(thatLocator, "shipMethodRef", rhsShipMethodRef), lhsShipMethodRef, rhsShipMethodRef, (this.shipMethodRef!= null), (that.shipMethodRef!= null))) { return false; } } @@ -727,7 +727,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFOB = this.getFOB(); String rhsFOB; rhsFOB = that.getFOB(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fob", lhsFOB), LocatorUtils.property(thatLocator, "fob", rhsFOB), lhsFOB, rhsFOB)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fob", lhsFOB), LocatorUtils.property(thatLocator, "fob", rhsFOB), lhsFOB, rhsFOB, (this.fob!= null), (that.fob!= null))) { return false; } } @@ -736,7 +736,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPOEmail = this.getPOEmail(); EmailAddress rhsPOEmail; rhsPOEmail = that.getPOEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "poEmail", lhsPOEmail), LocatorUtils.property(thatLocator, "poEmail", rhsPOEmail), lhsPOEmail, rhsPOEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "poEmail", lhsPOEmail), LocatorUtils.property(thatLocator, "poEmail", rhsPOEmail), lhsPOEmail, rhsPOEmail, (this.poEmail!= null), (that.poEmail!= null))) { return false; } } @@ -745,7 +745,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTemplateRef = this.getTemplateRef(); ReferenceType rhsTemplateRef; rhsTemplateRef = that.getTemplateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "templateRef", lhsTemplateRef), LocatorUtils.property(thatLocator, "templateRef", rhsTemplateRef), lhsTemplateRef, rhsTemplateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "templateRef", lhsTemplateRef), LocatorUtils.property(thatLocator, "templateRef", rhsTemplateRef), lhsTemplateRef, rhsTemplateRef, (this.templateRef!= null), (that.templateRef!= null))) { return false; } } @@ -754,7 +754,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintStatus = this.getPrintStatus(); PrintStatusEnum rhsPrintStatus; rhsPrintStatus = that.getPrintStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus, (this.printStatus!= null), (that.printStatus!= null))) { return false; } } @@ -763,7 +763,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailStatus = this.getEmailStatus(); EmailStatusEnum rhsEmailStatus; rhsEmailStatus = that.getEmailStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailStatus", lhsEmailStatus), LocatorUtils.property(thatLocator, "emailStatus", rhsEmailStatus), lhsEmailStatus, rhsEmailStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailStatus", lhsEmailStatus), LocatorUtils.property(thatLocator, "emailStatus", rhsEmailStatus), lhsEmailStatus, rhsEmailStatus, (this.emailStatus!= null), (that.emailStatus!= null))) { return false; } } @@ -772,7 +772,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManuallyClosed = this.isManuallyClosed(); Boolean rhsManuallyClosed; rhsManuallyClosed = that.isManuallyClosed(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed, (this.manuallyClosed!= null), (that.manuallyClosed!= null))) { return false; } } @@ -781,7 +781,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPOStatus = this.getPOStatus(); PurchaseOrderStatusEnum rhsPOStatus; rhsPOStatus = that.getPOStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "poStatus", lhsPOStatus), LocatorUtils.property(thatLocator, "poStatus", rhsPOStatus), lhsPOStatus, rhsPOStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "poStatus", lhsPOStatus), LocatorUtils.property(thatLocator, "poStatus", rhsPOStatus), lhsPOStatus, rhsPOStatus, (this.poStatus!= null), (that.poStatus!= null))) { return false; } } @@ -790,7 +790,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseOrderEx = this.getPurchaseOrderEx(); IntuitAnyType rhsPurchaseOrderEx; rhsPurchaseOrderEx = that.getPurchaseOrderEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderEx", lhsPurchaseOrderEx), LocatorUtils.property(thatLocator, "purchaseOrderEx", rhsPurchaseOrderEx), lhsPurchaseOrderEx, rhsPurchaseOrderEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderEx", lhsPurchaseOrderEx), LocatorUtils.property(thatLocator, "purchaseOrderEx", rhsPurchaseOrderEx), lhsPurchaseOrderEx, rhsPurchaseOrderEx, (this.purchaseOrderEx!= null), (that.purchaseOrderEx!= null))) { return false; } } @@ -798,112 +798,112 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { 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)); } { 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 theReimbursableInfoRef; theReimbursableInfoRef = this.getReimbursableInfoRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reimbursableInfoRef", theReimbursableInfoRef), currentHashCode, theReimbursableInfoRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reimbursableInfoRef", theReimbursableInfoRef), currentHashCode, theReimbursableInfoRef, (this.reimbursableInfoRef!= null)); } { ReferenceType theSalesTermRef; theSalesTermRef = this.getSalesTermRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef, (this.salesTermRef!= null)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { Date theExpectedDate; theExpectedDate = this.getExpectedDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expectedDate", theExpectedDate), currentHashCode, theExpectedDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expectedDate", theExpectedDate), currentHashCode, theExpectedDate, (this.expectedDate!= null)); } { PhysicalAddress theVendorAddr; theVendorAddr = this.getVendorAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorAddr", theVendorAddr), currentHashCode, theVendorAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorAddr", theVendorAddr), currentHashCode, theVendorAddr, (this.vendorAddr!= null)); } { ReferenceType theDropShipToEntity; theDropShipToEntity = this.getDropShipToEntity(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dropShipToEntity", theDropShipToEntity), currentHashCode, theDropShipToEntity); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dropShipToEntity", theDropShipToEntity), currentHashCode, theDropShipToEntity, (this.dropShipToEntity!= null)); } { ReferenceType theInventorySiteRef; theInventorySiteRef = this.getInventorySiteRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteRef", theInventorySiteRef), currentHashCode, theInventorySiteRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inventorySiteRef", theInventorySiteRef), currentHashCode, theInventorySiteRef, (this.inventorySiteRef!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { ReferenceType theShipMethodRef; theShipMethodRef = this.getShipMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodRef", theShipMethodRef), currentHashCode, theShipMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodRef", theShipMethodRef), currentHashCode, theShipMethodRef, (this.shipMethodRef!= null)); } { String theFOB; theFOB = this.getFOB(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fob", theFOB), currentHashCode, theFOB); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fob", theFOB), currentHashCode, theFOB, (this.fob!= null)); } { EmailAddress thePOEmail; thePOEmail = this.getPOEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poEmail", thePOEmail), currentHashCode, thePOEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poEmail", thePOEmail), currentHashCode, thePOEmail, (this.poEmail!= null)); } { ReferenceType theTemplateRef; theTemplateRef = this.getTemplateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "templateRef", theTemplateRef), currentHashCode, theTemplateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "templateRef", theTemplateRef), currentHashCode, theTemplateRef, (this.templateRef!= null)); } { PrintStatusEnum thePrintStatus; thePrintStatus = this.getPrintStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus, (this.printStatus!= null)); } { EmailStatusEnum theEmailStatus; theEmailStatus = this.getEmailStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailStatus", theEmailStatus), currentHashCode, theEmailStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailStatus", theEmailStatus), currentHashCode, theEmailStatus, (this.emailStatus!= null)); } { Boolean theManuallyClosed; theManuallyClosed = this.isManuallyClosed(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed, (this.manuallyClosed!= null)); } { PurchaseOrderStatusEnum thePOStatus; thePOStatus = this.getPOStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poStatus", thePOStatus), currentHashCode, thePOStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poStatus", thePOStatus), currentHashCode, thePOStatus, (this.poStatus!= null)); } { IntuitAnyType thePurchaseOrderEx; thePurchaseOrderEx = this.getPurchaseOrderEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderEx", thePurchaseOrderEx), currentHashCode, thePurchaseOrderEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderEx", thePurchaseOrderEx), currentHashCode, thePurchaseOrderEx, (this.purchaseOrderEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderItemLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderItemLineDetail.java index 9c245074..d024aa68 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderItemLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderItemLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -76,7 +76,7 @@ }) public class PurchaseOrderItemLineDetail extends SalesItemLineDetail - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -185,8 +185,8 @@ public void setPurchaseOrderItemLineDetailEx(IntuitAnyType value) { this.purchaseOrderItemLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof PurchaseOrderItemLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -201,7 +201,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManPartNum = this.getManPartNum(); String rhsManPartNum; rhsManPartNum = that.getManPartNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manPartNum", lhsManPartNum), LocatorUtils.property(thatLocator, "manPartNum", rhsManPartNum), lhsManPartNum, rhsManPartNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manPartNum", lhsManPartNum), LocatorUtils.property(thatLocator, "manPartNum", rhsManPartNum), lhsManPartNum, rhsManPartNum, (this.manPartNum!= null), (that.manPartNum!= null))) { return false; } } @@ -210,7 +210,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManuallyClosed = this.isManuallyClosed(); Boolean rhsManuallyClosed; rhsManuallyClosed = that.isManuallyClosed(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed, (this.manuallyClosed!= null), (that.manuallyClosed!= null))) { return false; } } @@ -219,7 +219,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOpenQty = this.getOpenQty(); BigDecimal rhsOpenQty; rhsOpenQty = that.getOpenQty(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "openQty", lhsOpenQty), LocatorUtils.property(thatLocator, "openQty", rhsOpenQty), lhsOpenQty, rhsOpenQty)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "openQty", lhsOpenQty), LocatorUtils.property(thatLocator, "openQty", rhsOpenQty), lhsOpenQty, rhsOpenQty, (this.openQty!= null), (that.openQty!= null))) { return false; } } @@ -228,7 +228,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseOrderItemLineDetailEx = this.getPurchaseOrderItemLineDetailEx(); IntuitAnyType rhsPurchaseOrderItemLineDetailEx; rhsPurchaseOrderItemLineDetailEx = that.getPurchaseOrderItemLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderItemLineDetailEx", lhsPurchaseOrderItemLineDetailEx), LocatorUtils.property(thatLocator, "purchaseOrderItemLineDetailEx", rhsPurchaseOrderItemLineDetailEx), lhsPurchaseOrderItemLineDetailEx, rhsPurchaseOrderItemLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseOrderItemLineDetailEx", lhsPurchaseOrderItemLineDetailEx), LocatorUtils.property(thatLocator, "purchaseOrderItemLineDetailEx", rhsPurchaseOrderItemLineDetailEx), lhsPurchaseOrderItemLineDetailEx, rhsPurchaseOrderItemLineDetailEx, (this.purchaseOrderItemLineDetailEx!= null), (that.purchaseOrderItemLineDetailEx!= null))) { return false; } } @@ -236,37 +236,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theManPartNum; theManPartNum = this.getManPartNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manPartNum", theManPartNum), currentHashCode, theManPartNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manPartNum", theManPartNum), currentHashCode, theManPartNum, (this.manPartNum!= null)); } { Boolean theManuallyClosed; theManuallyClosed = this.isManuallyClosed(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed, (this.manuallyClosed!= null)); } { BigDecimal theOpenQty; theOpenQty = this.getOpenQty(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openQty", theOpenQty), currentHashCode, theOpenQty); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openQty", theOpenQty), currentHashCode, theOpenQty, (this.openQty!= null)); } { IntuitAnyType thePurchaseOrderItemLineDetailEx; thePurchaseOrderItemLineDetailEx = this.getPurchaseOrderItemLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderItemLineDetailEx", thePurchaseOrderItemLineDetailEx), currentHashCode, thePurchaseOrderItemLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseOrderItemLineDetailEx", thePurchaseOrderItemLineDetailEx), currentHashCode, thePurchaseOrderItemLineDetailEx, (this.purchaseOrderItemLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderStatusEnum.java index ad28d229..0726787e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/PurchaseOrderStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QbdtEntityIdMapping.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QbdtEntityIdMapping.java index 5430aa6b..811d5a18 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QbdtEntityIdMapping.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QbdtEntityIdMapping.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -74,7 +74,7 @@ }) public class QbdtEntityIdMapping extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -183,8 +183,8 @@ public void setQbdtEntityType(String value) { this.qbdtEntityType = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof QbdtEntityIdMapping)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -199,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQboEntityId = this.getQboEntityId(); String rhsQboEntityId; rhsQboEntityId = that.getQboEntityId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qboEntityId", lhsQboEntityId), LocatorUtils.property(thatLocator, "qboEntityId", rhsQboEntityId), lhsQboEntityId, rhsQboEntityId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qboEntityId", lhsQboEntityId), LocatorUtils.property(thatLocator, "qboEntityId", rhsQboEntityId), lhsQboEntityId, rhsQboEntityId, (this.qboEntityId!= null), (that.qboEntityId!= null))) { return false; } } @@ -208,7 +208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQbdtExportableId = this.getQbdtExportableId(); String rhsQbdtExportableId; rhsQbdtExportableId = that.getQbdtExportableId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qbdtExportableId", lhsQbdtExportableId), LocatorUtils.property(thatLocator, "qbdtExportableId", rhsQbdtExportableId), lhsQbdtExportableId, rhsQbdtExportableId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qbdtExportableId", lhsQbdtExportableId), LocatorUtils.property(thatLocator, "qbdtExportableId", rhsQbdtExportableId), lhsQbdtExportableId, rhsQbdtExportableId, (this.qbdtExportableId!= null), (that.qbdtExportableId!= null))) { return false; } } @@ -217,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQboEntityType = this.getQboEntityType(); String rhsQboEntityType; rhsQboEntityType = that.getQboEntityType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qboEntityType", lhsQboEntityType), LocatorUtils.property(thatLocator, "qboEntityType", rhsQboEntityType), lhsQboEntityType, rhsQboEntityType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qboEntityType", lhsQboEntityType), LocatorUtils.property(thatLocator, "qboEntityType", rhsQboEntityType), lhsQboEntityType, rhsQboEntityType, (this.qboEntityType!= null), (that.qboEntityType!= null))) { return false; } } @@ -226,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQbdtEntityType = this.getQbdtEntityType(); String rhsQbdtEntityType; rhsQbdtEntityType = that.getQbdtEntityType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qbdtEntityType", lhsQbdtEntityType), LocatorUtils.property(thatLocator, "qbdtEntityType", rhsQbdtEntityType), lhsQbdtEntityType, rhsQbdtEntityType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qbdtEntityType", lhsQbdtEntityType), LocatorUtils.property(thatLocator, "qbdtEntityType", rhsQbdtEntityType), lhsQbdtEntityType, rhsQbdtEntityType, (this.qbdtEntityType!= null), (that.qbdtEntityType!= null))) { return false; } } @@ -234,37 +234,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theQboEntityId; theQboEntityId = this.getQboEntityId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qboEntityId", theQboEntityId), currentHashCode, theQboEntityId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qboEntityId", theQboEntityId), currentHashCode, theQboEntityId, (this.qboEntityId!= null)); } { String theQbdtExportableId; theQbdtExportableId = this.getQbdtExportableId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbdtExportableId", theQbdtExportableId), currentHashCode, theQbdtExportableId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbdtExportableId", theQbdtExportableId), currentHashCode, theQbdtExportableId, (this.qbdtExportableId!= null)); } { String theQboEntityType; theQboEntityType = this.getQboEntityType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qboEntityType", theQboEntityType), currentHashCode, theQboEntityType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qboEntityType", theQboEntityType), currentHashCode, theQboEntityType, (this.qboEntityType!= null)); } { String theQbdtEntityType; theQbdtEntityType = this.getQbdtEntityType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbdtEntityType", theQbdtEntityType), currentHashCode, theQbdtEntityType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbdtEntityType", theQbdtEntityType), currentHashCode, theQbdtEntityType, (this.qbdtEntityType!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEntityTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEntityTypeEnum.java index f85f4913..6ebdeab8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEntityTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEntityTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEstimateStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEstimateStatusEnum.java index dd4b9ad5..c7ed55ca 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEstimateStatusEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QboEstimateStatusEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QueryResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QueryResponse.java index d1bfa7c0..6d5ce0a8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QueryResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/QueryResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; 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; @@ -77,8 +77,7 @@ "intuitObject", "fault" }) -public class QueryResponse - implements Serializable, Equals, HashCode +public class QueryResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -137,68 +136,68 @@ public void setWarnings(Warnings value) { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * * */ @@ -310,76 +309,76 @@ public void setTotalCount(Integer value) { * * @param intuitObject * allowed object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public void setIntuitObject(List> intuitObject) { this.intuitObject = intuitObject; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof QueryResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -391,7 +390,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWarnings = this.getWarnings(); Warnings rhsWarnings; rhsWarnings = that.getWarnings(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "warnings", lhsWarnings), LocatorUtils.property(thatLocator, "warnings", rhsWarnings), lhsWarnings, rhsWarnings, (this.warnings!= null), (that.warnings!= null))) { return false; } } @@ -400,7 +399,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitObject = (((this.intuitObject!= null)&&(!this.intuitObject.isEmpty()))?this.getIntuitObject():null); List> rhsIntuitObject; rhsIntuitObject = (((that.intuitObject!= null)&&(!that.intuitObject.isEmpty()))?that.getIntuitObject():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject, ((this.intuitObject!= null)&&(!this.intuitObject.isEmpty())), ((that.intuitObject!= null)&&(!that.intuitObject.isEmpty())))) { return false; } } @@ -409,7 +408,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -418,7 +417,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartPosition = this.getStartPosition(); Integer rhsStartPosition; rhsStartPosition = that.getStartPosition(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition, (this.startPosition!= null), (that.startPosition!= null))) { return false; } } @@ -427,7 +426,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxResults = this.getMaxResults(); Integer rhsMaxResults; rhsMaxResults = that.getMaxResults(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults, (this.maxResults!= null), (that.maxResults!= null))) { return false; } } @@ -436,7 +435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalCount = this.getTotalCount(); Integer rhsTotalCount; rhsTotalCount = that.getTotalCount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount, (this.totalCount!= null), (that.totalCount!= null))) { return false; } } @@ -444,47 +443,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Warnings theWarnings; theWarnings = this.getWarnings(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warnings", theWarnings), currentHashCode, theWarnings, (this.warnings!= null)); } { List> theIntuitObject; theIntuitObject = (((this.intuitObject!= null)&&(!this.intuitObject.isEmpty()))?this.getIntuitObject():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject, ((this.intuitObject!= null)&&(!this.intuitObject.isEmpty()))); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } { Integer theStartPosition; theStartPosition = this.getStartPosition(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition, (this.startPosition!= null)); } { Integer theMaxResults; theMaxResults = this.getMaxResults(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults, (this.maxResults!= null)); } { Integer theTotalCount; theTotalCount = this.getTotalCount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount, (this.totalCount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReferenceType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReferenceType.java index 417857f9..4957905e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReferenceType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReferenceType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -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; @@ -66,8 +66,7 @@ @XmlType(name = "ReferenceType", propOrder = { "value" }) -public class ReferenceType - implements Serializable, Equals, HashCode +public class ReferenceType implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -153,8 +152,8 @@ public void setType(String value) { this.type = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ReferenceType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -166,7 +165,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsValue = this.getValue(); String rhsValue; rhsValue = that.getValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue, (this.value!= null), (that.value!= null))) { return false; } } @@ -175,7 +174,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -184,7 +183,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -192,32 +191,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theValue; theValue = this.getValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue, (this.value!= null)); } { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RefundReceipt.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RefundReceipt.java index 3a42dfc6..ff40331d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RefundReceipt.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RefundReceipt.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -70,7 +70,7 @@ }) public class RefundReceipt extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +127,8 @@ public void setRefundReceiptEx(IntuitAnyType value) { this.refundReceiptEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof RefundReceipt)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -143,7 +143,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemainingCredit = this.getRemainingCredit(); BigDecimal rhsRemainingCredit; rhsRemainingCredit = that.getRemainingCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remainingCredit", lhsRemainingCredit), LocatorUtils.property(thatLocator, "remainingCredit", rhsRemainingCredit), lhsRemainingCredit, rhsRemainingCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remainingCredit", lhsRemainingCredit), LocatorUtils.property(thatLocator, "remainingCredit", rhsRemainingCredit), lhsRemainingCredit, rhsRemainingCredit, (this.remainingCredit!= null), (that.remainingCredit!= null))) { return false; } } @@ -152,7 +152,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRefundReceiptEx = this.getRefundReceiptEx(); IntuitAnyType rhsRefundReceiptEx; rhsRefundReceiptEx = that.getRefundReceiptEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "refundReceiptEx", lhsRefundReceiptEx), LocatorUtils.property(thatLocator, "refundReceiptEx", rhsRefundReceiptEx), lhsRefundReceiptEx, rhsRefundReceiptEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "refundReceiptEx", lhsRefundReceiptEx), LocatorUtils.property(thatLocator, "refundReceiptEx", rhsRefundReceiptEx), lhsRefundReceiptEx, rhsRefundReceiptEx, (this.refundReceiptEx!= null), (that.refundReceiptEx!= null))) { return false; } } @@ -160,27 +160,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { BigDecimal theRemainingCredit; theRemainingCredit = this.getRemainingCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remainingCredit", theRemainingCredit), currentHashCode, theRemainingCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remainingCredit", theRemainingCredit), currentHashCode, theRemainingCredit, (this.remainingCredit!= null)); } { IntuitAnyType theRefundReceiptEx; theRefundReceiptEx = this.getRefundReceiptEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "refundReceiptEx", theRefundReceiptEx), currentHashCode, theRefundReceiptEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "refundReceiptEx", theRefundReceiptEx), currentHashCode, theRefundReceiptEx, (this.refundReceiptEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimbursableTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimbursableTypeEnum.java index c1040816..e35e984c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimbursableTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimbursableTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimburseCharge.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimburseCharge.java index b734378c..a1451c89 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimburseCharge.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReimburseCharge.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -70,7 +70,7 @@ }) public class ReimburseCharge extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -127,8 +127,8 @@ public void setAmount(BigDecimal value) { this.amount = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ReimburseCharge)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -143,7 +143,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; } } @@ -152,7 +152,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -160,27 +160,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { 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)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Report.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Report.java index b721ad17..6b9ef926 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Report.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Report.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -67,8 +67,7 @@ "columns", "rows" }) -public class Report - implements Serializable, Equals, HashCode +public class Report implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -151,8 +150,8 @@ public void setRows(Rows value) { this.rows = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Report)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -164,7 +163,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHeader = this.getHeader(); ReportHeader rhsHeader; rhsHeader = that.getHeader(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "header", lhsHeader), LocatorUtils.property(thatLocator, "header", rhsHeader), lhsHeader, rhsHeader)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "header", lhsHeader), LocatorUtils.property(thatLocator, "header", rhsHeader), lhsHeader, rhsHeader, (this.header!= null), (that.header!= null))) { return false; } } @@ -173,7 +172,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColumns = this.getColumns(); Columns rhsColumns; rhsColumns = that.getColumns(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "columns", lhsColumns), LocatorUtils.property(thatLocator, "columns", rhsColumns), lhsColumns, rhsColumns)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "columns", lhsColumns), LocatorUtils.property(thatLocator, "columns", rhsColumns), lhsColumns, rhsColumns, (this.columns!= null), (that.columns!= null))) { return false; } } @@ -182,7 +181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRows = this.getRows(); Rows rhsRows; rhsRows = that.getRows(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rows", lhsRows), LocatorUtils.property(thatLocator, "rows", rhsRows), lhsRows, rhsRows)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rows", lhsRows), LocatorUtils.property(thatLocator, "rows", rhsRows), lhsRows, rhsRows, (this.rows!= null), (that.rows!= null))) { return false; } } @@ -190,32 +189,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { ReportHeader theHeader; theHeader = this.getHeader(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "header", theHeader), currentHashCode, theHeader); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "header", theHeader), currentHashCode, theHeader, (this.header!= null)); } { Columns theColumns; theColumns = this.getColumns(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "columns", theColumns), currentHashCode, theColumns); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "columns", theColumns), currentHashCode, theColumns, (this.columns!= null)); } { Rows theRows; theRows = this.getRows(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rows", theRows), currentHashCode, theRows); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rows", theRows), currentHashCode, theRows, (this.rows!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportBasisEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportBasisEnum.java index 1c99f3f1..81557d69 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportBasisEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportBasisEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportHeader.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportHeader.java index 8c5ffad5..8116f6b5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportHeader.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportHeader.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -97,8 +97,7 @@ "department", "option" }) -public class ReportHeader - implements Serializable, Equals, HashCode +public class ReportHeader implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -512,8 +511,8 @@ public void setOption(List option) { this.option = option; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ReportHeader)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -525,7 +524,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTime = this.getTime(); Date rhsTime; rhsTime = that.getTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "time", lhsTime), LocatorUtils.property(thatLocator, "time", rhsTime), lhsTime, rhsTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "time", lhsTime), LocatorUtils.property(thatLocator, "time", rhsTime), lhsTime, rhsTime, (this.time!= null), (that.time!= null))) { return false; } } @@ -534,7 +533,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportName = this.getReportName(); String rhsReportName; rhsReportName = that.getReportName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportName", lhsReportName), LocatorUtils.property(thatLocator, "reportName", rhsReportName), lhsReportName, rhsReportName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportName", lhsReportName), LocatorUtils.property(thatLocator, "reportName", rhsReportName), lhsReportName, rhsReportName, (this.reportName!= null), (that.reportName!= null))) { return false; } } @@ -543,7 +542,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDateMacro = this.getDateMacro(); String rhsDateMacro; rhsDateMacro = that.getDateMacro(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dateMacro", lhsDateMacro), LocatorUtils.property(thatLocator, "dateMacro", rhsDateMacro), lhsDateMacro, rhsDateMacro)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dateMacro", lhsDateMacro), LocatorUtils.property(thatLocator, "dateMacro", rhsDateMacro), lhsDateMacro, rhsDateMacro, (this.dateMacro!= null), (that.dateMacro!= null))) { return false; } } @@ -552,7 +551,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportBasis = this.getReportBasis(); ReportBasisEnum rhsReportBasis; rhsReportBasis = that.getReportBasis(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportBasis", lhsReportBasis), LocatorUtils.property(thatLocator, "reportBasis", rhsReportBasis), lhsReportBasis, rhsReportBasis)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportBasis", lhsReportBasis), LocatorUtils.property(thatLocator, "reportBasis", rhsReportBasis), lhsReportBasis, rhsReportBasis, (this.reportBasis!= null), (that.reportBasis!= null))) { return false; } } @@ -561,7 +560,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartPeriod = this.getStartPeriod(); String rhsStartPeriod; rhsStartPeriod = that.getStartPeriod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startPeriod", lhsStartPeriod), LocatorUtils.property(thatLocator, "startPeriod", rhsStartPeriod), lhsStartPeriod, rhsStartPeriod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startPeriod", lhsStartPeriod), LocatorUtils.property(thatLocator, "startPeriod", rhsStartPeriod), lhsStartPeriod, rhsStartPeriod, (this.startPeriod!= null), (that.startPeriod!= null))) { return false; } } @@ -570,7 +569,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndPeriod = this.getEndPeriod(); String rhsEndPeriod; rhsEndPeriod = that.getEndPeriod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endPeriod", lhsEndPeriod), LocatorUtils.property(thatLocator, "endPeriod", rhsEndPeriod), lhsEndPeriod, rhsEndPeriod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endPeriod", lhsEndPeriod), LocatorUtils.property(thatLocator, "endPeriod", rhsEndPeriod), lhsEndPeriod, rhsEndPeriod, (this.endPeriod!= null), (that.endPeriod!= null))) { return false; } } @@ -579,7 +578,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSummarizeColumnsBy = this.getSummarizeColumnsBy(); String rhsSummarizeColumnsBy; rhsSummarizeColumnsBy = that.getSummarizeColumnsBy(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "summarizeColumnsBy", lhsSummarizeColumnsBy), LocatorUtils.property(thatLocator, "summarizeColumnsBy", rhsSummarizeColumnsBy), lhsSummarizeColumnsBy, rhsSummarizeColumnsBy)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "summarizeColumnsBy", lhsSummarizeColumnsBy), LocatorUtils.property(thatLocator, "summarizeColumnsBy", rhsSummarizeColumnsBy), lhsSummarizeColumnsBy, rhsSummarizeColumnsBy, (this.summarizeColumnsBy!= null), (that.summarizeColumnsBy!= null))) { return false; } } @@ -588,7 +587,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrency = this.getCurrency(); String rhsCurrency; rhsCurrency = that.getCurrency(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currency", lhsCurrency), LocatorUtils.property(thatLocator, "currency", rhsCurrency), lhsCurrency, rhsCurrency)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currency", lhsCurrency), LocatorUtils.property(thatLocator, "currency", rhsCurrency), lhsCurrency, rhsCurrency, (this.currency!= null), (that.currency!= null))) { return false; } } @@ -597,7 +596,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomer = this.getCustomer(); String rhsCustomer; rhsCustomer = that.getCustomer(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customer", lhsCustomer), LocatorUtils.property(thatLocator, "customer", rhsCustomer), lhsCustomer, rhsCustomer)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customer", lhsCustomer), LocatorUtils.property(thatLocator, "customer", rhsCustomer), lhsCustomer, rhsCustomer, (this.customer!= null), (that.customer!= null))) { return false; } } @@ -606,7 +605,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendor = this.getVendor(); String rhsVendor; rhsVendor = that.getVendor(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor", lhsVendor), LocatorUtils.property(thatLocator, "vendor", rhsVendor), lhsVendor, rhsVendor)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor", lhsVendor), LocatorUtils.property(thatLocator, "vendor", rhsVendor), lhsVendor, rhsVendor, (this.vendor!= null), (that.vendor!= null))) { return false; } } @@ -615,7 +614,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployee = this.getEmployee(); String rhsEmployee; rhsEmployee = that.getEmployee(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employee", lhsEmployee), LocatorUtils.property(thatLocator, "employee", rhsEmployee), lhsEmployee, rhsEmployee)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employee", lhsEmployee), LocatorUtils.property(thatLocator, "employee", rhsEmployee), lhsEmployee, rhsEmployee, (this.employee!= null), (that.employee!= null))) { return false; } } @@ -624,7 +623,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItem = this.getItem(); String rhsItem; rhsItem = that.getItem(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "item", lhsItem), LocatorUtils.property(thatLocator, "item", rhsItem), lhsItem, rhsItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "item", lhsItem), LocatorUtils.property(thatLocator, "item", rhsItem), lhsItem, rhsItem, (this.item!= null), (that.item!= null))) { return false; } } @@ -633,7 +632,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsClazz = this.getClazz(); String rhsClazz; rhsClazz = that.getClazz(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "clazz", lhsClazz), LocatorUtils.property(thatLocator, "clazz", rhsClazz), lhsClazz, rhsClazz)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "clazz", lhsClazz), LocatorUtils.property(thatLocator, "clazz", rhsClazz), lhsClazz, rhsClazz, (this.clazz!= null), (that.clazz!= null))) { return false; } } @@ -642,7 +641,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartment = this.getDepartment(); String rhsDepartment; rhsDepartment = that.getDepartment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "department", lhsDepartment), LocatorUtils.property(thatLocator, "department", rhsDepartment), lhsDepartment, rhsDepartment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "department", lhsDepartment), LocatorUtils.property(thatLocator, "department", rhsDepartment), lhsDepartment, rhsDepartment, (this.department!= null), (that.department!= null))) { return false; } } @@ -651,7 +650,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOption = (((this.option!= null)&&(!this.option.isEmpty()))?this.getOption():null); List rhsOption; rhsOption = (((that.option!= null)&&(!that.option.isEmpty()))?that.getOption():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "option", lhsOption), LocatorUtils.property(thatLocator, "option", rhsOption), lhsOption, rhsOption)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "option", lhsOption), LocatorUtils.property(thatLocator, "option", rhsOption), lhsOption, rhsOption, ((this.option!= null)&&(!this.option.isEmpty())), ((that.option!= null)&&(!that.option.isEmpty())))) { return false; } } @@ -659,92 +658,92 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Date theTime; theTime = this.getTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "time", theTime), currentHashCode, theTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "time", theTime), currentHashCode, theTime, (this.time!= null)); } { String theReportName; theReportName = this.getReportName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportName", theReportName), currentHashCode, theReportName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportName", theReportName), currentHashCode, theReportName, (this.reportName!= null)); } { String theDateMacro; theDateMacro = this.getDateMacro(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dateMacro", theDateMacro), currentHashCode, theDateMacro); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dateMacro", theDateMacro), currentHashCode, theDateMacro, (this.dateMacro!= null)); } { ReportBasisEnum theReportBasis; theReportBasis = this.getReportBasis(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportBasis", theReportBasis), currentHashCode, theReportBasis); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportBasis", theReportBasis), currentHashCode, theReportBasis, (this.reportBasis!= null)); } { String theStartPeriod; theStartPeriod = this.getStartPeriod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPeriod", theStartPeriod), currentHashCode, theStartPeriod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPeriod", theStartPeriod), currentHashCode, theStartPeriod, (this.startPeriod!= null)); } { String theEndPeriod; theEndPeriod = this.getEndPeriod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endPeriod", theEndPeriod), currentHashCode, theEndPeriod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endPeriod", theEndPeriod), currentHashCode, theEndPeriod, (this.endPeriod!= null)); } { String theSummarizeColumnsBy; theSummarizeColumnsBy = this.getSummarizeColumnsBy(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "summarizeColumnsBy", theSummarizeColumnsBy), currentHashCode, theSummarizeColumnsBy); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "summarizeColumnsBy", theSummarizeColumnsBy), currentHashCode, theSummarizeColumnsBy, (this.summarizeColumnsBy!= null)); } { String theCurrency; theCurrency = this.getCurrency(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currency", theCurrency), currentHashCode, theCurrency); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currency", theCurrency), currentHashCode, theCurrency, (this.currency!= null)); } { String theCustomer; theCustomer = this.getCustomer(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customer", theCustomer), currentHashCode, theCustomer); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customer", theCustomer), currentHashCode, theCustomer, (this.customer!= null)); } { String theVendor; theVendor = this.getVendor(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor", theVendor), currentHashCode, theVendor); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor", theVendor), currentHashCode, theVendor, (this.vendor!= null)); } { String theEmployee; theEmployee = this.getEmployee(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employee", theEmployee), currentHashCode, theEmployee); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employee", theEmployee), currentHashCode, theEmployee, (this.employee!= null)); } { String theItem; theItem = this.getItem(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "item", theItem), currentHashCode, theItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "item", theItem), currentHashCode, theItem, (this.item!= null)); } { String theClazz; theClazz = this.getClazz(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "clazz", theClazz), currentHashCode, theClazz); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "clazz", theClazz), currentHashCode, theClazz, (this.clazz!= null)); } { String theDepartment; theDepartment = this.getDepartment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "department", theDepartment), currentHashCode, theDepartment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "department", theDepartment), currentHashCode, theDepartment, (this.department!= null)); } { List theOption; theOption = (((this.option!= null)&&(!this.option.isEmpty()))?this.getOption():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "option", theOption), currentHashCode, theOption); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "option", theOption), currentHashCode, theOption, ((this.option!= null)&&(!this.option.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportPrefs.java index ebfa54fc..02bec932 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ReportPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -65,8 +65,7 @@ "reportBasis", "calcAgingReportFromTxnDate" }) -public class ReportPrefs - implements Serializable, Equals, HashCode +public class ReportPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -123,8 +122,8 @@ public void setCalcAgingReportFromTxnDate(Boolean value) { this.calcAgingReportFromTxnDate = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ReportPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -136,7 +135,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportBasis = this.getReportBasis(); ReportBasisEnum rhsReportBasis; rhsReportBasis = that.getReportBasis(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportBasis", lhsReportBasis), LocatorUtils.property(thatLocator, "reportBasis", rhsReportBasis), lhsReportBasis, rhsReportBasis)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportBasis", lhsReportBasis), LocatorUtils.property(thatLocator, "reportBasis", rhsReportBasis), lhsReportBasis, rhsReportBasis, (this.reportBasis!= null), (that.reportBasis!= null))) { return false; } } @@ -145,7 +144,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCalcAgingReportFromTxnDate = this.isCalcAgingReportFromTxnDate(); Boolean rhsCalcAgingReportFromTxnDate; rhsCalcAgingReportFromTxnDate = that.isCalcAgingReportFromTxnDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "calcAgingReportFromTxnDate", lhsCalcAgingReportFromTxnDate), LocatorUtils.property(thatLocator, "calcAgingReportFromTxnDate", rhsCalcAgingReportFromTxnDate), lhsCalcAgingReportFromTxnDate, rhsCalcAgingReportFromTxnDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "calcAgingReportFromTxnDate", lhsCalcAgingReportFromTxnDate), LocatorUtils.property(thatLocator, "calcAgingReportFromTxnDate", rhsCalcAgingReportFromTxnDate), lhsCalcAgingReportFromTxnDate, rhsCalcAgingReportFromTxnDate, (this.calcAgingReportFromTxnDate!= null), (that.calcAgingReportFromTxnDate!= null))) { return false; } } @@ -153,27 +152,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { ReportBasisEnum theReportBasis; theReportBasis = this.getReportBasis(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportBasis", theReportBasis), currentHashCode, theReportBasis); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportBasis", theReportBasis), currentHashCode, theReportBasis, (this.reportBasis!= null)); } { Boolean theCalcAgingReportFromTxnDate; theCalcAgingReportFromTxnDate = this.isCalcAgingReportFromTxnDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "calcAgingReportFromTxnDate", theCalcAgingReportFromTxnDate), currentHashCode, theCalcAgingReportFromTxnDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "calcAgingReportFromTxnDate", theCalcAgingReportFromTxnDate), currentHashCode, theCalcAgingReportFromTxnDate, (this.calcAgingReportFromTxnDate!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RoundingMethodEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RoundingMethodEnum.java index fc531048..d1ba08ab 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RoundingMethodEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RoundingMethodEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Row.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Row.java index 4894aa0d..7c44cc2a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Row.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Row.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlAttribute; 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 @@ "summary", "colData" }) -public class Row - implements Serializable, Equals, HashCode +public class Row implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -313,8 +312,8 @@ public void setColData(List colData) { this.colData = colData; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Row)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -326,7 +325,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -335,7 +334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentId = this.getParentId(); String rhsParentId; rhsParentId = that.getParentId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentId", lhsParentId), LocatorUtils.property(thatLocator, "parentId", rhsParentId), lhsParentId, rhsParentId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentId", lhsParentId), LocatorUtils.property(thatLocator, "parentId", rhsParentId), lhsParentId, rhsParentId, (this.parentId!= null), (that.parentId!= null))) { return false; } } @@ -344,7 +343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHeader = this.getHeader(); Header rhsHeader; rhsHeader = that.getHeader(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "header", lhsHeader), LocatorUtils.property(thatLocator, "header", rhsHeader), lhsHeader, rhsHeader)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "header", lhsHeader), LocatorUtils.property(thatLocator, "header", rhsHeader), lhsHeader, rhsHeader, (this.header!= null), (that.header!= null))) { return false; } } @@ -353,7 +352,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRows = this.getRows(); Rows rhsRows; rhsRows = that.getRows(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rows", lhsRows), LocatorUtils.property(thatLocator, "rows", rhsRows), lhsRows, rhsRows)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rows", lhsRows), LocatorUtils.property(thatLocator, "rows", rhsRows), lhsRows, rhsRows, (this.rows!= null), (that.rows!= null))) { return false; } } @@ -362,7 +361,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSummary = this.getSummary(); Summary rhsSummary; rhsSummary = that.getSummary(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "summary", lhsSummary), LocatorUtils.property(thatLocator, "summary", rhsSummary), lhsSummary, rhsSummary)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "summary", lhsSummary), LocatorUtils.property(thatLocator, "summary", rhsSummary), lhsSummary, rhsSummary, (this.summary!= null), (that.summary!= null))) { return false; } } @@ -371,7 +370,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); List rhsColData; rhsColData = (((that.colData!= null)&&(!that.colData.isEmpty()))?that.getColData():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData, ((this.colData!= null)&&(!this.colData.isEmpty())), ((that.colData!= null)&&(!that.colData.isEmpty())))) { return false; } } @@ -380,7 +379,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); RowTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -389,7 +388,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGroup = this.getGroup(); String rhsGroup; rhsGroup = that.getGroup(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "group", lhsGroup), LocatorUtils.property(thatLocator, "group", rhsGroup), lhsGroup, rhsGroup)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "group", lhsGroup), LocatorUtils.property(thatLocator, "group", rhsGroup), lhsGroup, rhsGroup, (this.group!= null), (that.group!= null))) { return false; } } @@ -397,57 +396,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theParentId; theParentId = this.getParentId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentId", theParentId), currentHashCode, theParentId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentId", theParentId), currentHashCode, theParentId, (this.parentId!= null)); } { Header theHeader; theHeader = this.getHeader(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "header", theHeader), currentHashCode, theHeader); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "header", theHeader), currentHashCode, theHeader, (this.header!= null)); } { Rows theRows; theRows = this.getRows(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rows", theRows), currentHashCode, theRows); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rows", theRows), currentHashCode, theRows, (this.rows!= null)); } { Summary theSummary; theSummary = this.getSummary(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "summary", theSummary), currentHashCode, theSummary); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "summary", theSummary), currentHashCode, theSummary, (this.summary!= null)); } { List theColData; theColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData, ((this.colData!= null)&&(!this.colData.isEmpty()))); } { RowTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theGroup; theGroup = this.getGroup(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "group", theGroup), currentHashCode, theGroup); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "group", theGroup), currentHashCode, theGroup, (this.group!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RowTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RowTypeEnum.java index c5d11739..3d445d9f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RowTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/RowTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Rows.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Rows.java index 0797b9fc..35db0357 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Rows.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Rows.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "Rows", propOrder = { "row" }) -public class Rows - implements Serializable, Equals, HashCode +public class Rows implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setRow(List row) { this.row = row; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Rows)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRow = (((this.row!= null)&&(!this.row.isEmpty()))?this.getRow():null); List rhsRow; rhsRow = (((that.row!= null)&&(!that.row.isEmpty()))?that.getRow():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "row", lhsRow), LocatorUtils.property(thatLocator, "row", rhsRow), lhsRow, rhsRow)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "row", lhsRow), LocatorUtils.property(thatLocator, "row", rhsRow), lhsRow, rhsRow, ((this.row!= null)&&(!this.row.isEmpty())), ((that.row!= null)&&(!that.row.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theRow; theRow = (((this.row!= null)&&(!this.row.isEmpty()))?this.getRow():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "row", theRow), currentHashCode, theRow); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "row", theRow), currentHashCode, theRow, ((this.row!= null)&&(!this.row.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesFormsPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesFormsPrefs.java index 50ee797c..51d8ae05 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesFormsPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesFormsPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,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; @@ -130,8 +130,7 @@ "defaultFOB", "defaultCustomerMessage" }) -public class SalesFormsPrefs - implements Serializable, Equals, HashCode +public class SalesFormsPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1011,8 +1010,8 @@ public void setCustomField(List customField) { this.customField = customField; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesFormsPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1024,7 +1023,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingProgressInvoicing = this.isUsingProgressInvoicing(); Boolean rhsUsingProgressInvoicing; rhsUsingProgressInvoicing = that.isUsingProgressInvoicing(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingProgressInvoicing", lhsUsingProgressInvoicing), LocatorUtils.property(thatLocator, "usingProgressInvoicing", rhsUsingProgressInvoicing), lhsUsingProgressInvoicing, rhsUsingProgressInvoicing)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingProgressInvoicing", lhsUsingProgressInvoicing), LocatorUtils.property(thatLocator, "usingProgressInvoicing", rhsUsingProgressInvoicing), lhsUsingProgressInvoicing, rhsUsingProgressInvoicing, (this.usingProgressInvoicing!= null), (that.usingProgressInvoicing!= null))) { return false; } } @@ -1033,7 +1032,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); List rhsCustomField; rhsCustomField = (((that.customField!= null)&&(!that.customField.isEmpty()))?that.getCustomField():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customField", lhsCustomField), LocatorUtils.property(thatLocator, "customField", rhsCustomField), lhsCustomField, rhsCustomField, ((this.customField!= null)&&(!this.customField.isEmpty())), ((that.customField!= null)&&(!that.customField.isEmpty())))) { return false; } } @@ -1042,7 +1041,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomTxnNumbers = this.isCustomTxnNumbers(); Boolean rhsCustomTxnNumbers; rhsCustomTxnNumbers = that.isCustomTxnNumbers(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customTxnNumbers", lhsCustomTxnNumbers), LocatorUtils.property(thatLocator, "customTxnNumbers", rhsCustomTxnNumbers), lhsCustomTxnNumbers, rhsCustomTxnNumbers)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customTxnNumbers", lhsCustomTxnNumbers), LocatorUtils.property(thatLocator, "customTxnNumbers", rhsCustomTxnNumbers), lhsCustomTxnNumbers, rhsCustomTxnNumbers, (this.customTxnNumbers!= null), (that.customTxnNumbers!= null))) { return false; } } @@ -1051,7 +1050,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDelayedCharges = this.isDelayedCharges(); Boolean rhsDelayedCharges; rhsDelayedCharges = that.isDelayedCharges(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "delayedCharges", lhsDelayedCharges), LocatorUtils.property(thatLocator, "delayedCharges", rhsDelayedCharges), lhsDelayedCharges, rhsDelayedCharges)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "delayedCharges", lhsDelayedCharges), LocatorUtils.property(thatLocator, "delayedCharges", rhsDelayedCharges), lhsDelayedCharges, rhsDelayedCharges, (this.delayedCharges!= null), (that.delayedCharges!= null))) { return false; } } @@ -1060,7 +1059,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesEmailCc = this.getSalesEmailCc(); EmailAddress rhsSalesEmailCc; rhsSalesEmailCc = that.getSalesEmailCc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesEmailCc", lhsSalesEmailCc), LocatorUtils.property(thatLocator, "salesEmailCc", rhsSalesEmailCc), lhsSalesEmailCc, rhsSalesEmailCc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesEmailCc", lhsSalesEmailCc), LocatorUtils.property(thatLocator, "salesEmailCc", rhsSalesEmailCc), lhsSalesEmailCc, rhsSalesEmailCc, (this.salesEmailCc!= null), (that.salesEmailCc!= null))) { return false; } } @@ -1069,7 +1068,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesEmailBcc = this.getSalesEmailBcc(); EmailAddress rhsSalesEmailBcc; rhsSalesEmailBcc = that.getSalesEmailBcc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesEmailBcc", lhsSalesEmailBcc), LocatorUtils.property(thatLocator, "salesEmailBcc", rhsSalesEmailBcc), lhsSalesEmailBcc, rhsSalesEmailBcc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesEmailBcc", lhsSalesEmailBcc), LocatorUtils.property(thatLocator, "salesEmailBcc", rhsSalesEmailBcc), lhsSalesEmailBcc, rhsSalesEmailBcc, (this.salesEmailBcc!= null), (that.salesEmailBcc!= null))) { return false; } } @@ -1078,7 +1077,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailCopyToCompany = this.isEmailCopyToCompany(); Boolean rhsEmailCopyToCompany; rhsEmailCopyToCompany = that.isEmailCopyToCompany(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailCopyToCompany", lhsEmailCopyToCompany), LocatorUtils.property(thatLocator, "emailCopyToCompany", rhsEmailCopyToCompany), lhsEmailCopyToCompany, rhsEmailCopyToCompany)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailCopyToCompany", lhsEmailCopyToCompany), LocatorUtils.property(thatLocator, "emailCopyToCompany", rhsEmailCopyToCompany), lhsEmailCopyToCompany, rhsEmailCopyToCompany, (this.emailCopyToCompany!= null), (that.emailCopyToCompany!= null))) { return false; } } @@ -1087,7 +1086,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowDeposit = this.isAllowDeposit(); Boolean rhsAllowDeposit; rhsAllowDeposit = that.isAllowDeposit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowDeposit", lhsAllowDeposit), LocatorUtils.property(thatLocator, "allowDeposit", rhsAllowDeposit), lhsAllowDeposit, rhsAllowDeposit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowDeposit", lhsAllowDeposit), LocatorUtils.property(thatLocator, "allowDeposit", rhsAllowDeposit), lhsAllowDeposit, rhsAllowDeposit, (this.allowDeposit!= null), (that.allowDeposit!= null))) { return false; } } @@ -1096,7 +1095,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowDiscount = this.isAllowDiscount(); Boolean rhsAllowDiscount; rhsAllowDiscount = that.isAllowDiscount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowDiscount", lhsAllowDiscount), LocatorUtils.property(thatLocator, "allowDiscount", rhsAllowDiscount), lhsAllowDiscount, rhsAllowDiscount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowDiscount", lhsAllowDiscount), LocatorUtils.property(thatLocator, "allowDiscount", rhsAllowDiscount), lhsAllowDiscount, rhsAllowDiscount, (this.allowDiscount!= null), (that.allowDiscount!= null))) { return false; } } @@ -1105,7 +1104,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultDiscountAccount = this.getDefaultDiscountAccount(); String rhsDefaultDiscountAccount; rhsDefaultDiscountAccount = that.getDefaultDiscountAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDiscountAccount", lhsDefaultDiscountAccount), LocatorUtils.property(thatLocator, "defaultDiscountAccount", rhsDefaultDiscountAccount), lhsDefaultDiscountAccount, rhsDefaultDiscountAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDiscountAccount", lhsDefaultDiscountAccount), LocatorUtils.property(thatLocator, "defaultDiscountAccount", rhsDefaultDiscountAccount), lhsDefaultDiscountAccount, rhsDefaultDiscountAccount, (this.defaultDiscountAccount!= null), (that.defaultDiscountAccount!= null))) { return false; } } @@ -1114,7 +1113,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowEstimates = this.isAllowEstimates(); Boolean rhsAllowEstimates; rhsAllowEstimates = that.isAllowEstimates(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowEstimates", lhsAllowEstimates), LocatorUtils.property(thatLocator, "allowEstimates", rhsAllowEstimates), lhsAllowEstimates, rhsAllowEstimates)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowEstimates", lhsAllowEstimates), LocatorUtils.property(thatLocator, "allowEstimates", rhsAllowEstimates), lhsAllowEstimates, rhsAllowEstimates, (this.allowEstimates!= null), (that.allowEstimates!= null))) { return false; } } @@ -1123,7 +1122,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEstimateMessage = this.getEstimateMessage(); String rhsEstimateMessage; rhsEstimateMessage = that.getEstimateMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateMessage", lhsEstimateMessage), LocatorUtils.property(thatLocator, "estimateMessage", rhsEstimateMessage), lhsEstimateMessage, rhsEstimateMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "estimateMessage", lhsEstimateMessage), LocatorUtils.property(thatLocator, "estimateMessage", rhsEstimateMessage), lhsEstimateMessage, rhsEstimateMessage, (this.estimateMessage!= null), (that.estimateMessage!= null))) { return false; } } @@ -1132,7 +1131,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsETransactionEnabledStatus = this.getETransactionEnabledStatus(); ETransactionEnabledStatusEnum rhsETransactionEnabledStatus; rhsETransactionEnabledStatus = that.getETransactionEnabledStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionEnabledStatus", lhsETransactionEnabledStatus), LocatorUtils.property(thatLocator, "eTransactionEnabledStatus", rhsETransactionEnabledStatus), lhsETransactionEnabledStatus, rhsETransactionEnabledStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionEnabledStatus", lhsETransactionEnabledStatus), LocatorUtils.property(thatLocator, "eTransactionEnabledStatus", rhsETransactionEnabledStatus), lhsETransactionEnabledStatus, rhsETransactionEnabledStatus, (this.eTransactionEnabledStatus!= null), (that.eTransactionEnabledStatus!= null))) { return false; } } @@ -1141,7 +1140,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsETransactionAttachPDF = this.isETransactionAttachPDF(); Boolean rhsETransactionAttachPDF; rhsETransactionAttachPDF = that.isETransactionAttachPDF(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionAttachPDF", lhsETransactionAttachPDF), LocatorUtils.property(thatLocator, "eTransactionAttachPDF", rhsETransactionAttachPDF), lhsETransactionAttachPDF, rhsETransactionAttachPDF)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionAttachPDF", lhsETransactionAttachPDF), LocatorUtils.property(thatLocator, "eTransactionAttachPDF", rhsETransactionAttachPDF), lhsETransactionAttachPDF, rhsETransactionAttachPDF, (this.eTransactionAttachPDF!= null), (that.eTransactionAttachPDF!= null))) { return false; } } @@ -1150,7 +1149,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsETransactionPaymentEnabled = this.isETransactionPaymentEnabled(); Boolean rhsETransactionPaymentEnabled; rhsETransactionPaymentEnabled = that.isETransactionPaymentEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionPaymentEnabled", lhsETransactionPaymentEnabled), LocatorUtils.property(thatLocator, "eTransactionPaymentEnabled", rhsETransactionPaymentEnabled), lhsETransactionPaymentEnabled, rhsETransactionPaymentEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "eTransactionPaymentEnabled", lhsETransactionPaymentEnabled), LocatorUtils.property(thatLocator, "eTransactionPaymentEnabled", rhsETransactionPaymentEnabled), lhsETransactionPaymentEnabled, rhsETransactionPaymentEnabled, (this.eTransactionPaymentEnabled!= null), (that.eTransactionPaymentEnabled!= null))) { return false; } } @@ -1159,7 +1158,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIPNSupportEnabled = this.isIPNSupportEnabled(); Boolean rhsIPNSupportEnabled; rhsIPNSupportEnabled = that.isIPNSupportEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "ipnSupportEnabled", lhsIPNSupportEnabled), LocatorUtils.property(thatLocator, "ipnSupportEnabled", rhsIPNSupportEnabled), lhsIPNSupportEnabled, rhsIPNSupportEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "ipnSupportEnabled", lhsIPNSupportEnabled), LocatorUtils.property(thatLocator, "ipnSupportEnabled", rhsIPNSupportEnabled), lhsIPNSupportEnabled, rhsIPNSupportEnabled, (this.ipnSupportEnabled!= null), (that.ipnSupportEnabled!= null))) { return false; } } @@ -1168,7 +1167,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInvoiceMessage = this.getInvoiceMessage(); String rhsInvoiceMessage; rhsInvoiceMessage = that.getInvoiceMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceMessage", lhsInvoiceMessage), LocatorUtils.property(thatLocator, "invoiceMessage", rhsInvoiceMessage), lhsInvoiceMessage, rhsInvoiceMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "invoiceMessage", lhsInvoiceMessage), LocatorUtils.property(thatLocator, "invoiceMessage", rhsInvoiceMessage), lhsInvoiceMessage, rhsInvoiceMessage, (this.invoiceMessage!= null), (that.invoiceMessage!= null))) { return false; } } @@ -1177,7 +1176,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowServiceDate = this.isAllowServiceDate(); Boolean rhsAllowServiceDate; rhsAllowServiceDate = that.isAllowServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowServiceDate", lhsAllowServiceDate), LocatorUtils.property(thatLocator, "allowServiceDate", rhsAllowServiceDate), lhsAllowServiceDate, rhsAllowServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowServiceDate", lhsAllowServiceDate), LocatorUtils.property(thatLocator, "allowServiceDate", rhsAllowServiceDate), lhsAllowServiceDate, rhsAllowServiceDate, (this.allowServiceDate!= null), (that.allowServiceDate!= null))) { return false; } } @@ -1186,7 +1185,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAllowShipping = this.isAllowShipping(); Boolean rhsAllowShipping; rhsAllowShipping = that.isAllowShipping(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "allowShipping", lhsAllowShipping), LocatorUtils.property(thatLocator, "allowShipping", rhsAllowShipping), lhsAllowShipping, rhsAllowShipping)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "allowShipping", lhsAllowShipping), LocatorUtils.property(thatLocator, "allowShipping", rhsAllowShipping), lhsAllowShipping, rhsAllowShipping, (this.allowShipping!= null), (that.allowShipping!= null))) { return false; } } @@ -1195,7 +1194,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultShippingAccount = this.getDefaultShippingAccount(); String rhsDefaultShippingAccount; rhsDefaultShippingAccount = that.getDefaultShippingAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultShippingAccount", lhsDefaultShippingAccount), LocatorUtils.property(thatLocator, "defaultShippingAccount", rhsDefaultShippingAccount), lhsDefaultShippingAccount, rhsDefaultShippingAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultShippingAccount", lhsDefaultShippingAccount), LocatorUtils.property(thatLocator, "defaultShippingAccount", rhsDefaultShippingAccount), lhsDefaultShippingAccount, rhsDefaultShippingAccount, (this.defaultShippingAccount!= null), (that.defaultShippingAccount!= null))) { return false; } } @@ -1204,7 +1203,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultItem = this.getDefaultItem(); ReferenceType rhsDefaultItem; rhsDefaultItem = that.getDefaultItem(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultItem", lhsDefaultItem), LocatorUtils.property(thatLocator, "defaultItem", rhsDefaultItem), lhsDefaultItem, rhsDefaultItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultItem", lhsDefaultItem), LocatorUtils.property(thatLocator, "defaultItem", rhsDefaultItem), lhsDefaultItem, rhsDefaultItem, (this.defaultItem!= null), (that.defaultItem!= null))) { return false; } } @@ -1213,7 +1212,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTerms = this.getDefaultTerms(); ReferenceType rhsDefaultTerms; rhsDefaultTerms = that.getDefaultTerms(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTerms", lhsDefaultTerms), LocatorUtils.property(thatLocator, "defaultTerms", rhsDefaultTerms), lhsDefaultTerms, rhsDefaultTerms)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTerms", lhsDefaultTerms), LocatorUtils.property(thatLocator, "defaultTerms", rhsDefaultTerms), lhsDefaultTerms, rhsDefaultTerms, (this.defaultTerms!= null), (that.defaultTerms!= null))) { return false; } } @@ -1222,7 +1221,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultDeliveryMethod = this.getDefaultDeliveryMethod(); String rhsDefaultDeliveryMethod; rhsDefaultDeliveryMethod = that.getDefaultDeliveryMethod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDeliveryMethod", lhsDefaultDeliveryMethod), LocatorUtils.property(thatLocator, "defaultDeliveryMethod", rhsDefaultDeliveryMethod), lhsDefaultDeliveryMethod, rhsDefaultDeliveryMethod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultDeliveryMethod", lhsDefaultDeliveryMethod), LocatorUtils.property(thatLocator, "defaultDeliveryMethod", rhsDefaultDeliveryMethod), lhsDefaultDeliveryMethod, rhsDefaultDeliveryMethod, (this.defaultDeliveryMethod!= null), (that.defaultDeliveryMethod!= null))) { return false; } } @@ -1231,7 +1230,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAutoApplyCredit = this.isAutoApplyCredit(); Boolean rhsAutoApplyCredit; rhsAutoApplyCredit = that.isAutoApplyCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "autoApplyCredit", lhsAutoApplyCredit), LocatorUtils.property(thatLocator, "autoApplyCredit", rhsAutoApplyCredit), lhsAutoApplyCredit, rhsAutoApplyCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "autoApplyCredit", lhsAutoApplyCredit), LocatorUtils.property(thatLocator, "autoApplyCredit", rhsAutoApplyCredit), lhsAutoApplyCredit, rhsAutoApplyCredit, (this.autoApplyCredit!= null), (that.autoApplyCredit!= null))) { return false; } } @@ -1240,7 +1239,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAutoApplyPayments = this.isAutoApplyPayments(); Boolean rhsAutoApplyPayments; rhsAutoApplyPayments = that.isAutoApplyPayments(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "autoApplyPayments", lhsAutoApplyPayments), LocatorUtils.property(thatLocator, "autoApplyPayments", rhsAutoApplyPayments), lhsAutoApplyPayments, rhsAutoApplyPayments)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "autoApplyPayments", lhsAutoApplyPayments), LocatorUtils.property(thatLocator, "autoApplyPayments", rhsAutoApplyPayments), lhsAutoApplyPayments, rhsAutoApplyPayments, (this.autoApplyPayments!= null), (that.autoApplyPayments!= null))) { return false; } } @@ -1249,7 +1248,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintItemWithZeroAmount = this.isPrintItemWithZeroAmount(); Boolean rhsPrintItemWithZeroAmount; rhsPrintItemWithZeroAmount = that.isPrintItemWithZeroAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printItemWithZeroAmount", lhsPrintItemWithZeroAmount), LocatorUtils.property(thatLocator, "printItemWithZeroAmount", rhsPrintItemWithZeroAmount), lhsPrintItemWithZeroAmount, rhsPrintItemWithZeroAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printItemWithZeroAmount", lhsPrintItemWithZeroAmount), LocatorUtils.property(thatLocator, "printItemWithZeroAmount", rhsPrintItemWithZeroAmount), lhsPrintItemWithZeroAmount, rhsPrintItemWithZeroAmount, (this.printItemWithZeroAmount!= null), (that.printItemWithZeroAmount!= null))) { return false; } } @@ -1258,7 +1257,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultShipMethodRef = this.getDefaultShipMethodRef(); ReferenceType rhsDefaultShipMethodRef; rhsDefaultShipMethodRef = that.getDefaultShipMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultShipMethodRef", lhsDefaultShipMethodRef), LocatorUtils.property(thatLocator, "defaultShipMethodRef", rhsDefaultShipMethodRef), lhsDefaultShipMethodRef, rhsDefaultShipMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultShipMethodRef", lhsDefaultShipMethodRef), LocatorUtils.property(thatLocator, "defaultShipMethodRef", rhsDefaultShipMethodRef), lhsDefaultShipMethodRef, rhsDefaultShipMethodRef, (this.defaultShipMethodRef!= null), (that.defaultShipMethodRef!= null))) { return false; } } @@ -1267,7 +1266,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultMarkup = this.getDefaultMarkup(); BigDecimal rhsDefaultMarkup; rhsDefaultMarkup = that.getDefaultMarkup(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkup", lhsDefaultMarkup), LocatorUtils.property(thatLocator, "defaultMarkup", rhsDefaultMarkup), lhsDefaultMarkup, rhsDefaultMarkup)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkup", lhsDefaultMarkup), LocatorUtils.property(thatLocator, "defaultMarkup", rhsDefaultMarkup), lhsDefaultMarkup, rhsDefaultMarkup, (this.defaultMarkup!= null), (that.defaultMarkup!= null))) { return false; } } @@ -1276,7 +1275,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackReimbursableExpensesAsIncome = this.isTrackReimbursableExpensesAsIncome(); Boolean rhsTrackReimbursableExpensesAsIncome; rhsTrackReimbursableExpensesAsIncome = that.isTrackReimbursableExpensesAsIncome(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackReimbursableExpensesAsIncome", lhsTrackReimbursableExpensesAsIncome), LocatorUtils.property(thatLocator, "trackReimbursableExpensesAsIncome", rhsTrackReimbursableExpensesAsIncome), lhsTrackReimbursableExpensesAsIncome, rhsTrackReimbursableExpensesAsIncome)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackReimbursableExpensesAsIncome", lhsTrackReimbursableExpensesAsIncome), LocatorUtils.property(thatLocator, "trackReimbursableExpensesAsIncome", rhsTrackReimbursableExpensesAsIncome), lhsTrackReimbursableExpensesAsIncome, rhsTrackReimbursableExpensesAsIncome, (this.trackReimbursableExpensesAsIncome!= null), (that.trackReimbursableExpensesAsIncome!= null))) { return false; } } @@ -1285,7 +1284,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingSalesOrders = this.isUsingSalesOrders(); Boolean rhsUsingSalesOrders; rhsUsingSalesOrders = that.isUsingSalesOrders(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingSalesOrders", lhsUsingSalesOrders), LocatorUtils.property(thatLocator, "usingSalesOrders", rhsUsingSalesOrders), lhsUsingSalesOrders, rhsUsingSalesOrders)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingSalesOrders", lhsUsingSalesOrders), LocatorUtils.property(thatLocator, "usingSalesOrders", rhsUsingSalesOrders), lhsUsingSalesOrders, rhsUsingSalesOrders, (this.usingSalesOrders!= null), (that.usingSalesOrders!= null))) { return false; } } @@ -1294,7 +1293,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingPriceLevels = this.isUsingPriceLevels(); Boolean rhsUsingPriceLevels; rhsUsingPriceLevels = that.isUsingPriceLevels(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingPriceLevels", lhsUsingPriceLevels), LocatorUtils.property(thatLocator, "usingPriceLevels", rhsUsingPriceLevels), lhsUsingPriceLevels, rhsUsingPriceLevels)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingPriceLevels", lhsUsingPriceLevels), LocatorUtils.property(thatLocator, "usingPriceLevels", rhsUsingPriceLevels), lhsUsingPriceLevels, rhsUsingPriceLevels, (this.usingPriceLevels!= null), (that.usingPriceLevels!= null))) { return false; } } @@ -1303,7 +1302,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultFOB = this.getDefaultFOB(); String rhsDefaultFOB; rhsDefaultFOB = that.getDefaultFOB(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultFOB", lhsDefaultFOB), LocatorUtils.property(thatLocator, "defaultFOB", rhsDefaultFOB), lhsDefaultFOB, rhsDefaultFOB)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultFOB", lhsDefaultFOB), LocatorUtils.property(thatLocator, "defaultFOB", rhsDefaultFOB), lhsDefaultFOB, rhsDefaultFOB, (this.defaultFOB!= null), (that.defaultFOB!= null))) { return false; } } @@ -1312,7 +1311,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultCustomerMessage = this.getDefaultCustomerMessage(); String rhsDefaultCustomerMessage; rhsDefaultCustomerMessage = that.getDefaultCustomerMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultCustomerMessage", lhsDefaultCustomerMessage), LocatorUtils.property(thatLocator, "defaultCustomerMessage", rhsDefaultCustomerMessage), lhsDefaultCustomerMessage, rhsDefaultCustomerMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultCustomerMessage", lhsDefaultCustomerMessage), LocatorUtils.property(thatLocator, "defaultCustomerMessage", rhsDefaultCustomerMessage), lhsDefaultCustomerMessage, rhsDefaultCustomerMessage, (this.defaultCustomerMessage!= null), (that.defaultCustomerMessage!= null))) { return false; } } @@ -1320,182 +1319,182 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theUsingProgressInvoicing; theUsingProgressInvoicing = this.isUsingProgressInvoicing(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingProgressInvoicing", theUsingProgressInvoicing), currentHashCode, theUsingProgressInvoicing); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingProgressInvoicing", theUsingProgressInvoicing), currentHashCode, theUsingProgressInvoicing, (this.usingProgressInvoicing!= null)); } { List theCustomField; theCustomField = (((this.customField!= null)&&(!this.customField.isEmpty()))?this.getCustomField():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customField", theCustomField), currentHashCode, theCustomField, ((this.customField!= null)&&(!this.customField.isEmpty()))); } { Boolean theCustomTxnNumbers; theCustomTxnNumbers = this.isCustomTxnNumbers(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customTxnNumbers", theCustomTxnNumbers), currentHashCode, theCustomTxnNumbers); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customTxnNumbers", theCustomTxnNumbers), currentHashCode, theCustomTxnNumbers, (this.customTxnNumbers!= null)); } { Boolean theDelayedCharges; theDelayedCharges = this.isDelayedCharges(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "delayedCharges", theDelayedCharges), currentHashCode, theDelayedCharges); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "delayedCharges", theDelayedCharges), currentHashCode, theDelayedCharges, (this.delayedCharges!= null)); } { EmailAddress theSalesEmailCc; theSalesEmailCc = this.getSalesEmailCc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesEmailCc", theSalesEmailCc), currentHashCode, theSalesEmailCc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesEmailCc", theSalesEmailCc), currentHashCode, theSalesEmailCc, (this.salesEmailCc!= null)); } { EmailAddress theSalesEmailBcc; theSalesEmailBcc = this.getSalesEmailBcc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesEmailBcc", theSalesEmailBcc), currentHashCode, theSalesEmailBcc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesEmailBcc", theSalesEmailBcc), currentHashCode, theSalesEmailBcc, (this.salesEmailBcc!= null)); } { Boolean theEmailCopyToCompany; theEmailCopyToCompany = this.isEmailCopyToCompany(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailCopyToCompany", theEmailCopyToCompany), currentHashCode, theEmailCopyToCompany); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailCopyToCompany", theEmailCopyToCompany), currentHashCode, theEmailCopyToCompany, (this.emailCopyToCompany!= null)); } { Boolean theAllowDeposit; theAllowDeposit = this.isAllowDeposit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowDeposit", theAllowDeposit), currentHashCode, theAllowDeposit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowDeposit", theAllowDeposit), currentHashCode, theAllowDeposit, (this.allowDeposit!= null)); } { Boolean theAllowDiscount; theAllowDiscount = this.isAllowDiscount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowDiscount", theAllowDiscount), currentHashCode, theAllowDiscount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowDiscount", theAllowDiscount), currentHashCode, theAllowDiscount, (this.allowDiscount!= null)); } { String theDefaultDiscountAccount; theDefaultDiscountAccount = this.getDefaultDiscountAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDiscountAccount", theDefaultDiscountAccount), currentHashCode, theDefaultDiscountAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDiscountAccount", theDefaultDiscountAccount), currentHashCode, theDefaultDiscountAccount, (this.defaultDiscountAccount!= null)); } { Boolean theAllowEstimates; theAllowEstimates = this.isAllowEstimates(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowEstimates", theAllowEstimates), currentHashCode, theAllowEstimates); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowEstimates", theAllowEstimates), currentHashCode, theAllowEstimates, (this.allowEstimates!= null)); } { String theEstimateMessage; theEstimateMessage = this.getEstimateMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateMessage", theEstimateMessage), currentHashCode, theEstimateMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "estimateMessage", theEstimateMessage), currentHashCode, theEstimateMessage, (this.estimateMessage!= null)); } { ETransactionEnabledStatusEnum theETransactionEnabledStatus; theETransactionEnabledStatus = this.getETransactionEnabledStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionEnabledStatus", theETransactionEnabledStatus), currentHashCode, theETransactionEnabledStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionEnabledStatus", theETransactionEnabledStatus), currentHashCode, theETransactionEnabledStatus, (this.eTransactionEnabledStatus!= null)); } { Boolean theETransactionAttachPDF; theETransactionAttachPDF = this.isETransactionAttachPDF(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionAttachPDF", theETransactionAttachPDF), currentHashCode, theETransactionAttachPDF); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionAttachPDF", theETransactionAttachPDF), currentHashCode, theETransactionAttachPDF, (this.eTransactionAttachPDF!= null)); } { Boolean theETransactionPaymentEnabled; theETransactionPaymentEnabled = this.isETransactionPaymentEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionPaymentEnabled", theETransactionPaymentEnabled), currentHashCode, theETransactionPaymentEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "eTransactionPaymentEnabled", theETransactionPaymentEnabled), currentHashCode, theETransactionPaymentEnabled, (this.eTransactionPaymentEnabled!= null)); } { Boolean theIPNSupportEnabled; theIPNSupportEnabled = this.isIPNSupportEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ipnSupportEnabled", theIPNSupportEnabled), currentHashCode, theIPNSupportEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "ipnSupportEnabled", theIPNSupportEnabled), currentHashCode, theIPNSupportEnabled, (this.ipnSupportEnabled!= null)); } { String theInvoiceMessage; theInvoiceMessage = this.getInvoiceMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceMessage", theInvoiceMessage), currentHashCode, theInvoiceMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "invoiceMessage", theInvoiceMessage), currentHashCode, theInvoiceMessage, (this.invoiceMessage!= null)); } { Boolean theAllowServiceDate; theAllowServiceDate = this.isAllowServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowServiceDate", theAllowServiceDate), currentHashCode, theAllowServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowServiceDate", theAllowServiceDate), currentHashCode, theAllowServiceDate, (this.allowServiceDate!= null)); } { Boolean theAllowShipping; theAllowShipping = this.isAllowShipping(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowShipping", theAllowShipping), currentHashCode, theAllowShipping); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "allowShipping", theAllowShipping), currentHashCode, theAllowShipping, (this.allowShipping!= null)); } { String theDefaultShippingAccount; theDefaultShippingAccount = this.getDefaultShippingAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultShippingAccount", theDefaultShippingAccount), currentHashCode, theDefaultShippingAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultShippingAccount", theDefaultShippingAccount), currentHashCode, theDefaultShippingAccount, (this.defaultShippingAccount!= null)); } { ReferenceType theDefaultItem; theDefaultItem = this.getDefaultItem(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultItem", theDefaultItem), currentHashCode, theDefaultItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultItem", theDefaultItem), currentHashCode, theDefaultItem, (this.defaultItem!= null)); } { ReferenceType theDefaultTerms; theDefaultTerms = this.getDefaultTerms(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTerms", theDefaultTerms), currentHashCode, theDefaultTerms); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTerms", theDefaultTerms), currentHashCode, theDefaultTerms, (this.defaultTerms!= null)); } { String theDefaultDeliveryMethod; theDefaultDeliveryMethod = this.getDefaultDeliveryMethod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDeliveryMethod", theDefaultDeliveryMethod), currentHashCode, theDefaultDeliveryMethod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultDeliveryMethod", theDefaultDeliveryMethod), currentHashCode, theDefaultDeliveryMethod, (this.defaultDeliveryMethod!= null)); } { Boolean theAutoApplyCredit; theAutoApplyCredit = this.isAutoApplyCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoApplyCredit", theAutoApplyCredit), currentHashCode, theAutoApplyCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoApplyCredit", theAutoApplyCredit), currentHashCode, theAutoApplyCredit, (this.autoApplyCredit!= null)); } { Boolean theAutoApplyPayments; theAutoApplyPayments = this.isAutoApplyPayments(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoApplyPayments", theAutoApplyPayments), currentHashCode, theAutoApplyPayments); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoApplyPayments", theAutoApplyPayments), currentHashCode, theAutoApplyPayments, (this.autoApplyPayments!= null)); } { Boolean thePrintItemWithZeroAmount; thePrintItemWithZeroAmount = this.isPrintItemWithZeroAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printItemWithZeroAmount", thePrintItemWithZeroAmount), currentHashCode, thePrintItemWithZeroAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printItemWithZeroAmount", thePrintItemWithZeroAmount), currentHashCode, thePrintItemWithZeroAmount, (this.printItemWithZeroAmount!= null)); } { ReferenceType theDefaultShipMethodRef; theDefaultShipMethodRef = this.getDefaultShipMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultShipMethodRef", theDefaultShipMethodRef), currentHashCode, theDefaultShipMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultShipMethodRef", theDefaultShipMethodRef), currentHashCode, theDefaultShipMethodRef, (this.defaultShipMethodRef!= null)); } { BigDecimal theDefaultMarkup; theDefaultMarkup = this.getDefaultMarkup(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkup", theDefaultMarkup), currentHashCode, theDefaultMarkup); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkup", theDefaultMarkup), currentHashCode, theDefaultMarkup, (this.defaultMarkup!= null)); } { Boolean theTrackReimbursableExpensesAsIncome; theTrackReimbursableExpensesAsIncome = this.isTrackReimbursableExpensesAsIncome(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackReimbursableExpensesAsIncome", theTrackReimbursableExpensesAsIncome), currentHashCode, theTrackReimbursableExpensesAsIncome); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackReimbursableExpensesAsIncome", theTrackReimbursableExpensesAsIncome), currentHashCode, theTrackReimbursableExpensesAsIncome, (this.trackReimbursableExpensesAsIncome!= null)); } { Boolean theUsingSalesOrders; theUsingSalesOrders = this.isUsingSalesOrders(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingSalesOrders", theUsingSalesOrders), currentHashCode, theUsingSalesOrders); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingSalesOrders", theUsingSalesOrders), currentHashCode, theUsingSalesOrders, (this.usingSalesOrders!= null)); } { Boolean theUsingPriceLevels; theUsingPriceLevels = this.isUsingPriceLevels(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingPriceLevels", theUsingPriceLevels), currentHashCode, theUsingPriceLevels); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingPriceLevels", theUsingPriceLevels), currentHashCode, theUsingPriceLevels, (this.usingPriceLevels!= null)); } { String theDefaultFOB; theDefaultFOB = this.getDefaultFOB(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultFOB", theDefaultFOB), currentHashCode, theDefaultFOB); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultFOB", theDefaultFOB), currentHashCode, theDefaultFOB, (this.defaultFOB!= null)); } { String theDefaultCustomerMessage; theDefaultCustomerMessage = this.getDefaultCustomerMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultCustomerMessage", theDefaultCustomerMessage), currentHashCode, theDefaultCustomerMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultCustomerMessage", theDefaultCustomerMessage), currentHashCode, theDefaultCustomerMessage, (this.defaultCustomerMessage!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesItemLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesItemLineDetail.java index 5340f977..cd4dbb69 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesItemLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesItemLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -87,7 +87,7 @@ }) public class SalesItemLineDetail extends ItemLineDetail - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -224,8 +224,8 @@ public void setSalesItemLineDetailEx(IntuitAnyType value) { this.salesItemLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesItemLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -240,7 +240,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -249,7 +249,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; } } @@ -258,7 +258,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountRate = this.getDiscountRate(); BigDecimal rhsDiscountRate; rhsDiscountRate = that.getDiscountRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRate", lhsDiscountRate), LocatorUtils.property(thatLocator, "discountRate", rhsDiscountRate), lhsDiscountRate, rhsDiscountRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRate", lhsDiscountRate), LocatorUtils.property(thatLocator, "discountRate", rhsDiscountRate), lhsDiscountRate, rhsDiscountRate, (this.discountRate!= null), (that.discountRate!= null))) { return false; } } @@ -267,7 +267,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountAmt = this.getDiscountAmt(); BigDecimal rhsDiscountAmt; rhsDiscountAmt = that.getDiscountAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAmt", lhsDiscountAmt), LocatorUtils.property(thatLocator, "discountAmt", rhsDiscountAmt), lhsDiscountAmt, rhsDiscountAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAmt", lhsDiscountAmt), LocatorUtils.property(thatLocator, "discountAmt", rhsDiscountAmt), lhsDiscountAmt, rhsDiscountAmt, (this.discountAmt!= null), (that.discountAmt!= null))) { return false; } } @@ -276,7 +276,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesItemLineDetailEx = this.getSalesItemLineDetailEx(); IntuitAnyType rhsSalesItemLineDetailEx; rhsSalesItemLineDetailEx = that.getSalesItemLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesItemLineDetailEx", lhsSalesItemLineDetailEx), LocatorUtils.property(thatLocator, "salesItemLineDetailEx", rhsSalesItemLineDetailEx), lhsSalesItemLineDetailEx, rhsSalesItemLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesItemLineDetailEx", lhsSalesItemLineDetailEx), LocatorUtils.property(thatLocator, "salesItemLineDetailEx", rhsSalesItemLineDetailEx), lhsSalesItemLineDetailEx, rhsSalesItemLineDetailEx, (this.salesItemLineDetailEx!= null), (that.salesItemLineDetailEx!= null))) { return false; } } @@ -284,42 +284,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= 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)); } { BigDecimal theDiscountRate; theDiscountRate = this.getDiscountRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRate", theDiscountRate), currentHashCode, theDiscountRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRate", theDiscountRate), currentHashCode, theDiscountRate, (this.discountRate!= null)); } { BigDecimal theDiscountAmt; theDiscountAmt = this.getDiscountAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAmt", theDiscountAmt), currentHashCode, theDiscountAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAmt", theDiscountAmt), currentHashCode, theDiscountAmt, (this.discountAmt!= null)); } { IntuitAnyType theSalesItemLineDetailEx; theSalesItemLineDetailEx = this.getSalesItemLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesItemLineDetailEx", theSalesItemLineDetailEx), currentHashCode, theSalesItemLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesItemLineDetailEx", theSalesItemLineDetailEx), currentHashCode, theSalesItemLineDetailEx, (this.salesItemLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrder.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrder.java index e2b86d0f..4bda460a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrder.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrder.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -86,7 +86,7 @@ }) public class SalesOrder extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -143,8 +143,8 @@ public void setSalesOrderEx(IntuitAnyType value) { this.salesOrderEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesOrder)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -159,7 +159,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManuallyClosed = this.isManuallyClosed(); Boolean rhsManuallyClosed; rhsManuallyClosed = that.isManuallyClosed(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed, (this.manuallyClosed!= null), (that.manuallyClosed!= null))) { return false; } } @@ -168,7 +168,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesOrderEx = this.getSalesOrderEx(); IntuitAnyType rhsSalesOrderEx; rhsSalesOrderEx = that.getSalesOrderEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesOrderEx", lhsSalesOrderEx), LocatorUtils.property(thatLocator, "salesOrderEx", rhsSalesOrderEx), lhsSalesOrderEx, rhsSalesOrderEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesOrderEx", lhsSalesOrderEx), LocatorUtils.property(thatLocator, "salesOrderEx", rhsSalesOrderEx), lhsSalesOrderEx, rhsSalesOrderEx, (this.salesOrderEx!= null), (that.salesOrderEx!= null))) { return false; } } @@ -176,27 +176,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theManuallyClosed; theManuallyClosed = this.isManuallyClosed(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed, (this.manuallyClosed!= null)); } { IntuitAnyType theSalesOrderEx; theSalesOrderEx = this.getSalesOrderEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesOrderEx", theSalesOrderEx), currentHashCode, theSalesOrderEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesOrderEx", theSalesOrderEx), currentHashCode, theSalesOrderEx, (this.salesOrderEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrderItemLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrderItemLineDetail.java index f6eea036..4d17ccce 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrderItemLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesOrderItemLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -69,7 +69,7 @@ }) public class SalesOrderItemLineDetail extends SalesItemLineDetail - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -100,8 +100,8 @@ public void setManuallyClosed(Boolean value) { this.manuallyClosed = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesOrderItemLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -116,7 +116,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsManuallyClosed = this.isManuallyClosed(); Boolean rhsManuallyClosed; rhsManuallyClosed = that.isManuallyClosed(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "manuallyClosed", lhsManuallyClosed), LocatorUtils.property(thatLocator, "manuallyClosed", rhsManuallyClosed), lhsManuallyClosed, rhsManuallyClosed, (this.manuallyClosed!= null), (that.manuallyClosed!= null))) { return false; } } @@ -124,22 +124,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theManuallyClosed; theManuallyClosed = this.isManuallyClosed(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "manuallyClosed", theManuallyClosed), currentHashCode, theManuallyClosed, (this.manuallyClosed!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesReceipt.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesReceipt.java index 958355dd..b0a2ede7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesReceipt.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesReceipt.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -65,7 +65,7 @@ }) public class SalesReceipt extends SalesTransaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -96,8 +96,8 @@ public void setSalesReceiptEx(IntuitAnyType value) { this.salesReceiptEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesReceipt)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -112,7 +112,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesReceiptEx = this.getSalesReceiptEx(); IntuitAnyType rhsSalesReceiptEx; rhsSalesReceiptEx = that.getSalesReceiptEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesReceiptEx", lhsSalesReceiptEx), LocatorUtils.property(thatLocator, "salesReceiptEx", rhsSalesReceiptEx), lhsSalesReceiptEx, rhsSalesReceiptEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesReceiptEx", lhsSalesReceiptEx), LocatorUtils.property(thatLocator, "salesReceiptEx", rhsSalesReceiptEx), lhsSalesReceiptEx, rhsSalesReceiptEx, (this.salesReceiptEx!= null), (that.salesReceiptEx!= null))) { return false; } } @@ -120,22 +120,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { IntuitAnyType theSalesReceiptEx; theSalesReceiptEx = this.getSalesReceiptEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesReceiptEx", theSalesReceiptEx), currentHashCode, theSalesReceiptEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesReceiptEx", theSalesReceiptEx), currentHashCode, theSalesReceiptEx, (this.salesReceiptEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRep.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRep.java index c2a5c781..78c4a438 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRep.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRep.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -86,7 +86,7 @@ }) public class SalesRep extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -273,8 +273,8 @@ public void setSalesRepEx(IntuitAnyType value) { this.salesRepEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesRep)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -289,7 +289,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameOf = this.getNameOf(); SalesRepTypeEnum rhsNameOf; rhsNameOf = that.getNameOf(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOf", lhsNameOf), LocatorUtils.property(thatLocator, "nameOf", rhsNameOf), lhsNameOf, rhsNameOf)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOf", lhsNameOf), LocatorUtils.property(thatLocator, "nameOf", rhsNameOf), lhsNameOf, rhsNameOf, (this.nameOf!= null), (that.nameOf!= null))) { return false; } } @@ -298,7 +298,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -307,7 +307,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployeeRef = this.getEmployeeRef(); ReferenceType rhsEmployeeRef; rhsEmployeeRef = that.getEmployeeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeRef", lhsEmployeeRef), LocatorUtils.property(thatLocator, "employeeRef", rhsEmployeeRef), lhsEmployeeRef, rhsEmployeeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeRef", lhsEmployeeRef), LocatorUtils.property(thatLocator, "employeeRef", rhsEmployeeRef), lhsEmployeeRef, rhsEmployeeRef, (this.employeeRef!= null), (that.employeeRef!= null))) { return false; } } @@ -316,7 +316,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorRef = this.getVendorRef(); ReferenceType rhsVendorRef; rhsVendorRef = that.getVendorRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef, (this.vendorRef!= null), (that.vendorRef!= null))) { return false; } } @@ -325,7 +325,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherNameRef = this.getOtherNameRef(); ReferenceType rhsOtherNameRef; rhsOtherNameRef = that.getOtherNameRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameRef", lhsOtherNameRef), LocatorUtils.property(thatLocator, "otherNameRef", rhsOtherNameRef), lhsOtherNameRef, rhsOtherNameRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameRef", lhsOtherNameRef), LocatorUtils.property(thatLocator, "otherNameRef", rhsOtherNameRef), lhsOtherNameRef, rhsOtherNameRef, (this.otherNameRef!= null), (that.otherNameRef!= null))) { return false; } } @@ -334,7 +334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsInitials = this.getInitials(); String rhsInitials; rhsInitials = that.getInitials(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "initials", lhsInitials), LocatorUtils.property(thatLocator, "initials", rhsInitials), lhsInitials, rhsInitials)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "initials", lhsInitials), LocatorUtils.property(thatLocator, "initials", rhsInitials), lhsInitials, rhsInitials, (this.initials!= null), (that.initials!= null))) { return false; } } @@ -343,7 +343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesRepEx = this.getSalesRepEx(); IntuitAnyType rhsSalesRepEx; rhsSalesRepEx = that.getSalesRepEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepEx", lhsSalesRepEx), LocatorUtils.property(thatLocator, "salesRepEx", rhsSalesRepEx), lhsSalesRepEx, rhsSalesRepEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepEx", lhsSalesRepEx), LocatorUtils.property(thatLocator, "salesRepEx", rhsSalesRepEx), lhsSalesRepEx, rhsSalesRepEx, (this.salesRepEx!= null), (that.salesRepEx!= null))) { return false; } } @@ -351,52 +351,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { SalesRepTypeEnum theNameOf; theNameOf = this.getNameOf(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOf", theNameOf), currentHashCode, theNameOf); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOf", theNameOf), currentHashCode, theNameOf, (this.nameOf!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { ReferenceType theEmployeeRef; theEmployeeRef = this.getEmployeeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeRef", theEmployeeRef), currentHashCode, theEmployeeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeRef", theEmployeeRef), currentHashCode, theEmployeeRef, (this.employeeRef!= null)); } { ReferenceType theVendorRef; theVendorRef = this.getVendorRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef, (this.vendorRef!= null)); } { ReferenceType theOtherNameRef; theOtherNameRef = this.getOtherNameRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameRef", theOtherNameRef), currentHashCode, theOtherNameRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameRef", theOtherNameRef), currentHashCode, theOtherNameRef, (this.otherNameRef!= null)); } { String theInitials; theInitials = this.getInitials(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "initials", theInitials), currentHashCode, theInitials); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "initials", theInitials), currentHashCode, theInitials, (this.initials!= null)); } { IntuitAnyType theSalesRepEx; theSalesRepEx = this.getSalesRepEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepEx", theSalesRepEx), currentHashCode, theSalesRepEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepEx", theSalesRepEx), currentHashCode, theSalesRepEx, (this.salesRepEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRepTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRepTypeEnum.java index f5e73e44..6612b642 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRepTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesRepTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTermTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTermTypeEnum.java index 3daa9dae..62c4a3de 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTermTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTermTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTransaction.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTransaction.java index 309936f2..bde25ec9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTransaction.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SalesTransaction.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -161,7 +161,7 @@ }) public class SalesTransaction extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -1184,8 +1184,8 @@ public void setGovtTxnRefIdentifier(String value) { this.govtTxnRefIdentifier = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SalesTransaction)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -1200,7 +1200,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAutoDocNumber = this.isAutoDocNumber(); Boolean rhsAutoDocNumber; rhsAutoDocNumber = that.isAutoDocNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "autoDocNumber", lhsAutoDocNumber), LocatorUtils.property(thatLocator, "autoDocNumber", rhsAutoDocNumber), lhsAutoDocNumber, rhsAutoDocNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "autoDocNumber", lhsAutoDocNumber), LocatorUtils.property(thatLocator, "autoDocNumber", rhsAutoDocNumber), lhsAutoDocNumber, rhsAutoDocNumber, (this.autoDocNumber!= null), (that.autoDocNumber!= null))) { return false; } } @@ -1209,7 +1209,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; } } @@ -1218,7 +1218,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCustomerMemo = this.getCustomerMemo(); MemoRef rhsCustomerMemo; rhsCustomerMemo = that.getCustomerMemo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "customerMemo", lhsCustomerMemo), LocatorUtils.property(thatLocator, "customerMemo", rhsCustomerMemo), lhsCustomerMemo, rhsCustomerMemo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "customerMemo", lhsCustomerMemo), LocatorUtils.property(thatLocator, "customerMemo", rhsCustomerMemo), lhsCustomerMemo, rhsCustomerMemo, (this.customerMemo!= null), (that.customerMemo!= null))) { return false; } } @@ -1227,7 +1227,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillAddr = this.getBillAddr(); PhysicalAddress rhsBillAddr; rhsBillAddr = that.getBillAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr, (this.billAddr!= null), (that.billAddr!= null))) { return false; } } @@ -1236,7 +1236,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -1245,7 +1245,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToRef = this.getRemitToRef(); ReferenceType rhsRemitToRef; rhsRemitToRef = that.getRemitToRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef, (this.remitToRef!= null), (that.remitToRef!= null))) { return false; } } @@ -1254,7 +1254,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; } } @@ -1263,7 +1263,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTermRef = this.getSalesTermRef(); ReferenceType rhsSalesTermRef; rhsSalesTermRef = that.getSalesTermRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermRef", lhsSalesTermRef), LocatorUtils.property(thatLocator, "salesTermRef", rhsSalesTermRef), lhsSalesTermRef, rhsSalesTermRef, (this.salesTermRef!= null), (that.salesTermRef!= null))) { return false; } } @@ -1272,7 +1272,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -1281,7 +1281,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesRepRef = this.getSalesRepRef(); ReferenceType rhsSalesRepRef; rhsSalesRepRef = that.getSalesRepRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepRef", lhsSalesRepRef), LocatorUtils.property(thatLocator, "salesRepRef", rhsSalesRepRef), lhsSalesRepRef, rhsSalesRepRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesRepRef", lhsSalesRepRef), LocatorUtils.property(thatLocator, "salesRepRef", rhsSalesRepRef), lhsSalesRepRef, rhsSalesRepRef, (this.salesRepRef!= null), (that.salesRepRef!= null))) { return false; } } @@ -1290,7 +1290,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPONumber = this.getPONumber(); String rhsPONumber; rhsPONumber = that.getPONumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "poNumber", lhsPONumber), LocatorUtils.property(thatLocator, "poNumber", rhsPONumber), lhsPONumber, rhsPONumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "poNumber", lhsPONumber), LocatorUtils.property(thatLocator, "poNumber", rhsPONumber), lhsPONumber, rhsPONumber, (this.poNumber!= null), (that.poNumber!= null))) { return false; } } @@ -1299,7 +1299,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFOB = this.getFOB(); String rhsFOB; rhsFOB = that.getFOB(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fob", lhsFOB), LocatorUtils.property(thatLocator, "fob", rhsFOB), lhsFOB, rhsFOB)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fob", lhsFOB), LocatorUtils.property(thatLocator, "fob", rhsFOB), lhsFOB, rhsFOB, (this.fob!= null), (that.fob!= null))) { return false; } } @@ -1308,7 +1308,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipMethodRef = this.getShipMethodRef(); ReferenceType rhsShipMethodRef; rhsShipMethodRef = that.getShipMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodRef", lhsShipMethodRef), LocatorUtils.property(thatLocator, "shipMethodRef", rhsShipMethodRef), lhsShipMethodRef, rhsShipMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodRef", lhsShipMethodRef), LocatorUtils.property(thatLocator, "shipMethodRef", rhsShipMethodRef), lhsShipMethodRef, rhsShipMethodRef, (this.shipMethodRef!= null), (that.shipMethodRef!= null))) { return false; } } @@ -1317,7 +1317,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipDate = this.getShipDate(); Date rhsShipDate; rhsShipDate = that.getShipDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipDate", lhsShipDate), LocatorUtils.property(thatLocator, "shipDate", rhsShipDate), lhsShipDate, rhsShipDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipDate", lhsShipDate), LocatorUtils.property(thatLocator, "shipDate", rhsShipDate), lhsShipDate, rhsShipDate, (this.shipDate!= null), (that.shipDate!= null))) { return false; } } @@ -1326,7 +1326,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingNum = this.getTrackingNum(); String rhsTrackingNum; rhsTrackingNum = that.getTrackingNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingNum", lhsTrackingNum), LocatorUtils.property(thatLocator, "trackingNum", rhsTrackingNum), lhsTrackingNum, rhsTrackingNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingNum", lhsTrackingNum), LocatorUtils.property(thatLocator, "trackingNum", rhsTrackingNum), lhsTrackingNum, rhsTrackingNum, (this.trackingNum!= null), (that.trackingNum!= null))) { return false; } } @@ -1335,7 +1335,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGlobalTaxCalculation = this.getGlobalTaxCalculation(); GlobalTaxCalculationEnum rhsGlobalTaxCalculation; rhsGlobalTaxCalculation = that.getGlobalTaxCalculation(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "globalTaxCalculation", lhsGlobalTaxCalculation), LocatorUtils.property(thatLocator, "globalTaxCalculation", rhsGlobalTaxCalculation), lhsGlobalTaxCalculation, rhsGlobalTaxCalculation, (this.globalTaxCalculation!= null), (that.globalTaxCalculation!= null))) { return false; } } @@ -1344,7 +1344,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -1353,7 +1353,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeTotalAmt = this.getHomeTotalAmt(); BigDecimal rhsHomeTotalAmt; rhsHomeTotalAmt = that.getHomeTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeTotalAmt", lhsHomeTotalAmt), LocatorUtils.property(thatLocator, "homeTotalAmt", rhsHomeTotalAmt), lhsHomeTotalAmt, rhsHomeTotalAmt, (this.homeTotalAmt!= null), (that.homeTotalAmt!= null))) { return false; } } @@ -1362,7 +1362,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsApplyTaxAfterDiscount = this.isApplyTaxAfterDiscount(); Boolean rhsApplyTaxAfterDiscount; rhsApplyTaxAfterDiscount = that.isApplyTaxAfterDiscount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "applyTaxAfterDiscount", lhsApplyTaxAfterDiscount), LocatorUtils.property(thatLocator, "applyTaxAfterDiscount", rhsApplyTaxAfterDiscount), lhsApplyTaxAfterDiscount, rhsApplyTaxAfterDiscount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "applyTaxAfterDiscount", lhsApplyTaxAfterDiscount), LocatorUtils.property(thatLocator, "applyTaxAfterDiscount", rhsApplyTaxAfterDiscount), lhsApplyTaxAfterDiscount, rhsApplyTaxAfterDiscount, (this.applyTaxAfterDiscount!= null), (that.applyTaxAfterDiscount!= null))) { return false; } } @@ -1371,7 +1371,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTemplateRef = this.getTemplateRef(); ReferenceType rhsTemplateRef; rhsTemplateRef = that.getTemplateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "templateRef", lhsTemplateRef), LocatorUtils.property(thatLocator, "templateRef", rhsTemplateRef), lhsTemplateRef, rhsTemplateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "templateRef", lhsTemplateRef), LocatorUtils.property(thatLocator, "templateRef", rhsTemplateRef), lhsTemplateRef, rhsTemplateRef, (this.templateRef!= null), (that.templateRef!= null))) { return false; } } @@ -1380,7 +1380,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrintStatus = this.getPrintStatus(); PrintStatusEnum rhsPrintStatus; rhsPrintStatus = that.getPrintStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "printStatus", lhsPrintStatus), LocatorUtils.property(thatLocator, "printStatus", rhsPrintStatus), lhsPrintStatus, rhsPrintStatus, (this.printStatus!= null), (that.printStatus!= null))) { return false; } } @@ -1389,7 +1389,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailStatus = this.getEmailStatus(); EmailStatusEnum rhsEmailStatus; rhsEmailStatus = that.getEmailStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailStatus", lhsEmailStatus), LocatorUtils.property(thatLocator, "emailStatus", rhsEmailStatus), lhsEmailStatus, rhsEmailStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailStatus", lhsEmailStatus), LocatorUtils.property(thatLocator, "emailStatus", rhsEmailStatus), lhsEmailStatus, rhsEmailStatus, (this.emailStatus!= null), (that.emailStatus!= null))) { return false; } } @@ -1398,7 +1398,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillEmail = this.getBillEmail(); EmailAddress rhsBillEmail; rhsBillEmail = that.getBillEmail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmail", lhsBillEmail), LocatorUtils.property(thatLocator, "billEmail", rhsBillEmail), lhsBillEmail, rhsBillEmail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmail", lhsBillEmail), LocatorUtils.property(thatLocator, "billEmail", rhsBillEmail), lhsBillEmail, rhsBillEmail, (this.billEmail!= null), (that.billEmail!= null))) { return false; } } @@ -1407,7 +1407,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillEmailCc = this.getBillEmailCc(); EmailAddress rhsBillEmailCc; rhsBillEmailCc = that.getBillEmailCc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmailCc", lhsBillEmailCc), LocatorUtils.property(thatLocator, "billEmailCc", rhsBillEmailCc), lhsBillEmailCc, rhsBillEmailCc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmailCc", lhsBillEmailCc), LocatorUtils.property(thatLocator, "billEmailCc", rhsBillEmailCc), lhsBillEmailCc, rhsBillEmailCc, (this.billEmailCc!= null), (that.billEmailCc!= null))) { return false; } } @@ -1416,7 +1416,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillEmailBcc = this.getBillEmailBcc(); EmailAddress rhsBillEmailBcc; rhsBillEmailBcc = that.getBillEmailBcc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmailBcc", lhsBillEmailBcc), LocatorUtils.property(thatLocator, "billEmailBcc", rhsBillEmailBcc), lhsBillEmailBcc, rhsBillEmailBcc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billEmailBcc", lhsBillEmailBcc), LocatorUtils.property(thatLocator, "billEmailBcc", rhsBillEmailBcc), lhsBillEmailBcc, rhsBillEmailBcc, (this.billEmailBcc!= null), (that.billEmailBcc!= null))) { return false; } } @@ -1425,7 +1425,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsARAccountRef = this.getARAccountRef(); ReferenceType rhsARAccountRef; rhsARAccountRef = that.getARAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef, (this.arAccountRef!= null), (that.arAccountRef!= null))) { return false; } } @@ -1434,7 +1434,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalance = this.getBalance(); BigDecimal rhsBalance; rhsBalance = that.getBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -1443,7 +1443,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHomeBalance = this.getHomeBalance(); BigDecimal rhsHomeBalance; rhsHomeBalance = that.getHomeBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "homeBalance", lhsHomeBalance), LocatorUtils.property(thatLocator, "homeBalance", rhsHomeBalance), lhsHomeBalance, rhsHomeBalance, (this.homeBalance!= null), (that.homeBalance!= null))) { return false; } } @@ -1452,7 +1452,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFinanceCharge = this.isFinanceCharge(); Boolean rhsFinanceCharge; rhsFinanceCharge = that.isFinanceCharge(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "financeCharge", lhsFinanceCharge), LocatorUtils.property(thatLocator, "financeCharge", rhsFinanceCharge), lhsFinanceCharge, rhsFinanceCharge)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "financeCharge", lhsFinanceCharge), LocatorUtils.property(thatLocator, "financeCharge", rhsFinanceCharge), lhsFinanceCharge, rhsFinanceCharge, (this.financeCharge!= null), (that.financeCharge!= null))) { return false; } } @@ -1461,7 +1461,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentMethodRef = this.getPaymentMethodRef(); ReferenceType rhsPaymentMethodRef; rhsPaymentMethodRef = that.getPaymentMethodRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentMethodRef", lhsPaymentMethodRef), LocatorUtils.property(thatLocator, "paymentMethodRef", rhsPaymentMethodRef), lhsPaymentMethodRef, rhsPaymentMethodRef, (this.paymentMethodRef!= null), (that.paymentMethodRef!= null))) { return false; } } @@ -1470,7 +1470,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentRefNum = this.getPaymentRefNum(); String rhsPaymentRefNum; rhsPaymentRefNum = that.getPaymentRefNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentRefNum", lhsPaymentRefNum), LocatorUtils.property(thatLocator, "paymentRefNum", rhsPaymentRefNum), lhsPaymentRefNum, rhsPaymentRefNum, (this.paymentRefNum!= null), (that.paymentRefNum!= null))) { return false; } } @@ -1479,7 +1479,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaymentType = this.getPaymentType(); PaymentTypeEnum rhsPaymentType; rhsPaymentType = that.getPaymentType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paymentType", lhsPaymentType), LocatorUtils.property(thatLocator, "paymentType", rhsPaymentType), lhsPaymentType, rhsPaymentType, (this.paymentType!= null), (that.paymentType!= null))) { return false; } } @@ -1488,7 +1488,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCheckPayment = this.getCheckPayment(); CheckPayment rhsCheckPayment; rhsCheckPayment = that.getCheckPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "checkPayment", lhsCheckPayment), LocatorUtils.property(thatLocator, "checkPayment", rhsCheckPayment), lhsCheckPayment, rhsCheckPayment, (this.checkPayment!= null), (that.checkPayment!= null))) { return false; } } @@ -1497,7 +1497,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditCardPayment = this.getCreditCardPayment(); CreditCardPayment rhsCreditCardPayment; rhsCreditCardPayment = that.getCreditCardPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditCardPayment", lhsCreditCardPayment), LocatorUtils.property(thatLocator, "creditCardPayment", rhsCreditCardPayment), lhsCreditCardPayment, rhsCreditCardPayment, (this.creditCardPayment!= null), (that.creditCardPayment!= null))) { return false; } } @@ -1506,7 +1506,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepositToAccountRef = this.getDepositToAccountRef(); ReferenceType rhsDepositToAccountRef; rhsDepositToAccountRef = that.getDepositToAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "depositToAccountRef", lhsDepositToAccountRef), LocatorUtils.property(thatLocator, "depositToAccountRef", rhsDepositToAccountRef), lhsDepositToAccountRef, rhsDepositToAccountRef, (this.depositToAccountRef!= null), (that.depositToAccountRef!= null))) { return false; } } @@ -1515,7 +1515,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryInfo = this.getDeliveryInfo(); TransactionDeliveryInfo rhsDeliveryInfo; rhsDeliveryInfo = that.getDeliveryInfo(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryInfo", lhsDeliveryInfo), LocatorUtils.property(thatLocator, "deliveryInfo", rhsDeliveryInfo), lhsDeliveryInfo, rhsDeliveryInfo)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryInfo", lhsDeliveryInfo), LocatorUtils.property(thatLocator, "deliveryInfo", rhsDeliveryInfo), lhsDeliveryInfo, rhsDeliveryInfo, (this.deliveryInfo!= null), (that.deliveryInfo!= null))) { return false; } } @@ -1524,7 +1524,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountRate = this.getDiscountRate(); BigDecimal rhsDiscountRate; rhsDiscountRate = that.getDiscountRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRate", lhsDiscountRate), LocatorUtils.property(thatLocator, "discountRate", rhsDiscountRate), lhsDiscountRate, rhsDiscountRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountRate", lhsDiscountRate), LocatorUtils.property(thatLocator, "discountRate", rhsDiscountRate), lhsDiscountRate, rhsDiscountRate, (this.discountRate!= null), (that.discountRate!= null))) { return false; } } @@ -1533,7 +1533,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountAmt = this.getDiscountAmt(); BigDecimal rhsDiscountAmt; rhsDiscountAmt = that.getDiscountAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAmt", lhsDiscountAmt), LocatorUtils.property(thatLocator, "discountAmt", rhsDiscountAmt), lhsDiscountAmt, rhsDiscountAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAmt", lhsDiscountAmt), LocatorUtils.property(thatLocator, "discountAmt", rhsDiscountAmt), lhsDiscountAmt, rhsDiscountAmt, (this.discountAmt!= null), (that.discountAmt!= null))) { return false; } } @@ -1542,7 +1542,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGovtTxnRefIdentifier = this.getGovtTxnRefIdentifier(); String rhsGovtTxnRefIdentifier; rhsGovtTxnRefIdentifier = that.getGovtTxnRefIdentifier(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "govtTxnRefIdentifier", lhsGovtTxnRefIdentifier), LocatorUtils.property(thatLocator, "govtTxnRefIdentifier", rhsGovtTxnRefIdentifier), lhsGovtTxnRefIdentifier, rhsGovtTxnRefIdentifier)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "govtTxnRefIdentifier", lhsGovtTxnRefIdentifier), LocatorUtils.property(thatLocator, "govtTxnRefIdentifier", rhsGovtTxnRefIdentifier), lhsGovtTxnRefIdentifier, rhsGovtTxnRefIdentifier, (this.govtTxnRefIdentifier!= null), (that.govtTxnRefIdentifier!= null))) { return false; } } @@ -1550,212 +1550,212 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theAutoDocNumber; theAutoDocNumber = this.isAutoDocNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoDocNumber", theAutoDocNumber), currentHashCode, theAutoDocNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "autoDocNumber", theAutoDocNumber), currentHashCode, theAutoDocNumber, (this.autoDocNumber!= null)); } { 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)); } { MemoRef theCustomerMemo; theCustomerMemo = this.getCustomerMemo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerMemo", theCustomerMemo), currentHashCode, theCustomerMemo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "customerMemo", theCustomerMemo), currentHashCode, theCustomerMemo, (this.customerMemo!= null)); } { PhysicalAddress theBillAddr; theBillAddr = this.getBillAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr, (this.billAddr!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { ReferenceType theRemitToRef; theRemitToRef = this.getRemitToRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef, (this.remitToRef!= 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 theSalesTermRef; theSalesTermRef = this.getSalesTermRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermRef", theSalesTermRef), currentHashCode, theSalesTermRef, (this.salesTermRef!= null)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { ReferenceType theSalesRepRef; theSalesRepRef = this.getSalesRepRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepRef", theSalesRepRef), currentHashCode, theSalesRepRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesRepRef", theSalesRepRef), currentHashCode, theSalesRepRef, (this.salesRepRef!= null)); } { String thePONumber; thePONumber = this.getPONumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poNumber", thePONumber), currentHashCode, thePONumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poNumber", thePONumber), currentHashCode, thePONumber, (this.poNumber!= null)); } { String theFOB; theFOB = this.getFOB(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fob", theFOB), currentHashCode, theFOB); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fob", theFOB), currentHashCode, theFOB, (this.fob!= null)); } { ReferenceType theShipMethodRef; theShipMethodRef = this.getShipMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodRef", theShipMethodRef), currentHashCode, theShipMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodRef", theShipMethodRef), currentHashCode, theShipMethodRef, (this.shipMethodRef!= null)); } { Date theShipDate; theShipDate = this.getShipDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipDate", theShipDate), currentHashCode, theShipDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipDate", theShipDate), currentHashCode, theShipDate, (this.shipDate!= null)); } { String theTrackingNum; theTrackingNum = this.getTrackingNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingNum", theTrackingNum), currentHashCode, theTrackingNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingNum", theTrackingNum), currentHashCode, theTrackingNum, (this.trackingNum!= null)); } { GlobalTaxCalculationEnum theGlobalTaxCalculation; theGlobalTaxCalculation = this.getGlobalTaxCalculation(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "globalTaxCalculation", theGlobalTaxCalculation), currentHashCode, theGlobalTaxCalculation, (this.globalTaxCalculation!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { BigDecimal theHomeTotalAmt; theHomeTotalAmt = this.getHomeTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeTotalAmt", theHomeTotalAmt), currentHashCode, theHomeTotalAmt, (this.homeTotalAmt!= null)); } { Boolean theApplyTaxAfterDiscount; theApplyTaxAfterDiscount = this.isApplyTaxAfterDiscount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "applyTaxAfterDiscount", theApplyTaxAfterDiscount), currentHashCode, theApplyTaxAfterDiscount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "applyTaxAfterDiscount", theApplyTaxAfterDiscount), currentHashCode, theApplyTaxAfterDiscount, (this.applyTaxAfterDiscount!= null)); } { ReferenceType theTemplateRef; theTemplateRef = this.getTemplateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "templateRef", theTemplateRef), currentHashCode, theTemplateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "templateRef", theTemplateRef), currentHashCode, theTemplateRef, (this.templateRef!= null)); } { PrintStatusEnum thePrintStatus; thePrintStatus = this.getPrintStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "printStatus", thePrintStatus), currentHashCode, thePrintStatus, (this.printStatus!= null)); } { EmailStatusEnum theEmailStatus; theEmailStatus = this.getEmailStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailStatus", theEmailStatus), currentHashCode, theEmailStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailStatus", theEmailStatus), currentHashCode, theEmailStatus, (this.emailStatus!= null)); } { EmailAddress theBillEmail; theBillEmail = this.getBillEmail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmail", theBillEmail), currentHashCode, theBillEmail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmail", theBillEmail), currentHashCode, theBillEmail, (this.billEmail!= null)); } { EmailAddress theBillEmailCc; theBillEmailCc = this.getBillEmailCc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmailCc", theBillEmailCc), currentHashCode, theBillEmailCc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmailCc", theBillEmailCc), currentHashCode, theBillEmailCc, (this.billEmailCc!= null)); } { EmailAddress theBillEmailBcc; theBillEmailBcc = this.getBillEmailBcc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmailBcc", theBillEmailBcc), currentHashCode, theBillEmailBcc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billEmailBcc", theBillEmailBcc), currentHashCode, theBillEmailBcc, (this.billEmailBcc!= null)); } { ReferenceType theARAccountRef; theARAccountRef = this.getARAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef, (this.arAccountRef!= null)); } { BigDecimal theBalance; theBalance = this.getBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } { BigDecimal theHomeBalance; theHomeBalance = this.getHomeBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "homeBalance", theHomeBalance), currentHashCode, theHomeBalance, (this.homeBalance!= null)); } { Boolean theFinanceCharge; theFinanceCharge = this.isFinanceCharge(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "financeCharge", theFinanceCharge), currentHashCode, theFinanceCharge); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "financeCharge", theFinanceCharge), currentHashCode, theFinanceCharge, (this.financeCharge!= null)); } { ReferenceType thePaymentMethodRef; thePaymentMethodRef = this.getPaymentMethodRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentMethodRef", thePaymentMethodRef), currentHashCode, thePaymentMethodRef, (this.paymentMethodRef!= null)); } { String thePaymentRefNum; thePaymentRefNum = this.getPaymentRefNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentRefNum", thePaymentRefNum), currentHashCode, thePaymentRefNum, (this.paymentRefNum!= null)); } { PaymentTypeEnum thePaymentType; thePaymentType = this.getPaymentType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paymentType", thePaymentType), currentHashCode, thePaymentType, (this.paymentType!= null)); } { CheckPayment theCheckPayment; theCheckPayment = this.getCheckPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "checkPayment", theCheckPayment), currentHashCode, theCheckPayment, (this.checkPayment!= null)); } { CreditCardPayment theCreditCardPayment; theCreditCardPayment = this.getCreditCardPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditCardPayment", theCreditCardPayment), currentHashCode, theCreditCardPayment, (this.creditCardPayment!= null)); } { ReferenceType theDepositToAccountRef; theDepositToAccountRef = this.getDepositToAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "depositToAccountRef", theDepositToAccountRef), currentHashCode, theDepositToAccountRef, (this.depositToAccountRef!= null)); } { TransactionDeliveryInfo theDeliveryInfo; theDeliveryInfo = this.getDeliveryInfo(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryInfo", theDeliveryInfo), currentHashCode, theDeliveryInfo); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryInfo", theDeliveryInfo), currentHashCode, theDeliveryInfo, (this.deliveryInfo!= null)); } { BigDecimal theDiscountRate; theDiscountRate = this.getDiscountRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRate", theDiscountRate), currentHashCode, theDiscountRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountRate", theDiscountRate), currentHashCode, theDiscountRate, (this.discountRate!= null)); } { BigDecimal theDiscountAmt; theDiscountAmt = this.getDiscountAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAmt", theDiscountAmt), currentHashCode, theDiscountAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAmt", theDiscountAmt), currentHashCode, theDiscountAmt, (this.discountAmt!= null)); } { String theGovtTxnRefIdentifier; theGovtTxnRefIdentifier = this.getGovtTxnRefIdentifier(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "govtTxnRefIdentifier", theGovtTxnRefIdentifier), currentHashCode, theGovtTxnRefIdentifier); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "govtTxnRefIdentifier", theGovtTxnRefIdentifier), currentHashCode, theGovtTxnRefIdentifier, (this.govtTxnRefIdentifier!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ServiceTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ServiceTypeEnum.java index 14f0dc82..0b56d1cc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ServiceTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ServiceTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ShipMethod.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ShipMethod.java index 048f614d..6732e5c9 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ShipMethod.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/ShipMethod.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -73,7 +73,7 @@ }) public class ShipMethod extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -148,8 +148,8 @@ public void setShipMethodEx(IntuitAnyType value) { this.shipMethodEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof ShipMethod)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -164,16 +164,16 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } { boolean lhsActive; - lhsActive = (true?this.isActive():false); + lhsActive = this.isActive(); boolean rhsActive; - rhsActive = (true?that.isActive():false); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + rhsActive = that.isActive(); + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, true, true)) { return false; } } @@ -182,7 +182,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipMethodEx = this.getShipMethodEx(); IntuitAnyType rhsShipMethodEx; rhsShipMethodEx = that.getShipMethodEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodEx", lhsShipMethodEx), LocatorUtils.property(thatLocator, "shipMethodEx", rhsShipMethodEx), lhsShipMethodEx, rhsShipMethodEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipMethodEx", lhsShipMethodEx), LocatorUtils.property(thatLocator, "shipMethodEx", rhsShipMethodEx), lhsShipMethodEx, rhsShipMethodEx, (this.shipMethodEx!= null), (that.shipMethodEx!= null))) { return false; } } @@ -190,32 +190,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { boolean theActive; - theActive = (true?this.isActive():false); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + theActive = this.isActive(); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, true); } { IntuitAnyType theShipMethodEx; theShipMethodEx = this.getShipMethodEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodEx", theShipMethodEx), currentHashCode, theShipMethodEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipMethodEx", theShipMethodEx), currentHashCode, theShipMethodEx, (this.shipMethodEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialItemTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialItemTypeEnum.java index bb0b408a..f596226f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialItemTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialItemTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialTaxTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialTaxTypeEnum.java index 3e9334e2..3da5910b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialTaxTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SpecialTaxTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatementCharge.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatementCharge.java index 62638e0b..deb9d5bd 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatementCharge.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatementCharge.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -88,7 +88,7 @@ }) public class StatementCharge extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -331,8 +331,8 @@ public void setStatementChargeEx(IntuitAnyType value) { this.statementChargeEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof StatementCharge)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -347,7 +347,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCredit = this.isCredit(); Boolean rhsCredit; rhsCredit = that.isCredit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "credit", lhsCredit), LocatorUtils.property(thatLocator, "credit", rhsCredit), lhsCredit, rhsCredit, (this.credit!= null), (that.credit!= null))) { return false; } } @@ -356,7 +356,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; } } @@ -365,7 +365,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRemitToRef = this.getRemitToRef(); ReferenceType rhsRemitToRef; rhsRemitToRef = that.getRemitToRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "remitToRef", lhsRemitToRef), LocatorUtils.property(thatLocator, "remitToRef", rhsRemitToRef), lhsRemitToRef, rhsRemitToRef, (this.remitToRef!= null), (that.remitToRef!= null))) { return false; } } @@ -374,7 +374,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsARAccountRef = this.getARAccountRef(); ReferenceType rhsARAccountRef; rhsARAccountRef = that.getARAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "arAccountRef", lhsARAccountRef), LocatorUtils.property(thatLocator, "arAccountRef", rhsARAccountRef), lhsARAccountRef, rhsARAccountRef, (this.arAccountRef!= null), (that.arAccountRef!= null))) { return false; } } @@ -383,7 +383,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; } } @@ -392,7 +392,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -401,7 +401,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBilledDate = this.getBilledDate(); Date rhsBilledDate; rhsBilledDate = that.getBilledDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billedDate", lhsBilledDate), LocatorUtils.property(thatLocator, "billedDate", rhsBilledDate), lhsBilledDate, rhsBilledDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billedDate", lhsBilledDate), LocatorUtils.property(thatLocator, "billedDate", rhsBilledDate), lhsBilledDate, rhsBilledDate, (this.billedDate!= null), (that.billedDate!= null))) { return false; } } @@ -410,7 +410,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalAmt = this.getTotalAmt(); BigDecimal rhsTotalAmt; rhsTotalAmt = that.getTotalAmt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalAmt", lhsTotalAmt), LocatorUtils.property(thatLocator, "totalAmt", rhsTotalAmt), lhsTotalAmt, rhsTotalAmt, (this.totalAmt!= null), (that.totalAmt!= null))) { return false; } } @@ -419,7 +419,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatementChargeEx = this.getStatementChargeEx(); IntuitAnyType rhsStatementChargeEx; rhsStatementChargeEx = that.getStatementChargeEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "statementChargeEx", lhsStatementChargeEx), LocatorUtils.property(thatLocator, "statementChargeEx", rhsStatementChargeEx), lhsStatementChargeEx, rhsStatementChargeEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "statementChargeEx", lhsStatementChargeEx), LocatorUtils.property(thatLocator, "statementChargeEx", rhsStatementChargeEx), lhsStatementChargeEx, rhsStatementChargeEx, (this.statementChargeEx!= null), (that.statementChargeEx!= null))) { return false; } } @@ -427,62 +427,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theCredit; theCredit = this.isCredit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credit", theCredit), currentHashCode, theCredit, (this.credit!= null)); } { 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 theRemitToRef; theRemitToRef = this.getRemitToRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "remitToRef", theRemitToRef), currentHashCode, theRemitToRef, (this.remitToRef!= null)); } { ReferenceType theARAccountRef; theARAccountRef = this.getARAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "arAccountRef", theARAccountRef), currentHashCode, theARAccountRef, (this.arAccountRef!= 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)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { Date theBilledDate; theBilledDate = this.getBilledDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billedDate", theBilledDate), currentHashCode, theBilledDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billedDate", theBilledDate), currentHashCode, theBilledDate, (this.billedDate!= null)); } { BigDecimal theTotalAmt; theTotalAmt = this.getTotalAmt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalAmt", theTotalAmt), currentHashCode, theTotalAmt, (this.totalAmt!= null)); } { IntuitAnyType theStatementChargeEx; theStatementChargeEx = this.getStatementChargeEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statementChargeEx", theStatementChargeEx), currentHashCode, theStatementChargeEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statementChargeEx", theStatementChargeEx), currentHashCode, theStatementChargeEx, (this.statementChargeEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Status.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Status.java index c55eb057..146bb6c7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Status.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Status.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -80,7 +80,7 @@ }) public class Status extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -267,8 +267,8 @@ public void setMessageDesc(String value) { this.messageDesc = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Status)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -283,7 +283,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRequestId = this.getRequestId(); String rhsRequestId; rhsRequestId = that.getRequestId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "requestId", lhsRequestId), LocatorUtils.property(thatLocator, "requestId", rhsRequestId), lhsRequestId, rhsRequestId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "requestId", lhsRequestId), LocatorUtils.property(thatLocator, "requestId", rhsRequestId), lhsRequestId, rhsRequestId, (this.requestId!= null), (that.requestId!= null))) { return false; } } @@ -292,7 +292,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBatchId = this.getBatchId(); String rhsBatchId; rhsBatchId = that.getBatchId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "batchId", lhsBatchId), LocatorUtils.property(thatLocator, "batchId", rhsBatchId), lhsBatchId, rhsBatchId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "batchId", lhsBatchId), LocatorUtils.property(thatLocator, "batchId", rhsBatchId), lhsBatchId, rhsBatchId, (this.batchId!= null), (that.batchId!= null))) { return false; } } @@ -301,7 +301,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsObjectType = this.getObjectType(); String rhsObjectType; rhsObjectType = that.getObjectType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "objectType", lhsObjectType), LocatorUtils.property(thatLocator, "objectType", rhsObjectType), lhsObjectType, rhsObjectType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "objectType", lhsObjectType), LocatorUtils.property(thatLocator, "objectType", rhsObjectType), lhsObjectType, rhsObjectType, (this.objectType!= null), (that.objectType!= null))) { return false; } } @@ -310,7 +310,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStateCode = this.getStateCode(); String rhsStateCode; rhsStateCode = that.getStateCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "stateCode", lhsStateCode), LocatorUtils.property(thatLocator, "stateCode", rhsStateCode), lhsStateCode, rhsStateCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "stateCode", lhsStateCode), LocatorUtils.property(thatLocator, "stateCode", rhsStateCode), lhsStateCode, rhsStateCode, (this.stateCode!= null), (that.stateCode!= null))) { return false; } } @@ -319,7 +319,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStateDesc = this.getStateDesc(); String rhsStateDesc; rhsStateDesc = that.getStateDesc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "stateDesc", lhsStateDesc), LocatorUtils.property(thatLocator, "stateDesc", rhsStateDesc), lhsStateDesc, rhsStateDesc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "stateDesc", lhsStateDesc), LocatorUtils.property(thatLocator, "stateDesc", rhsStateDesc), lhsStateDesc, rhsStateDesc, (this.stateDesc!= null), (that.stateDesc!= null))) { return false; } } @@ -328,7 +328,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMessageCode = this.getMessageCode(); String rhsMessageCode; rhsMessageCode = that.getMessageCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "messageCode", lhsMessageCode), LocatorUtils.property(thatLocator, "messageCode", rhsMessageCode), lhsMessageCode, rhsMessageCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "messageCode", lhsMessageCode), LocatorUtils.property(thatLocator, "messageCode", rhsMessageCode), lhsMessageCode, rhsMessageCode, (this.messageCode!= null), (that.messageCode!= null))) { return false; } } @@ -337,7 +337,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMessageDesc = this.getMessageDesc(); String rhsMessageDesc; rhsMessageDesc = that.getMessageDesc(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "messageDesc", lhsMessageDesc), LocatorUtils.property(thatLocator, "messageDesc", rhsMessageDesc), lhsMessageDesc, rhsMessageDesc)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "messageDesc", lhsMessageDesc), LocatorUtils.property(thatLocator, "messageDesc", rhsMessageDesc), lhsMessageDesc, rhsMessageDesc, (this.messageDesc!= null), (that.messageDesc!= null))) { return false; } } @@ -345,52 +345,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theRequestId; theRequestId = this.getRequestId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requestId", theRequestId), currentHashCode, theRequestId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requestId", theRequestId), currentHashCode, theRequestId, (this.requestId!= null)); } { String theBatchId; theBatchId = this.getBatchId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchId", theBatchId), currentHashCode, theBatchId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "batchId", theBatchId), currentHashCode, theBatchId, (this.batchId!= null)); } { String theObjectType; theObjectType = this.getObjectType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "objectType", theObjectType), currentHashCode, theObjectType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "objectType", theObjectType), currentHashCode, theObjectType, (this.objectType!= null)); } { String theStateCode; theStateCode = this.getStateCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stateCode", theStateCode), currentHashCode, theStateCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stateCode", theStateCode), currentHashCode, theStateCode, (this.stateCode!= null)); } { String theStateDesc; theStateDesc = this.getStateDesc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stateDesc", theStateDesc), currentHashCode, theStateDesc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stateDesc", theStateDesc), currentHashCode, theStateDesc, (this.stateDesc!= null)); } { String theMessageCode; theMessageCode = this.getMessageCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "messageCode", theMessageCode), currentHashCode, theMessageCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "messageCode", theMessageCode), currentHashCode, theMessageCode, (this.messageCode!= null)); } { String theMessageDesc; theMessageDesc = this.getMessageDesc(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "messageDesc", theMessageDesc), currentHashCode, theMessageDesc); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "messageDesc", theMessageDesc), currentHashCode, theMessageDesc, (this.messageDesc!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatusInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatusInfo.java index ce7068be..3ca60d16 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatusInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StatusInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -74,8 +74,7 @@ "statusDate", "callToAction" }) -public class StatusInfo - implements Serializable, Equals, HashCode +public class StatusInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -158,8 +157,8 @@ public void setCallToAction(String value) { this.callToAction = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof StatusInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -171,7 +170,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatus = this.getStatus(); String rhsStatus; rhsStatus = that.getStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "status", lhsStatus), LocatorUtils.property(thatLocator, "status", rhsStatus), lhsStatus, rhsStatus, (this.status!= null), (that.status!= null))) { return false; } } @@ -180,7 +179,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStatusDate = this.getStatusDate(); Date rhsStatusDate; rhsStatusDate = that.getStatusDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "statusDate", lhsStatusDate), LocatorUtils.property(thatLocator, "statusDate", rhsStatusDate), lhsStatusDate, rhsStatusDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "statusDate", lhsStatusDate), LocatorUtils.property(thatLocator, "statusDate", rhsStatusDate), lhsStatusDate, rhsStatusDate, (this.statusDate!= null), (that.statusDate!= null))) { return false; } } @@ -189,7 +188,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCallToAction = this.getCallToAction(); String rhsCallToAction; rhsCallToAction = that.getCallToAction(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "callToAction", lhsCallToAction), LocatorUtils.property(thatLocator, "callToAction", rhsCallToAction), lhsCallToAction, rhsCallToAction)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "callToAction", lhsCallToAction), LocatorUtils.property(thatLocator, "callToAction", rhsCallToAction), lhsCallToAction, rhsCallToAction, (this.callToAction!= null), (that.callToAction!= null))) { return false; } } @@ -197,32 +196,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theStatus; theStatus = this.getStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "status", theStatus), currentHashCode, theStatus, (this.status!= null)); } { Date theStatusDate; theStatusDate = this.getStatusDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statusDate", theStatusDate), currentHashCode, theStatusDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "statusDate", theStatusDate), currentHashCode, theStatusDate, (this.statusDate!= null)); } { String theCallToAction; theCallToAction = this.getCallToAction(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "callToAction", theCallToAction), currentHashCode, theCallToAction); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "callToAction", theCallToAction), currentHashCode, theCallToAction, (this.callToAction!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StringTypeCustomFieldDefinition.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StringTypeCustomFieldDefinition.java index 00721c1c..91e6517f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StringTypeCustomFieldDefinition.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/StringTypeCustomFieldDefinition.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -72,7 +72,7 @@ }) public class StringTypeCustomFieldDefinition extends CustomFieldDefinition - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -155,8 +155,8 @@ public void setMaxLength(Integer value) { this.maxLength = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof StringTypeCustomFieldDefinition)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -171,7 +171,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultString = this.getDefaultString(); String rhsDefaultString; rhsDefaultString = that.getDefaultString(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultString", lhsDefaultString), LocatorUtils.property(thatLocator, "defaultString", rhsDefaultString), lhsDefaultString, rhsDefaultString)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultString", lhsDefaultString), LocatorUtils.property(thatLocator, "defaultString", rhsDefaultString), lhsDefaultString, rhsDefaultString, (this.defaultString!= null), (that.defaultString!= null))) { return false; } } @@ -180,7 +180,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRegularExpression = this.getRegularExpression(); String rhsRegularExpression; rhsRegularExpression = that.getRegularExpression(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "regularExpression", lhsRegularExpression), LocatorUtils.property(thatLocator, "regularExpression", rhsRegularExpression), lhsRegularExpression, rhsRegularExpression)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "regularExpression", lhsRegularExpression), LocatorUtils.property(thatLocator, "regularExpression", rhsRegularExpression), lhsRegularExpression, rhsRegularExpression, (this.regularExpression!= null), (that.regularExpression!= null))) { return false; } } @@ -189,7 +189,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxLength = this.getMaxLength(); Integer rhsMaxLength; rhsMaxLength = that.getMaxLength(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxLength", lhsMaxLength), LocatorUtils.property(thatLocator, "maxLength", rhsMaxLength), lhsMaxLength, rhsMaxLength)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxLength", lhsMaxLength), LocatorUtils.property(thatLocator, "maxLength", rhsMaxLength), lhsMaxLength, rhsMaxLength, (this.maxLength!= null), (that.maxLength!= null))) { return false; } } @@ -197,32 +197,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theDefaultString; theDefaultString = this.getDefaultString(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultString", theDefaultString), currentHashCode, theDefaultString); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultString", theDefaultString), currentHashCode, theDefaultString, (this.defaultString!= null)); } { String theRegularExpression; theRegularExpression = this.getRegularExpression(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "regularExpression", theRegularExpression), currentHashCode, theRegularExpression); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "regularExpression", theRegularExpression), currentHashCode, theRegularExpression, (this.regularExpression!= null)); } { Integer theMaxLength; theMaxLength = this.getMaxLength(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxLength", theMaxLength), currentHashCode, theMaxLength); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxLength", theMaxLength), currentHashCode, theMaxLength, (this.maxLength!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SubTotalLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SubTotalLineDetail.java index ea6b32e1..88aa0fbb 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SubTotalLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SubTotalLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -72,8 +72,7 @@ "itemRef", "serviceDate" }) -public class SubTotalLineDetail - implements Serializable, Equals, HashCode +public class SubTotalLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -132,8 +131,8 @@ public void setServiceDate(Date value) { this.serviceDate = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SubTotalLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -145,7 +144,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -154,7 +153,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -162,27 +161,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= null)); } { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SummarizeColumnsByEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SummarizeColumnsByEnum.java index 05476ced..01954b7c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SummarizeColumnsByEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SummarizeColumnsByEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Summary.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Summary.java index c64b3487..6adccdf1 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Summary.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Summary.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "Summary", propOrder = { "colData" }) -public class Summary - implements Serializable, Equals, HashCode +public class Summary implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setColData(List colData) { this.colData = colData; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Summary)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); List rhsColData; rhsColData = (((that.colData!= null)&&(!that.colData.isEmpty()))?that.getColData():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "colData", lhsColData), LocatorUtils.property(thatLocator, "colData", rhsColData), lhsColData, rhsColData, ((this.colData!= null)&&(!this.colData.isEmpty())), ((that.colData!= null)&&(!that.colData.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theColData; theColData = (((this.colData!= null)&&(!this.colData.isEmpty()))?this.getColData():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "colData", theColData), currentHashCode, theColData, ((this.colData!= null)&&(!this.colData.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SymbolPositionEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SymbolPositionEnum.java index 41199e84..930b0d28 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SymbolPositionEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SymbolPositionEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncActivity.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncActivity.java index 00f7dcc3..a779d436 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncActivity.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncActivity.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -85,7 +85,7 @@ }) public class SyncActivity extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -280,8 +280,8 @@ public void setEntityRowCount(Integer value) { this.entityRowCount = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SyncActivity)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -296,7 +296,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLatestUploadDateTime = this.getLatestUploadDateTime(); Date rhsLatestUploadDateTime; rhsLatestUploadDateTime = that.getLatestUploadDateTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "latestUploadDateTime", lhsLatestUploadDateTime), LocatorUtils.property(thatLocator, "latestUploadDateTime", rhsLatestUploadDateTime), lhsLatestUploadDateTime, rhsLatestUploadDateTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "latestUploadDateTime", lhsLatestUploadDateTime), LocatorUtils.property(thatLocator, "latestUploadDateTime", rhsLatestUploadDateTime), lhsLatestUploadDateTime, rhsLatestUploadDateTime, (this.latestUploadDateTime!= null), (that.latestUploadDateTime!= null))) { return false; } } @@ -305,7 +305,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLatestWriteBackDateTime = this.getLatestWriteBackDateTime(); Date rhsLatestWriteBackDateTime; rhsLatestWriteBackDateTime = that.getLatestWriteBackDateTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "latestWriteBackDateTime", lhsLatestWriteBackDateTime), LocatorUtils.property(thatLocator, "latestWriteBackDateTime", rhsLatestWriteBackDateTime), lhsLatestWriteBackDateTime, rhsLatestWriteBackDateTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "latestWriteBackDateTime", lhsLatestWriteBackDateTime), LocatorUtils.property(thatLocator, "latestWriteBackDateTime", rhsLatestWriteBackDateTime), lhsLatestWriteBackDateTime, rhsLatestWriteBackDateTime, (this.latestWriteBackDateTime!= null), (that.latestWriteBackDateTime!= null))) { return false; } } @@ -314,7 +314,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSyncType = this.getSyncType(); SyncType rhsSyncType; rhsSyncType = that.getSyncType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "syncType", lhsSyncType), LocatorUtils.property(thatLocator, "syncType", rhsSyncType), lhsSyncType, rhsSyncType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "syncType", lhsSyncType), LocatorUtils.property(thatLocator, "syncType", rhsSyncType), lhsSyncType, rhsSyncType, (this.syncType!= null), (that.syncType!= null))) { return false; } } @@ -323,7 +323,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartSyncTMS = this.getStartSyncTMS(); Date rhsStartSyncTMS; rhsStartSyncTMS = that.getStartSyncTMS(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startSyncTMS", lhsStartSyncTMS), LocatorUtils.property(thatLocator, "startSyncTMS", rhsStartSyncTMS), lhsStartSyncTMS, rhsStartSyncTMS)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startSyncTMS", lhsStartSyncTMS), LocatorUtils.property(thatLocator, "startSyncTMS", rhsStartSyncTMS), lhsStartSyncTMS, rhsStartSyncTMS, (this.startSyncTMS!= null), (that.startSyncTMS!= null))) { return false; } } @@ -332,7 +332,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndSyncTMS = this.getEndSyncTMS(); Date rhsEndSyncTMS; rhsEndSyncTMS = that.getEndSyncTMS(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endSyncTMS", lhsEndSyncTMS), LocatorUtils.property(thatLocator, "endSyncTMS", rhsEndSyncTMS), lhsEndSyncTMS, rhsEndSyncTMS)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endSyncTMS", lhsEndSyncTMS), LocatorUtils.property(thatLocator, "endSyncTMS", rhsEndSyncTMS), lhsEndSyncTMS, rhsEndSyncTMS, (this.endSyncTMS!= null), (that.endSyncTMS!= null))) { return false; } } @@ -341,7 +341,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityName = this.getEntityName(); String rhsEntityName; rhsEntityName = that.getEntityName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityName", lhsEntityName), LocatorUtils.property(thatLocator, "entityName", rhsEntityName), lhsEntityName, rhsEntityName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityName", lhsEntityName), LocatorUtils.property(thatLocator, "entityName", rhsEntityName), lhsEntityName, rhsEntityName, (this.entityName!= null), (that.entityName!= null))) { return false; } } @@ -350,7 +350,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEntityRowCount = this.getEntityRowCount(); Integer rhsEntityRowCount; rhsEntityRowCount = that.getEntityRowCount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRowCount", lhsEntityRowCount), LocatorUtils.property(thatLocator, "entityRowCount", rhsEntityRowCount), lhsEntityRowCount, rhsEntityRowCount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "entityRowCount", lhsEntityRowCount), LocatorUtils.property(thatLocator, "entityRowCount", rhsEntityRowCount), lhsEntityRowCount, rhsEntityRowCount, (this.entityRowCount!= null), (that.entityRowCount!= null))) { return false; } } @@ -358,52 +358,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Date theLatestUploadDateTime; theLatestUploadDateTime = this.getLatestUploadDateTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestUploadDateTime", theLatestUploadDateTime), currentHashCode, theLatestUploadDateTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestUploadDateTime", theLatestUploadDateTime), currentHashCode, theLatestUploadDateTime, (this.latestUploadDateTime!= null)); } { Date theLatestWriteBackDateTime; theLatestWriteBackDateTime = this.getLatestWriteBackDateTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestWriteBackDateTime", theLatestWriteBackDateTime), currentHashCode, theLatestWriteBackDateTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestWriteBackDateTime", theLatestWriteBackDateTime), currentHashCode, theLatestWriteBackDateTime, (this.latestWriteBackDateTime!= null)); } { SyncType theSyncType; theSyncType = this.getSyncType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncType", theSyncType), currentHashCode, theSyncType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncType", theSyncType), currentHashCode, theSyncType, (this.syncType!= null)); } { Date theStartSyncTMS; theStartSyncTMS = this.getStartSyncTMS(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startSyncTMS", theStartSyncTMS), currentHashCode, theStartSyncTMS); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startSyncTMS", theStartSyncTMS), currentHashCode, theStartSyncTMS, (this.startSyncTMS!= null)); } { Date theEndSyncTMS; theEndSyncTMS = this.getEndSyncTMS(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endSyncTMS", theEndSyncTMS), currentHashCode, theEndSyncTMS); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endSyncTMS", theEndSyncTMS), currentHashCode, theEndSyncTMS, (this.endSyncTMS!= null)); } { String theEntityName; theEntityName = this.getEntityName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityName", theEntityName), currentHashCode, theEntityName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityName", theEntityName), currentHashCode, theEntityName, (this.entityName!= null)); } { Integer theEntityRowCount; theEntityRowCount = this.getEntityRowCount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRowCount", theEntityRowCount), currentHashCode, theEntityRowCount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "entityRowCount", theEntityRowCount), currentHashCode, theEntityRowCount, (this.entityRowCount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncError.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncError.java index 91fb3015..0c02366c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncError.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncError.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; 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; @@ -75,8 +75,7 @@ "cloudVersion", "qbVersion" }) -public class SyncError - implements Serializable, Equals, HashCode +public class SyncError implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -211,8 +210,8 @@ public void setAppToken(String value) { this.appToken = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SyncError)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -224,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsError = this.getError(); Error rhsError; rhsError = that.getError(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "error", lhsError), LocatorUtils.property(thatLocator, "error", rhsError), lhsError, rhsError)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "error", lhsError), LocatorUtils.property(thatLocator, "error", rhsError), lhsError, rhsError, (this.error!= null), (that.error!= null))) { return false; } } @@ -233,7 +232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCloudVersion = this.getCloudVersion(); SyncObject rhsCloudVersion; rhsCloudVersion = that.getCloudVersion(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "cloudVersion", lhsCloudVersion), LocatorUtils.property(thatLocator, "cloudVersion", rhsCloudVersion), lhsCloudVersion, rhsCloudVersion)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "cloudVersion", lhsCloudVersion), LocatorUtils.property(thatLocator, "cloudVersion", rhsCloudVersion), lhsCloudVersion, rhsCloudVersion, (this.cloudVersion!= null), (that.cloudVersion!= null))) { return false; } } @@ -242,7 +241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsQBVersion = this.getQBVersion(); SyncObject rhsQBVersion; rhsQBVersion = that.getQBVersion(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "qbVersion", lhsQBVersion), LocatorUtils.property(thatLocator, "qbVersion", rhsQBVersion), lhsQBVersion, rhsQBVersion, (this.qbVersion!= null), (that.qbVersion!= null))) { return false; } } @@ -251,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -260,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAppToken = this.getAppToken(); String rhsAppToken; rhsAppToken = that.getAppToken(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "appToken", lhsAppToken), LocatorUtils.property(thatLocator, "appToken", rhsAppToken), lhsAppToken, rhsAppToken)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "appToken", lhsAppToken), LocatorUtils.property(thatLocator, "appToken", rhsAppToken), lhsAppToken, rhsAppToken, (this.appToken!= null), (that.appToken!= null))) { return false; } } @@ -268,42 +267,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Error theError; theError = this.getError(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "error", theError), currentHashCode, theError); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "error", theError), currentHashCode, theError, (this.error!= null)); } { SyncObject theCloudVersion; theCloudVersion = this.getCloudVersion(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cloudVersion", theCloudVersion), currentHashCode, theCloudVersion); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cloudVersion", theCloudVersion), currentHashCode, theCloudVersion, (this.cloudVersion!= null)); } { SyncObject theQBVersion; theQBVersion = this.getQBVersion(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qbVersion", theQBVersion), currentHashCode, theQBVersion, (this.qbVersion!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { String theAppToken; theAppToken = this.getAppToken(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appToken", theAppToken), currentHashCode, theAppToken); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appToken", theAppToken), currentHashCode, theAppToken, (this.appToken!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorResponse.java index 814baf73..5e30a0a5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorResponse.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorResponse.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -78,8 +78,7 @@ @XmlType(name = "SyncErrorResponse", propOrder = { "syncError" }) -public class SyncErrorResponse - implements Serializable, Equals, HashCode +public class SyncErrorResponse implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -233,8 +232,8 @@ public void setSyncError(List syncError) { this.syncError = syncError; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SyncErrorResponse)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -246,7 +245,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSyncError = (((this.syncError!= null)&&(!this.syncError.isEmpty()))?this.getSyncError():null); List rhsSyncError; rhsSyncError = (((that.syncError!= null)&&(!that.syncError.isEmpty()))?that.getSyncError():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "syncError", lhsSyncError), LocatorUtils.property(thatLocator, "syncError", rhsSyncError), lhsSyncError, rhsSyncError)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "syncError", lhsSyncError), LocatorUtils.property(thatLocator, "syncError", rhsSyncError), lhsSyncError, rhsSyncError, ((this.syncError!= null)&&(!this.syncError.isEmpty())), ((that.syncError!= null)&&(!that.syncError.isEmpty())))) { return false; } } @@ -255,7 +254,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLatestUploadTime = this.getLatestUploadTime(); Date rhsLatestUploadTime; rhsLatestUploadTime = that.getLatestUploadTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "latestUploadTime", lhsLatestUploadTime), LocatorUtils.property(thatLocator, "latestUploadTime", rhsLatestUploadTime), lhsLatestUploadTime, rhsLatestUploadTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "latestUploadTime", lhsLatestUploadTime), LocatorUtils.property(thatLocator, "latestUploadTime", rhsLatestUploadTime), lhsLatestUploadTime, rhsLatestUploadTime, (this.latestUploadTime!= null), (that.latestUploadTime!= null))) { return false; } } @@ -264,7 +263,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartPosition = this.getStartPosition(); Integer rhsStartPosition; rhsStartPosition = that.getStartPosition(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startPosition", lhsStartPosition), LocatorUtils.property(thatLocator, "startPosition", rhsStartPosition), lhsStartPosition, rhsStartPosition, (this.startPosition!= null), (that.startPosition!= null))) { return false; } } @@ -273,7 +272,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMaxResults = this.getMaxResults(); Integer rhsMaxResults; rhsMaxResults = that.getMaxResults(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "maxResults", lhsMaxResults), LocatorUtils.property(thatLocator, "maxResults", rhsMaxResults), lhsMaxResults, rhsMaxResults, (this.maxResults!= null), (that.maxResults!= null))) { return false; } } @@ -282,7 +281,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalCount = this.getTotalCount(); Integer rhsTotalCount; rhsTotalCount = that.getTotalCount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalCount", lhsTotalCount), LocatorUtils.property(thatLocator, "totalCount", rhsTotalCount), lhsTotalCount, rhsTotalCount, (this.totalCount!= null), (that.totalCount!= null))) { return false; } } @@ -290,42 +289,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theSyncError; theSyncError = (((this.syncError!= null)&&(!this.syncError.isEmpty()))?this.getSyncError():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncError", theSyncError), currentHashCode, theSyncError); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "syncError", theSyncError), currentHashCode, theSyncError, ((this.syncError!= null)&&(!this.syncError.isEmpty()))); } { Date theLatestUploadTime; theLatestUploadTime = this.getLatestUploadTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestUploadTime", theLatestUploadTime), currentHashCode, theLatestUploadTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "latestUploadTime", theLatestUploadTime), currentHashCode, theLatestUploadTime, (this.latestUploadTime!= null)); } { Integer theStartPosition; theStartPosition = this.getStartPosition(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startPosition", theStartPosition), currentHashCode, theStartPosition, (this.startPosition!= null)); } { Integer theMaxResults; theMaxResults = this.getMaxResults(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "maxResults", theMaxResults), currentHashCode, theMaxResults, (this.maxResults!= null)); } { Integer theTotalCount; theTotalCount = this.getTotalCount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalCount", theTotalCount), currentHashCode, theTotalCount, (this.totalCount!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorType.java index 7e541f33..88efc7d5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncErrorType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncObject.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncObject.java index 44f8e6ce..1ba6462e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncObject.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncObject.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; 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; @@ -72,8 +72,7 @@ "intuitObject", "fault" }) -public class SyncObject - implements Serializable, Equals, HashCode +public class SyncObject implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -87,68 +86,68 @@ public class SyncObject * * @return * possible object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public JAXBElement getIntuitObject() { @@ -160,68 +159,68 @@ public JAXBElement getIntuitObject() { * * @param value * allowed object is - * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Transfer }{@code >} - * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} - * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} - * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} - * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} + * {@link JAXBElement }{@code <}{@link TaxService }{@code >} + * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} * {@link JAXBElement }{@code <}{@link TaxAgency }{@code >} - * {@link JAXBElement }{@code <}{@link Class }{@code >} * {@link JAXBElement }{@code <}{@link EmailDeliveryInfo }{@code >} - * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} - * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} + * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} + * {@link JAXBElement }{@code <}{@link Status }{@code >} + * {@link JAXBElement }{@code <}{@link Attachable }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} + * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} + * {@link JAXBElement }{@code <}{@link Term }{@code >} + * {@link JAXBElement }{@code <}{@link Class }{@code >} + * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} + * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Preferences }{@code >} + * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} + * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Payment }{@code >} * {@link JAXBElement }{@code <}{@link MasterAccount }{@code >} - * {@link JAXBElement }{@code <}{@link Deposit }{@code >} - * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link CustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} + * {@link JAXBElement }{@code <}{@link Bill }{@code >} + * {@link JAXBElement }{@code <}{@link ReimburseCharge }{@code >} + * {@link JAXBElement }{@code <}{@link Transfer }{@code >} * {@link JAXBElement }{@code <}{@link Company }{@code >} - * {@link JAXBElement }{@code <}{@link Status }{@code >} - * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} - * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} - * {@link JAXBElement }{@code <}{@link DateTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} - * {@link JAXBElement }{@code <}{@link NumberTypeCustomFieldDefinition }{@code >} - * {@link JAXBElement }{@code <}{@link Account }{@code >} - * {@link JAXBElement }{@code <}{@link Department }{@code >} - * {@link JAXBElement }{@code <}{@link Task }{@code >} - * {@link JAXBElement }{@code <}{@link TaxService }{@code >} - * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} * {@link JAXBElement }{@code <}{@link Vendor }{@code >} - * {@link JAXBElement }{@code <}{@link Item }{@code >} - * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link Deposit }{@code >} * {@link JAXBElement }{@code <}{@link Invoice }{@code >} - * {@link JAXBElement }{@code <}{@link CreditMemo }{@code >} - * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} - * {@link JAXBElement }{@code <}{@link BillPayment }{@code >} + * {@link JAXBElement }{@code <}{@link Employee }{@code >} + * {@link JAXBElement }{@code <}{@link SalesReceipt }{@code >} * {@link JAXBElement }{@code <}{@link SyncActivity }{@code >} - * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} - * {@link JAXBElement }{@code <}{@link JournalCode }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyCurrency }{@code >} * {@link JAXBElement }{@code <}{@link Estimate }{@code >} + * {@link JAXBElement }{@code <}{@link ChargeCredit }{@code >} + * {@link JAXBElement }{@code <}{@link SalesRep }{@code >} + * {@link JAXBElement }{@code <}{@link VendorType }{@code >} + * {@link JAXBElement }{@code <}{@link SalesOrder }{@code >} + * {@link JAXBElement }{@code <}{@link UserAlert }{@code >} + * {@link JAXBElement }{@code <}{@link BooleanTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link PurchaseOrder }{@code >} + * {@link JAXBElement }{@code <}{@link Task }{@code >} + * {@link JAXBElement }{@code <}{@link Department }{@code >} + * {@link JAXBElement }{@code <}{@link StatementCharge }{@code >} + * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} + * {@link JAXBElement }{@code <}{@link TimeActivity }{@code >} * {@link JAXBElement }{@code <}{@link JournalEntry }{@code >} - * {@link JAXBElement }{@code <}{@link Bill }{@code >} - * {@link JAXBElement }{@code <}{@link Preferences }{@code >} - * {@link JAXBElement }{@code <}{@link CompanyInfo }{@code >} - * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} - * {@link JAXBElement }{@code <}{@link Customer }{@code >} + * {@link JAXBElement }{@code <}{@link Item }{@code >} + * {@link JAXBElement }{@code <}{@link Account }{@code >} + * {@link JAXBElement }{@code <}{@link TaxCode }{@code >} + * {@link JAXBElement }{@code <}{@link PriceLevel }{@code >} + * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} + * {@link JAXBElement }{@code <}{@link InventorySite }{@code >} * {@link JAXBElement }{@code <}{@link OtherName }{@code >} - * {@link JAXBElement }{@code <}{@link IntuitEntity }{@code >} - * {@link JAXBElement }{@code <}{@link Employee }{@code >} * {@link JAXBElement }{@code <}{@link CustomerType }{@code >} - * {@link JAXBElement }{@code <}{@link TaxReturn }{@code >} - * {@link JAXBElement }{@code <}{@link QbdtEntityIdMapping }{@code >} - * {@link JAXBElement }{@code <}{@link FixedAsset }{@code >} - * {@link JAXBElement }{@code <}{@link Payment }{@code >} - * {@link JAXBElement }{@code <}{@link VendorCredit }{@code >} - * {@link JAXBElement }{@code <}{@link ExchangeRate }{@code >} - * {@link JAXBElement }{@code <}{@link VendorType }{@code >} - * {@link JAXBElement }{@code <}{@link TDSMetadata }{@code >} - * {@link JAXBElement }{@code <}{@link Attachable }{@code >} - * {@link JAXBElement }{@code <}{@link Term }{@code >} - * {@link JAXBElement }{@code <}{@link RefundReceipt }{@code >} - * {@link JAXBElement }{@code <}{@link Budget }{@code >} + * {@link JAXBElement }{@code <}{@link Purchase }{@code >} + * {@link JAXBElement }{@code <}{@link PaymentMethod }{@code >} + * {@link JAXBElement }{@code <}{@link StringTypeCustomFieldDefinition }{@code >} + * {@link JAXBElement }{@code <}{@link TaxRate }{@code >} * */ public void setIntuitObject(JAXBElement value) { @@ -252,8 +251,8 @@ public void setFault(Fault value) { this.fault = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof SyncObject)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -265,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsIntuitObject = this.getIntuitObject(); JAXBElement rhsIntuitObject; rhsIntuitObject = that.getIntuitObject(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "intuitObject", lhsIntuitObject), LocatorUtils.property(thatLocator, "intuitObject", rhsIntuitObject), lhsIntuitObject, rhsIntuitObject, (this.intuitObject!= null), (that.intuitObject!= null))) { return false; } } @@ -274,7 +273,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -282,27 +281,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { JAXBElement theIntuitObject; theIntuitObject = this.getIntuitObject(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "intuitObject", theIntuitObject), currentHashCode, theIntuitObject, (this.intuitObject!= null)); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncType.java index 9666e89b..8570666a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/SyncType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSLineDetail.java index c5c6c106..3504681e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -71,8 +71,7 @@ "tdsSectionTypeId", "tdsLineDetailEx" }) -public class TDSLineDetail - implements Serializable, Equals, HashCode +public class TDSLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -155,8 +154,8 @@ public void setTDSLineDetailEx(IntuitAnyType value) { this.tdsLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TDSLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -168,7 +167,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSAccountRef = this.getTDSAccountRef(); ReferenceType rhsTDSAccountRef; rhsTDSAccountRef = that.getTDSAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsAccountRef", lhsTDSAccountRef), LocatorUtils.property(thatLocator, "tdsAccountRef", rhsTDSAccountRef), lhsTDSAccountRef, rhsTDSAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsAccountRef", lhsTDSAccountRef), LocatorUtils.property(thatLocator, "tdsAccountRef", rhsTDSAccountRef), lhsTDSAccountRef, rhsTDSAccountRef, (this.tdsAccountRef!= null), (that.tdsAccountRef!= null))) { return false; } } @@ -177,7 +176,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSSectionTypeId = this.getTDSSectionTypeId(); Integer rhsTDSSectionTypeId; rhsTDSSectionTypeId = that.getTDSSectionTypeId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypeId", lhsTDSSectionTypeId), LocatorUtils.property(thatLocator, "tdsSectionTypeId", rhsTDSSectionTypeId), lhsTDSSectionTypeId, rhsTDSSectionTypeId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypeId", lhsTDSSectionTypeId), LocatorUtils.property(thatLocator, "tdsSectionTypeId", rhsTDSSectionTypeId), lhsTDSSectionTypeId, rhsTDSSectionTypeId, (this.tdsSectionTypeId!= null), (that.tdsSectionTypeId!= null))) { return false; } } @@ -186,7 +185,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSLineDetailEx = this.getTDSLineDetailEx(); IntuitAnyType rhsTDSLineDetailEx; rhsTDSLineDetailEx = that.getTDSLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsLineDetailEx", lhsTDSLineDetailEx), LocatorUtils.property(thatLocator, "tdsLineDetailEx", rhsTDSLineDetailEx), lhsTDSLineDetailEx, rhsTDSLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsLineDetailEx", lhsTDSLineDetailEx), LocatorUtils.property(thatLocator, "tdsLineDetailEx", rhsTDSLineDetailEx), lhsTDSLineDetailEx, rhsTDSLineDetailEx, (this.tdsLineDetailEx!= null), (that.tdsLineDetailEx!= null))) { return false; } } @@ -194,32 +193,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theTDSAccountRef; theTDSAccountRef = this.getTDSAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsAccountRef", theTDSAccountRef), currentHashCode, theTDSAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsAccountRef", theTDSAccountRef), currentHashCode, theTDSAccountRef, (this.tdsAccountRef!= null)); } { Integer theTDSSectionTypeId; theTDSSectionTypeId = this.getTDSSectionTypeId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypeId", theTDSSectionTypeId), currentHashCode, theTDSSectionTypeId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypeId", theTDSSectionTypeId), currentHashCode, theTDSSectionTypeId, (this.tdsSectionTypeId!= null)); } { IntuitAnyType theTDSLineDetailEx; theTDSLineDetailEx = this.getTDSLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsLineDetailEx", theTDSLineDetailEx), currentHashCode, theTDSLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsLineDetailEx", theTDSLineDetailEx), currentHashCode, theTDSLineDetailEx, (this.tdsLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSMetadata.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSMetadata.java index deac6904..81dcb542 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSMetadata.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TDSMetadata.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -73,7 +73,7 @@ }) public class TDSMetadata extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -164,8 +164,8 @@ public void setTDSSectionTypes(List tdsSectionTypes) { this.tdsSectionTypes = tdsSectionTypes; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TDSMetadata)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -180,7 +180,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSEntityTypes = (((this.tdsEntityTypes!= null)&&(!this.tdsEntityTypes.isEmpty()))?this.getTDSEntityTypes():null); List rhsTDSEntityTypes; rhsTDSEntityTypes = (((that.tdsEntityTypes!= null)&&(!that.tdsEntityTypes.isEmpty()))?that.getTDSEntityTypes():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEntityTypes", lhsTDSEntityTypes), LocatorUtils.property(thatLocator, "tdsEntityTypes", rhsTDSEntityTypes), lhsTDSEntityTypes, rhsTDSEntityTypes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEntityTypes", lhsTDSEntityTypes), LocatorUtils.property(thatLocator, "tdsEntityTypes", rhsTDSEntityTypes), lhsTDSEntityTypes, rhsTDSEntityTypes, ((this.tdsEntityTypes!= null)&&(!this.tdsEntityTypes.isEmpty())), ((that.tdsEntityTypes!= null)&&(!that.tdsEntityTypes.isEmpty())))) { return false; } } @@ -189,7 +189,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSSectionTypes = (((this.tdsSectionTypes!= null)&&(!this.tdsSectionTypes.isEmpty()))?this.getTDSSectionTypes():null); List rhsTDSSectionTypes; rhsTDSSectionTypes = (((that.tdsSectionTypes!= null)&&(!that.tdsSectionTypes.isEmpty()))?that.getTDSSectionTypes():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypes", lhsTDSSectionTypes), LocatorUtils.property(thatLocator, "tdsSectionTypes", rhsTDSSectionTypes), lhsTDSSectionTypes, rhsTDSSectionTypes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypes", lhsTDSSectionTypes), LocatorUtils.property(thatLocator, "tdsSectionTypes", rhsTDSSectionTypes), lhsTDSSectionTypes, rhsTDSSectionTypes, ((this.tdsSectionTypes!= null)&&(!this.tdsSectionTypes.isEmpty())), ((that.tdsSectionTypes!= null)&&(!that.tdsSectionTypes.isEmpty())))) { return false; } } @@ -197,27 +197,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { List theTDSEntityTypes; theTDSEntityTypes = (((this.tdsEntityTypes!= null)&&(!this.tdsEntityTypes.isEmpty()))?this.getTDSEntityTypes():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEntityTypes", theTDSEntityTypes), currentHashCode, theTDSEntityTypes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEntityTypes", theTDSEntityTypes), currentHashCode, theTDSEntityTypes, ((this.tdsEntityTypes!= null)&&(!this.tdsEntityTypes.isEmpty()))); } { List theTDSSectionTypes; theTDSSectionTypes = (((this.tdsSectionTypes!= null)&&(!this.tdsSectionTypes.isEmpty()))?this.getTDSSectionTypes():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypes", theTDSSectionTypes), currentHashCode, theTDSSectionTypes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypes", theTDSSectionTypes), currentHashCode, theTDSSectionTypes, ((this.tdsSectionTypes!= null)&&(!this.tdsSectionTypes.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Task.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Task.java index 035067b8..fe26c6b6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Task.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Task.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -83,7 +83,7 @@ }) public class Task extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -246,8 +246,8 @@ public void setTaskEx(IntuitAnyType value) { this.taskEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Task)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -262,7 +262,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNotes = this.getNotes(); String rhsNotes; rhsNotes = that.getNotes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes, (this.notes!= null), (that.notes!= null))) { return false; } } @@ -271,7 +271,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFrom = this.getFrom(); String rhsFrom; rhsFrom = that.getFrom(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "from", lhsFrom), LocatorUtils.property(thatLocator, "from", rhsFrom), lhsFrom, rhsFrom)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "from", lhsFrom), LocatorUtils.property(thatLocator, "from", rhsFrom), lhsFrom, rhsFrom, (this.from!= null), (that.from!= null))) { return false; } } @@ -280,7 +280,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -289,7 +289,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDone = this.isDone(); Boolean rhsDone; rhsDone = that.isDone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "done", lhsDone), LocatorUtils.property(thatLocator, "done", rhsDone), lhsDone, rhsDone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "done", lhsDone), LocatorUtils.property(thatLocator, "done", rhsDone), lhsDone, rhsDone, (this.done!= null), (that.done!= null))) { return false; } } @@ -298,7 +298,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReminderDate = this.getReminderDate(); Date rhsReminderDate; rhsReminderDate = that.getReminderDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reminderDate", lhsReminderDate), LocatorUtils.property(thatLocator, "reminderDate", rhsReminderDate), lhsReminderDate, rhsReminderDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reminderDate", lhsReminderDate), LocatorUtils.property(thatLocator, "reminderDate", rhsReminderDate), lhsReminderDate, rhsReminderDate, (this.reminderDate!= null), (that.reminderDate!= null))) { return false; } } @@ -307,7 +307,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaskEx = this.getTaskEx(); IntuitAnyType rhsTaskEx; rhsTaskEx = that.getTaskEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taskEx", lhsTaskEx), LocatorUtils.property(thatLocator, "taskEx", rhsTaskEx), lhsTaskEx, rhsTaskEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taskEx", lhsTaskEx), LocatorUtils.property(thatLocator, "taskEx", rhsTaskEx), lhsTaskEx, rhsTaskEx, (this.taskEx!= null), (that.taskEx!= null))) { return false; } } @@ -315,47 +315,47 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theNotes; theNotes = this.getNotes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes, (this.notes!= null)); } { String theFrom; theFrom = this.getFrom(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "from", theFrom), currentHashCode, theFrom); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "from", theFrom), currentHashCode, theFrom, (this.from!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { Boolean theDone; theDone = this.isDone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "done", theDone), currentHashCode, theDone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "done", theDone), currentHashCode, theDone, (this.done!= null)); } { Date theReminderDate; theReminderDate = this.getReminderDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reminderDate", theReminderDate), currentHashCode, theReminderDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reminderDate", theReminderDate), currentHashCode, theReminderDate, (this.reminderDate!= null)); } { IntuitAnyType theTaskEx; theTaskEx = this.getTaskEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taskEx", theTaskEx), currentHashCode, theTaskEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taskEx", theTaskEx), currentHashCode, theTaskEx, (this.taskEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxAgency.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxAgency.java index c259c1af..e4da2472 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxAgency.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxAgency.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -94,7 +94,7 @@ }) public class TaxAgency extends Vendor - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -413,8 +413,8 @@ public void setTaxAgencyExt(IntuitAnyType value) { this.taxAgencyExt = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxAgency)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -429,7 +429,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxCodeRef = this.getSalesTaxCodeRef(); ReferenceType rhsSalesTaxCodeRef; rhsSalesTaxCodeRef = that.getSalesTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCodeRef", lhsSalesTaxCodeRef), LocatorUtils.property(thatLocator, "salesTaxCodeRef", rhsSalesTaxCodeRef), lhsSalesTaxCodeRef, rhsSalesTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCodeRef", lhsSalesTaxCodeRef), LocatorUtils.property(thatLocator, "salesTaxCodeRef", rhsSalesTaxCodeRef), lhsSalesTaxCodeRef, rhsSalesTaxCodeRef, (this.salesTaxCodeRef!= null), (that.salesTaxCodeRef!= null))) { return false; } } @@ -438,7 +438,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxCountry = this.getSalesTaxCountry(); String rhsSalesTaxCountry; rhsSalesTaxCountry = that.getSalesTaxCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCountry", lhsSalesTaxCountry), LocatorUtils.property(thatLocator, "salesTaxCountry", rhsSalesTaxCountry), lhsSalesTaxCountry, rhsSalesTaxCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxCountry", lhsSalesTaxCountry), LocatorUtils.property(thatLocator, "salesTaxCountry", rhsSalesTaxCountry), lhsSalesTaxCountry, rhsSalesTaxCountry, (this.salesTaxCountry!= null), (that.salesTaxCountry!= null))) { return false; } } @@ -447,7 +447,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxReturnRef = this.getSalesTaxReturnRef(); ReferenceType rhsSalesTaxReturnRef; rhsSalesTaxReturnRef = that.getSalesTaxReturnRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxReturnRef", lhsSalesTaxReturnRef), LocatorUtils.property(thatLocator, "salesTaxReturnRef", rhsSalesTaxReturnRef), lhsSalesTaxReturnRef, rhsSalesTaxReturnRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxReturnRef", lhsSalesTaxReturnRef), LocatorUtils.property(thatLocator, "salesTaxReturnRef", rhsSalesTaxReturnRef), lhsSalesTaxReturnRef, rhsSalesTaxReturnRef, (this.salesTaxReturnRef!= null), (that.salesTaxReturnRef!= null))) { return false; } } @@ -456,7 +456,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRegistrationNumber = this.getTaxRegistrationNumber(); String rhsTaxRegistrationNumber; rhsTaxRegistrationNumber = that.getTaxRegistrationNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRegistrationNumber", lhsTaxRegistrationNumber), LocatorUtils.property(thatLocator, "taxRegistrationNumber", rhsTaxRegistrationNumber), lhsTaxRegistrationNumber, rhsTaxRegistrationNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRegistrationNumber", lhsTaxRegistrationNumber), LocatorUtils.property(thatLocator, "taxRegistrationNumber", rhsTaxRegistrationNumber), lhsTaxRegistrationNumber, rhsTaxRegistrationNumber, (this.taxRegistrationNumber!= null), (that.taxRegistrationNumber!= null))) { return false; } } @@ -465,7 +465,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReportingPeriod = this.getReportingPeriod(); String rhsReportingPeriod; rhsReportingPeriod = that.getReportingPeriod(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reportingPeriod", lhsReportingPeriod), LocatorUtils.property(thatLocator, "reportingPeriod", rhsReportingPeriod), lhsReportingPeriod, rhsReportingPeriod)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reportingPeriod", lhsReportingPeriod), LocatorUtils.property(thatLocator, "reportingPeriod", rhsReportingPeriod), lhsReportingPeriod, rhsReportingPeriod, (this.reportingPeriod!= null), (that.reportingPeriod!= null))) { return false; } } @@ -474,7 +474,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxTrackedOnPurchases = this.isTaxTrackedOnPurchases(); Boolean rhsTaxTrackedOnPurchases; rhsTaxTrackedOnPurchases = that.isTaxTrackedOnPurchases(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnPurchases", lhsTaxTrackedOnPurchases), LocatorUtils.property(thatLocator, "taxTrackedOnPurchases", rhsTaxTrackedOnPurchases), lhsTaxTrackedOnPurchases, rhsTaxTrackedOnPurchases)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnPurchases", lhsTaxTrackedOnPurchases), LocatorUtils.property(thatLocator, "taxTrackedOnPurchases", rhsTaxTrackedOnPurchases), lhsTaxTrackedOnPurchases, rhsTaxTrackedOnPurchases, (this.taxTrackedOnPurchases!= null), (that.taxTrackedOnPurchases!= null))) { return false; } } @@ -483,7 +483,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxOnPurchasesAccountRef = this.getTaxOnPurchasesAccountRef(); ReferenceType rhsTaxOnPurchasesAccountRef; rhsTaxOnPurchasesAccountRef = that.getTaxOnPurchasesAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnPurchasesAccountRef", lhsTaxOnPurchasesAccountRef), LocatorUtils.property(thatLocator, "taxOnPurchasesAccountRef", rhsTaxOnPurchasesAccountRef), lhsTaxOnPurchasesAccountRef, rhsTaxOnPurchasesAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnPurchasesAccountRef", lhsTaxOnPurchasesAccountRef), LocatorUtils.property(thatLocator, "taxOnPurchasesAccountRef", rhsTaxOnPurchasesAccountRef), lhsTaxOnPurchasesAccountRef, rhsTaxOnPurchasesAccountRef, (this.taxOnPurchasesAccountRef!= null), (that.taxOnPurchasesAccountRef!= null))) { return false; } } @@ -492,7 +492,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxTrackedOnSales = this.isTaxTrackedOnSales(); Boolean rhsTaxTrackedOnSales; rhsTaxTrackedOnSales = that.isTaxTrackedOnSales(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnSales", lhsTaxTrackedOnSales), LocatorUtils.property(thatLocator, "taxTrackedOnSales", rhsTaxTrackedOnSales), lhsTaxTrackedOnSales, rhsTaxTrackedOnSales)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnSales", lhsTaxTrackedOnSales), LocatorUtils.property(thatLocator, "taxTrackedOnSales", rhsTaxTrackedOnSales), lhsTaxTrackedOnSales, rhsTaxTrackedOnSales, (this.taxTrackedOnSales!= null), (that.taxTrackedOnSales!= null))) { return false; } } @@ -501,7 +501,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxTrackedOnSalesAccountRef = this.getTaxTrackedOnSalesAccountRef(); ReferenceType rhsTaxTrackedOnSalesAccountRef; rhsTaxTrackedOnSalesAccountRef = that.getTaxTrackedOnSalesAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnSalesAccountRef", lhsTaxTrackedOnSalesAccountRef), LocatorUtils.property(thatLocator, "taxTrackedOnSalesAccountRef", rhsTaxTrackedOnSalesAccountRef), lhsTaxTrackedOnSalesAccountRef, rhsTaxTrackedOnSalesAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTrackedOnSalesAccountRef", lhsTaxTrackedOnSalesAccountRef), LocatorUtils.property(thatLocator, "taxTrackedOnSalesAccountRef", rhsTaxTrackedOnSalesAccountRef), lhsTaxTrackedOnSalesAccountRef, rhsTaxTrackedOnSalesAccountRef, (this.taxTrackedOnSalesAccountRef!= null), (that.taxTrackedOnSalesAccountRef!= null))) { return false; } } @@ -510,7 +510,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxOnTax = this.isTaxOnTax(); Boolean rhsTaxOnTax; rhsTaxOnTax = that.isTaxOnTax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnTax", lhsTaxOnTax), LocatorUtils.property(thatLocator, "taxOnTax", rhsTaxOnTax), lhsTaxOnTax, rhsTaxOnTax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnTax", lhsTaxOnTax), LocatorUtils.property(thatLocator, "taxOnTax", rhsTaxOnTax), lhsTaxOnTax, rhsTaxOnTax, (this.taxOnTax!= null), (that.taxOnTax!= null))) { return false; } } @@ -519,7 +519,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLastFileDate = this.getLastFileDate(); Date rhsLastFileDate; rhsLastFileDate = that.getLastFileDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "lastFileDate", lhsLastFileDate), LocatorUtils.property(thatLocator, "lastFileDate", rhsLastFileDate), lhsLastFileDate, rhsLastFileDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "lastFileDate", lhsLastFileDate), LocatorUtils.property(thatLocator, "lastFileDate", rhsLastFileDate), lhsLastFileDate, rhsLastFileDate, (this.lastFileDate!= null), (that.lastFileDate!= null))) { return false; } } @@ -528,7 +528,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxAgencyExt = this.getTaxAgencyExt(); IntuitAnyType rhsTaxAgencyExt; rhsTaxAgencyExt = that.getTaxAgencyExt(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAgencyExt", lhsTaxAgencyExt), LocatorUtils.property(thatLocator, "taxAgencyExt", rhsTaxAgencyExt), lhsTaxAgencyExt, rhsTaxAgencyExt)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAgencyExt", lhsTaxAgencyExt), LocatorUtils.property(thatLocator, "taxAgencyExt", rhsTaxAgencyExt), lhsTaxAgencyExt, rhsTaxAgencyExt, (this.taxAgencyExt!= null), (that.taxAgencyExt!= null))) { return false; } } @@ -536,77 +536,77 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theSalesTaxCodeRef; theSalesTaxCodeRef = this.getSalesTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCodeRef", theSalesTaxCodeRef), currentHashCode, theSalesTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCodeRef", theSalesTaxCodeRef), currentHashCode, theSalesTaxCodeRef, (this.salesTaxCodeRef!= null)); } { String theSalesTaxCountry; theSalesTaxCountry = this.getSalesTaxCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCountry", theSalesTaxCountry), currentHashCode, theSalesTaxCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxCountry", theSalesTaxCountry), currentHashCode, theSalesTaxCountry, (this.salesTaxCountry!= null)); } { ReferenceType theSalesTaxReturnRef; theSalesTaxReturnRef = this.getSalesTaxReturnRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxReturnRef", theSalesTaxReturnRef), currentHashCode, theSalesTaxReturnRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxReturnRef", theSalesTaxReturnRef), currentHashCode, theSalesTaxReturnRef, (this.salesTaxReturnRef!= null)); } { String theTaxRegistrationNumber; theTaxRegistrationNumber = this.getTaxRegistrationNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRegistrationNumber", theTaxRegistrationNumber), currentHashCode, theTaxRegistrationNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRegistrationNumber", theTaxRegistrationNumber), currentHashCode, theTaxRegistrationNumber, (this.taxRegistrationNumber!= null)); } { String theReportingPeriod; theReportingPeriod = this.getReportingPeriod(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportingPeriod", theReportingPeriod), currentHashCode, theReportingPeriod); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reportingPeriod", theReportingPeriod), currentHashCode, theReportingPeriod, (this.reportingPeriod!= null)); } { Boolean theTaxTrackedOnPurchases; theTaxTrackedOnPurchases = this.isTaxTrackedOnPurchases(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnPurchases", theTaxTrackedOnPurchases), currentHashCode, theTaxTrackedOnPurchases); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnPurchases", theTaxTrackedOnPurchases), currentHashCode, theTaxTrackedOnPurchases, (this.taxTrackedOnPurchases!= null)); } { ReferenceType theTaxOnPurchasesAccountRef; theTaxOnPurchasesAccountRef = this.getTaxOnPurchasesAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnPurchasesAccountRef", theTaxOnPurchasesAccountRef), currentHashCode, theTaxOnPurchasesAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnPurchasesAccountRef", theTaxOnPurchasesAccountRef), currentHashCode, theTaxOnPurchasesAccountRef, (this.taxOnPurchasesAccountRef!= null)); } { Boolean theTaxTrackedOnSales; theTaxTrackedOnSales = this.isTaxTrackedOnSales(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnSales", theTaxTrackedOnSales), currentHashCode, theTaxTrackedOnSales); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnSales", theTaxTrackedOnSales), currentHashCode, theTaxTrackedOnSales, (this.taxTrackedOnSales!= null)); } { ReferenceType theTaxTrackedOnSalesAccountRef; theTaxTrackedOnSalesAccountRef = this.getTaxTrackedOnSalesAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnSalesAccountRef", theTaxTrackedOnSalesAccountRef), currentHashCode, theTaxTrackedOnSalesAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTrackedOnSalesAccountRef", theTaxTrackedOnSalesAccountRef), currentHashCode, theTaxTrackedOnSalesAccountRef, (this.taxTrackedOnSalesAccountRef!= null)); } { Boolean theTaxOnTax; theTaxOnTax = this.isTaxOnTax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnTax", theTaxOnTax), currentHashCode, theTaxOnTax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnTax", theTaxOnTax), currentHashCode, theTaxOnTax, (this.taxOnTax!= null)); } { Date theLastFileDate; theLastFileDate = this.getLastFileDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastFileDate", theLastFileDate), currentHashCode, theLastFileDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastFileDate", theLastFileDate), currentHashCode, theLastFileDate, (this.lastFileDate!= null)); } { IntuitAnyType theTaxAgencyExt; theTaxAgencyExt = this.getTaxAgencyExt(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAgencyExt", theTaxAgencyExt), currentHashCode, theTaxAgencyExt); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAgencyExt", theTaxAgencyExt), currentHashCode, theTaxAgencyExt, (this.taxAgencyExt!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxApplicableOnEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxApplicableOnEnum.java index 5910ab82..274533b5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxApplicableOnEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxApplicableOnEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxCode.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxCode.java index 5e6189ad..da212192 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxCode.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxCode.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -92,7 +92,7 @@ }) public class TaxCode extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -331,8 +331,8 @@ public void setTaxCodeEx(IntuitAnyType value) { this.taxCodeEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxCode)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -347,7 +347,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -356,7 +356,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -365,7 +365,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -374,7 +374,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxable = this.isTaxable(); Boolean rhsTaxable; rhsTaxable = that.isTaxable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable, (this.taxable!= null), (that.taxable!= null))) { return false; } } @@ -383,7 +383,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxGroup = this.isTaxGroup(); Boolean rhsTaxGroup; rhsTaxGroup = that.isTaxGroup(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroup", lhsTaxGroup), LocatorUtils.property(thatLocator, "taxGroup", rhsTaxGroup), lhsTaxGroup, rhsTaxGroup)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroup", lhsTaxGroup), LocatorUtils.property(thatLocator, "taxGroup", rhsTaxGroup), lhsTaxGroup, rhsTaxGroup, (this.taxGroup!= null), (that.taxGroup!= null))) { return false; } } @@ -392,7 +392,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTaxRateList = this.getSalesTaxRateList(); TaxRateList rhsSalesTaxRateList; rhsSalesTaxRateList = that.getSalesTaxRateList(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxRateList", lhsSalesTaxRateList), LocatorUtils.property(thatLocator, "salesTaxRateList", rhsSalesTaxRateList), lhsSalesTaxRateList, rhsSalesTaxRateList)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTaxRateList", lhsSalesTaxRateList), LocatorUtils.property(thatLocator, "salesTaxRateList", rhsSalesTaxRateList), lhsSalesTaxRateList, rhsSalesTaxRateList, (this.salesTaxRateList!= null), (that.salesTaxRateList!= null))) { return false; } } @@ -401,7 +401,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPurchaseTaxRateList = this.getPurchaseTaxRateList(); TaxRateList rhsPurchaseTaxRateList; rhsPurchaseTaxRateList = that.getPurchaseTaxRateList(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxRateList", lhsPurchaseTaxRateList), LocatorUtils.property(thatLocator, "purchaseTaxRateList", rhsPurchaseTaxRateList), lhsPurchaseTaxRateList, rhsPurchaseTaxRateList)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "purchaseTaxRateList", lhsPurchaseTaxRateList), LocatorUtils.property(thatLocator, "purchaseTaxRateList", rhsPurchaseTaxRateList), lhsPurchaseTaxRateList, rhsPurchaseTaxRateList, (this.purchaseTaxRateList!= null), (that.purchaseTaxRateList!= null))) { return false; } } @@ -410,7 +410,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAdjustmentTaxRateList = this.getAdjustmentTaxRateList(); TaxRateList rhsAdjustmentTaxRateList; rhsAdjustmentTaxRateList = that.getAdjustmentTaxRateList(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "adjustmentTaxRateList", lhsAdjustmentTaxRateList), LocatorUtils.property(thatLocator, "adjustmentTaxRateList", rhsAdjustmentTaxRateList), lhsAdjustmentTaxRateList, rhsAdjustmentTaxRateList)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "adjustmentTaxRateList", lhsAdjustmentTaxRateList), LocatorUtils.property(thatLocator, "adjustmentTaxRateList", rhsAdjustmentTaxRateList), lhsAdjustmentTaxRateList, rhsAdjustmentTaxRateList, (this.adjustmentTaxRateList!= null), (that.adjustmentTaxRateList!= null))) { return false; } } @@ -419,7 +419,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxCodeEx = this.getTaxCodeEx(); IntuitAnyType rhsTaxCodeEx; rhsTaxCodeEx = that.getTaxCodeEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeEx", lhsTaxCodeEx), LocatorUtils.property(thatLocator, "taxCodeEx", rhsTaxCodeEx), lhsTaxCodeEx, rhsTaxCodeEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeEx", lhsTaxCodeEx), LocatorUtils.property(thatLocator, "taxCodeEx", rhsTaxCodeEx), lhsTaxCodeEx, rhsTaxCodeEx, (this.taxCodeEx!= null), (that.taxCodeEx!= null))) { return false; } } @@ -427,62 +427,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { Boolean theTaxable; theTaxable = this.isTaxable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable, (this.taxable!= null)); } { Boolean theTaxGroup; theTaxGroup = this.isTaxGroup(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroup", theTaxGroup), currentHashCode, theTaxGroup); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroup", theTaxGroup), currentHashCode, theTaxGroup, (this.taxGroup!= null)); } { TaxRateList theSalesTaxRateList; theSalesTaxRateList = this.getSalesTaxRateList(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxRateList", theSalesTaxRateList), currentHashCode, theSalesTaxRateList); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTaxRateList", theSalesTaxRateList), currentHashCode, theSalesTaxRateList, (this.salesTaxRateList!= null)); } { TaxRateList thePurchaseTaxRateList; thePurchaseTaxRateList = this.getPurchaseTaxRateList(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxRateList", thePurchaseTaxRateList), currentHashCode, thePurchaseTaxRateList); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "purchaseTaxRateList", thePurchaseTaxRateList), currentHashCode, thePurchaseTaxRateList, (this.purchaseTaxRateList!= null)); } { TaxRateList theAdjustmentTaxRateList; theAdjustmentTaxRateList = this.getAdjustmentTaxRateList(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "adjustmentTaxRateList", theAdjustmentTaxRateList), currentHashCode, theAdjustmentTaxRateList); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "adjustmentTaxRateList", theAdjustmentTaxRateList), currentHashCode, theAdjustmentTaxRateList, (this.adjustmentTaxRateList!= null)); } { IntuitAnyType theTaxCodeEx; theTaxCodeEx = this.getTaxCodeEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeEx", theTaxCodeEx), currentHashCode, theTaxCodeEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeEx", theTaxCodeEx), currentHashCode, theTaxCodeEx, (this.taxCodeEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxFormTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxFormTypeEnum.java index 201acd70..44a9d50c 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxFormTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxFormTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxLineDetail.java index 38086657..1ad3683a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxLineDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxLineDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -86,8 +86,7 @@ "serviceDate", "taxLineDetailEx" }) -public class TaxLineDetail - implements Serializable, Equals, HashCode +public class TaxLineDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -302,8 +301,8 @@ public void setTaxLineDetailEx(IntuitAnyType value) { this.taxLineDetailEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxLineDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -315,7 +314,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateRef = this.getTaxRateRef(); ReferenceType rhsTaxRateRef; rhsTaxRateRef = that.getTaxRateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef, (this.taxRateRef!= null), (that.taxRateRef!= null))) { return false; } } @@ -324,7 +323,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPercentBased = this.isPercentBased(); Boolean rhsPercentBased; rhsPercentBased = that.isPercentBased(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "percentBased", lhsPercentBased), LocatorUtils.property(thatLocator, "percentBased", rhsPercentBased), lhsPercentBased, rhsPercentBased, (this.percentBased!= null), (that.percentBased!= null))) { return false; } } @@ -333,7 +332,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxPercent = this.getTaxPercent(); BigDecimal rhsTaxPercent; rhsTaxPercent = that.getTaxPercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxPercent", lhsTaxPercent), LocatorUtils.property(thatLocator, "taxPercent", rhsTaxPercent), lhsTaxPercent, rhsTaxPercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxPercent", lhsTaxPercent), LocatorUtils.property(thatLocator, "taxPercent", rhsTaxPercent), lhsTaxPercent, rhsTaxPercent, (this.taxPercent!= null), (that.taxPercent!= null))) { return false; } } @@ -342,7 +341,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNetAmountTaxable = this.getNetAmountTaxable(); BigDecimal rhsNetAmountTaxable; rhsNetAmountTaxable = that.getNetAmountTaxable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "netAmountTaxable", lhsNetAmountTaxable), LocatorUtils.property(thatLocator, "netAmountTaxable", rhsNetAmountTaxable), lhsNetAmountTaxable, rhsNetAmountTaxable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "netAmountTaxable", lhsNetAmountTaxable), LocatorUtils.property(thatLocator, "netAmountTaxable", rhsNetAmountTaxable), lhsNetAmountTaxable, rhsNetAmountTaxable, (this.netAmountTaxable!= null), (that.netAmountTaxable!= null))) { return false; } } @@ -351,7 +350,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxInclusiveAmount = this.getTaxInclusiveAmount(); BigDecimal rhsTaxInclusiveAmount; rhsTaxInclusiveAmount = that.getTaxInclusiveAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxInclusiveAmount", lhsTaxInclusiveAmount), LocatorUtils.property(thatLocator, "taxInclusiveAmount", rhsTaxInclusiveAmount), lhsTaxInclusiveAmount, rhsTaxInclusiveAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxInclusiveAmount", lhsTaxInclusiveAmount), LocatorUtils.property(thatLocator, "taxInclusiveAmount", rhsTaxInclusiveAmount), lhsTaxInclusiveAmount, rhsTaxInclusiveAmount, (this.taxInclusiveAmount!= null), (that.taxInclusiveAmount!= null))) { return false; } } @@ -360,7 +359,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOverrideDeltaAmount = this.getOverrideDeltaAmount(); BigDecimal rhsOverrideDeltaAmount; rhsOverrideDeltaAmount = that.getOverrideDeltaAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "overrideDeltaAmount", lhsOverrideDeltaAmount), LocatorUtils.property(thatLocator, "overrideDeltaAmount", rhsOverrideDeltaAmount), lhsOverrideDeltaAmount, rhsOverrideDeltaAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "overrideDeltaAmount", lhsOverrideDeltaAmount), LocatorUtils.property(thatLocator, "overrideDeltaAmount", rhsOverrideDeltaAmount), lhsOverrideDeltaAmount, rhsOverrideDeltaAmount, (this.overrideDeltaAmount!= null), (that.overrideDeltaAmount!= null))) { return false; } } @@ -369,7 +368,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsServiceDate = this.getServiceDate(); Date rhsServiceDate; rhsServiceDate = that.getServiceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "serviceDate", lhsServiceDate), LocatorUtils.property(thatLocator, "serviceDate", rhsServiceDate), lhsServiceDate, rhsServiceDate, (this.serviceDate!= null), (that.serviceDate!= null))) { return false; } } @@ -378,7 +377,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxLineDetailEx = this.getTaxLineDetailEx(); IntuitAnyType rhsTaxLineDetailEx; rhsTaxLineDetailEx = that.getTaxLineDetailEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLineDetailEx", lhsTaxLineDetailEx), LocatorUtils.property(thatLocator, "taxLineDetailEx", rhsTaxLineDetailEx), lhsTaxLineDetailEx, rhsTaxLineDetailEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLineDetailEx", lhsTaxLineDetailEx), LocatorUtils.property(thatLocator, "taxLineDetailEx", rhsTaxLineDetailEx), lhsTaxLineDetailEx, rhsTaxLineDetailEx, (this.taxLineDetailEx!= null), (that.taxLineDetailEx!= null))) { return false; } } @@ -386,57 +385,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theTaxRateRef; theTaxRateRef = this.getTaxRateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef, (this.taxRateRef!= null)); } { Boolean thePercentBased; thePercentBased = this.isPercentBased(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "percentBased", thePercentBased), currentHashCode, thePercentBased, (this.percentBased!= null)); } { BigDecimal theTaxPercent; theTaxPercent = this.getTaxPercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxPercent", theTaxPercent), currentHashCode, theTaxPercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxPercent", theTaxPercent), currentHashCode, theTaxPercent, (this.taxPercent!= null)); } { BigDecimal theNetAmountTaxable; theNetAmountTaxable = this.getNetAmountTaxable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "netAmountTaxable", theNetAmountTaxable), currentHashCode, theNetAmountTaxable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "netAmountTaxable", theNetAmountTaxable), currentHashCode, theNetAmountTaxable, (this.netAmountTaxable!= null)); } { BigDecimal theTaxInclusiveAmount; theTaxInclusiveAmount = this.getTaxInclusiveAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxInclusiveAmount", theTaxInclusiveAmount), currentHashCode, theTaxInclusiveAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxInclusiveAmount", theTaxInclusiveAmount), currentHashCode, theTaxInclusiveAmount, (this.taxInclusiveAmount!= null)); } { BigDecimal theOverrideDeltaAmount; theOverrideDeltaAmount = this.getOverrideDeltaAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "overrideDeltaAmount", theOverrideDeltaAmount), currentHashCode, theOverrideDeltaAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "overrideDeltaAmount", theOverrideDeltaAmount), currentHashCode, theOverrideDeltaAmount, (this.overrideDeltaAmount!= null)); } { Date theServiceDate; theServiceDate = this.getServiceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "serviceDate", theServiceDate), currentHashCode, theServiceDate, (this.serviceDate!= null)); } { IntuitAnyType theTaxLineDetailEx; theTaxLineDetailEx = this.getTaxLineDetailEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLineDetailEx", theTaxLineDetailEx), currentHashCode, theTaxLineDetailEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLineDetailEx", theTaxLineDetailEx), currentHashCode, theTaxLineDetailEx, (this.taxLineDetailEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxPrefs.java index 94fa4427..415ba90a 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -75,8 +75,7 @@ "nonTaxableSalesTaxCodeRef", "taxableSalesTaxCodeRef" }) -public class TaxPrefs - implements Serializable, Equals, HashCode +public class TaxPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -263,8 +262,8 @@ public void setTaxableSalesTaxCodeRef(ReferenceType value) { this.taxableSalesTaxCodeRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -276,7 +275,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingSalesTax = this.isUsingSalesTax(); Boolean rhsUsingSalesTax; rhsUsingSalesTax = that.isUsingSalesTax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingSalesTax", lhsUsingSalesTax), LocatorUtils.property(thatLocator, "usingSalesTax", rhsUsingSalesTax), lhsUsingSalesTax, rhsUsingSalesTax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingSalesTax", lhsUsingSalesTax), LocatorUtils.property(thatLocator, "usingSalesTax", rhsUsingSalesTax), lhsUsingSalesTax, rhsUsingSalesTax, (this.usingSalesTax!= null), (that.usingSalesTax!= null))) { return false; } } @@ -285,7 +284,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPartnerTaxEnabled = this.isPartnerTaxEnabled(); Boolean rhsPartnerTaxEnabled; rhsPartnerTaxEnabled = that.isPartnerTaxEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "partnerTaxEnabled", lhsPartnerTaxEnabled), LocatorUtils.property(thatLocator, "partnerTaxEnabled", rhsPartnerTaxEnabled), lhsPartnerTaxEnabled, rhsPartnerTaxEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "partnerTaxEnabled", lhsPartnerTaxEnabled), LocatorUtils.property(thatLocator, "partnerTaxEnabled", rhsPartnerTaxEnabled), lhsPartnerTaxEnabled, rhsPartnerTaxEnabled, (this.partnerTaxEnabled!= null), (that.partnerTaxEnabled!= null))) { return false; } } @@ -294,7 +293,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxGroupCodeRef = this.getTaxGroupCodeRef(); ReferenceType rhsTaxGroupCodeRef; rhsTaxGroupCodeRef = that.getTaxGroupCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroupCodeRef", lhsTaxGroupCodeRef), LocatorUtils.property(thatLocator, "taxGroupCodeRef", rhsTaxGroupCodeRef), lhsTaxGroupCodeRef, rhsTaxGroupCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxGroupCodeRef", lhsTaxGroupCodeRef), LocatorUtils.property(thatLocator, "taxGroupCodeRef", rhsTaxGroupCodeRef), lhsTaxGroupCodeRef, rhsTaxGroupCodeRef, (this.taxGroupCodeRef!= null), (that.taxGroupCodeRef!= null))) { return false; } } @@ -303,7 +302,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateRef = this.getTaxRateRef(); ReferenceType rhsTaxRateRef; rhsTaxRateRef = that.getTaxRateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef, (this.taxRateRef!= null), (that.taxRateRef!= null))) { return false; } } @@ -312,7 +311,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPaySalesTax = this.getPaySalesTax(); PaySalesTaxEnum rhsPaySalesTax; rhsPaySalesTax = that.getPaySalesTax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "paySalesTax", lhsPaySalesTax), LocatorUtils.property(thatLocator, "paySalesTax", rhsPaySalesTax), lhsPaySalesTax, rhsPaySalesTax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "paySalesTax", lhsPaySalesTax), LocatorUtils.property(thatLocator, "paySalesTax", rhsPaySalesTax), lhsPaySalesTax, rhsPaySalesTax, (this.paySalesTax!= null), (that.paySalesTax!= null))) { return false; } } @@ -321,7 +320,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNonTaxableSalesTaxCodeRef = this.getNonTaxableSalesTaxCodeRef(); ReferenceType rhsNonTaxableSalesTaxCodeRef; rhsNonTaxableSalesTaxCodeRef = that.getNonTaxableSalesTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nonTaxableSalesTaxCodeRef", lhsNonTaxableSalesTaxCodeRef), LocatorUtils.property(thatLocator, "nonTaxableSalesTaxCodeRef", rhsNonTaxableSalesTaxCodeRef), lhsNonTaxableSalesTaxCodeRef, rhsNonTaxableSalesTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nonTaxableSalesTaxCodeRef", lhsNonTaxableSalesTaxCodeRef), LocatorUtils.property(thatLocator, "nonTaxableSalesTaxCodeRef", rhsNonTaxableSalesTaxCodeRef), lhsNonTaxableSalesTaxCodeRef, rhsNonTaxableSalesTaxCodeRef, (this.nonTaxableSalesTaxCodeRef!= null), (that.nonTaxableSalesTaxCodeRef!= null))) { return false; } } @@ -330,7 +329,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxableSalesTaxCodeRef = this.getTaxableSalesTaxCodeRef(); ReferenceType rhsTaxableSalesTaxCodeRef; rhsTaxableSalesTaxCodeRef = that.getTaxableSalesTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxableSalesTaxCodeRef", lhsTaxableSalesTaxCodeRef), LocatorUtils.property(thatLocator, "taxableSalesTaxCodeRef", rhsTaxableSalesTaxCodeRef), lhsTaxableSalesTaxCodeRef, rhsTaxableSalesTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxableSalesTaxCodeRef", lhsTaxableSalesTaxCodeRef), LocatorUtils.property(thatLocator, "taxableSalesTaxCodeRef", rhsTaxableSalesTaxCodeRef), lhsTaxableSalesTaxCodeRef, rhsTaxableSalesTaxCodeRef, (this.taxableSalesTaxCodeRef!= null), (that.taxableSalesTaxCodeRef!= null))) { return false; } } @@ -338,52 +337,52 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theUsingSalesTax; theUsingSalesTax = this.isUsingSalesTax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingSalesTax", theUsingSalesTax), currentHashCode, theUsingSalesTax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingSalesTax", theUsingSalesTax), currentHashCode, theUsingSalesTax, (this.usingSalesTax!= null)); } { Boolean thePartnerTaxEnabled; thePartnerTaxEnabled = this.isPartnerTaxEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "partnerTaxEnabled", thePartnerTaxEnabled), currentHashCode, thePartnerTaxEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "partnerTaxEnabled", thePartnerTaxEnabled), currentHashCode, thePartnerTaxEnabled, (this.partnerTaxEnabled!= null)); } { ReferenceType theTaxGroupCodeRef; theTaxGroupCodeRef = this.getTaxGroupCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroupCodeRef", theTaxGroupCodeRef), currentHashCode, theTaxGroupCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxGroupCodeRef", theTaxGroupCodeRef), currentHashCode, theTaxGroupCodeRef, (this.taxGroupCodeRef!= null)); } { ReferenceType theTaxRateRef; theTaxRateRef = this.getTaxRateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef, (this.taxRateRef!= null)); } { PaySalesTaxEnum thePaySalesTax; thePaySalesTax = this.getPaySalesTax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paySalesTax", thePaySalesTax), currentHashCode, thePaySalesTax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paySalesTax", thePaySalesTax), currentHashCode, thePaySalesTax, (this.paySalesTax!= null)); } { ReferenceType theNonTaxableSalesTaxCodeRef; theNonTaxableSalesTaxCodeRef = this.getNonTaxableSalesTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nonTaxableSalesTaxCodeRef", theNonTaxableSalesTaxCodeRef), currentHashCode, theNonTaxableSalesTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nonTaxableSalesTaxCodeRef", theNonTaxableSalesTaxCodeRef), currentHashCode, theNonTaxableSalesTaxCodeRef, (this.nonTaxableSalesTaxCodeRef!= null)); } { ReferenceType theTaxableSalesTaxCodeRef; theTaxableSalesTaxCodeRef = this.getTaxableSalesTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxableSalesTaxCodeRef", theTaxableSalesTaxCodeRef), currentHashCode, theTaxableSalesTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxableSalesTaxCodeRef", theTaxableSalesTaxCodeRef), currentHashCode, theTaxableSalesTaxCodeRef, (this.taxableSalesTaxCodeRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRate.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRate.java index 1bf63b13..ccd9ae68 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRate.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRate.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,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; @@ -92,7 +92,7 @@ }) public class TaxRate extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -374,8 +374,8 @@ public void setEffectiveTaxRate(List effectiveTaxRate) { this.effectiveTaxRate = effectiveTaxRate; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxRate)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -390,7 +390,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -399,7 +399,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -408,7 +408,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -417,7 +417,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRateValue = this.getRateValue(); BigDecimal rhsRateValue; rhsRateValue = that.getRateValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue, (this.rateValue!= null), (that.rateValue!= null))) { return false; } } @@ -426,7 +426,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAgencyRef = this.getAgencyRef(); ReferenceType rhsAgencyRef; rhsAgencyRef = that.getAgencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "agencyRef", lhsAgencyRef), LocatorUtils.property(thatLocator, "agencyRef", rhsAgencyRef), lhsAgencyRef, rhsAgencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "agencyRef", lhsAgencyRef), LocatorUtils.property(thatLocator, "agencyRef", rhsAgencyRef), lhsAgencyRef, rhsAgencyRef, (this.agencyRef!= null), (that.agencyRef!= null))) { return false; } } @@ -435,7 +435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxReturnLineRef = this.getTaxReturnLineRef(); ReferenceType rhsTaxReturnLineRef; rhsTaxReturnLineRef = that.getTaxReturnLineRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxReturnLineRef", lhsTaxReturnLineRef), LocatorUtils.property(thatLocator, "taxReturnLineRef", rhsTaxReturnLineRef), lhsTaxReturnLineRef, rhsTaxReturnLineRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxReturnLineRef", lhsTaxReturnLineRef), LocatorUtils.property(thatLocator, "taxReturnLineRef", rhsTaxReturnLineRef), lhsTaxReturnLineRef, rhsTaxReturnLineRef, (this.taxReturnLineRef!= null), (that.taxReturnLineRef!= null))) { return false; } } @@ -444,7 +444,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEffectiveTaxRate = (((this.effectiveTaxRate!= null)&&(!this.effectiveTaxRate.isEmpty()))?this.getEffectiveTaxRate():null); List rhsEffectiveTaxRate; rhsEffectiveTaxRate = (((that.effectiveTaxRate!= null)&&(!that.effectiveTaxRate.isEmpty()))?that.getEffectiveTaxRate():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveTaxRate", lhsEffectiveTaxRate), LocatorUtils.property(thatLocator, "effectiveTaxRate", rhsEffectiveTaxRate), lhsEffectiveTaxRate, rhsEffectiveTaxRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "effectiveTaxRate", lhsEffectiveTaxRate), LocatorUtils.property(thatLocator, "effectiveTaxRate", rhsEffectiveTaxRate), lhsEffectiveTaxRate, rhsEffectiveTaxRate, ((this.effectiveTaxRate!= null)&&(!this.effectiveTaxRate.isEmpty())), ((that.effectiveTaxRate!= null)&&(!that.effectiveTaxRate.isEmpty())))) { return false; } } @@ -453,7 +453,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSpecialTaxType = this.getSpecialTaxType(); SpecialTaxTypeEnum rhsSpecialTaxType; rhsSpecialTaxType = that.getSpecialTaxType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "specialTaxType", lhsSpecialTaxType), LocatorUtils.property(thatLocator, "specialTaxType", rhsSpecialTaxType), lhsSpecialTaxType, rhsSpecialTaxType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "specialTaxType", lhsSpecialTaxType), LocatorUtils.property(thatLocator, "specialTaxType", rhsSpecialTaxType), lhsSpecialTaxType, rhsSpecialTaxType, (this.specialTaxType!= null), (that.specialTaxType!= null))) { return false; } } @@ -462,7 +462,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDisplayType = this.getDisplayType(); TaxRateDisplayTypeEnum rhsDisplayType; rhsDisplayType = that.getDisplayType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "displayType", lhsDisplayType), LocatorUtils.property(thatLocator, "displayType", rhsDisplayType), lhsDisplayType, rhsDisplayType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "displayType", lhsDisplayType), LocatorUtils.property(thatLocator, "displayType", rhsDisplayType), lhsDisplayType, rhsDisplayType, (this.displayType!= null), (that.displayType!= null))) { return false; } } @@ -471,7 +471,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateEx = this.getTaxRateEx(); IntuitAnyType rhsTaxRateEx; rhsTaxRateEx = that.getTaxRateEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateEx", lhsTaxRateEx), LocatorUtils.property(thatLocator, "taxRateEx", rhsTaxRateEx), lhsTaxRateEx, rhsTaxRateEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateEx", lhsTaxRateEx), LocatorUtils.property(thatLocator, "taxRateEx", rhsTaxRateEx), lhsTaxRateEx, rhsTaxRateEx, (this.taxRateEx!= null), (that.taxRateEx!= null))) { return false; } } @@ -479,67 +479,67 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { BigDecimal theRateValue; theRateValue = this.getRateValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue, (this.rateValue!= null)); } { ReferenceType theAgencyRef; theAgencyRef = this.getAgencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "agencyRef", theAgencyRef), currentHashCode, theAgencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "agencyRef", theAgencyRef), currentHashCode, theAgencyRef, (this.agencyRef!= null)); } { ReferenceType theTaxReturnLineRef; theTaxReturnLineRef = this.getTaxReturnLineRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxReturnLineRef", theTaxReturnLineRef), currentHashCode, theTaxReturnLineRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxReturnLineRef", theTaxReturnLineRef), currentHashCode, theTaxReturnLineRef, (this.taxReturnLineRef!= null)); } { List theEffectiveTaxRate; theEffectiveTaxRate = (((this.effectiveTaxRate!= null)&&(!this.effectiveTaxRate.isEmpty()))?this.getEffectiveTaxRate():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveTaxRate", theEffectiveTaxRate), currentHashCode, theEffectiveTaxRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "effectiveTaxRate", theEffectiveTaxRate), currentHashCode, theEffectiveTaxRate, ((this.effectiveTaxRate!= null)&&(!this.effectiveTaxRate.isEmpty()))); } { SpecialTaxTypeEnum theSpecialTaxType; theSpecialTaxType = this.getSpecialTaxType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialTaxType", theSpecialTaxType), currentHashCode, theSpecialTaxType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialTaxType", theSpecialTaxType), currentHashCode, theSpecialTaxType, (this.specialTaxType!= null)); } { TaxRateDisplayTypeEnum theDisplayType; theDisplayType = this.getDisplayType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayType", theDisplayType), currentHashCode, theDisplayType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayType", theDisplayType), currentHashCode, theDisplayType, (this.displayType!= null)); } { IntuitAnyType theTaxRateEx; theTaxRateEx = this.getTaxRateEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateEx", theTaxRateEx), currentHashCode, theTaxRateEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateEx", theTaxRateEx), currentHashCode, theTaxRateEx, (this.taxRateEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateApplicableOnEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateApplicableOnEnum.java index 1ae990ba..14170888 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateApplicableOnEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateApplicableOnEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetail.java index b0a40d43..706ffb79 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -67,8 +67,7 @@ "taxOrder", "taxOnTaxOrder" }) -public class TaxRateDetail - implements Serializable, Equals, HashCode +public class TaxRateDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -177,8 +176,8 @@ public void setTaxOnTaxOrder(Integer value) { this.taxOnTaxOrder = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxRateDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -190,7 +189,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateRef = this.getTaxRateRef(); ReferenceType rhsTaxRateRef; rhsTaxRateRef = that.getTaxRateRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateRef", lhsTaxRateRef), LocatorUtils.property(thatLocator, "taxRateRef", rhsTaxRateRef), lhsTaxRateRef, rhsTaxRateRef, (this.taxRateRef!= null), (that.taxRateRef!= null))) { return false; } } @@ -199,7 +198,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxTypeApplicable = this.getTaxTypeApplicable(); TaxTypeApplicablityEnum rhsTaxTypeApplicable; rhsTaxTypeApplicable = that.getTaxTypeApplicable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTypeApplicable", lhsTaxTypeApplicable), LocatorUtils.property(thatLocator, "taxTypeApplicable", rhsTaxTypeApplicable), lhsTaxTypeApplicable, rhsTaxTypeApplicable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxTypeApplicable", lhsTaxTypeApplicable), LocatorUtils.property(thatLocator, "taxTypeApplicable", rhsTaxTypeApplicable), lhsTaxTypeApplicable, rhsTaxTypeApplicable, (this.taxTypeApplicable!= null), (that.taxTypeApplicable!= null))) { return false; } } @@ -208,7 +207,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxOrder = this.getTaxOrder(); Integer rhsTaxOrder; rhsTaxOrder = that.getTaxOrder(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOrder", lhsTaxOrder), LocatorUtils.property(thatLocator, "taxOrder", rhsTaxOrder), lhsTaxOrder, rhsTaxOrder)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOrder", lhsTaxOrder), LocatorUtils.property(thatLocator, "taxOrder", rhsTaxOrder), lhsTaxOrder, rhsTaxOrder, (this.taxOrder!= null), (that.taxOrder!= null))) { return false; } } @@ -217,7 +216,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxOnTaxOrder = this.getTaxOnTaxOrder(); Integer rhsTaxOnTaxOrder; rhsTaxOnTaxOrder = that.getTaxOnTaxOrder(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnTaxOrder", lhsTaxOnTaxOrder), LocatorUtils.property(thatLocator, "taxOnTaxOrder", rhsTaxOnTaxOrder), lhsTaxOnTaxOrder, rhsTaxOnTaxOrder)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxOnTaxOrder", lhsTaxOnTaxOrder), LocatorUtils.property(thatLocator, "taxOnTaxOrder", rhsTaxOnTaxOrder), lhsTaxOnTaxOrder, rhsTaxOnTaxOrder, (this.taxOnTaxOrder!= null), (that.taxOnTaxOrder!= null))) { return false; } } @@ -225,37 +224,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theTaxRateRef; theTaxRateRef = this.getTaxRateRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateRef", theTaxRateRef), currentHashCode, theTaxRateRef, (this.taxRateRef!= null)); } { TaxTypeApplicablityEnum theTaxTypeApplicable; theTaxTypeApplicable = this.getTaxTypeApplicable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTypeApplicable", theTaxTypeApplicable), currentHashCode, theTaxTypeApplicable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxTypeApplicable", theTaxTypeApplicable), currentHashCode, theTaxTypeApplicable, (this.taxTypeApplicable!= null)); } { Integer theTaxOrder; theTaxOrder = this.getTaxOrder(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOrder", theTaxOrder), currentHashCode, theTaxOrder); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOrder", theTaxOrder), currentHashCode, theTaxOrder, (this.taxOrder!= null)); } { Integer theTaxOnTaxOrder; theTaxOnTaxOrder = this.getTaxOnTaxOrder(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnTaxOrder", theTaxOnTaxOrder), currentHashCode, theTaxOnTaxOrder); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxOnTaxOrder", theTaxOnTaxOrder), currentHashCode, theTaxOnTaxOrder, (this.taxOnTaxOrder!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetails.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetails.java index d4151198..07399e28 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetails.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDetails.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -75,8 +75,7 @@ "taxAgencyId", "taxApplicableOn" }) -public class TaxRateDetails - implements Serializable, Equals, HashCode +public class TaxRateDetails implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -211,8 +210,8 @@ public void setTaxApplicableOn(TaxRateApplicableOnEnum value) { this.taxApplicableOn = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxRateDetails)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -224,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateName = this.getTaxRateName(); String rhsTaxRateName; rhsTaxRateName = that.getTaxRateName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateName", lhsTaxRateName), LocatorUtils.property(thatLocator, "taxRateName", rhsTaxRateName), lhsTaxRateName, rhsTaxRateName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateName", lhsTaxRateName), LocatorUtils.property(thatLocator, "taxRateName", rhsTaxRateName), lhsTaxRateName, rhsTaxRateName, (this.taxRateName!= null), (that.taxRateName!= null))) { return false; } } @@ -233,7 +232,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateId = this.getTaxRateId(); String rhsTaxRateId; rhsTaxRateId = that.getTaxRateId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateId", lhsTaxRateId), LocatorUtils.property(thatLocator, "taxRateId", rhsTaxRateId), lhsTaxRateId, rhsTaxRateId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateId", lhsTaxRateId), LocatorUtils.property(thatLocator, "taxRateId", rhsTaxRateId), lhsTaxRateId, rhsTaxRateId, (this.taxRateId!= null), (that.taxRateId!= null))) { return false; } } @@ -242,7 +241,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsRateValue = this.getRateValue(); BigDecimal rhsRateValue; rhsRateValue = that.getRateValue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "rateValue", lhsRateValue), LocatorUtils.property(thatLocator, "rateValue", rhsRateValue), lhsRateValue, rhsRateValue, (this.rateValue!= null), (that.rateValue!= null))) { return false; } } @@ -251,7 +250,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxAgencyId = this.getTaxAgencyId(); String rhsTaxAgencyId; rhsTaxAgencyId = that.getTaxAgencyId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAgencyId", lhsTaxAgencyId), LocatorUtils.property(thatLocator, "taxAgencyId", rhsTaxAgencyId), lhsTaxAgencyId, rhsTaxAgencyId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxAgencyId", lhsTaxAgencyId), LocatorUtils.property(thatLocator, "taxAgencyId", rhsTaxAgencyId), lhsTaxAgencyId, rhsTaxAgencyId, (this.taxAgencyId!= null), (that.taxAgencyId!= null))) { return false; } } @@ -260,7 +259,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxApplicableOn = this.getTaxApplicableOn(); TaxRateApplicableOnEnum rhsTaxApplicableOn; rhsTaxApplicableOn = that.getTaxApplicableOn(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxApplicableOn", lhsTaxApplicableOn), LocatorUtils.property(thatLocator, "taxApplicableOn", rhsTaxApplicableOn), lhsTaxApplicableOn, rhsTaxApplicableOn, (this.taxApplicableOn!= null), (that.taxApplicableOn!= null))) { return false; } } @@ -268,42 +267,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theTaxRateName; theTaxRateName = this.getTaxRateName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateName", theTaxRateName), currentHashCode, theTaxRateName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateName", theTaxRateName), currentHashCode, theTaxRateName, (this.taxRateName!= null)); } { String theTaxRateId; theTaxRateId = this.getTaxRateId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateId", theTaxRateId), currentHashCode, theTaxRateId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateId", theTaxRateId), currentHashCode, theTaxRateId, (this.taxRateId!= null)); } { BigDecimal theRateValue; theRateValue = this.getRateValue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "rateValue", theRateValue), currentHashCode, theRateValue, (this.rateValue!= null)); } { String theTaxAgencyId; theTaxAgencyId = this.getTaxAgencyId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAgencyId", theTaxAgencyId), currentHashCode, theTaxAgencyId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxAgencyId", theTaxAgencyId), currentHashCode, theTaxAgencyId, (this.taxAgencyId!= null)); } { TaxRateApplicableOnEnum theTaxApplicableOn; theTaxApplicableOn = this.getTaxApplicableOn(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxApplicableOn", theTaxApplicableOn), currentHashCode, theTaxApplicableOn, (this.taxApplicableOn!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDisplayTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDisplayTypeEnum.java index f8e63143..a741bd20 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDisplayTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateDisplayTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateList.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateList.java index 0feb97cc..724602c8 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateList.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxRateList.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlAttribute; 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; @@ -65,8 +65,7 @@ @XmlType(name = "TaxRateList", propOrder = { "taxRateDetail" }) -public class TaxRateList - implements Serializable, Equals, HashCode +public class TaxRateList implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -140,8 +139,8 @@ public void setTaxRateDetail(List taxRateDetail) { this.taxRateDetail = taxRateDetail; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxRateList)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -153,7 +152,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateDetail = (((this.taxRateDetail!= null)&&(!this.taxRateDetail.isEmpty()))?this.getTaxRateDetail():null); List rhsTaxRateDetail; rhsTaxRateDetail = (((that.taxRateDetail!= null)&&(!that.taxRateDetail.isEmpty()))?that.getTaxRateDetail():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateDetail", lhsTaxRateDetail), LocatorUtils.property(thatLocator, "taxRateDetail", rhsTaxRateDetail), lhsTaxRateDetail, rhsTaxRateDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateDetail", lhsTaxRateDetail), LocatorUtils.property(thatLocator, "taxRateDetail", rhsTaxRateDetail), lhsTaxRateDetail, rhsTaxRateDetail, ((this.taxRateDetail!= null)&&(!this.taxRateDetail.isEmpty())), ((that.taxRateDetail!= null)&&(!that.taxRateDetail.isEmpty())))) { return false; } } @@ -162,7 +161,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOriginatingGroupId = this.getOriginatingGroupId(); String rhsOriginatingGroupId; rhsOriginatingGroupId = that.getOriginatingGroupId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "originatingGroupId", lhsOriginatingGroupId), LocatorUtils.property(thatLocator, "originatingGroupId", rhsOriginatingGroupId), lhsOriginatingGroupId, rhsOriginatingGroupId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "originatingGroupId", lhsOriginatingGroupId), LocatorUtils.property(thatLocator, "originatingGroupId", rhsOriginatingGroupId), lhsOriginatingGroupId, rhsOriginatingGroupId, (this.originatingGroupId!= null), (that.originatingGroupId!= null))) { return false; } } @@ -170,27 +169,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theTaxRateDetail; theTaxRateDetail = (((this.taxRateDetail!= null)&&(!this.taxRateDetail.isEmpty()))?this.getTaxRateDetail():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateDetail", theTaxRateDetail), currentHashCode, theTaxRateDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateDetail", theTaxRateDetail), currentHashCode, theTaxRateDetail, ((this.taxRateDetail!= null)&&(!this.taxRateDetail.isEmpty()))); } { String theOriginatingGroupId; theOriginatingGroupId = this.getOriginatingGroupId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "originatingGroupId", theOriginatingGroupId), currentHashCode, theOriginatingGroupId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "originatingGroupId", theOriginatingGroupId), currentHashCode, theOriginatingGroupId, (this.originatingGroupId!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReportBasisTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReportBasisTypeEnum.java index 48381586..a394224e 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReportBasisTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReportBasisTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReturn.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReturn.java index ef0165c1..969ee2f6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReturn.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxReturn.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -33,10 +33,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -88,7 +88,7 @@ }) public class TaxReturn extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -307,8 +307,8 @@ public void setAgencyRef(ReferenceType value) { this.agencyRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxReturn)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -323,7 +323,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUpcomingFiling = this.isUpcomingFiling(); Boolean rhsUpcomingFiling; rhsUpcomingFiling = that.isUpcomingFiling(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "upcomingFiling", lhsUpcomingFiling), LocatorUtils.property(thatLocator, "upcomingFiling", rhsUpcomingFiling), lhsUpcomingFiling, rhsUpcomingFiling)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "upcomingFiling", lhsUpcomingFiling), LocatorUtils.property(thatLocator, "upcomingFiling", rhsUpcomingFiling), lhsUpcomingFiling, rhsUpcomingFiling, (this.upcomingFiling!= null), (that.upcomingFiling!= null))) { return false; } } @@ -332,7 +332,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartDate = this.getStartDate(); Date rhsStartDate; rhsStartDate = that.getStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startDate", lhsStartDate), LocatorUtils.property(thatLocator, "startDate", rhsStartDate), lhsStartDate, rhsStartDate, (this.startDate!= null), (that.startDate!= null))) { return false; } } @@ -341,7 +341,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndDate = this.getEndDate(); Date rhsEndDate; rhsEndDate = that.getEndDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endDate", lhsEndDate), LocatorUtils.property(thatLocator, "endDate", rhsEndDate), lhsEndDate, rhsEndDate, (this.endDate!= null), (that.endDate!= null))) { return false; } } @@ -350,7 +350,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFileDate = this.getFileDate(); Date rhsFileDate; rhsFileDate = that.getFileDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fileDate", lhsFileDate), LocatorUtils.property(thatLocator, "fileDate", rhsFileDate), lhsFileDate, rhsFileDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fileDate", lhsFileDate), LocatorUtils.property(thatLocator, "fileDate", rhsFileDate), lhsFileDate, rhsFileDate, (this.fileDate!= null), (that.fileDate!= null))) { return false; } } @@ -359,7 +359,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNetTaxAmountDue = this.getNetTaxAmountDue(); BigDecimal rhsNetTaxAmountDue; rhsNetTaxAmountDue = that.getNetTaxAmountDue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "netTaxAmountDue", lhsNetTaxAmountDue), LocatorUtils.property(thatLocator, "netTaxAmountDue", rhsNetTaxAmountDue), lhsNetTaxAmountDue, rhsNetTaxAmountDue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "netTaxAmountDue", lhsNetTaxAmountDue), LocatorUtils.property(thatLocator, "netTaxAmountDue", rhsNetTaxAmountDue), lhsNetTaxAmountDue, rhsNetTaxAmountDue, (this.netTaxAmountDue!= null), (that.netTaxAmountDue!= null))) { return false; } } @@ -368,7 +368,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFlatRateSavingsAmountDue = this.getFlatRateSavingsAmountDue(); BigDecimal rhsFlatRateSavingsAmountDue; rhsFlatRateSavingsAmountDue = that.getFlatRateSavingsAmountDue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "flatRateSavingsAmountDue", lhsFlatRateSavingsAmountDue), LocatorUtils.property(thatLocator, "flatRateSavingsAmountDue", rhsFlatRateSavingsAmountDue), lhsFlatRateSavingsAmountDue, rhsFlatRateSavingsAmountDue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "flatRateSavingsAmountDue", lhsFlatRateSavingsAmountDue), LocatorUtils.property(thatLocator, "flatRateSavingsAmountDue", rhsFlatRateSavingsAmountDue), lhsFlatRateSavingsAmountDue, rhsFlatRateSavingsAmountDue, (this.flatRateSavingsAmountDue!= null), (that.flatRateSavingsAmountDue!= null))) { return false; } } @@ -377,7 +377,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayGWithheldAmount = this.getPayGWithheldAmount(); BigDecimal rhsPayGWithheldAmount; rhsPayGWithheldAmount = that.getPayGWithheldAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payGWithheldAmount", lhsPayGWithheldAmount), LocatorUtils.property(thatLocator, "payGWithheldAmount", rhsPayGWithheldAmount), lhsPayGWithheldAmount, rhsPayGWithheldAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payGWithheldAmount", lhsPayGWithheldAmount), LocatorUtils.property(thatLocator, "payGWithheldAmount", rhsPayGWithheldAmount), lhsPayGWithheldAmount, rhsPayGWithheldAmount, (this.payGWithheldAmount!= null), (that.payGWithheldAmount!= null))) { return false; } } @@ -386,7 +386,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAgencyRef = this.getAgencyRef(); ReferenceType rhsAgencyRef; rhsAgencyRef = that.getAgencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "agencyRef", lhsAgencyRef), LocatorUtils.property(thatLocator, "agencyRef", rhsAgencyRef), lhsAgencyRef, rhsAgencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "agencyRef", lhsAgencyRef), LocatorUtils.property(thatLocator, "agencyRef", rhsAgencyRef), lhsAgencyRef, rhsAgencyRef, (this.agencyRef!= null), (that.agencyRef!= null))) { return false; } } @@ -394,57 +394,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { Boolean theUpcomingFiling; theUpcomingFiling = this.isUpcomingFiling(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "upcomingFiling", theUpcomingFiling), currentHashCode, theUpcomingFiling); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "upcomingFiling", theUpcomingFiling), currentHashCode, theUpcomingFiling, (this.upcomingFiling!= null)); } { Date theStartDate; theStartDate = this.getStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startDate", theStartDate), currentHashCode, theStartDate, (this.startDate!= null)); } { Date theEndDate; theEndDate = this.getEndDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endDate", theEndDate), currentHashCode, theEndDate, (this.endDate!= null)); } { Date theFileDate; theFileDate = this.getFileDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileDate", theFileDate), currentHashCode, theFileDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fileDate", theFileDate), currentHashCode, theFileDate, (this.fileDate!= null)); } { BigDecimal theNetTaxAmountDue; theNetTaxAmountDue = this.getNetTaxAmountDue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "netTaxAmountDue", theNetTaxAmountDue), currentHashCode, theNetTaxAmountDue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "netTaxAmountDue", theNetTaxAmountDue), currentHashCode, theNetTaxAmountDue, (this.netTaxAmountDue!= null)); } { BigDecimal theFlatRateSavingsAmountDue; theFlatRateSavingsAmountDue = this.getFlatRateSavingsAmountDue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flatRateSavingsAmountDue", theFlatRateSavingsAmountDue), currentHashCode, theFlatRateSavingsAmountDue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "flatRateSavingsAmountDue", theFlatRateSavingsAmountDue), currentHashCode, theFlatRateSavingsAmountDue, (this.flatRateSavingsAmountDue!= null)); } { BigDecimal thePayGWithheldAmount; thePayGWithheldAmount = this.getPayGWithheldAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payGWithheldAmount", thePayGWithheldAmount), currentHashCode, thePayGWithheldAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payGWithheldAmount", thePayGWithheldAmount), currentHashCode, thePayGWithheldAmount, (this.payGWithheldAmount!= null)); } { ReferenceType theAgencyRef; theAgencyRef = this.getAgencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "agencyRef", theAgencyRef), currentHashCode, theAgencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "agencyRef", theAgencyRef), currentHashCode, theAgencyRef, (this.agencyRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxService.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxService.java index 4c144250..17cc6fb6 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxService.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxService.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import com.intuit.ipp.core.IEntity; import com.intuit.ipp.core.Response; -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; @@ -75,7 +75,7 @@ }) public class TaxService extends IntuitEntity - implements Serializable, IEntity, Response, Equals, HashCode + implements Serializable, IEntity, Response, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -201,8 +201,8 @@ public void setTaxRateDetails(List taxRateDetails) { this.taxRateDetails = taxRateDetails; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TaxService)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -217,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxCode = this.getTaxCode(); String rhsTaxCode; rhsTaxCode = that.getTaxCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCode", lhsTaxCode), LocatorUtils.property(thatLocator, "taxCode", rhsTaxCode), lhsTaxCode, rhsTaxCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCode", lhsTaxCode), LocatorUtils.property(thatLocator, "taxCode", rhsTaxCode), lhsTaxCode, rhsTaxCode, (this.taxCode!= null), (that.taxCode!= null))) { return false; } } @@ -226,7 +226,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxCodeId = this.getTaxCodeId(); String rhsTaxCodeId; rhsTaxCodeId = that.getTaxCodeId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeId", lhsTaxCodeId), LocatorUtils.property(thatLocator, "taxCodeId", rhsTaxCodeId), lhsTaxCodeId, rhsTaxCodeId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCodeId", lhsTaxCodeId), LocatorUtils.property(thatLocator, "taxCodeId", rhsTaxCodeId), lhsTaxCodeId, rhsTaxCodeId, (this.taxCodeId!= null), (that.taxCodeId!= null))) { return false; } } @@ -235,7 +235,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxRateDetails = (((this.taxRateDetails!= null)&&(!this.taxRateDetails.isEmpty()))?this.getTaxRateDetails():null); List rhsTaxRateDetails; rhsTaxRateDetails = (((that.taxRateDetails!= null)&&(!that.taxRateDetails.isEmpty()))?that.getTaxRateDetails():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateDetails", lhsTaxRateDetails), LocatorUtils.property(thatLocator, "taxRateDetails", rhsTaxRateDetails), lhsTaxRateDetails, rhsTaxRateDetails)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxRateDetails", lhsTaxRateDetails), LocatorUtils.property(thatLocator, "taxRateDetails", rhsTaxRateDetails), lhsTaxRateDetails, rhsTaxRateDetails, ((this.taxRateDetails!= null)&&(!this.taxRateDetails.isEmpty())), ((that.taxRateDetails!= null)&&(!that.taxRateDetails.isEmpty())))) { return false; } } @@ -244,7 +244,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFault = this.getFault(); Fault rhsFault; rhsFault = that.getFault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fault", lhsFault), LocatorUtils.property(thatLocator, "fault", rhsFault), lhsFault, rhsFault, (this.fault!= null), (that.fault!= null))) { return false; } } @@ -252,37 +252,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theTaxCode; theTaxCode = this.getTaxCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCode", theTaxCode), currentHashCode, theTaxCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCode", theTaxCode), currentHashCode, theTaxCode, (this.taxCode!= null)); } { String theTaxCodeId; theTaxCodeId = this.getTaxCodeId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeId", theTaxCodeId), currentHashCode, theTaxCodeId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCodeId", theTaxCodeId), currentHashCode, theTaxCodeId, (this.taxCodeId!= null)); } { List theTaxRateDetails; theTaxRateDetails = (((this.taxRateDetails!= null)&&(!this.taxRateDetails.isEmpty()))?this.getTaxRateDetails():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateDetails", theTaxRateDetails), currentHashCode, theTaxRateDetails); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxRateDetails", theTaxRateDetails), currentHashCode, theTaxRateDetails, ((this.taxRateDetails!= null)&&(!this.taxRateDetails.isEmpty()))); } { Fault theFault; theFault = this.getFault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fault", theFault), currentHashCode, theFault, (this.fault!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxTypeApplicablityEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxTypeApplicablityEnum.java index db722fb9..c20beef2 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxTypeApplicablityEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TaxTypeApplicablityEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneDeviceTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneDeviceTypeEnum.java index 8c02659d..e9f0a607 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneDeviceTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneDeviceTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumber.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumber.java index 7ec8cab1..35d59bfa 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumber.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumber.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -82,8 +82,7 @@ "_default", "tag" }) -public class TelephoneNumber - implements Serializable, Equals, HashCode +public class TelephoneNumber implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -322,8 +321,8 @@ public void setTag(String value) { this.tag = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TelephoneNumber)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -335,7 +334,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -344,7 +343,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeviceType = this.getDeviceType(); String rhsDeviceType; rhsDeviceType = that.getDeviceType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deviceType", lhsDeviceType), LocatorUtils.property(thatLocator, "deviceType", rhsDeviceType), lhsDeviceType, rhsDeviceType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deviceType", lhsDeviceType), LocatorUtils.property(thatLocator, "deviceType", rhsDeviceType), lhsDeviceType, rhsDeviceType, (this.deviceType!= null), (that.deviceType!= null))) { return false; } } @@ -353,7 +352,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCountryCode = this.getCountryCode(); String rhsCountryCode; rhsCountryCode = that.getCountryCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "countryCode", lhsCountryCode), LocatorUtils.property(thatLocator, "countryCode", rhsCountryCode), lhsCountryCode, rhsCountryCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "countryCode", lhsCountryCode), LocatorUtils.property(thatLocator, "countryCode", rhsCountryCode), lhsCountryCode, rhsCountryCode, (this.countryCode!= null), (that.countryCode!= null))) { return false; } } @@ -362,7 +361,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAreaCode = this.getAreaCode(); String rhsAreaCode; rhsAreaCode = that.getAreaCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "areaCode", lhsAreaCode), LocatorUtils.property(thatLocator, "areaCode", rhsAreaCode), lhsAreaCode, rhsAreaCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "areaCode", lhsAreaCode), LocatorUtils.property(thatLocator, "areaCode", rhsAreaCode), lhsAreaCode, rhsAreaCode, (this.areaCode!= null), (that.areaCode!= null))) { return false; } } @@ -371,7 +370,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExchangeCode = this.getExchangeCode(); String rhsExchangeCode; rhsExchangeCode = that.getExchangeCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeCode", lhsExchangeCode), LocatorUtils.property(thatLocator, "exchangeCode", rhsExchangeCode), lhsExchangeCode, rhsExchangeCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeCode", lhsExchangeCode), LocatorUtils.property(thatLocator, "exchangeCode", rhsExchangeCode), lhsExchangeCode, rhsExchangeCode, (this.exchangeCode!= null), (that.exchangeCode!= null))) { return false; } } @@ -380,7 +379,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExtension = this.getExtension(); String rhsExtension; rhsExtension = that.getExtension(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "extension", lhsExtension), LocatorUtils.property(thatLocator, "extension", rhsExtension), lhsExtension, rhsExtension)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "extension", lhsExtension), LocatorUtils.property(thatLocator, "extension", rhsExtension), lhsExtension, rhsExtension, (this.extension!= null), (that.extension!= null))) { return false; } } @@ -389,7 +388,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFreeFormNumber = this.getFreeFormNumber(); String rhsFreeFormNumber; rhsFreeFormNumber = that.getFreeFormNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "freeFormNumber", lhsFreeFormNumber), LocatorUtils.property(thatLocator, "freeFormNumber", rhsFreeFormNumber), lhsFreeFormNumber, rhsFreeFormNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "freeFormNumber", lhsFreeFormNumber), LocatorUtils.property(thatLocator, "freeFormNumber", rhsFreeFormNumber), lhsFreeFormNumber, rhsFreeFormNumber, (this.freeFormNumber!= null), (that.freeFormNumber!= null))) { return false; } } @@ -398,7 +397,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefault = this.isDefault(); Boolean rhsDefault; rhsDefault = that.isDefault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault, (this._default!= null), (that._default!= null))) { return false; } } @@ -407,7 +406,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -415,62 +414,62 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theDeviceType; theDeviceType = this.getDeviceType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deviceType", theDeviceType), currentHashCode, theDeviceType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deviceType", theDeviceType), currentHashCode, theDeviceType, (this.deviceType!= null)); } { String theCountryCode; theCountryCode = this.getCountryCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countryCode", theCountryCode), currentHashCode, theCountryCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countryCode", theCountryCode), currentHashCode, theCountryCode, (this.countryCode!= null)); } { String theAreaCode; theAreaCode = this.getAreaCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "areaCode", theAreaCode), currentHashCode, theAreaCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "areaCode", theAreaCode), currentHashCode, theAreaCode, (this.areaCode!= null)); } { String theExchangeCode; theExchangeCode = this.getExchangeCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeCode", theExchangeCode), currentHashCode, theExchangeCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeCode", theExchangeCode), currentHashCode, theExchangeCode, (this.exchangeCode!= null)); } { String theExtension; theExtension = this.getExtension(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "extension", theExtension), currentHashCode, theExtension); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "extension", theExtension), currentHashCode, theExtension, (this.extension!= null)); } { String theFreeFormNumber; theFreeFormNumber = this.getFreeFormNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "freeFormNumber", theFreeFormNumber), currentHashCode, theFreeFormNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "freeFormNumber", theFreeFormNumber), currentHashCode, theFreeFormNumber, (this.freeFormNumber!= null)); } { Boolean theDefault; theDefault = this.isDefault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault, (this._default!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumberTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumberTypeEnum.java index eb378a81..4836036f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumberTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TelephoneNumberTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateName.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateName.java index d881e7da..eb6ad44d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateName.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateName.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -70,7 +70,7 @@ }) public class TemplateName extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -153,8 +153,8 @@ public void setType(TemplateTypeEnum value) { this.type = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TemplateName)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -169,7 +169,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -178,7 +178,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -187,7 +187,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); TemplateTypeEnum rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -195,32 +195,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { TemplateTypeEnum theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateTypeEnum.java index 8dc3de93..2c7240ae 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TemplateTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Term.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Term.java index b2557da6..29b90add 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Term.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Term.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; 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; @@ -104,7 +104,7 @@ }) public class Term extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -372,8 +372,8 @@ public void setSalesTermEx(IntuitAnyType value) { this.salesTermEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Term)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -388,7 +388,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -397,7 +397,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -406,7 +406,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -415,7 +415,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountPercent = this.getDiscountPercent(); BigDecimal rhsDiscountPercent; rhsDiscountPercent = that.getDiscountPercent(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountPercent", lhsDiscountPercent), LocatorUtils.property(thatLocator, "discountPercent", rhsDiscountPercent), lhsDiscountPercent, rhsDiscountPercent)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountPercent", lhsDiscountPercent), LocatorUtils.property(thatLocator, "discountPercent", rhsDiscountPercent), lhsDiscountPercent, rhsDiscountPercent, (this.discountPercent!= null), (that.discountPercent!= null))) { return false; } } @@ -424,7 +424,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDays = this.getDueDays(); Integer rhsDueDays; rhsDueDays = that.getDueDays(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDays", lhsDueDays), LocatorUtils.property(thatLocator, "dueDays", rhsDueDays), lhsDueDays, rhsDueDays)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDays", lhsDueDays), LocatorUtils.property(thatLocator, "dueDays", rhsDueDays), lhsDueDays, rhsDueDays, (this.dueDays!= null), (that.dueDays!= null))) { return false; } } @@ -433,7 +433,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountDays = this.getDiscountDays(); Integer rhsDiscountDays; rhsDiscountDays = that.getDiscountDays(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountDays", lhsDiscountDays), LocatorUtils.property(thatLocator, "discountDays", rhsDiscountDays), lhsDiscountDays, rhsDiscountDays)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountDays", lhsDiscountDays), LocatorUtils.property(thatLocator, "discountDays", rhsDiscountDays), lhsDiscountDays, rhsDiscountDays, (this.discountDays!= null), (that.discountDays!= null))) { return false; } } @@ -442,7 +442,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDayOfMonthDue = this.getDayOfMonthDue(); BigInteger rhsDayOfMonthDue; rhsDayOfMonthDue = that.getDayOfMonthDue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dayOfMonthDue", lhsDayOfMonthDue), LocatorUtils.property(thatLocator, "dayOfMonthDue", rhsDayOfMonthDue), lhsDayOfMonthDue, rhsDayOfMonthDue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dayOfMonthDue", lhsDayOfMonthDue), LocatorUtils.property(thatLocator, "dayOfMonthDue", rhsDayOfMonthDue), lhsDayOfMonthDue, rhsDayOfMonthDue, (this.dayOfMonthDue!= null), (that.dayOfMonthDue!= null))) { return false; } } @@ -451,7 +451,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueNextMonthDays = this.getDueNextMonthDays(); BigInteger rhsDueNextMonthDays; rhsDueNextMonthDays = that.getDueNextMonthDays(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueNextMonthDays", lhsDueNextMonthDays), LocatorUtils.property(thatLocator, "dueNextMonthDays", rhsDueNextMonthDays), lhsDueNextMonthDays, rhsDueNextMonthDays)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueNextMonthDays", lhsDueNextMonthDays), LocatorUtils.property(thatLocator, "dueNextMonthDays", rhsDueNextMonthDays), lhsDueNextMonthDays, rhsDueNextMonthDays, (this.dueNextMonthDays!= null), (that.dueNextMonthDays!= null))) { return false; } } @@ -460,7 +460,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountDayOfMonth = this.getDiscountDayOfMonth(); BigInteger rhsDiscountDayOfMonth; rhsDiscountDayOfMonth = that.getDiscountDayOfMonth(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountDayOfMonth", lhsDiscountDayOfMonth), LocatorUtils.property(thatLocator, "discountDayOfMonth", rhsDiscountDayOfMonth), lhsDiscountDayOfMonth, rhsDiscountDayOfMonth)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountDayOfMonth", lhsDiscountDayOfMonth), LocatorUtils.property(thatLocator, "discountDayOfMonth", rhsDiscountDayOfMonth), lhsDiscountDayOfMonth, rhsDiscountDayOfMonth, (this.discountDayOfMonth!= null), (that.discountDayOfMonth!= null))) { return false; } } @@ -469,7 +469,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSalesTermEx = this.getSalesTermEx(); IntuitAnyType rhsSalesTermEx; rhsSalesTermEx = that.getSalesTermEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermEx", lhsSalesTermEx), LocatorUtils.property(thatLocator, "salesTermEx", rhsSalesTermEx), lhsSalesTermEx, rhsSalesTermEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "salesTermEx", lhsSalesTermEx), LocatorUtils.property(thatLocator, "salesTermEx", rhsSalesTermEx), lhsSalesTermEx, rhsSalesTermEx, (this.salesTermEx!= null), (that.salesTermEx!= null))) { return false; } } @@ -477,67 +477,67 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { BigDecimal theDiscountPercent; theDiscountPercent = this.getDiscountPercent(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountPercent", theDiscountPercent), currentHashCode, theDiscountPercent); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountPercent", theDiscountPercent), currentHashCode, theDiscountPercent, (this.discountPercent!= null)); } { Integer theDueDays; theDueDays = this.getDueDays(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDays", theDueDays), currentHashCode, theDueDays); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDays", theDueDays), currentHashCode, theDueDays, (this.dueDays!= null)); } { Integer theDiscountDays; theDiscountDays = this.getDiscountDays(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountDays", theDiscountDays), currentHashCode, theDiscountDays); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountDays", theDiscountDays), currentHashCode, theDiscountDays, (this.discountDays!= null)); } { BigInteger theDayOfMonthDue; theDayOfMonthDue = this.getDayOfMonthDue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dayOfMonthDue", theDayOfMonthDue), currentHashCode, theDayOfMonthDue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dayOfMonthDue", theDayOfMonthDue), currentHashCode, theDayOfMonthDue, (this.dayOfMonthDue!= null)); } { BigInteger theDueNextMonthDays; theDueNextMonthDays = this.getDueNextMonthDays(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueNextMonthDays", theDueNextMonthDays), currentHashCode, theDueNextMonthDays); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueNextMonthDays", theDueNextMonthDays), currentHashCode, theDueNextMonthDays, (this.dueNextMonthDays!= null)); } { BigInteger theDiscountDayOfMonth; theDiscountDayOfMonth = this.getDiscountDayOfMonth(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountDayOfMonth", theDiscountDayOfMonth), currentHashCode, theDiscountDayOfMonth); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountDayOfMonth", theDiscountDayOfMonth), currentHashCode, theDiscountDayOfMonth, (this.discountDayOfMonth!= null)); } { IntuitAnyType theSalesTermEx; theSalesTermEx = this.getSalesTermEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermEx", theSalesTermEx), currentHashCode, theSalesTermEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "salesTermEx", theSalesTermEx), currentHashCode, theSalesTermEx, (this.salesTermEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivity.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivity.java index 7b152f05..c26e2f08 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivity.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivity.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -34,10 +34,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -116,7 +116,7 @@ }) public class TimeActivity extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -699,8 +699,8 @@ public void setTimeActivityEx(IntuitAnyType value) { this.timeActivityEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TimeActivity)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -715,7 +715,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTimeZone = this.getTimeZone(); String rhsTimeZone; rhsTimeZone = that.getTimeZone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "timeZone", lhsTimeZone), LocatorUtils.property(thatLocator, "timeZone", rhsTimeZone), lhsTimeZone, rhsTimeZone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "timeZone", lhsTimeZone), LocatorUtils.property(thatLocator, "timeZone", rhsTimeZone), lhsTimeZone, rhsTimeZone, (this.timeZone!= null), (that.timeZone!= null))) { return false; } } @@ -724,7 +724,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnDate = this.getTxnDate(); Date rhsTxnDate; rhsTxnDate = that.getTxnDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate, (this.txnDate!= null), (that.txnDate!= null))) { return false; } } @@ -733,7 +733,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameOf = this.getNameOf(); TimeActivityTypeEnum rhsNameOf; rhsNameOf = that.getNameOf(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOf", lhsNameOf), LocatorUtils.property(thatLocator, "nameOf", rhsNameOf), lhsNameOf, rhsNameOf)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameOf", lhsNameOf), LocatorUtils.property(thatLocator, "nameOf", rhsNameOf), lhsNameOf, rhsNameOf, (this.nameOf!= null), (that.nameOf!= null))) { return false; } } @@ -742,7 +742,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmployeeRef = this.getEmployeeRef(); ReferenceType rhsEmployeeRef; rhsEmployeeRef = that.getEmployeeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeRef", lhsEmployeeRef), LocatorUtils.property(thatLocator, "employeeRef", rhsEmployeeRef), lhsEmployeeRef, rhsEmployeeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "employeeRef", lhsEmployeeRef), LocatorUtils.property(thatLocator, "employeeRef", rhsEmployeeRef), lhsEmployeeRef, rhsEmployeeRef, (this.employeeRef!= null), (that.employeeRef!= null))) { return false; } } @@ -751,7 +751,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorRef = this.getVendorRef(); ReferenceType rhsVendorRef; rhsVendorRef = that.getVendorRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorRef", lhsVendorRef), LocatorUtils.property(thatLocator, "vendorRef", rhsVendorRef), lhsVendorRef, rhsVendorRef, (this.vendorRef!= null), (that.vendorRef!= null))) { return false; } } @@ -760,7 +760,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherNameRef = this.getOtherNameRef(); ReferenceType rhsOtherNameRef; rhsOtherNameRef = that.getOtherNameRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameRef", lhsOtherNameRef), LocatorUtils.property(thatLocator, "otherNameRef", rhsOtherNameRef), lhsOtherNameRef, rhsOtherNameRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherNameRef", lhsOtherNameRef), LocatorUtils.property(thatLocator, "otherNameRef", rhsOtherNameRef), lhsOtherNameRef, rhsOtherNameRef, (this.otherNameRef!= null), (that.otherNameRef!= null))) { return false; } } @@ -769,7 +769,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; } } @@ -778,7 +778,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentRef = this.getDepartmentRef(); ReferenceType rhsDepartmentRef; rhsDepartmentRef = that.getDepartmentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef, (this.departmentRef!= null), (that.departmentRef!= null))) { return false; } } @@ -787,7 +787,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsItemRef = this.getItemRef(); ReferenceType rhsItemRef; rhsItemRef = that.getItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "itemRef", lhsItemRef), LocatorUtils.property(thatLocator, "itemRef", rhsItemRef), lhsItemRef, rhsItemRef, (this.itemRef!= null), (that.itemRef!= null))) { return false; } } @@ -796,7 +796,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; } } @@ -805,7 +805,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPayrollItemRef = this.getPayrollItemRef(); ReferenceType rhsPayrollItemRef; rhsPayrollItemRef = that.getPayrollItemRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "payrollItemRef", lhsPayrollItemRef), LocatorUtils.property(thatLocator, "payrollItemRef", rhsPayrollItemRef), lhsPayrollItemRef, rhsPayrollItemRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "payrollItemRef", lhsPayrollItemRef), LocatorUtils.property(thatLocator, "payrollItemRef", rhsPayrollItemRef), lhsPayrollItemRef, rhsPayrollItemRef, (this.payrollItemRef!= null), (that.payrollItemRef!= null))) { return false; } } @@ -814,7 +814,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; } } @@ -823,7 +823,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxable = this.isTaxable(); Boolean rhsTaxable; rhsTaxable = that.isTaxable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxable", lhsTaxable), LocatorUtils.property(thatLocator, "taxable", rhsTaxable), lhsTaxable, rhsTaxable, (this.taxable!= null), (that.taxable!= null))) { return false; } } @@ -832,7 +832,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHourlyRate = this.getHourlyRate(); BigDecimal rhsHourlyRate; rhsHourlyRate = that.getHourlyRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "hourlyRate", lhsHourlyRate), LocatorUtils.property(thatLocator, "hourlyRate", rhsHourlyRate), lhsHourlyRate, rhsHourlyRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "hourlyRate", lhsHourlyRate), LocatorUtils.property(thatLocator, "hourlyRate", rhsHourlyRate), lhsHourlyRate, rhsHourlyRate, (this.hourlyRate!= null), (that.hourlyRate!= null))) { return false; } } @@ -841,7 +841,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsHours = this.getHours(); Integer rhsHours; rhsHours = that.getHours(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "hours", lhsHours), LocatorUtils.property(thatLocator, "hours", rhsHours), lhsHours, rhsHours)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "hours", lhsHours), LocatorUtils.property(thatLocator, "hours", rhsHours), lhsHours, rhsHours, (this.hours!= null), (that.hours!= null))) { return false; } } @@ -850,7 +850,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMinutes = this.getMinutes(); Integer rhsMinutes; rhsMinutes = that.getMinutes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "minutes", lhsMinutes), LocatorUtils.property(thatLocator, "minutes", rhsMinutes), lhsMinutes, rhsMinutes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "minutes", lhsMinutes), LocatorUtils.property(thatLocator, "minutes", rhsMinutes), lhsMinutes, rhsMinutes, (this.minutes!= null), (that.minutes!= null))) { return false; } } @@ -859,7 +859,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBreakHours = this.getBreakHours(); Integer rhsBreakHours; rhsBreakHours = that.getBreakHours(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "breakHours", lhsBreakHours), LocatorUtils.property(thatLocator, "breakHours", rhsBreakHours), lhsBreakHours, rhsBreakHours)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "breakHours", lhsBreakHours), LocatorUtils.property(thatLocator, "breakHours", rhsBreakHours), lhsBreakHours, rhsBreakHours, (this.breakHours!= null), (that.breakHours!= null))) { return false; } } @@ -868,7 +868,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBreakMinutes = this.getBreakMinutes(); Integer rhsBreakMinutes; rhsBreakMinutes = that.getBreakMinutes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "breakMinutes", lhsBreakMinutes), LocatorUtils.property(thatLocator, "breakMinutes", rhsBreakMinutes), lhsBreakMinutes, rhsBreakMinutes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "breakMinutes", lhsBreakMinutes), LocatorUtils.property(thatLocator, "breakMinutes", rhsBreakMinutes), lhsBreakMinutes, rhsBreakMinutes, (this.breakMinutes!= null), (that.breakMinutes!= null))) { return false; } } @@ -877,7 +877,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsStartTime = this.getStartTime(); Date rhsStartTime; rhsStartTime = that.getStartTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "startTime", lhsStartTime), LocatorUtils.property(thatLocator, "startTime", rhsStartTime), lhsStartTime, rhsStartTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "startTime", lhsStartTime), LocatorUtils.property(thatLocator, "startTime", rhsStartTime), lhsStartTime, rhsStartTime, (this.startTime!= null), (that.startTime!= null))) { return false; } } @@ -886,7 +886,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEndTime = this.getEndTime(); Date rhsEndTime; rhsEndTime = that.getEndTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "endTime", lhsEndTime), LocatorUtils.property(thatLocator, "endTime", rhsEndTime), lhsEndTime, rhsEndTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "endTime", lhsEndTime), LocatorUtils.property(thatLocator, "endTime", rhsEndTime), lhsEndTime, rhsEndTime, (this.endTime!= null), (that.endTime!= null))) { return false; } } @@ -895,7 +895,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDescription = this.getDescription(); String rhsDescription; rhsDescription = that.getDescription(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "description", lhsDescription), LocatorUtils.property(thatLocator, "description", rhsDescription), lhsDescription, rhsDescription, (this.description!= null), (that.description!= null))) { return false; } } @@ -904,7 +904,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTimeActivityEx = this.getTimeActivityEx(); IntuitAnyType rhsTimeActivityEx; rhsTimeActivityEx = that.getTimeActivityEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "timeActivityEx", lhsTimeActivityEx), LocatorUtils.property(thatLocator, "timeActivityEx", rhsTimeActivityEx), lhsTimeActivityEx, rhsTimeActivityEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "timeActivityEx", lhsTimeActivityEx), LocatorUtils.property(thatLocator, "timeActivityEx", rhsTimeActivityEx), lhsTimeActivityEx, rhsTimeActivityEx, (this.timeActivityEx!= null), (that.timeActivityEx!= null))) { return false; } } @@ -912,127 +912,127 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theTimeZone; theTimeZone = this.getTimeZone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeZone", theTimeZone), currentHashCode, theTimeZone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeZone", theTimeZone), currentHashCode, theTimeZone, (this.timeZone!= null)); } { Date theTxnDate; theTxnDate = this.getTxnDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate, (this.txnDate!= null)); } { TimeActivityTypeEnum theNameOf; theNameOf = this.getNameOf(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOf", theNameOf), currentHashCode, theNameOf); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameOf", theNameOf), currentHashCode, theNameOf, (this.nameOf!= null)); } { ReferenceType theEmployeeRef; theEmployeeRef = this.getEmployeeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeRef", theEmployeeRef), currentHashCode, theEmployeeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "employeeRef", theEmployeeRef), currentHashCode, theEmployeeRef, (this.employeeRef!= null)); } { ReferenceType theVendorRef; theVendorRef = this.getVendorRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorRef", theVendorRef), currentHashCode, theVendorRef, (this.vendorRef!= null)); } { ReferenceType theOtherNameRef; theOtherNameRef = this.getOtherNameRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameRef", theOtherNameRef), currentHashCode, theOtherNameRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherNameRef", theOtherNameRef), currentHashCode, theOtherNameRef, (this.otherNameRef!= null)); } { 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 theDepartmentRef; theDepartmentRef = this.getDepartmentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef, (this.departmentRef!= null)); } { ReferenceType theItemRef; theItemRef = this.getItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "itemRef", theItemRef), currentHashCode, theItemRef, (this.itemRef!= 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 thePayrollItemRef; thePayrollItemRef = this.getPayrollItemRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payrollItemRef", thePayrollItemRef), currentHashCode, thePayrollItemRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "payrollItemRef", thePayrollItemRef), currentHashCode, thePayrollItemRef, (this.payrollItemRef!= 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)); } { Boolean theTaxable; theTaxable = this.isTaxable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxable", theTaxable), currentHashCode, theTaxable, (this.taxable!= null)); } { BigDecimal theHourlyRate; theHourlyRate = this.getHourlyRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hourlyRate", theHourlyRate), currentHashCode, theHourlyRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hourlyRate", theHourlyRate), currentHashCode, theHourlyRate, (this.hourlyRate!= null)); } { Integer theHours; theHours = this.getHours(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hours", theHours), currentHashCode, theHours); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "hours", theHours), currentHashCode, theHours, (this.hours!= null)); } { Integer theMinutes; theMinutes = this.getMinutes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minutes", theMinutes), currentHashCode, theMinutes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "minutes", theMinutes), currentHashCode, theMinutes, (this.minutes!= null)); } { Integer theBreakHours; theBreakHours = this.getBreakHours(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "breakHours", theBreakHours), currentHashCode, theBreakHours); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "breakHours", theBreakHours), currentHashCode, theBreakHours, (this.breakHours!= null)); } { Integer theBreakMinutes; theBreakMinutes = this.getBreakMinutes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "breakMinutes", theBreakMinutes), currentHashCode, theBreakMinutes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "breakMinutes", theBreakMinutes), currentHashCode, theBreakMinutes, (this.breakMinutes!= null)); } { Date theStartTime; theStartTime = this.getStartTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startTime", theStartTime), currentHashCode, theStartTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "startTime", theStartTime), currentHashCode, theStartTime, (this.startTime!= null)); } { Date theEndTime; theEndTime = this.getEndTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endTime", theEndTime), currentHashCode, theEndTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "endTime", theEndTime), currentHashCode, theEndTime, (this.endTime!= null)); } { String theDescription; theDescription = this.getDescription(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "description", theDescription), currentHashCode, theDescription, (this.description!= null)); } { IntuitAnyType theTimeActivityEx; theTimeActivityEx = this.getTimeActivityEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeActivityEx", theTimeActivityEx), currentHashCode, theTimeActivityEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeActivityEx", theTimeActivityEx), currentHashCode, theTimeActivityEx, (this.timeActivityEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivityTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivityTypeEnum.java index 4d40d682..e26e0658 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivityTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeActivityTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeEntryUsedForPaychecksEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeEntryUsedForPaychecksEnum.java index d11d9576..19b7106f 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeEntryUsedForPaychecksEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeEntryUsedForPaychecksEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeTrackingPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeTrackingPrefs.java index bd410dec..1edf3bfc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeTrackingPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TimeTrackingPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -78,8 +78,7 @@ "markTimeEntriesBillable", "markExpensesAsBillable" }) -public class TimeTrackingPrefs - implements Serializable, Equals, HashCode +public class TimeTrackingPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -292,8 +291,8 @@ public void setMarkExpensesAsBillable(Boolean value) { this.markExpensesAsBillable = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TimeTrackingPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -305,7 +304,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUseServices = this.isUseServices(); Boolean rhsUseServices; rhsUseServices = that.isUseServices(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "useServices", lhsUseServices), LocatorUtils.property(thatLocator, "useServices", rhsUseServices), lhsUseServices, rhsUseServices)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "useServices", lhsUseServices), LocatorUtils.property(thatLocator, "useServices", rhsUseServices), lhsUseServices, rhsUseServices, (this.useServices!= null), (that.useServices!= null))) { return false; } } @@ -314,7 +313,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTimeItem = this.getDefaultTimeItem(); ReferenceType rhsDefaultTimeItem; rhsDefaultTimeItem = that.getDefaultTimeItem(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeItem", lhsDefaultTimeItem), LocatorUtils.property(thatLocator, "defaultTimeItem", rhsDefaultTimeItem), lhsDefaultTimeItem, rhsDefaultTimeItem)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTimeItem", lhsDefaultTimeItem), LocatorUtils.property(thatLocator, "defaultTimeItem", rhsDefaultTimeItem), lhsDefaultTimeItem, rhsDefaultTimeItem, (this.defaultTimeItem!= null), (that.defaultTimeItem!= null))) { return false; } } @@ -323,7 +322,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillCustomers = this.isBillCustomers(); Boolean rhsBillCustomers; rhsBillCustomers = that.isBillCustomers(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billCustomers", lhsBillCustomers), LocatorUtils.property(thatLocator, "billCustomers", rhsBillCustomers), lhsBillCustomers, rhsBillCustomers)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billCustomers", lhsBillCustomers), LocatorUtils.property(thatLocator, "billCustomers", rhsBillCustomers), lhsBillCustomers, rhsBillCustomers, (this.billCustomers!= null), (that.billCustomers!= null))) { return false; } } @@ -332,7 +331,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShowBillRateToAll = this.isShowBillRateToAll(); Boolean rhsShowBillRateToAll; rhsShowBillRateToAll = that.isShowBillRateToAll(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "showBillRateToAll", lhsShowBillRateToAll), LocatorUtils.property(thatLocator, "showBillRateToAll", rhsShowBillRateToAll), lhsShowBillRateToAll, rhsShowBillRateToAll)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "showBillRateToAll", lhsShowBillRateToAll), LocatorUtils.property(thatLocator, "showBillRateToAll", rhsShowBillRateToAll), lhsShowBillRateToAll, rhsShowBillRateToAll, (this.showBillRateToAll!= null), (that.showBillRateToAll!= null))) { return false; } } @@ -341,7 +340,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWorkWeekStartDate = this.getWorkWeekStartDate(); WeekEnum rhsWorkWeekStartDate; rhsWorkWeekStartDate = that.getWorkWeekStartDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "workWeekStartDate", lhsWorkWeekStartDate), LocatorUtils.property(thatLocator, "workWeekStartDate", rhsWorkWeekStartDate), lhsWorkWeekStartDate, rhsWorkWeekStartDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "workWeekStartDate", lhsWorkWeekStartDate), LocatorUtils.property(thatLocator, "workWeekStartDate", rhsWorkWeekStartDate), lhsWorkWeekStartDate, rhsWorkWeekStartDate, (this.workWeekStartDate!= null), (that.workWeekStartDate!= null))) { return false; } } @@ -350,7 +349,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTimeTrackingEnabled = this.isTimeTrackingEnabled(); Boolean rhsTimeTrackingEnabled; rhsTimeTrackingEnabled = that.isTimeTrackingEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "timeTrackingEnabled", lhsTimeTrackingEnabled), LocatorUtils.property(thatLocator, "timeTrackingEnabled", rhsTimeTrackingEnabled), lhsTimeTrackingEnabled, rhsTimeTrackingEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "timeTrackingEnabled", lhsTimeTrackingEnabled), LocatorUtils.property(thatLocator, "timeTrackingEnabled", rhsTimeTrackingEnabled), lhsTimeTrackingEnabled, rhsTimeTrackingEnabled, (this.timeTrackingEnabled!= null), (that.timeTrackingEnabled!= null))) { return false; } } @@ -359,7 +358,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMarkTimeEntriesBillable = this.isMarkTimeEntriesBillable(); Boolean rhsMarkTimeEntriesBillable; rhsMarkTimeEntriesBillable = that.isMarkTimeEntriesBillable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "markTimeEntriesBillable", lhsMarkTimeEntriesBillable), LocatorUtils.property(thatLocator, "markTimeEntriesBillable", rhsMarkTimeEntriesBillable), lhsMarkTimeEntriesBillable, rhsMarkTimeEntriesBillable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "markTimeEntriesBillable", lhsMarkTimeEntriesBillable), LocatorUtils.property(thatLocator, "markTimeEntriesBillable", rhsMarkTimeEntriesBillable), lhsMarkTimeEntriesBillable, rhsMarkTimeEntriesBillable, (this.markTimeEntriesBillable!= null), (that.markTimeEntriesBillable!= null))) { return false; } } @@ -368,7 +367,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMarkExpensesAsBillable = this.isMarkExpensesAsBillable(); Boolean rhsMarkExpensesAsBillable; rhsMarkExpensesAsBillable = that.isMarkExpensesAsBillable(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "markExpensesAsBillable", lhsMarkExpensesAsBillable), LocatorUtils.property(thatLocator, "markExpensesAsBillable", rhsMarkExpensesAsBillable), lhsMarkExpensesAsBillable, rhsMarkExpensesAsBillable)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "markExpensesAsBillable", lhsMarkExpensesAsBillable), LocatorUtils.property(thatLocator, "markExpensesAsBillable", rhsMarkExpensesAsBillable), lhsMarkExpensesAsBillable, rhsMarkExpensesAsBillable, (this.markExpensesAsBillable!= null), (that.markExpensesAsBillable!= null))) { return false; } } @@ -376,57 +375,57 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theUseServices; theUseServices = this.isUseServices(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useServices", theUseServices), currentHashCode, theUseServices); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useServices", theUseServices), currentHashCode, theUseServices, (this.useServices!= null)); } { ReferenceType theDefaultTimeItem; theDefaultTimeItem = this.getDefaultTimeItem(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeItem", theDefaultTimeItem), currentHashCode, theDefaultTimeItem); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTimeItem", theDefaultTimeItem), currentHashCode, theDefaultTimeItem, (this.defaultTimeItem!= null)); } { Boolean theBillCustomers; theBillCustomers = this.isBillCustomers(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billCustomers", theBillCustomers), currentHashCode, theBillCustomers); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billCustomers", theBillCustomers), currentHashCode, theBillCustomers, (this.billCustomers!= null)); } { Boolean theShowBillRateToAll; theShowBillRateToAll = this.isShowBillRateToAll(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "showBillRateToAll", theShowBillRateToAll), currentHashCode, theShowBillRateToAll); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "showBillRateToAll", theShowBillRateToAll), currentHashCode, theShowBillRateToAll, (this.showBillRateToAll!= null)); } { WeekEnum theWorkWeekStartDate; theWorkWeekStartDate = this.getWorkWeekStartDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "workWeekStartDate", theWorkWeekStartDate), currentHashCode, theWorkWeekStartDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "workWeekStartDate", theWorkWeekStartDate), currentHashCode, theWorkWeekStartDate, (this.workWeekStartDate!= null)); } { Boolean theTimeTrackingEnabled; theTimeTrackingEnabled = this.isTimeTrackingEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeTrackingEnabled", theTimeTrackingEnabled), currentHashCode, theTimeTrackingEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeTrackingEnabled", theTimeTrackingEnabled), currentHashCode, theTimeTrackingEnabled, (this.timeTrackingEnabled!= null)); } { Boolean theMarkTimeEntriesBillable; theMarkTimeEntriesBillable = this.isMarkTimeEntriesBillable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markTimeEntriesBillable", theMarkTimeEntriesBillable), currentHashCode, theMarkTimeEntriesBillable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markTimeEntriesBillable", theMarkTimeEntriesBillable), currentHashCode, theMarkTimeEntriesBillable, (this.markTimeEntriesBillable!= null)); } { Boolean theMarkExpensesAsBillable; theMarkExpensesAsBillable = this.isMarkExpensesAsBillable(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markExpensesAsBillable", theMarkExpensesAsBillable), currentHashCode, theMarkExpensesAsBillable); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "markExpensesAsBillable", theMarkExpensesAsBillable), currentHashCode, theMarkExpensesAsBillable, (this.markExpensesAsBillable!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transaction.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transaction.java index e12fe180..0a79970d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transaction.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transaction.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -36,10 +36,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -116,7 +116,7 @@ }) public class Transaction extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -521,8 +521,8 @@ public void setLine(List line) { this.line = line; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Transaction)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -537,7 +537,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDocNumber = this.getDocNumber(); String rhsDocNumber; rhsDocNumber = that.getDocNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "docNumber", lhsDocNumber), LocatorUtils.property(thatLocator, "docNumber", rhsDocNumber), lhsDocNumber, rhsDocNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "docNumber", lhsDocNumber), LocatorUtils.property(thatLocator, "docNumber", rhsDocNumber), lhsDocNumber, rhsDocNumber, (this.docNumber!= null), (that.docNumber!= null))) { return false; } } @@ -546,7 +546,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnDate = this.getTxnDate(); Date rhsTxnDate; rhsTxnDate = that.getTxnDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnDate", lhsTxnDate), LocatorUtils.property(thatLocator, "txnDate", rhsTxnDate), lhsTxnDate, rhsTxnDate, (this.txnDate!= null), (that.txnDate!= null))) { return false; } } @@ -555,7 +555,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDepartmentRef = this.getDepartmentRef(); ReferenceType rhsDepartmentRef; rhsDepartmentRef = that.getDepartmentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "departmentRef", lhsDepartmentRef), LocatorUtils.property(thatLocator, "departmentRef", rhsDepartmentRef), lhsDepartmentRef, rhsDepartmentRef, (this.departmentRef!= null), (that.departmentRef!= null))) { return false; } } @@ -564,7 +564,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyRef = this.getCurrencyRef(); ReferenceType rhsCurrencyRef; rhsCurrencyRef = that.getCurrencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef, (this.currencyRef!= null), (that.currencyRef!= null))) { return false; } } @@ -573,7 +573,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExchangeRate = this.getExchangeRate(); BigDecimal rhsExchangeRate; rhsExchangeRate = that.getExchangeRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRate", lhsExchangeRate), LocatorUtils.property(thatLocator, "exchangeRate", rhsExchangeRate), lhsExchangeRate, rhsExchangeRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "exchangeRate", lhsExchangeRate), LocatorUtils.property(thatLocator, "exchangeRate", rhsExchangeRate), lhsExchangeRate, rhsExchangeRate, (this.exchangeRate!= null), (that.exchangeRate!= null))) { return false; } } @@ -582,7 +582,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrivateNote = this.getPrivateNote(); String rhsPrivateNote; rhsPrivateNote = that.getPrivateNote(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "privateNote", lhsPrivateNote), LocatorUtils.property(thatLocator, "privateNote", rhsPrivateNote), lhsPrivateNote, rhsPrivateNote)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "privateNote", lhsPrivateNote), LocatorUtils.property(thatLocator, "privateNote", rhsPrivateNote), lhsPrivateNote, rhsPrivateNote, (this.privateNote!= null), (that.privateNote!= null))) { return false; } } @@ -591,7 +591,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnStatus = this.getTxnStatus(); String rhsTxnStatus; rhsTxnStatus = that.getTxnStatus(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnStatus", lhsTxnStatus), LocatorUtils.property(thatLocator, "txnStatus", rhsTxnStatus), lhsTxnStatus, rhsTxnStatus)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnStatus", lhsTxnStatus), LocatorUtils.property(thatLocator, "txnStatus", rhsTxnStatus), lhsTxnStatus, rhsTxnStatus, (this.txnStatus!= null), (that.txnStatus!= null))) { return false; } } @@ -600,7 +600,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLinkedTxn = (((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))?this.getLinkedTxn():null); List rhsLinkedTxn; rhsLinkedTxn = (((that.linkedTxn!= null)&&(!that.linkedTxn.isEmpty()))?that.getLinkedTxn():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "linkedTxn", lhsLinkedTxn), LocatorUtils.property(thatLocator, "linkedTxn", rhsLinkedTxn), lhsLinkedTxn, rhsLinkedTxn)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "linkedTxn", lhsLinkedTxn), LocatorUtils.property(thatLocator, "linkedTxn", rhsLinkedTxn), lhsLinkedTxn, rhsLinkedTxn, ((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty())), ((that.linkedTxn!= null)&&(!that.linkedTxn.isEmpty())))) { return false; } } @@ -609,7 +609,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLine = (((this.line!= null)&&(!this.line.isEmpty()))?this.getLine():null); List rhsLine; rhsLine = (((that.line!= null)&&(!that.line.isEmpty()))?that.getLine():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "line", lhsLine), LocatorUtils.property(thatLocator, "line", rhsLine), lhsLine, rhsLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "line", lhsLine), LocatorUtils.property(thatLocator, "line", rhsLine), lhsLine, rhsLine, ((this.line!= null)&&(!this.line.isEmpty())), ((that.line!= null)&&(!that.line.isEmpty())))) { return false; } } @@ -618,7 +618,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnTaxDetail = this.getTxnTaxDetail(); TxnTaxDetail rhsTxnTaxDetail; rhsTxnTaxDetail = that.getTxnTaxDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnTaxDetail", lhsTxnTaxDetail), LocatorUtils.property(thatLocator, "txnTaxDetail", rhsTxnTaxDetail), lhsTxnTaxDetail, rhsTxnTaxDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnTaxDetail", lhsTxnTaxDetail), LocatorUtils.property(thatLocator, "txnTaxDetail", rhsTxnTaxDetail), lhsTxnTaxDetail, rhsTxnTaxDetail, (this.txnTaxDetail!= null), (that.txnTaxDetail!= null))) { return false; } } @@ -627,7 +627,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnSource = this.getTxnSource(); String rhsTxnSource; rhsTxnSource = that.getTxnSource(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnSource", lhsTxnSource), LocatorUtils.property(thatLocator, "txnSource", rhsTxnSource), lhsTxnSource, rhsTxnSource)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnSource", lhsTxnSource), LocatorUtils.property(thatLocator, "txnSource", rhsTxnSource), lhsTxnSource, rhsTxnSource, (this.txnSource!= null), (that.txnSource!= null))) { return false; } } @@ -636,7 +636,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxFormType = this.getTaxFormType(); String rhsTaxFormType; rhsTaxFormType = that.getTaxFormType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxFormType", lhsTaxFormType), LocatorUtils.property(thatLocator, "taxFormType", rhsTaxFormType), lhsTaxFormType, rhsTaxFormType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxFormType", lhsTaxFormType), LocatorUtils.property(thatLocator, "taxFormType", rhsTaxFormType), lhsTaxFormType, rhsTaxFormType, (this.taxFormType!= null), (that.taxFormType!= null))) { return false; } } @@ -645,7 +645,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxFormNum = this.getTaxFormNum(); String rhsTaxFormNum; rhsTaxFormNum = that.getTaxFormNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxFormNum", lhsTaxFormNum), LocatorUtils.property(thatLocator, "taxFormNum", rhsTaxFormNum), lhsTaxFormNum, rhsTaxFormNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxFormNum", lhsTaxFormNum), LocatorUtils.property(thatLocator, "taxFormNum", rhsTaxFormNum), lhsTaxFormNum, rhsTaxFormNum, (this.taxFormNum!= null), (that.taxFormNum!= null))) { return false; } } @@ -654,7 +654,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTransactionLocationType = this.getTransactionLocationType(); String rhsTransactionLocationType; rhsTransactionLocationType = that.getTransactionLocationType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "transactionLocationType", lhsTransactionLocationType), LocatorUtils.property(thatLocator, "transactionLocationType", rhsTransactionLocationType), lhsTransactionLocationType, rhsTransactionLocationType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "transactionLocationType", lhsTransactionLocationType), LocatorUtils.property(thatLocator, "transactionLocationType", rhsTransactionLocationType), lhsTransactionLocationType, rhsTransactionLocationType, (this.transactionLocationType!= null), (that.transactionLocationType!= null))) { return false; } } @@ -662,87 +662,87 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theDocNumber; theDocNumber = this.getDocNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "docNumber", theDocNumber), currentHashCode, theDocNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "docNumber", theDocNumber), currentHashCode, theDocNumber, (this.docNumber!= null)); } { Date theTxnDate; theTxnDate = this.getTxnDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnDate", theTxnDate), currentHashCode, theTxnDate, (this.txnDate!= null)); } { ReferenceType theDepartmentRef; theDepartmentRef = this.getDepartmentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "departmentRef", theDepartmentRef), currentHashCode, theDepartmentRef, (this.departmentRef!= null)); } { ReferenceType theCurrencyRef; theCurrencyRef = this.getCurrencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef, (this.currencyRef!= null)); } { BigDecimal theExchangeRate; theExchangeRate = this.getExchangeRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRate", theExchangeRate), currentHashCode, theExchangeRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "exchangeRate", theExchangeRate), currentHashCode, theExchangeRate, (this.exchangeRate!= null)); } { String thePrivateNote; thePrivateNote = this.getPrivateNote(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "privateNote", thePrivateNote), currentHashCode, thePrivateNote); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "privateNote", thePrivateNote), currentHashCode, thePrivateNote, (this.privateNote!= null)); } { String theTxnStatus; theTxnStatus = this.getTxnStatus(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnStatus", theTxnStatus), currentHashCode, theTxnStatus); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnStatus", theTxnStatus), currentHashCode, theTxnStatus, (this.txnStatus!= null)); } { List theLinkedTxn; theLinkedTxn = (((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))?this.getLinkedTxn():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "linkedTxn", theLinkedTxn), currentHashCode, theLinkedTxn); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "linkedTxn", theLinkedTxn), currentHashCode, theLinkedTxn, ((this.linkedTxn!= null)&&(!this.linkedTxn.isEmpty()))); } { List theLine; theLine = (((this.line!= null)&&(!this.line.isEmpty()))?this.getLine():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line", theLine), currentHashCode, theLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "line", theLine), currentHashCode, theLine, ((this.line!= null)&&(!this.line.isEmpty()))); } { TxnTaxDetail theTxnTaxDetail; theTxnTaxDetail = this.getTxnTaxDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnTaxDetail", theTxnTaxDetail), currentHashCode, theTxnTaxDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnTaxDetail", theTxnTaxDetail), currentHashCode, theTxnTaxDetail, (this.txnTaxDetail!= null)); } { String theTxnSource; theTxnSource = this.getTxnSource(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnSource", theTxnSource), currentHashCode, theTxnSource); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnSource", theTxnSource), currentHashCode, theTxnSource, (this.txnSource!= null)); } { String theTaxFormType; theTaxFormType = this.getTaxFormType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxFormType", theTaxFormType), currentHashCode, theTaxFormType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxFormType", theTaxFormType), currentHashCode, theTaxFormType, (this.taxFormType!= null)); } { String theTaxFormNum; theTaxFormNum = this.getTaxFormNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxFormNum", theTaxFormNum), currentHashCode, theTaxFormNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxFormNum", theTaxFormNum), currentHashCode, theTaxFormNum, (this.taxFormNum!= null)); } { String theTransactionLocationType; theTransactionLocationType = this.getTransactionLocationType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transactionLocationType", theTransactionLocationType), currentHashCode, theTransactionLocationType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transactionLocationType", theTransactionLocationType), currentHashCode, theTransactionLocationType, (this.transactionLocationType!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionDeliveryInfo.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionDeliveryInfo.java index ee5d1a78..a514bdeb 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionDeliveryInfo.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionDeliveryInfo.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -32,10 +32,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -74,8 +74,7 @@ "deliveryTime", "deliveryErrorType" }) -public class TransactionDeliveryInfo - implements Serializable, Equals, HashCode +public class TransactionDeliveryInfo implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -160,8 +159,8 @@ public void setDeliveryErrorType(DeliveryErrorTypeEnum value) { this.deliveryErrorType = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TransactionDeliveryInfo)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -173,7 +172,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryType = this.getDeliveryType(); DeliveryTypeEnum rhsDeliveryType; rhsDeliveryType = that.getDeliveryType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryType", lhsDeliveryType), LocatorUtils.property(thatLocator, "deliveryType", rhsDeliveryType), lhsDeliveryType, rhsDeliveryType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryType", lhsDeliveryType), LocatorUtils.property(thatLocator, "deliveryType", rhsDeliveryType), lhsDeliveryType, rhsDeliveryType, (this.deliveryType!= null), (that.deliveryType!= null))) { return false; } } @@ -182,7 +181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryTime = this.getDeliveryTime(); Date rhsDeliveryTime; rhsDeliveryTime = that.getDeliveryTime(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryTime", lhsDeliveryTime), LocatorUtils.property(thatLocator, "deliveryTime", rhsDeliveryTime), lhsDeliveryTime, rhsDeliveryTime)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryTime", lhsDeliveryTime), LocatorUtils.property(thatLocator, "deliveryTime", rhsDeliveryTime), lhsDeliveryTime, rhsDeliveryTime, (this.deliveryTime!= null), (that.deliveryTime!= null))) { return false; } } @@ -191,7 +190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDeliveryErrorType = this.getDeliveryErrorType(); DeliveryErrorTypeEnum rhsDeliveryErrorType; rhsDeliveryErrorType = that.getDeliveryErrorType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryErrorType", lhsDeliveryErrorType), LocatorUtils.property(thatLocator, "deliveryErrorType", rhsDeliveryErrorType), lhsDeliveryErrorType, rhsDeliveryErrorType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "deliveryErrorType", lhsDeliveryErrorType), LocatorUtils.property(thatLocator, "deliveryErrorType", rhsDeliveryErrorType), lhsDeliveryErrorType, rhsDeliveryErrorType, (this.deliveryErrorType!= null), (that.deliveryErrorType!= null))) { return false; } } @@ -199,32 +198,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { DeliveryTypeEnum theDeliveryType; theDeliveryType = this.getDeliveryType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryType", theDeliveryType), currentHashCode, theDeliveryType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryType", theDeliveryType), currentHashCode, theDeliveryType, (this.deliveryType!= null)); } { Date theDeliveryTime; theDeliveryTime = this.getDeliveryTime(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryTime", theDeliveryTime), currentHashCode, theDeliveryTime); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryTime", theDeliveryTime), currentHashCode, theDeliveryTime, (this.deliveryTime!= null)); } { DeliveryErrorTypeEnum theDeliveryErrorType; theDeliveryErrorType = this.getDeliveryErrorType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryErrorType", theDeliveryErrorType), currentHashCode, theDeliveryErrorType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "deliveryErrorType", theDeliveryErrorType), currentHashCode, theDeliveryErrorType, (this.deliveryErrorType!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionLocationTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionLocationTypeEnum.java index 0ab01869..f5b4a77b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionLocationTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TransactionLocationTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transfer.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transfer.java index 60c116b0..7c1823ab 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transfer.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Transfer.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -77,7 +77,7 @@ }) public class Transfer extends Transaction - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -212,8 +212,8 @@ public void setTransferEx(IntuitAnyType value) { this.transferEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Transfer)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -228,7 +228,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFromAccountRef = this.getFromAccountRef(); ReferenceType rhsFromAccountRef; rhsFromAccountRef = that.getFromAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fromAccountRef", lhsFromAccountRef), LocatorUtils.property(thatLocator, "fromAccountRef", rhsFromAccountRef), lhsFromAccountRef, rhsFromAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fromAccountRef", lhsFromAccountRef), LocatorUtils.property(thatLocator, "fromAccountRef", rhsFromAccountRef), lhsFromAccountRef, rhsFromAccountRef, (this.fromAccountRef!= null), (that.fromAccountRef!= null))) { return false; } } @@ -237,7 +237,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsToAccountRef = this.getToAccountRef(); ReferenceType rhsToAccountRef; rhsToAccountRef = that.getToAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "toAccountRef", lhsToAccountRef), LocatorUtils.property(thatLocator, "toAccountRef", rhsToAccountRef), lhsToAccountRef, rhsToAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "toAccountRef", lhsToAccountRef), LocatorUtils.property(thatLocator, "toAccountRef", rhsToAccountRef), lhsToAccountRef, rhsToAccountRef, (this.toAccountRef!= null), (that.toAccountRef!= null))) { return false; } } @@ -246,7 +246,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAmount = this.getAmount(); BigDecimal rhsAmount; rhsAmount = that.getAmount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "amount", lhsAmount), LocatorUtils.property(thatLocator, "amount", rhsAmount), lhsAmount, rhsAmount, (this.amount!= null), (that.amount!= null))) { return false; } } @@ -255,7 +255,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; } } @@ -264,7 +264,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTransferEx = this.getTransferEx(); IntuitAnyType rhsTransferEx; rhsTransferEx = that.getTransferEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "transferEx", lhsTransferEx), LocatorUtils.property(thatLocator, "transferEx", rhsTransferEx), lhsTransferEx, rhsTransferEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "transferEx", lhsTransferEx), LocatorUtils.property(thatLocator, "transferEx", rhsTransferEx), lhsTransferEx, rhsTransferEx, (this.transferEx!= null), (that.transferEx!= null))) { return false; } } @@ -272,42 +272,42 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { ReferenceType theFromAccountRef; theFromAccountRef = this.getFromAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fromAccountRef", theFromAccountRef), currentHashCode, theFromAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fromAccountRef", theFromAccountRef), currentHashCode, theFromAccountRef, (this.fromAccountRef!= null)); } { ReferenceType theToAccountRef; theToAccountRef = this.getToAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "toAccountRef", theToAccountRef), currentHashCode, theToAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "toAccountRef", theToAccountRef), currentHashCode, theToAccountRef, (this.toAccountRef!= null)); } { BigDecimal theAmount; theAmount = this.getAmount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "amount", theAmount), currentHashCode, theAmount, (this.amount!= 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)); } { IntuitAnyType theTransferEx; theTransferEx = this.getTransferEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transferEx", theTransferEx), currentHashCode, theTransferEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transferEx", theTransferEx), currentHashCode, theTransferEx, (this.transferEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnSourceEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnSourceEnum.java index 03538001..628a56ae 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnSourceEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnSourceEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTaxDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTaxDetail.java index 62b3bc5e..b9170224 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTaxDetail.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTaxDetail.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,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; @@ -88,8 +88,7 @@ "totalTax", "taxLine" }) -public class TxnTaxDetail - implements Serializable, Equals, HashCode +public class TxnTaxDetail implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -215,8 +214,8 @@ public void setTaxLine(List taxLine) { this.taxLine = taxLine; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof TxnTaxDetail)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -228,7 +227,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTaxCodeRef = this.getDefaultTaxCodeRef(); ReferenceType rhsDefaultTaxCodeRef; rhsDefaultTaxCodeRef = that.getDefaultTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTaxCodeRef", lhsDefaultTaxCodeRef), LocatorUtils.property(thatLocator, "defaultTaxCodeRef", rhsDefaultTaxCodeRef), lhsDefaultTaxCodeRef, rhsDefaultTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTaxCodeRef", lhsDefaultTaxCodeRef), LocatorUtils.property(thatLocator, "defaultTaxCodeRef", rhsDefaultTaxCodeRef), lhsDefaultTaxCodeRef, rhsDefaultTaxCodeRef, (this.defaultTaxCodeRef!= null), (that.defaultTaxCodeRef!= null))) { return false; } } @@ -237,7 +236,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTxnTaxCodeRef = this.getTxnTaxCodeRef(); ReferenceType rhsTxnTaxCodeRef; rhsTxnTaxCodeRef = that.getTxnTaxCodeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "txnTaxCodeRef", lhsTxnTaxCodeRef), LocatorUtils.property(thatLocator, "txnTaxCodeRef", rhsTxnTaxCodeRef), lhsTxnTaxCodeRef, rhsTxnTaxCodeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "txnTaxCodeRef", lhsTxnTaxCodeRef), LocatorUtils.property(thatLocator, "txnTaxCodeRef", rhsTxnTaxCodeRef), lhsTxnTaxCodeRef, rhsTxnTaxCodeRef, (this.txnTaxCodeRef!= null), (that.txnTaxCodeRef!= null))) { return false; } } @@ -246,7 +245,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTotalTax = this.getTotalTax(); BigDecimal rhsTotalTax; rhsTotalTax = that.getTotalTax(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "totalTax", lhsTotalTax), LocatorUtils.property(thatLocator, "totalTax", rhsTotalTax), lhsTotalTax, rhsTotalTax)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "totalTax", lhsTotalTax), LocatorUtils.property(thatLocator, "totalTax", rhsTotalTax), lhsTotalTax, rhsTotalTax, (this.totalTax!= null), (that.totalTax!= null))) { return false; } } @@ -255,7 +254,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxLine = (((this.taxLine!= null)&&(!this.taxLine.isEmpty()))?this.getTaxLine():null); List rhsTaxLine; rhsTaxLine = (((that.taxLine!= null)&&(!that.taxLine.isEmpty()))?that.getTaxLine():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLine", lhsTaxLine), LocatorUtils.property(thatLocator, "taxLine", rhsTaxLine), lhsTaxLine, rhsTaxLine)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxLine", lhsTaxLine), LocatorUtils.property(thatLocator, "taxLine", rhsTaxLine), lhsTaxLine, rhsTaxLine, ((this.taxLine!= null)&&(!this.taxLine.isEmpty())), ((that.taxLine!= null)&&(!that.taxLine.isEmpty())))) { return false; } } @@ -263,37 +262,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 theDefaultTaxCodeRef; theDefaultTaxCodeRef = this.getDefaultTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTaxCodeRef", theDefaultTaxCodeRef), currentHashCode, theDefaultTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTaxCodeRef", theDefaultTaxCodeRef), currentHashCode, theDefaultTaxCodeRef, (this.defaultTaxCodeRef!= null)); } { ReferenceType theTxnTaxCodeRef; theTxnTaxCodeRef = this.getTxnTaxCodeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnTaxCodeRef", theTxnTaxCodeRef), currentHashCode, theTxnTaxCodeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "txnTaxCodeRef", theTxnTaxCodeRef), currentHashCode, theTxnTaxCodeRef, (this.txnTaxCodeRef!= null)); } { BigDecimal theTotalTax; theTotalTax = this.getTotalTax(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalTax", theTotalTax), currentHashCode, theTotalTax); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "totalTax", theTotalTax), currentHashCode, theTotalTax, (this.totalTax!= null)); } { List theTaxLine; theTaxLine = (((this.taxLine!= null)&&(!this.taxLine.isEmpty()))?this.getTaxLine():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLine", theTaxLine), currentHashCode, theTaxLine); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxLine", theTaxLine), currentHashCode, theTaxLine, ((this.taxLine!= null)&&(!this.taxLine.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTypeEnum.java index 8f6421a9..a51eaf49 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/TxnTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOM.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOM.java index 6708df5b..ef8e9933 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOM.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOM.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -76,7 +76,7 @@ }) public class UOM extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -202,8 +202,8 @@ public void setConvUnit(List convUnit) { this.convUnit = convUnit; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof UOM)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -218,7 +218,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -227,7 +227,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAbbrv = this.getAbbrv(); String rhsAbbrv; rhsAbbrv = that.getAbbrv(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "abbrv", lhsAbbrv), LocatorUtils.property(thatLocator, "abbrv", rhsAbbrv), lhsAbbrv, rhsAbbrv)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "abbrv", lhsAbbrv), LocatorUtils.property(thatLocator, "abbrv", rhsAbbrv), lhsAbbrv, rhsAbbrv, (this.abbrv!= null), (that.abbrv!= null))) { return false; } } @@ -236,7 +236,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBaseType = this.getBaseType(); UOMBaseTypeEnum rhsBaseType; rhsBaseType = that.getBaseType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "baseType", lhsBaseType), LocatorUtils.property(thatLocator, "baseType", rhsBaseType), lhsBaseType, rhsBaseType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "baseType", lhsBaseType), LocatorUtils.property(thatLocator, "baseType", rhsBaseType), lhsBaseType, rhsBaseType, (this.baseType!= null), (that.baseType!= null))) { return false; } } @@ -245,7 +245,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsConvUnit = (((this.convUnit!= null)&&(!this.convUnit.isEmpty()))?this.getConvUnit():null); List rhsConvUnit; rhsConvUnit = (((that.convUnit!= null)&&(!that.convUnit.isEmpty()))?that.getConvUnit():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "convUnit", lhsConvUnit), LocatorUtils.property(thatLocator, "convUnit", rhsConvUnit), lhsConvUnit, rhsConvUnit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "convUnit", lhsConvUnit), LocatorUtils.property(thatLocator, "convUnit", rhsConvUnit), lhsConvUnit, rhsConvUnit, ((this.convUnit!= null)&&(!this.convUnit.isEmpty())), ((that.convUnit!= null)&&(!that.convUnit.isEmpty())))) { return false; } } @@ -253,37 +253,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theAbbrv; theAbbrv = this.getAbbrv(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abbrv", theAbbrv), currentHashCode, theAbbrv); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abbrv", theAbbrv), currentHashCode, theAbbrv, (this.abbrv!= null)); } { UOMBaseTypeEnum theBaseType; theBaseType = this.getBaseType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "baseType", theBaseType), currentHashCode, theBaseType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "baseType", theBaseType), currentHashCode, theBaseType, (this.baseType!= null)); } { List theConvUnit; theConvUnit = (((this.convUnit!= null)&&(!this.convUnit.isEmpty()))?this.getConvUnit():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "convUnit", theConvUnit), currentHashCode, theConvUnit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "convUnit", theConvUnit), currentHashCode, theConvUnit, ((this.convUnit!= null)&&(!this.convUnit.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMBaseTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMBaseTypeEnum.java index e0f868e8..6c051b1d 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMBaseTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMBaseTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMConvUnit.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMConvUnit.java index 98046a22..a19911fc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMConvUnit.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMConvUnit.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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; @@ -68,8 +68,7 @@ "abbrv", "convRatio" }) -public class UOMConvUnit - implements Serializable, Equals, HashCode +public class UOMConvUnit implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -152,8 +151,8 @@ public void setConvRatio(BigDecimal value) { this.convRatio = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof UOMConvUnit)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -165,7 +164,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -174,7 +173,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAbbrv = this.getAbbrv(); String rhsAbbrv; rhsAbbrv = that.getAbbrv(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "abbrv", lhsAbbrv), LocatorUtils.property(thatLocator, "abbrv", rhsAbbrv), lhsAbbrv, rhsAbbrv)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "abbrv", lhsAbbrv), LocatorUtils.property(thatLocator, "abbrv", rhsAbbrv), lhsAbbrv, rhsAbbrv, (this.abbrv!= null), (that.abbrv!= null))) { return false; } } @@ -183,7 +182,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsConvRatio = this.getConvRatio(); BigDecimal rhsConvRatio; rhsConvRatio = that.getConvRatio(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "convRatio", lhsConvRatio), LocatorUtils.property(thatLocator, "convRatio", rhsConvRatio), lhsConvRatio, rhsConvRatio)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "convRatio", lhsConvRatio), LocatorUtils.property(thatLocator, "convRatio", rhsConvRatio), lhsConvRatio, rhsConvRatio, (this.convRatio!= null), (that.convRatio!= null))) { return false; } } @@ -191,32 +190,32 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { String theAbbrv; theAbbrv = this.getAbbrv(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abbrv", theAbbrv), currentHashCode, theAbbrv); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "abbrv", theAbbrv), currentHashCode, theAbbrv, (this.abbrv!= null)); } { BigDecimal theConvRatio; theConvRatio = this.getConvRatio(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "convRatio", theConvRatio), currentHashCode, theConvRatio); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "convRatio", theConvRatio), currentHashCode, theConvRatio, (this.convRatio!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMFeatureTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMFeatureTypeEnum.java index 3e1df5b0..562ac392 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMFeatureTypeEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMFeatureTypeEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMRef.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMRef.java index e01c0318..ee38ca26 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMRef.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UOMRef.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -68,8 +68,7 @@ "unit", "uomSetRef" }) -public class UOMRef - implements Serializable, Equals, HashCode +public class UOMRef implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -126,8 +125,8 @@ public void setUOMSetRef(ReferenceType value) { this.uomSetRef = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof UOMRef)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -139,7 +138,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUnit = this.getUnit(); String rhsUnit; rhsUnit = that.getUnit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "unit", lhsUnit), LocatorUtils.property(thatLocator, "unit", rhsUnit), lhsUnit, rhsUnit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "unit", lhsUnit), LocatorUtils.property(thatLocator, "unit", rhsUnit), lhsUnit, rhsUnit, (this.unit!= null), (that.unit!= null))) { return false; } } @@ -148,7 +147,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUOMSetRef = this.getUOMSetRef(); ReferenceType rhsUOMSetRef; rhsUOMSetRef = that.getUOMSetRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uomSetRef", lhsUOMSetRef), LocatorUtils.property(thatLocator, "uomSetRef", rhsUOMSetRef), lhsUOMSetRef, rhsUOMSetRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uomSetRef", lhsUOMSetRef), LocatorUtils.property(thatLocator, "uomSetRef", rhsUOMSetRef), lhsUOMSetRef, rhsUOMSetRef, (this.uomSetRef!= null), (that.uomSetRef!= null))) { return false; } } @@ -156,27 +155,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theUnit; theUnit = this.getUnit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unit", theUnit), currentHashCode, theUnit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "unit", theUnit), currentHashCode, theUnit, (this.unit!= null)); } { ReferenceType theUOMSetRef; theUOMSetRef = this.getUOMSetRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomSetRef", theUOMSetRef), currentHashCode, theUOMSetRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uomSetRef", theUOMSetRef), currentHashCode, theUOMSetRef, (this.uomSetRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/User.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/User.java index 50461fd0..991d11a7 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/User.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/User.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -96,7 +96,7 @@ }) public class User extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -533,8 +533,8 @@ public void setNameValueAttr(List nameValueAttr) { this.nameValueAttr = nameValueAttr; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof User)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -549,7 +549,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDisplayName = this.getDisplayName(); String rhsDisplayName; rhsDisplayName = that.getDisplayName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "displayName", lhsDisplayName), LocatorUtils.property(thatLocator, "displayName", rhsDisplayName), lhsDisplayName, rhsDisplayName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "displayName", lhsDisplayName), LocatorUtils.property(thatLocator, "displayName", rhsDisplayName), lhsDisplayName, rhsDisplayName, (this.displayName!= null), (that.displayName!= null))) { return false; } } @@ -558,7 +558,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTitle = this.getTitle(); String rhsTitle; rhsTitle = that.getTitle(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "title", lhsTitle), LocatorUtils.property(thatLocator, "title", rhsTitle), lhsTitle, rhsTitle)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "title", lhsTitle), LocatorUtils.property(thatLocator, "title", rhsTitle), lhsTitle, rhsTitle, (this.title!= null), (that.title!= null))) { return false; } } @@ -567,7 +567,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsGivenName = this.getGivenName(); String rhsGivenName; rhsGivenName = that.getGivenName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "givenName", lhsGivenName), LocatorUtils.property(thatLocator, "givenName", rhsGivenName), lhsGivenName, rhsGivenName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "givenName", lhsGivenName), LocatorUtils.property(thatLocator, "givenName", rhsGivenName), lhsGivenName, rhsGivenName, (this.givenName!= null), (that.givenName!= null))) { return false; } } @@ -576,7 +576,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMiddleName = this.getMiddleName(); String rhsMiddleName; rhsMiddleName = that.getMiddleName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "middleName", lhsMiddleName), LocatorUtils.property(thatLocator, "middleName", rhsMiddleName), lhsMiddleName, rhsMiddleName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "middleName", lhsMiddleName), LocatorUtils.property(thatLocator, "middleName", rhsMiddleName), lhsMiddleName, rhsMiddleName, (this.middleName!= null), (that.middleName!= null))) { return false; } } @@ -585,7 +585,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFamilyName = this.getFamilyName(); String rhsFamilyName; rhsFamilyName = that.getFamilyName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "familyName", lhsFamilyName), LocatorUtils.property(thatLocator, "familyName", rhsFamilyName), lhsFamilyName, rhsFamilyName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "familyName", lhsFamilyName), LocatorUtils.property(thatLocator, "familyName", rhsFamilyName), lhsFamilyName, rhsFamilyName, (this.familyName!= null), (that.familyName!= null))) { return false; } } @@ -594,7 +594,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsSuffix = this.getSuffix(); String rhsSuffix; rhsSuffix = that.getSuffix(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "suffix", lhsSuffix), LocatorUtils.property(thatLocator, "suffix", rhsSuffix), lhsSuffix, rhsSuffix)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "suffix", lhsSuffix), LocatorUtils.property(thatLocator, "suffix", rhsSuffix), lhsSuffix, rhsSuffix, (this.suffix!= null), (that.suffix!= null))) { return false; } } @@ -603,7 +603,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEmailAddr = (((this.emailAddr!= null)&&(!this.emailAddr.isEmpty()))?this.getEmailAddr():null); List rhsEmailAddr; rhsEmailAddr = (((that.emailAddr!= null)&&(!that.emailAddr.isEmpty()))?that.getEmailAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "emailAddr", lhsEmailAddr), LocatorUtils.property(thatLocator, "emailAddr", rhsEmailAddr), lhsEmailAddr, rhsEmailAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "emailAddr", lhsEmailAddr), LocatorUtils.property(thatLocator, "emailAddr", rhsEmailAddr), lhsEmailAddr, rhsEmailAddr, ((this.emailAddr!= null)&&(!this.emailAddr.isEmpty())), ((that.emailAddr!= null)&&(!that.emailAddr.isEmpty())))) { return false; } } @@ -612,7 +612,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAddr = (((this.addr!= null)&&(!this.addr.isEmpty()))?this.getAddr():null); List rhsAddr; rhsAddr = (((that.addr!= null)&&(!that.addr.isEmpty()))?that.getAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "addr", lhsAddr), LocatorUtils.property(thatLocator, "addr", rhsAddr), lhsAddr, rhsAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "addr", lhsAddr), LocatorUtils.property(thatLocator, "addr", rhsAddr), lhsAddr, rhsAddr, ((this.addr!= null)&&(!this.addr.isEmpty())), ((that.addr!= null)&&(!that.addr.isEmpty())))) { return false; } } @@ -621,7 +621,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPhoneNumber = (((this.phoneNumber!= null)&&(!this.phoneNumber.isEmpty()))?this.getPhoneNumber():null); List rhsPhoneNumber; rhsPhoneNumber = (((that.phoneNumber!= null)&&(!that.phoneNumber.isEmpty()))?that.getPhoneNumber():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "phoneNumber", lhsPhoneNumber), LocatorUtils.property(thatLocator, "phoneNumber", rhsPhoneNumber), lhsPhoneNumber, rhsPhoneNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "phoneNumber", lhsPhoneNumber), LocatorUtils.property(thatLocator, "phoneNumber", rhsPhoneNumber), lhsPhoneNumber, rhsPhoneNumber, ((this.phoneNumber!= null)&&(!this.phoneNumber.isEmpty())), ((that.phoneNumber!= null)&&(!that.phoneNumber.isEmpty())))) { return false; } } @@ -630,7 +630,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLocaleCountry = this.getLocaleCountry(); String rhsLocaleCountry; rhsLocaleCountry = that.getLocaleCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "localeCountry", lhsLocaleCountry), LocatorUtils.property(thatLocator, "localeCountry", rhsLocaleCountry), lhsLocaleCountry, rhsLocaleCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "localeCountry", lhsLocaleCountry), LocatorUtils.property(thatLocator, "localeCountry", rhsLocaleCountry), lhsLocaleCountry, rhsLocaleCountry, (this.localeCountry!= null), (that.localeCountry!= null))) { return false; } } @@ -639,7 +639,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLocaleLanguage = this.getLocaleLanguage(); String rhsLocaleLanguage; rhsLocaleLanguage = that.getLocaleLanguage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "localeLanguage", lhsLocaleLanguage), LocatorUtils.property(thatLocator, "localeLanguage", rhsLocaleLanguage), lhsLocaleLanguage, rhsLocaleLanguage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "localeLanguage", lhsLocaleLanguage), LocatorUtils.property(thatLocator, "localeLanguage", rhsLocaleLanguage), lhsLocaleLanguage, rhsLocaleLanguage, (this.localeLanguage!= null), (that.localeLanguage!= null))) { return false; } } @@ -648,7 +648,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLocalePostalCode = this.getLocalePostalCode(); String rhsLocalePostalCode; rhsLocalePostalCode = that.getLocalePostalCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "localePostalCode", lhsLocalePostalCode), LocatorUtils.property(thatLocator, "localePostalCode", rhsLocalePostalCode), lhsLocalePostalCode, rhsLocalePostalCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "localePostalCode", lhsLocalePostalCode), LocatorUtils.property(thatLocator, "localePostalCode", rhsLocalePostalCode), lhsLocalePostalCode, rhsLocalePostalCode, (this.localePostalCode!= null), (that.localePostalCode!= null))) { return false; } } @@ -657,7 +657,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsLocaleTimeZone = this.getLocaleTimeZone(); String rhsLocaleTimeZone; rhsLocaleTimeZone = that.getLocaleTimeZone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "localeTimeZone", lhsLocaleTimeZone), LocatorUtils.property(thatLocator, "localeTimeZone", rhsLocaleTimeZone), lhsLocaleTimeZone, rhsLocaleTimeZone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "localeTimeZone", lhsLocaleTimeZone), LocatorUtils.property(thatLocator, "localeTimeZone", rhsLocaleTimeZone), lhsLocaleTimeZone, rhsLocaleTimeZone, (this.localeTimeZone!= null), (that.localeTimeZone!= null))) { return false; } } @@ -666,7 +666,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValueAttr = (((this.nameValueAttr!= null)&&(!this.nameValueAttr.isEmpty()))?this.getNameValueAttr():null); List rhsNameValueAttr; rhsNameValueAttr = (((that.nameValueAttr!= null)&&(!that.nameValueAttr.isEmpty()))?that.getNameValueAttr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValueAttr", lhsNameValueAttr), LocatorUtils.property(thatLocator, "nameValueAttr", rhsNameValueAttr), lhsNameValueAttr, rhsNameValueAttr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValueAttr", lhsNameValueAttr), LocatorUtils.property(thatLocator, "nameValueAttr", rhsNameValueAttr), lhsNameValueAttr, rhsNameValueAttr, ((this.nameValueAttr!= null)&&(!this.nameValueAttr.isEmpty())), ((that.nameValueAttr!= null)&&(!that.nameValueAttr.isEmpty())))) { return false; } } @@ -674,87 +674,87 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theDisplayName; theDisplayName = this.getDisplayName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayName", theDisplayName), currentHashCode, theDisplayName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayName", theDisplayName), currentHashCode, theDisplayName, (this.displayName!= null)); } { String theTitle; theTitle = this.getTitle(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "title", theTitle), currentHashCode, theTitle); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "title", theTitle), currentHashCode, theTitle, (this.title!= null)); } { String theGivenName; theGivenName = this.getGivenName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenName", theGivenName), currentHashCode, theGivenName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenName", theGivenName), currentHashCode, theGivenName, (this.givenName!= null)); } { String theMiddleName; theMiddleName = this.getMiddleName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "middleName", theMiddleName), currentHashCode, theMiddleName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "middleName", theMiddleName), currentHashCode, theMiddleName, (this.middleName!= null)); } { String theFamilyName; theFamilyName = this.getFamilyName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "familyName", theFamilyName), currentHashCode, theFamilyName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "familyName", theFamilyName), currentHashCode, theFamilyName, (this.familyName!= null)); } { String theSuffix; theSuffix = this.getSuffix(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "suffix", theSuffix), currentHashCode, theSuffix); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "suffix", theSuffix), currentHashCode, theSuffix, (this.suffix!= null)); } { List theEmailAddr; theEmailAddr = (((this.emailAddr!= null)&&(!this.emailAddr.isEmpty()))?this.getEmailAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailAddr", theEmailAddr), currentHashCode, theEmailAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "emailAddr", theEmailAddr), currentHashCode, theEmailAddr, ((this.emailAddr!= null)&&(!this.emailAddr.isEmpty()))); } { List theAddr; theAddr = (((this.addr!= null)&&(!this.addr.isEmpty()))?this.getAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "addr", theAddr), currentHashCode, theAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "addr", theAddr), currentHashCode, theAddr, ((this.addr!= null)&&(!this.addr.isEmpty()))); } { List thePhoneNumber; thePhoneNumber = (((this.phoneNumber!= null)&&(!this.phoneNumber.isEmpty()))?this.getPhoneNumber():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "phoneNumber", thePhoneNumber), currentHashCode, thePhoneNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "phoneNumber", thePhoneNumber), currentHashCode, thePhoneNumber, ((this.phoneNumber!= null)&&(!this.phoneNumber.isEmpty()))); } { String theLocaleCountry; theLocaleCountry = this.getLocaleCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeCountry", theLocaleCountry), currentHashCode, theLocaleCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeCountry", theLocaleCountry), currentHashCode, theLocaleCountry, (this.localeCountry!= null)); } { String theLocaleLanguage; theLocaleLanguage = this.getLocaleLanguage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeLanguage", theLocaleLanguage), currentHashCode, theLocaleLanguage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeLanguage", theLocaleLanguage), currentHashCode, theLocaleLanguage, (this.localeLanguage!= null)); } { String theLocalePostalCode; theLocalePostalCode = this.getLocalePostalCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localePostalCode", theLocalePostalCode), currentHashCode, theLocalePostalCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localePostalCode", theLocalePostalCode), currentHashCode, theLocalePostalCode, (this.localePostalCode!= null)); } { String theLocaleTimeZone; theLocaleTimeZone = this.getLocaleTimeZone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeTimeZone", theLocaleTimeZone), currentHashCode, theLocaleTimeZone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localeTimeZone", theLocaleTimeZone), currentHashCode, theLocaleTimeZone, (this.localeTimeZone!= null)); } { List theNameValueAttr; theNameValueAttr = (((this.nameValueAttr!= null)&&(!this.nameValueAttr.isEmpty()))?this.getNameValueAttr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValueAttr", theNameValueAttr), currentHashCode, theNameValueAttr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValueAttr", theNameValueAttr), currentHashCode, theNameValueAttr, ((this.nameValueAttr!= null)&&(!this.nameValueAttr.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UserAlert.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UserAlert.java index 329d224b..28d255f1 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UserAlert.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/UserAlert.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -35,10 +35,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; import com.intuit.sb.cdm.util.v3.DateTimeAdapter; -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; @@ -96,7 +96,7 @@ }) public class UserAlert extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -410,8 +410,8 @@ public void setNameValue(List nameValue) { this.nameValue = nameValue; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof UserAlert)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -426,7 +426,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNotes = this.getNotes(); String rhsNotes; rhsNotes = that.getNotes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes, (this.notes!= null), (that.notes!= null))) { return false; } } @@ -435,7 +435,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -444,7 +444,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDone = this.isDone(); Boolean rhsDone; rhsDone = that.isDone(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "done", lhsDone), LocatorUtils.property(thatLocator, "done", rhsDone), lhsDone, rhsDone)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "done", lhsDone), LocatorUtils.property(thatLocator, "done", rhsDone), lhsDone, rhsDone, (this.done!= null), (that.done!= null))) { return false; } } @@ -453,7 +453,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsType = this.getType(); String rhsType; rhsType = that.getType(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType, (this.type!= null), (that.type!= null))) { return false; } } @@ -462,7 +462,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsReminderDate = this.getReminderDate(); Date rhsReminderDate; rhsReminderDate = that.getReminderDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "reminderDate", lhsReminderDate), LocatorUtils.property(thatLocator, "reminderDate", rhsReminderDate), lhsReminderDate, rhsReminderDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "reminderDate", lhsReminderDate), LocatorUtils.property(thatLocator, "reminderDate", rhsReminderDate), lhsReminderDate, rhsReminderDate, (this.reminderDate!= null), (that.reminderDate!= null))) { return false; } } @@ -471,7 +471,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsExpireDate = this.getExpireDate(); Date rhsExpireDate; rhsExpireDate = that.getExpireDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "expireDate", lhsExpireDate), LocatorUtils.property(thatLocator, "expireDate", rhsExpireDate), lhsExpireDate, rhsExpireDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "expireDate", lhsExpireDate), LocatorUtils.property(thatLocator, "expireDate", rhsExpireDate), lhsExpireDate, rhsExpireDate, (this.expireDate!= null), (that.expireDate!= null))) { return false; } } @@ -480,7 +480,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDueDate = this.getDueDate(); Date rhsDueDate; rhsDueDate = that.getDueDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "dueDate", lhsDueDate), LocatorUtils.property(thatLocator, "dueDate", rhsDueDate), lhsDueDate, rhsDueDate, (this.dueDate!= null), (that.dueDate!= null))) { return false; } } @@ -489,7 +489,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsURL = this.getURL(); String rhsURL; rhsURL = that.getURL(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL, (this.url!= null), (that.url!= null))) { return false; } } @@ -498,7 +498,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFilter = this.getFilter(); String rhsFilter; rhsFilter = that.getFilter(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "filter", lhsFilter), LocatorUtils.property(thatLocator, "filter", rhsFilter), lhsFilter, rhsFilter)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "filter", lhsFilter), LocatorUtils.property(thatLocator, "filter", rhsFilter), lhsFilter, rhsFilter, (this.filter!= null), (that.filter!= null))) { return false; } } @@ -507,7 +507,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); List rhsNameValue; rhsNameValue = (((that.nameValue!= null)&&(!that.nameValue.isEmpty()))?that.getNameValue():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "nameValue", lhsNameValue), LocatorUtils.property(thatLocator, "nameValue", rhsNameValue), lhsNameValue, rhsNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty())), ((that.nameValue!= null)&&(!that.nameValue.isEmpty())))) { return false; } } @@ -516,7 +516,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUserAlertEx = this.getUserAlertEx(); IntuitAnyType rhsUserAlertEx; rhsUserAlertEx = that.getUserAlertEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "userAlertEx", lhsUserAlertEx), LocatorUtils.property(thatLocator, "userAlertEx", rhsUserAlertEx), lhsUserAlertEx, rhsUserAlertEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "userAlertEx", lhsUserAlertEx), LocatorUtils.property(thatLocator, "userAlertEx", rhsUserAlertEx), lhsUserAlertEx, rhsUserAlertEx, (this.userAlertEx!= null), (that.userAlertEx!= null))) { return false; } } @@ -524,72 +524,72 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theNotes; theNotes = this.getNotes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes, (this.notes!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } { Boolean theDone; theDone = this.isDone(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "done", theDone), currentHashCode, theDone); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "done", theDone), currentHashCode, theDone, (this.done!= null)); } { String theType; theType = this.getType(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType, (this.type!= null)); } { Date theReminderDate; theReminderDate = this.getReminderDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reminderDate", theReminderDate), currentHashCode, theReminderDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "reminderDate", theReminderDate), currentHashCode, theReminderDate, (this.reminderDate!= null)); } { Date theExpireDate; theExpireDate = this.getExpireDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expireDate", theExpireDate), currentHashCode, theExpireDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "expireDate", theExpireDate), currentHashCode, theExpireDate, (this.expireDate!= null)); } { Date theDueDate; theDueDate = this.getDueDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "dueDate", theDueDate), currentHashCode, theDueDate, (this.dueDate!= null)); } { String theURL; theURL = this.getURL(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL, (this.url!= null)); } { String theFilter; theFilter = this.getFilter(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "filter", theFilter), currentHashCode, theFilter); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "filter", theFilter), currentHashCode, theFilter, (this.filter!= null)); } { List theNameValue; theNameValue = (((this.nameValue!= null)&&(!this.nameValue.isEmpty()))?this.getNameValue():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "nameValue", theNameValue), currentHashCode, theNameValue, ((this.nameValue!= null)&&(!this.nameValue.isEmpty()))); } { IntuitAnyType theUserAlertEx; theUserAlertEx = this.getUserAlertEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userAlertEx", theUserAlertEx), currentHashCode, theUserAlertEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userAlertEx", theUserAlertEx), currentHashCode, theUserAlertEx, (this.userAlertEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Vendor.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Vendor.java index 15bbf4be..fad3bdbc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Vendor.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Vendor.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -36,10 +36,10 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.intuit.sb.cdm.util.v3.DateAdapter; -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; @@ -134,7 +134,7 @@ }) public class Vendor extends NameBase - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -940,8 +940,8 @@ public void setOtherAddr(List otherAddr) { this.otherAddr = otherAddr; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Vendor)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -956,7 +956,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsContactName = this.getContactName(); String rhsContactName; rhsContactName = that.getContactName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "contactName", lhsContactName), LocatorUtils.property(thatLocator, "contactName", rhsContactName), lhsContactName, rhsContactName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "contactName", lhsContactName), LocatorUtils.property(thatLocator, "contactName", rhsContactName), lhsContactName, rhsContactName, (this.contactName!= null), (that.contactName!= null))) { return false; } } @@ -965,7 +965,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAltContactName = this.getAltContactName(); String rhsAltContactName; rhsAltContactName = that.getAltContactName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "altContactName", lhsAltContactName), LocatorUtils.property(thatLocator, "altContactName", rhsAltContactName), lhsAltContactName, rhsAltContactName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "altContactName", lhsAltContactName), LocatorUtils.property(thatLocator, "altContactName", rhsAltContactName), lhsAltContactName, rhsAltContactName, (this.altContactName!= null), (that.altContactName!= null))) { return false; } } @@ -974,7 +974,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsNotes = this.getNotes(); String rhsNotes; rhsNotes = that.getNotes(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "notes", lhsNotes), LocatorUtils.property(thatLocator, "notes", rhsNotes), lhsNotes, rhsNotes, (this.notes!= null), (that.notes!= null))) { return false; } } @@ -983,7 +983,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillAddr = this.getBillAddr(); PhysicalAddress rhsBillAddr; rhsBillAddr = that.getBillAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billAddr", lhsBillAddr), LocatorUtils.property(thatLocator, "billAddr", rhsBillAddr), lhsBillAddr, rhsBillAddr, (this.billAddr!= null), (that.billAddr!= null))) { return false; } } @@ -992,7 +992,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsShipAddr = this.getShipAddr(); PhysicalAddress rhsShipAddr; rhsShipAddr = that.getShipAddr(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "shipAddr", lhsShipAddr), LocatorUtils.property(thatLocator, "shipAddr", rhsShipAddr), lhsShipAddr, rhsShipAddr, (this.shipAddr!= null), (that.shipAddr!= null))) { return false; } } @@ -1001,7 +1001,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); List rhsOtherAddr; rhsOtherAddr = (((that.otherAddr!= null)&&(!that.otherAddr.isEmpty()))?that.getOtherAddr():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "otherAddr", lhsOtherAddr), LocatorUtils.property(thatLocator, "otherAddr", rhsOtherAddr), lhsOtherAddr, rhsOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty())), ((that.otherAddr!= null)&&(!that.otherAddr.isEmpty())))) { return false; } } @@ -1010,7 +1010,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxCountry = this.getTaxCountry(); String rhsTaxCountry; rhsTaxCountry = that.getTaxCountry(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCountry", lhsTaxCountry), LocatorUtils.property(thatLocator, "taxCountry", rhsTaxCountry), lhsTaxCountry, rhsTaxCountry)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxCountry", lhsTaxCountry), LocatorUtils.property(thatLocator, "taxCountry", rhsTaxCountry), lhsTaxCountry, rhsTaxCountry, (this.taxCountry!= null), (that.taxCountry!= null))) { return false; } } @@ -1019,7 +1019,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxIdentifier = this.getTaxIdentifier(); String rhsTaxIdentifier; rhsTaxIdentifier = that.getTaxIdentifier(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxIdentifier", lhsTaxIdentifier), LocatorUtils.property(thatLocator, "taxIdentifier", rhsTaxIdentifier), lhsTaxIdentifier, rhsTaxIdentifier)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxIdentifier", lhsTaxIdentifier), LocatorUtils.property(thatLocator, "taxIdentifier", rhsTaxIdentifier), lhsTaxIdentifier, rhsTaxIdentifier, (this.taxIdentifier!= null), (that.taxIdentifier!= null))) { return false; } } @@ -1028,7 +1028,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxIdEffectiveDate = this.getTaxIdEffectiveDate(); Date rhsTaxIdEffectiveDate; rhsTaxIdEffectiveDate = that.getTaxIdEffectiveDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxIdEffectiveDate", lhsTaxIdEffectiveDate), LocatorUtils.property(thatLocator, "taxIdEffectiveDate", rhsTaxIdEffectiveDate), lhsTaxIdEffectiveDate, rhsTaxIdEffectiveDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxIdEffectiveDate", lhsTaxIdEffectiveDate), LocatorUtils.property(thatLocator, "taxIdEffectiveDate", rhsTaxIdEffectiveDate), lhsTaxIdEffectiveDate, rhsTaxIdEffectiveDate, (this.taxIdEffectiveDate!= null), (that.taxIdEffectiveDate!= null))) { return false; } } @@ -1037,7 +1037,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBusinessNumber = this.getBusinessNumber(); String rhsBusinessNumber; rhsBusinessNumber = that.getBusinessNumber(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "businessNumber", lhsBusinessNumber), LocatorUtils.property(thatLocator, "businessNumber", rhsBusinessNumber), lhsBusinessNumber, rhsBusinessNumber)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "businessNumber", lhsBusinessNumber), LocatorUtils.property(thatLocator, "businessNumber", rhsBusinessNumber), lhsBusinessNumber, rhsBusinessNumber, (this.businessNumber!= null), (that.businessNumber!= null))) { return false; } } @@ -1046,7 +1046,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -1055,7 +1055,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorTypeRef = this.getVendorTypeRef(); ReferenceType rhsVendorTypeRef; rhsVendorTypeRef = that.getVendorTypeRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorTypeRef", lhsVendorTypeRef), LocatorUtils.property(thatLocator, "vendorTypeRef", rhsVendorTypeRef), lhsVendorTypeRef, rhsVendorTypeRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorTypeRef", lhsVendorTypeRef), LocatorUtils.property(thatLocator, "vendorTypeRef", rhsVendorTypeRef), lhsVendorTypeRef, rhsVendorTypeRef, (this.vendorTypeRef!= null), (that.vendorTypeRef!= null))) { return false; } } @@ -1064,7 +1064,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTermRef = this.getTermRef(); ReferenceType rhsTermRef; rhsTermRef = that.getTermRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "termRef", lhsTermRef), LocatorUtils.property(thatLocator, "termRef", rhsTermRef), lhsTermRef, rhsTermRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "termRef", lhsTermRef), LocatorUtils.property(thatLocator, "termRef", rhsTermRef), lhsTermRef, rhsTermRef, (this.termRef!= null), (that.termRef!= null))) { return false; } } @@ -1073,7 +1073,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPrefillAccountRef = this.getPrefillAccountRef(); ReferenceType rhsPrefillAccountRef; rhsPrefillAccountRef = that.getPrefillAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "prefillAccountRef", lhsPrefillAccountRef), LocatorUtils.property(thatLocator, "prefillAccountRef", rhsPrefillAccountRef), lhsPrefillAccountRef, rhsPrefillAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "prefillAccountRef", lhsPrefillAccountRef), LocatorUtils.property(thatLocator, "prefillAccountRef", rhsPrefillAccountRef), lhsPrefillAccountRef, rhsPrefillAccountRef, (this.prefillAccountRef!= null), (that.prefillAccountRef!= null))) { return false; } } @@ -1082,7 +1082,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBalance = this.getBalance(); BigDecimal rhsBalance; rhsBalance = that.getBalance(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -1091,7 +1091,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillRate = this.getBillRate(); BigDecimal rhsBillRate; rhsBillRate = that.getBillRate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billRate", lhsBillRate), LocatorUtils.property(thatLocator, "billRate", rhsBillRate), lhsBillRate, rhsBillRate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billRate", lhsBillRate), LocatorUtils.property(thatLocator, "billRate", rhsBillRate), lhsBillRate, rhsBillRate, (this.billRate!= null), (that.billRate!= null))) { return false; } } @@ -1100,7 +1100,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsOpenBalanceDate = this.getOpenBalanceDate(); Date rhsOpenBalanceDate; rhsOpenBalanceDate = that.getOpenBalanceDate(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "openBalanceDate", lhsOpenBalanceDate), LocatorUtils.property(thatLocator, "openBalanceDate", rhsOpenBalanceDate), lhsOpenBalanceDate, rhsOpenBalanceDate)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "openBalanceDate", lhsOpenBalanceDate), LocatorUtils.property(thatLocator, "openBalanceDate", rhsOpenBalanceDate), lhsOpenBalanceDate, rhsOpenBalanceDate, (this.openBalanceDate!= null), (that.openBalanceDate!= null))) { return false; } } @@ -1109,7 +1109,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCreditLimit = this.getCreditLimit(); BigDecimal rhsCreditLimit; rhsCreditLimit = that.getCreditLimit(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "creditLimit", lhsCreditLimit), LocatorUtils.property(thatLocator, "creditLimit", rhsCreditLimit), lhsCreditLimit, rhsCreditLimit)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "creditLimit", lhsCreditLimit), LocatorUtils.property(thatLocator, "creditLimit", rhsCreditLimit), lhsCreditLimit, rhsCreditLimit, (this.creditLimit!= null), (that.creditLimit!= null))) { return false; } } @@ -1118,7 +1118,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAcctNum = this.getAcctNum(); String rhsAcctNum; rhsAcctNum = that.getAcctNum(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "acctNum", lhsAcctNum), LocatorUtils.property(thatLocator, "acctNum", rhsAcctNum), lhsAcctNum, rhsAcctNum, (this.acctNum!= null), (that.acctNum!= null))) { return false; } } @@ -1127,7 +1127,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendor1099 = this.isVendor1099(); Boolean rhsVendor1099; rhsVendor1099 = that.isVendor1099(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor1099", lhsVendor1099), LocatorUtils.property(thatLocator, "vendor1099", rhsVendor1099), lhsVendor1099, rhsVendor1099)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendor1099", lhsVendor1099), LocatorUtils.property(thatLocator, "vendor1099", rhsVendor1099), lhsVendor1099, rhsVendor1099, (this.vendor1099 != null), (that.vendor1099 != null))) { return false; } } @@ -1136,7 +1136,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsT4AEligible = this.isT4AEligible(); Boolean rhsT4AEligible; rhsT4AEligible = that.isT4AEligible(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "t4AEligible", lhsT4AEligible), LocatorUtils.property(thatLocator, "t4AEligible", rhsT4AEligible), lhsT4AEligible, rhsT4AEligible)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "t4AEligible", lhsT4AEligible), LocatorUtils.property(thatLocator, "t4AEligible", rhsT4AEligible), lhsT4AEligible, rhsT4AEligible, (this.t4AEligible!= null), (that.t4AEligible!= null))) { return false; } } @@ -1145,7 +1145,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsT5018Eligible = this.isT5018Eligible(); Boolean rhsT5018Eligible; rhsT5018Eligible = that.isT5018Eligible(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "t5018Eligible", lhsT5018Eligible), LocatorUtils.property(thatLocator, "t5018Eligible", rhsT5018Eligible), lhsT5018Eligible, rhsT5018Eligible)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "t5018Eligible", lhsT5018Eligible), LocatorUtils.property(thatLocator, "t5018Eligible", rhsT5018Eligible), lhsT5018Eligible, rhsT5018Eligible, (this.t5018Eligible!= null), (that.t5018Eligible!= null))) { return false; } } @@ -1154,7 +1154,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCurrencyRef = this.getCurrencyRef(); ReferenceType rhsCurrencyRef; rhsCurrencyRef = that.getCurrencyRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "currencyRef", lhsCurrencyRef), LocatorUtils.property(thatLocator, "currencyRef", rhsCurrencyRef), lhsCurrencyRef, rhsCurrencyRef, (this.currencyRef!= null), (that.currencyRef!= null))) { return false; } } @@ -1163,7 +1163,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSEnabled = this.isTDSEnabled(); Boolean rhsTDSEnabled; rhsTDSEnabled = that.isTDSEnabled(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEnabled", lhsTDSEnabled), LocatorUtils.property(thatLocator, "tdsEnabled", rhsTDSEnabled), lhsTDSEnabled, rhsTDSEnabled)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEnabled", lhsTDSEnabled), LocatorUtils.property(thatLocator, "tdsEnabled", rhsTDSEnabled), lhsTDSEnabled, rhsTDSEnabled, (this.tdsEnabled!= null), (that.tdsEnabled!= null))) { return false; } } @@ -1172,7 +1172,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSEntityTypeId = this.getTDSEntityTypeId(); Integer rhsTDSEntityTypeId; rhsTDSEntityTypeId = that.getTDSEntityTypeId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEntityTypeId", lhsTDSEntityTypeId), LocatorUtils.property(thatLocator, "tdsEntityTypeId", rhsTDSEntityTypeId), lhsTDSEntityTypeId, rhsTDSEntityTypeId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsEntityTypeId", lhsTDSEntityTypeId), LocatorUtils.property(thatLocator, "tdsEntityTypeId", rhsTDSEntityTypeId), lhsTDSEntityTypeId, rhsTDSEntityTypeId, (this.tdsEntityTypeId!= null), (that.tdsEntityTypeId!= null))) { return false; } } @@ -1181,7 +1181,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSSectionTypeId = this.getTDSSectionTypeId(); Integer rhsTDSSectionTypeId; rhsTDSSectionTypeId = that.getTDSSectionTypeId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypeId", lhsTDSSectionTypeId), LocatorUtils.property(thatLocator, "tdsSectionTypeId", rhsTDSSectionTypeId), lhsTDSSectionTypeId, rhsTDSSectionTypeId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsSectionTypeId", lhsTDSSectionTypeId), LocatorUtils.property(thatLocator, "tdsSectionTypeId", rhsTDSSectionTypeId), lhsTDSSectionTypeId, rhsTDSSectionTypeId, (this.tdsSectionTypeId!= null), (that.tdsSectionTypeId!= null))) { return false; } } @@ -1190,7 +1190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTDSOverrideThreshold = this.isTDSOverrideThreshold(); Boolean rhsTDSOverrideThreshold; rhsTDSOverrideThreshold = that.isTDSOverrideThreshold(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsOverrideThreshold", lhsTDSOverrideThreshold), LocatorUtils.property(thatLocator, "tdsOverrideThreshold", rhsTDSOverrideThreshold), lhsTDSOverrideThreshold, rhsTDSOverrideThreshold)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tdsOverrideThreshold", lhsTDSOverrideThreshold), LocatorUtils.property(thatLocator, "tdsOverrideThreshold", rhsTDSOverrideThreshold), lhsTDSOverrideThreshold, rhsTDSOverrideThreshold, (this.tdsOverrideThreshold!= null), (that.tdsOverrideThreshold!= null))) { return false; } } @@ -1199,7 +1199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTaxReportingBasis = this.getTaxReportingBasis(); String rhsTaxReportingBasis; rhsTaxReportingBasis = that.getTaxReportingBasis(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "taxReportingBasis", lhsTaxReportingBasis), LocatorUtils.property(thatLocator, "taxReportingBasis", rhsTaxReportingBasis), lhsTaxReportingBasis, rhsTaxReportingBasis)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "taxReportingBasis", lhsTaxReportingBasis), LocatorUtils.property(thatLocator, "taxReportingBasis", rhsTaxReportingBasis), lhsTaxReportingBasis, rhsTaxReportingBasis, (this.taxReportingBasis!= null), (that.taxReportingBasis!= null))) { return false; } } @@ -1208,7 +1208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAPAccountRef = this.getAPAccountRef(); ReferenceType rhsAPAccountRef; rhsAPAccountRef = that.getAPAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "apAccountRef", lhsAPAccountRef), LocatorUtils.property(thatLocator, "apAccountRef", rhsAPAccountRef), lhsAPAccountRef, rhsAPAccountRef, (this.apAccountRef!= null), (that.apAccountRef!= null))) { return false; } } @@ -1217,7 +1217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorEx = this.getVendorEx(); IntuitAnyType rhsVendorEx; rhsVendorEx = that.getVendorEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorEx", lhsVendorEx), LocatorUtils.property(thatLocator, "vendorEx", rhsVendorEx), lhsVendorEx, rhsVendorEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorEx", lhsVendorEx), LocatorUtils.property(thatLocator, "vendorEx", rhsVendorEx), lhsVendorEx, rhsVendorEx, (this.vendorEx!= null), (that.vendorEx!= null))) { return false; } } @@ -1225,167 +1225,167 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theContactName; theContactName = this.getContactName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactName", theContactName), currentHashCode, theContactName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contactName", theContactName), currentHashCode, theContactName, (this.contactName!= null)); } { String theAltContactName; theAltContactName = this.getAltContactName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "altContactName", theAltContactName), currentHashCode, theAltContactName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "altContactName", theAltContactName), currentHashCode, theAltContactName, (this.altContactName!= null)); } { String theNotes; theNotes = this.getNotes(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "notes", theNotes), currentHashCode, theNotes, (this.notes!= null)); } { PhysicalAddress theBillAddr; theBillAddr = this.getBillAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billAddr", theBillAddr), currentHashCode, theBillAddr, (this.billAddr!= null)); } { PhysicalAddress theShipAddr; theShipAddr = this.getShipAddr(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "shipAddr", theShipAddr), currentHashCode, theShipAddr, (this.shipAddr!= null)); } { List theOtherAddr; theOtherAddr = (((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))?this.getOtherAddr():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "otherAddr", theOtherAddr), currentHashCode, theOtherAddr, ((this.otherAddr!= null)&&(!this.otherAddr.isEmpty()))); } { String theTaxCountry; theTaxCountry = this.getTaxCountry(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCountry", theTaxCountry), currentHashCode, theTaxCountry); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxCountry", theTaxCountry), currentHashCode, theTaxCountry, (this.taxCountry!= null)); } { String theTaxIdentifier; theTaxIdentifier = this.getTaxIdentifier(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxIdentifier", theTaxIdentifier), currentHashCode, theTaxIdentifier); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxIdentifier", theTaxIdentifier), currentHashCode, theTaxIdentifier, (this.taxIdentifier!= null)); } { Date theTaxIdEffectiveDate; theTaxIdEffectiveDate = this.getTaxIdEffectiveDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxIdEffectiveDate", theTaxIdEffectiveDate), currentHashCode, theTaxIdEffectiveDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxIdEffectiveDate", theTaxIdEffectiveDate), currentHashCode, theTaxIdEffectiveDate, (this.taxIdEffectiveDate!= null)); } { String theBusinessNumber; theBusinessNumber = this.getBusinessNumber(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "businessNumber", theBusinessNumber), currentHashCode, theBusinessNumber); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "businessNumber", theBusinessNumber), currentHashCode, theBusinessNumber, (this.businessNumber!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { ReferenceType theVendorTypeRef; theVendorTypeRef = this.getVendorTypeRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorTypeRef", theVendorTypeRef), currentHashCode, theVendorTypeRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorTypeRef", theVendorTypeRef), currentHashCode, theVendorTypeRef, (this.vendorTypeRef!= null)); } { ReferenceType theTermRef; theTermRef = this.getTermRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "termRef", theTermRef), currentHashCode, theTermRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "termRef", theTermRef), currentHashCode, theTermRef, (this.termRef!= null)); } { ReferenceType thePrefillAccountRef; thePrefillAccountRef = this.getPrefillAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prefillAccountRef", thePrefillAccountRef), currentHashCode, thePrefillAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "prefillAccountRef", thePrefillAccountRef), currentHashCode, thePrefillAccountRef, (this.prefillAccountRef!= null)); } { BigDecimal theBalance; theBalance = this.getBalance(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } { BigDecimal theBillRate; theBillRate = this.getBillRate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billRate", theBillRate), currentHashCode, theBillRate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billRate", theBillRate), currentHashCode, theBillRate, (this.billRate!= null)); } { Date theOpenBalanceDate; theOpenBalanceDate = this.getOpenBalanceDate(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openBalanceDate", theOpenBalanceDate), currentHashCode, theOpenBalanceDate); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "openBalanceDate", theOpenBalanceDate), currentHashCode, theOpenBalanceDate, (this.openBalanceDate!= null)); } { BigDecimal theCreditLimit; theCreditLimit = this.getCreditLimit(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditLimit", theCreditLimit), currentHashCode, theCreditLimit); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "creditLimit", theCreditLimit), currentHashCode, theCreditLimit, (this.creditLimit!= null)); } { String theAcctNum; theAcctNum = this.getAcctNum(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acctNum", theAcctNum), currentHashCode, theAcctNum, (this.acctNum!= null)); } { Boolean theVendor1099; theVendor1099 = this.isVendor1099(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor1099", theVendor1099), currentHashCode, theVendor1099); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendor1099", theVendor1099), currentHashCode, theVendor1099, (this.vendor1099 != null)); } { Boolean theT4AEligible; theT4AEligible = this.isT4AEligible(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "t4AEligible", theT4AEligible), currentHashCode, theT4AEligible); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "t4AEligible", theT4AEligible), currentHashCode, theT4AEligible, (this.t4AEligible!= null)); } { Boolean theT5018Eligible; theT5018Eligible = this.isT5018Eligible(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "t5018Eligible", theT5018Eligible), currentHashCode, theT5018Eligible); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "t5018Eligible", theT5018Eligible), currentHashCode, theT5018Eligible, (this.t5018Eligible!= null)); } { ReferenceType theCurrencyRef; theCurrencyRef = this.getCurrencyRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "currencyRef", theCurrencyRef), currentHashCode, theCurrencyRef, (this.currencyRef!= null)); } { Boolean theTDSEnabled; theTDSEnabled = this.isTDSEnabled(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEnabled", theTDSEnabled), currentHashCode, theTDSEnabled); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEnabled", theTDSEnabled), currentHashCode, theTDSEnabled, (this.tdsEnabled!= null)); } { Integer theTDSEntityTypeId; theTDSEntityTypeId = this.getTDSEntityTypeId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEntityTypeId", theTDSEntityTypeId), currentHashCode, theTDSEntityTypeId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsEntityTypeId", theTDSEntityTypeId), currentHashCode, theTDSEntityTypeId, (this.tdsEntityTypeId!= null)); } { Integer theTDSSectionTypeId; theTDSSectionTypeId = this.getTDSSectionTypeId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypeId", theTDSSectionTypeId), currentHashCode, theTDSSectionTypeId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsSectionTypeId", theTDSSectionTypeId), currentHashCode, theTDSSectionTypeId, (this.tdsSectionTypeId!= null)); } { Boolean theTDSOverrideThreshold; theTDSOverrideThreshold = this.isTDSOverrideThreshold(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsOverrideThreshold", theTDSOverrideThreshold), currentHashCode, theTDSOverrideThreshold); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tdsOverrideThreshold", theTDSOverrideThreshold), currentHashCode, theTDSOverrideThreshold, (this.tdsOverrideThreshold!= null)); } { String theTaxReportingBasis; theTaxReportingBasis = this.getTaxReportingBasis(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxReportingBasis", theTaxReportingBasis), currentHashCode, theTaxReportingBasis); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "taxReportingBasis", theTaxReportingBasis), currentHashCode, theTaxReportingBasis, (this.taxReportingBasis!= null)); } { ReferenceType theAPAccountRef; theAPAccountRef = this.getAPAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "apAccountRef", theAPAccountRef), currentHashCode, theAPAccountRef, (this.apAccountRef!= null)); } { IntuitAnyType theVendorEx; theVendorEx = this.getVendorEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorEx", theVendorEx), currentHashCode, theVendorEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorEx", theVendorEx), currentHashCode, theVendorEx, (this.vendorEx!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorAndPurchasesPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorAndPurchasesPrefs.java index 7df689b1..66c3e416 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorAndPurchasesPrefs.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorAndPurchasesPrefs.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -31,10 +31,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; @@ -91,8 +91,7 @@ "daysBillsAreDue", "discountAccountRef" }) -public class VendorAndPurchasesPrefs - implements Serializable, Equals, HashCode +public class VendorAndPurchasesPrefs implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -452,8 +451,8 @@ public void setPOCustomField(List poCustomField) { this.poCustomField = poCustomField; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof VendorAndPurchasesPrefs)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -465,7 +464,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsEnableBills = this.isEnableBills(); Boolean rhsEnableBills; rhsEnableBills = that.isEnableBills(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "enableBills", lhsEnableBills), LocatorUtils.property(thatLocator, "enableBills", rhsEnableBills), lhsEnableBills, rhsEnableBills)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "enableBills", lhsEnableBills), LocatorUtils.property(thatLocator, "enableBills", rhsEnableBills), lhsEnableBills, rhsEnableBills, (this.enableBills!= null), (that.enableBills!= null))) { return false; } } @@ -474,7 +473,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTrackingByCustomer = this.isTrackingByCustomer(); Boolean rhsTrackingByCustomer; rhsTrackingByCustomer = that.isTrackingByCustomer(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingByCustomer", lhsTrackingByCustomer), LocatorUtils.property(thatLocator, "trackingByCustomer", rhsTrackingByCustomer), lhsTrackingByCustomer, rhsTrackingByCustomer)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "trackingByCustomer", lhsTrackingByCustomer), LocatorUtils.property(thatLocator, "trackingByCustomer", rhsTrackingByCustomer), lhsTrackingByCustomer, rhsTrackingByCustomer, (this.trackingByCustomer!= null), (that.trackingByCustomer!= null))) { return false; } } @@ -483,7 +482,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsBillableExpenseTracking = this.isBillableExpenseTracking(); Boolean rhsBillableExpenseTracking; rhsBillableExpenseTracking = that.isBillableExpenseTracking(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "billableExpenseTracking", lhsBillableExpenseTracking), LocatorUtils.property(thatLocator, "billableExpenseTracking", rhsBillableExpenseTracking), lhsBillableExpenseTracking, rhsBillableExpenseTracking)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "billableExpenseTracking", lhsBillableExpenseTracking), LocatorUtils.property(thatLocator, "billableExpenseTracking", rhsBillableExpenseTracking), lhsBillableExpenseTracking, rhsBillableExpenseTracking, (this.billableExpenseTracking!= null), (that.billableExpenseTracking!= null))) { return false; } } @@ -492,7 +491,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultTerms = this.getDefaultTerms(); ReferenceType rhsDefaultTerms; rhsDefaultTerms = that.getDefaultTerms(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTerms", lhsDefaultTerms), LocatorUtils.property(thatLocator, "defaultTerms", rhsDefaultTerms), lhsDefaultTerms, rhsDefaultTerms)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTerms", lhsDefaultTerms), LocatorUtils.property(thatLocator, "defaultTerms", rhsDefaultTerms), lhsDefaultTerms, rhsDefaultTerms, (this.defaultTerms!= null), (that.defaultTerms!= null))) { return false; } } @@ -501,7 +500,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultMarkup = this.getDefaultMarkup(); BigDecimal rhsDefaultMarkup; rhsDefaultMarkup = that.getDefaultMarkup(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkup", lhsDefaultMarkup), LocatorUtils.property(thatLocator, "defaultMarkup", rhsDefaultMarkup), lhsDefaultMarkup, rhsDefaultMarkup)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkup", lhsDefaultMarkup), LocatorUtils.property(thatLocator, "defaultMarkup", rhsDefaultMarkup), lhsDefaultMarkup, rhsDefaultMarkup, (this.defaultMarkup!= null), (that.defaultMarkup!= null))) { return false; } } @@ -510,7 +509,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefaultMarkupAccount = this.getDefaultMarkupAccount(); ReferenceType rhsDefaultMarkupAccount; rhsDefaultMarkupAccount = that.getDefaultMarkupAccount(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkupAccount", lhsDefaultMarkupAccount), LocatorUtils.property(thatLocator, "defaultMarkupAccount", rhsDefaultMarkupAccount), lhsDefaultMarkupAccount, rhsDefaultMarkupAccount)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultMarkupAccount", lhsDefaultMarkupAccount), LocatorUtils.property(thatLocator, "defaultMarkupAccount", rhsDefaultMarkupAccount), lhsDefaultMarkupAccount, rhsDefaultMarkupAccount, (this.defaultMarkupAccount!= null), (that.defaultMarkupAccount!= null))) { return false; } } @@ -519,7 +518,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsAutomaticBillPayment = this.isAutomaticBillPayment(); Boolean rhsAutomaticBillPayment; rhsAutomaticBillPayment = that.isAutomaticBillPayment(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "automaticBillPayment", lhsAutomaticBillPayment), LocatorUtils.property(thatLocator, "automaticBillPayment", rhsAutomaticBillPayment), lhsAutomaticBillPayment, rhsAutomaticBillPayment)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "automaticBillPayment", lhsAutomaticBillPayment), LocatorUtils.property(thatLocator, "automaticBillPayment", rhsAutomaticBillPayment), lhsAutomaticBillPayment, rhsAutomaticBillPayment, (this.automaticBillPayment!= null), (that.automaticBillPayment!= null))) { return false; } } @@ -528,7 +527,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsPOCustomField = (((this.poCustomField!= null)&&(!this.poCustomField.isEmpty()))?this.getPOCustomField():null); List rhsPOCustomField; rhsPOCustomField = (((that.poCustomField!= null)&&(!that.poCustomField.isEmpty()))?that.getPOCustomField():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "poCustomField", lhsPOCustomField), LocatorUtils.property(thatLocator, "poCustomField", rhsPOCustomField), lhsPOCustomField, rhsPOCustomField)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "poCustomField", lhsPOCustomField), LocatorUtils.property(thatLocator, "poCustomField", rhsPOCustomField), lhsPOCustomField, rhsPOCustomField, ((this.poCustomField!= null)&&(!this.poCustomField.isEmpty())), ((that.poCustomField!= null)&&(!that.poCustomField.isEmpty())))) { return false; } } @@ -537,7 +536,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMsgToVendors = this.getMsgToVendors(); String rhsMsgToVendors; rhsMsgToVendors = that.getMsgToVendors(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "msgToVendors", lhsMsgToVendors), LocatorUtils.property(thatLocator, "msgToVendors", rhsMsgToVendors), lhsMsgToVendors, rhsMsgToVendors)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "msgToVendors", lhsMsgToVendors), LocatorUtils.property(thatLocator, "msgToVendors", rhsMsgToVendors), lhsMsgToVendors, rhsMsgToVendors, (this.msgToVendors!= null), (that.msgToVendors!= null))) { return false; } } @@ -546,7 +545,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingInventory = this.isUsingInventory(); Boolean rhsUsingInventory; rhsUsingInventory = that.isUsingInventory(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingInventory", lhsUsingInventory), LocatorUtils.property(thatLocator, "usingInventory", rhsUsingInventory), lhsUsingInventory, rhsUsingInventory)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingInventory", lhsUsingInventory), LocatorUtils.property(thatLocator, "usingInventory", rhsUsingInventory), lhsUsingInventory, rhsUsingInventory, (this.usingInventory!= null), (that.usingInventory!= null))) { return false; } } @@ -555,7 +554,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsUsingMultiLocationInventory = this.isUsingMultiLocationInventory(); Boolean rhsUsingMultiLocationInventory; rhsUsingMultiLocationInventory = that.isUsingMultiLocationInventory(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "usingMultiLocationInventory", lhsUsingMultiLocationInventory), LocatorUtils.property(thatLocator, "usingMultiLocationInventory", rhsUsingMultiLocationInventory), lhsUsingMultiLocationInventory, rhsUsingMultiLocationInventory)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "usingMultiLocationInventory", lhsUsingMultiLocationInventory), LocatorUtils.property(thatLocator, "usingMultiLocationInventory", rhsUsingMultiLocationInventory), lhsUsingMultiLocationInventory, rhsUsingMultiLocationInventory, (this.usingMultiLocationInventory!= null), (that.usingMultiLocationInventory!= null))) { return false; } } @@ -564,7 +563,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDaysBillsAreDue = this.getDaysBillsAreDue(); Integer rhsDaysBillsAreDue; rhsDaysBillsAreDue = that.getDaysBillsAreDue(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "daysBillsAreDue", lhsDaysBillsAreDue), LocatorUtils.property(thatLocator, "daysBillsAreDue", rhsDaysBillsAreDue), lhsDaysBillsAreDue, rhsDaysBillsAreDue)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "daysBillsAreDue", lhsDaysBillsAreDue), LocatorUtils.property(thatLocator, "daysBillsAreDue", rhsDaysBillsAreDue), lhsDaysBillsAreDue, rhsDaysBillsAreDue, (this.daysBillsAreDue!= null), (that.daysBillsAreDue!= null))) { return false; } } @@ -573,7 +572,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDiscountAccountRef = this.getDiscountAccountRef(); ReferenceType rhsDiscountAccountRef; rhsDiscountAccountRef = that.getDiscountAccountRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAccountRef", lhsDiscountAccountRef), LocatorUtils.property(thatLocator, "discountAccountRef", rhsDiscountAccountRef), lhsDiscountAccountRef, rhsDiscountAccountRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "discountAccountRef", lhsDiscountAccountRef), LocatorUtils.property(thatLocator, "discountAccountRef", rhsDiscountAccountRef), lhsDiscountAccountRef, rhsDiscountAccountRef, (this.discountAccountRef!= null), (that.discountAccountRef!= null))) { return false; } } @@ -581,82 +580,82 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { Boolean theEnableBills; theEnableBills = this.isEnableBills(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enableBills", theEnableBills), currentHashCode, theEnableBills); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enableBills", theEnableBills), currentHashCode, theEnableBills, (this.enableBills!= null)); } { Boolean theTrackingByCustomer; theTrackingByCustomer = this.isTrackingByCustomer(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingByCustomer", theTrackingByCustomer), currentHashCode, theTrackingByCustomer); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trackingByCustomer", theTrackingByCustomer), currentHashCode, theTrackingByCustomer, (this.trackingByCustomer!= null)); } { Boolean theBillableExpenseTracking; theBillableExpenseTracking = this.isBillableExpenseTracking(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableExpenseTracking", theBillableExpenseTracking), currentHashCode, theBillableExpenseTracking); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "billableExpenseTracking", theBillableExpenseTracking), currentHashCode, theBillableExpenseTracking, (this.billableExpenseTracking!= null)); } { ReferenceType theDefaultTerms; theDefaultTerms = this.getDefaultTerms(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTerms", theDefaultTerms), currentHashCode, theDefaultTerms); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTerms", theDefaultTerms), currentHashCode, theDefaultTerms, (this.defaultTerms!= null)); } { BigDecimal theDefaultMarkup; theDefaultMarkup = this.getDefaultMarkup(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkup", theDefaultMarkup), currentHashCode, theDefaultMarkup); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkup", theDefaultMarkup), currentHashCode, theDefaultMarkup, (this.defaultMarkup!= null)); } { ReferenceType theDefaultMarkupAccount; theDefaultMarkupAccount = this.getDefaultMarkupAccount(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkupAccount", theDefaultMarkupAccount), currentHashCode, theDefaultMarkupAccount); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultMarkupAccount", theDefaultMarkupAccount), currentHashCode, theDefaultMarkupAccount, (this.defaultMarkupAccount!= null)); } { Boolean theAutomaticBillPayment; theAutomaticBillPayment = this.isAutomaticBillPayment(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "automaticBillPayment", theAutomaticBillPayment), currentHashCode, theAutomaticBillPayment); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "automaticBillPayment", theAutomaticBillPayment), currentHashCode, theAutomaticBillPayment, (this.automaticBillPayment!= null)); } { List thePOCustomField; thePOCustomField = (((this.poCustomField!= null)&&(!this.poCustomField.isEmpty()))?this.getPOCustomField():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poCustomField", thePOCustomField), currentHashCode, thePOCustomField); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "poCustomField", thePOCustomField), currentHashCode, thePOCustomField, ((this.poCustomField!= null)&&(!this.poCustomField.isEmpty()))); } { String theMsgToVendors; theMsgToVendors = this.getMsgToVendors(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "msgToVendors", theMsgToVendors), currentHashCode, theMsgToVendors); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "msgToVendors", theMsgToVendors), currentHashCode, theMsgToVendors, (this.msgToVendors!= null)); } { Boolean theUsingInventory; theUsingInventory = this.isUsingInventory(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingInventory", theUsingInventory), currentHashCode, theUsingInventory); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingInventory", theUsingInventory), currentHashCode, theUsingInventory, (this.usingInventory!= null)); } { Boolean theUsingMultiLocationInventory; theUsingMultiLocationInventory = this.isUsingMultiLocationInventory(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingMultiLocationInventory", theUsingMultiLocationInventory), currentHashCode, theUsingMultiLocationInventory); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "usingMultiLocationInventory", theUsingMultiLocationInventory), currentHashCode, theUsingMultiLocationInventory, (this.usingMultiLocationInventory!= null)); } { Integer theDaysBillsAreDue; theDaysBillsAreDue = this.getDaysBillsAreDue(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "daysBillsAreDue", theDaysBillsAreDue), currentHashCode, theDaysBillsAreDue); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "daysBillsAreDue", theDaysBillsAreDue), currentHashCode, theDaysBillsAreDue, (this.daysBillsAreDue!= null)); } { ReferenceType theDiscountAccountRef; theDiscountAccountRef = this.getDiscountAccountRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAccountRef", theDiscountAccountRef), currentHashCode, theDiscountAccountRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "discountAccountRef", theDiscountAccountRef), currentHashCode, theDiscountAccountRef, (this.discountAccountRef!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorCredit.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorCredit.java index 429cc6e2..24af1dfc 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorCredit.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorCredit.java @@ -17,21 +17,22 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // package com.intuit.ipp.data; import java.io.Serializable; +import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAccessType; 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; @@ -53,6 +54,7 @@ * <extension base="{http://schema.intuit.com/finance/v3}PurchaseByVendor"> * <sequence> * <element name="VendorCreditEx" type="{http://schema.intuit.com/finance/v3}IntuitAnyType" minOccurs="0"/> + * <element name="Balance" type="{http://www.w3.org/2001/XMLSchema}decimal" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -63,16 +65,19 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "VendorCredit", propOrder = { - "vendorCreditEx" + "vendorCreditEx", + "balance" }) public class VendorCredit extends PurchaseByVendor - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @XmlElement(name = "VendorCreditEx") protected IntuitAnyType vendorCreditEx; + @XmlElement(name = "Balance") + protected BigDecimal balance; /** * Gets the value of the vendorCreditEx property. @@ -98,8 +103,32 @@ public void setVendorCreditEx(IntuitAnyType value) { this.vendorCreditEx = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof VendorCredit)) { + /** + * Gets the value of the balance property. + * + * @return + * possible object is + * {@link BigDecimal } + * + */ + public BigDecimal getBalance() { + return balance; + } + + /** + * Sets the value of the balance property. + * + * @param value + * allowed object is + * {@link BigDecimal } + * + */ + public void setBalance(BigDecimal value) { + this.balance = value; + } + + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -114,7 +143,16 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsVendorCreditEx = this.getVendorCreditEx(); IntuitAnyType rhsVendorCreditEx; rhsVendorCreditEx = that.getVendorCreditEx(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorCreditEx", lhsVendorCreditEx), LocatorUtils.property(thatLocator, "vendorCreditEx", rhsVendorCreditEx), lhsVendorCreditEx, rhsVendorCreditEx)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "vendorCreditEx", lhsVendorCreditEx), LocatorUtils.property(thatLocator, "vendorCreditEx", rhsVendorCreditEx), lhsVendorCreditEx, rhsVendorCreditEx, (this.vendorCreditEx!= null), (that.vendorCreditEx!= null))) { + return false; + } + } + { + BigDecimal lhsBalance; + lhsBalance = this.getBalance(); + BigDecimal rhsBalance; + rhsBalance = that.getBalance(); + if (!strategy.equals(LocatorUtils.property(thisLocator, "balance", lhsBalance), LocatorUtils.property(thatLocator, "balance", rhsBalance), lhsBalance, rhsBalance, (this.balance!= null), (that.balance!= null))) { return false; } } @@ -122,22 +160,27 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { IntuitAnyType theVendorCreditEx; theVendorCreditEx = this.getVendorCreditEx(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorCreditEx", theVendorCreditEx), currentHashCode, theVendorCreditEx); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vendorCreditEx", theVendorCreditEx), currentHashCode, theVendorCreditEx, (this.vendorCreditEx!= null)); + } + { + BigDecimal theBalance; + theBalance = this.getBalance(); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "balance", theBalance), currentHashCode, theBalance, (this.balance!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorType.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorType.java index fea6585d..e9bd8e7b 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorType.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/VendorType.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -28,10 +28,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; @@ -71,7 +71,7 @@ }) public class VendorType extends IntuitEntity - implements Serializable, Equals, HashCode + implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -180,8 +180,8 @@ public void setActive(Boolean value) { this.active = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof VendorType)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -196,7 +196,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsName = this.getName(); String rhsName; rhsName = that.getName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName, (this.name!= null), (that.name!= null))) { return false; } } @@ -205,7 +205,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsParentRef = this.getParentRef(); ReferenceType rhsParentRef; rhsParentRef = that.getParentRef(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "parentRef", lhsParentRef), LocatorUtils.property(thatLocator, "parentRef", rhsParentRef), lhsParentRef, rhsParentRef, (this.parentRef!= null), (that.parentRef!= null))) { return false; } } @@ -214,7 +214,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsFullyQualifiedName = this.getFullyQualifiedName(); String rhsFullyQualifiedName; rhsFullyQualifiedName = that.getFullyQualifiedName(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "fullyQualifiedName", lhsFullyQualifiedName), LocatorUtils.property(thatLocator, "fullyQualifiedName", rhsFullyQualifiedName), lhsFullyQualifiedName, rhsFullyQualifiedName, (this.fullyQualifiedName!= null), (that.fullyQualifiedName!= null))) { return false; } } @@ -223,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsActive = this.isActive(); Boolean rhsActive; rhsActive = that.isActive(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "active", lhsActive), LocatorUtils.property(thatLocator, "active", rhsActive), lhsActive, rhsActive, (this.active!= null), (that.active!= null))) { return false; } } @@ -231,37 +231,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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 = super.hashCode(locator, strategy); { String theName; theName = this.getName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName, (this.name!= null)); } { ReferenceType theParentRef; theParentRef = this.getParentRef(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parentRef", theParentRef), currentHashCode, theParentRef, (this.parentRef!= null)); } { String theFullyQualifiedName; theFullyQualifiedName = this.getFullyQualifiedName(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fullyQualifiedName", theFullyQualifiedName), currentHashCode, theFullyQualifiedName, (this.fullyQualifiedName!= null)); } { Boolean theActive; theActive = this.isActive(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "active", theActive), currentHashCode, theActive, (this.active!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warning.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warning.java index 1eb0d996..b0f58819 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warning.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warning.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlAttribute; 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; @@ -68,8 +68,7 @@ "message", "detail" }) -public class Warning - implements Serializable, Equals, HashCode +public class Warning implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -178,8 +177,8 @@ public void setElement(String value) { this.element = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Warning)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -191,7 +190,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsMessage = this.getMessage(); String rhsMessage; rhsMessage = that.getMessage(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "message", lhsMessage), LocatorUtils.property(thatLocator, "message", rhsMessage), lhsMessage, rhsMessage, (this.message!= null), (that.message!= null))) { return false; } } @@ -200,7 +199,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDetail = this.getDetail(); String rhsDetail; rhsDetail = that.getDetail(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "detail", lhsDetail), LocatorUtils.property(thatLocator, "detail", rhsDetail), lhsDetail, rhsDetail)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "detail", lhsDetail), LocatorUtils.property(thatLocator, "detail", rhsDetail), lhsDetail, rhsDetail, (this.detail!= null), (that.detail!= null))) { return false; } } @@ -209,7 +208,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsCode = this.getCode(); String rhsCode; rhsCode = that.getCode(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "code", lhsCode), LocatorUtils.property(thatLocator, "code", rhsCode), lhsCode, rhsCode, (this.code!= null), (that.code!= null))) { return false; } } @@ -218,7 +217,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsElement = this.getElement(); String rhsElement; rhsElement = that.getElement(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "element", lhsElement), LocatorUtils.property(thatLocator, "element", rhsElement), lhsElement, rhsElement)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "element", lhsElement), LocatorUtils.property(thatLocator, "element", rhsElement), lhsElement, rhsElement, (this.element!= null), (that.element!= null))) { return false; } } @@ -226,37 +225,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theMessage; theMessage = this.getMessage(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "message", theMessage), currentHashCode, theMessage, (this.message!= null)); } { String theDetail; theDetail = this.getDetail(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detail", theDetail), currentHashCode, theDetail); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "detail", theDetail), currentHashCode, theDetail, (this.detail!= null)); } { String theCode; theCode = this.getCode(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "code", theCode), currentHashCode, theCode, (this.code!= null)); } { String theElement; theElement = this.getElement(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "element", theElement), currentHashCode, theElement); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "element", theElement), currentHashCode, theElement, (this.element!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warnings.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warnings.java index 67c9bc2d..9eb9ac07 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warnings.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Warnings.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @@ -30,10 +30,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; @@ -65,8 +65,7 @@ @XmlType(name = "Warnings", propOrder = { "warning" }) -public class Warnings - implements Serializable, Equals, HashCode +public class Warnings implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -114,8 +113,8 @@ public void setWarning(List warning) { this.warning = warning; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof Warnings)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -127,7 +126,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsWarning = (((this.warning!= null)&&(!this.warning.isEmpty()))?this.getWarning():null); List rhsWarning; rhsWarning = (((that.warning!= null)&&(!that.warning.isEmpty()))?that.getWarning():null); - if (!strategy.equals(LocatorUtils.property(thisLocator, "warning", lhsWarning), LocatorUtils.property(thatLocator, "warning", rhsWarning), lhsWarning, rhsWarning)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "warning", lhsWarning), LocatorUtils.property(thatLocator, "warning", rhsWarning), lhsWarning, rhsWarning, ((this.warning!= null)&&(!this.warning.isEmpty())), ((that.warning!= null)&&(!that.warning.isEmpty())))) { return false; } } @@ -135,22 +134,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { List theWarning; theWarning = (((this.warning!= null)&&(!this.warning.isEmpty()))?this.getWarning():null); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warning", theWarning), currentHashCode, theWarning); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "warning", theWarning), currentHashCode, theWarning, ((this.warning!= null)&&(!this.warning.isEmpty()))); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WebSiteAddress.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WebSiteAddress.java index d1f67c15..fc863c04 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WebSiteAddress.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WebSiteAddress.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; 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; @@ -73,8 +73,7 @@ "_default", "tag" }) -public class WebSiteAddress - implements Serializable, Equals, HashCode +public class WebSiteAddress implements Serializable, Equals2, HashCode2 { private final static long serialVersionUID = 1L; @@ -184,8 +183,8 @@ public void setTag(String value) { this.tag = value; } - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { - if (!(object instanceof WebSiteAddress)) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { + if ((object == null)||(this.getClass()!= object.getClass())) { return false; } if (this == object) { @@ -197,7 +196,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, (this.id!= null), (that.id!= null))) { return false; } } @@ -206,7 +205,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsURI = this.getURI(); String rhsURI; rhsURI = that.getURI(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "uri", lhsURI), LocatorUtils.property(thatLocator, "uri", rhsURI), lhsURI, rhsURI)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "uri", lhsURI), LocatorUtils.property(thatLocator, "uri", rhsURI), lhsURI, rhsURI, (this.uri!= null), (that.uri!= null))) { return false; } } @@ -215,7 +214,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsDefault = this.isDefault(); Boolean rhsDefault; rhsDefault = that.isDefault(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "_default", lhsDefault), LocatorUtils.property(thatLocator, "_default", rhsDefault), lhsDefault, rhsDefault, (this._default!= null), (that._default!= null))) { return false; } } @@ -224,7 +223,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsTag = this.getTag(); String rhsTag; rhsTag = that.getTag(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "tag", lhsTag), LocatorUtils.property(thatLocator, "tag", rhsTag), lhsTag, rhsTag, (this.tag!= null), (that.tag!= null))) { return false; } } @@ -232,37 +231,37 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } 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; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, (this.id!= null)); } { String theURI; theURI = this.getURI(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uri", theURI), currentHashCode, theURI); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "uri", theURI), currentHashCode, theURI, (this.uri!= null)); } { Boolean theDefault; theDefault = this.isDefault(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "_default", theDefault), currentHashCode, theDefault, (this._default!= null)); } { String theTag; theTag = this.getTag(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "tag", theTag), currentHashCode, theTag, (this.tag!= null)); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE; return this.hashCode(null, strategy); } diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WeekEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WeekEnum.java index 53f37c77..a1827ff5 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WeekEnum.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WeekEnum.java @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/package-info.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/package-info.java index ba75e0f5..d0fe2b24 100644 --- a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/package-info.java +++ b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/package-info.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 // See http://java.sun.com/xml/jaxb // 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 // @javax.xml.bind.annotation.XmlSchema(namespace = "http://schema.intuit.com/finance/v3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/ipp-v3-java-data/src/main/xsd/Finance.xsd b/ipp-v3-java-data/src/main/xsd/Finance.xsd index 0380ff00..b6c8049f 100644 --- a/ipp-v3-java-data/src/main/xsd/Finance.xsd +++ b/ipp-v3-java-data/src/main/xsd/Finance.xsd @@ -7266,6 +7266,19 @@ Bill extensible element to qualify account. + + + + Product: ALL + Description: The unpaid amount of the bill. When paid-in-full, balance will + be zero. + [b]QuickBooks Notes[/b][br /] + Non QB-writable. + Filterable: QBW + Sortable: QBW + + + diff --git a/ipp-v3-java-devkit-assembly/pom.xml b/ipp-v3-java-devkit-assembly/pom.xml index ffe5d78f..840eac22 100755 --- a/ipp-v3-java-devkit-assembly/pom.xml +++ b/ipp-v3-java-devkit-assembly/pom.xml @@ -15,17 +15,17 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 2.9.5 + 2.9.6 ipp-v3-java-devkit-assembly pom IPP Java Devkit Assembly (${project.version}) IPP Java V3 DevKit assembly - 2.9.5 + 2.9.6 - 2.9.5 - 2.9.5 + 2.9.6 + 2.9.6 diff --git a/ipp-v3-java-devkit-javadoc/allclasses-frame.html b/ipp-v3-java-devkit-javadoc/allclasses-frame.html index 8a8fefe5..b07c7e8e 100644 --- a/ipp-v3-java-devkit-javadoc/allclasses-frame.html +++ b/ipp-v3-java-devkit-javadoc/allclasses-frame.html @@ -2,10 +2,10 @@ - + -All Classes (IPP V3 Java DevKit 2.9.5 API) - +All Classes (IPP V3 Java DevKit 2.9.6 API) + diff --git a/ipp-v3-java-devkit-javadoc/allclasses-noframe.html b/ipp-v3-java-devkit-javadoc/allclasses-noframe.html index 19fa139b..482c32d8 100644 --- a/ipp-v3-java-devkit-javadoc/allclasses-noframe.html +++ b/ipp-v3-java-devkit-javadoc/allclasses-noframe.html @@ -2,10 +2,10 @@ - + -All Classes (IPP V3 Java DevKit 2.9.5 API) - +All Classes (IPP V3 Java DevKit 2.9.6 API) + diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/IAPlatformClient.html b/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/IAPlatformClient.html index b4d7540c..a3937cf5 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/IAPlatformClient.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/IAPlatformClient.html @@ -2,10 +2,10 @@ - + -IAPlatformClient (IPP V3 Java DevKit 2.9.5 API) - +IAPlatformClient (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/package-summary.html index 89042eb9..c46cc445 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ia/connection/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ia.connection (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ia.connection (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ia/exception/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ia/exception/package-summary.html index 3a1fcdaa..1e46962b 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ia/exception/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ia/exception/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ia.exception (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ia.exception (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ia/utils/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ia/utils/package-summary.html index 89cc867c..3d135694 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ia/utils/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ia/utils/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ia.utils (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ia.utils (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/compression/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/compression/package-summary.html index dd2293f3..20004bc7 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/compression/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/compression/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.compression (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.compression (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/core/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/core/package-summary.html index eb3697a8..00845cb0 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/core/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/core/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.core (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.core (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,13 +13,13 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/data/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/data/package-summary.html index 737ba857..4e053f16 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/data/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/data/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.data (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.data (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/exception/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/exception/package-summary.html index bf58183e..cd3de7a8 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/exception/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/exception/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.exception (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.exception (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/interceptors/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/interceptors/package-summary.html index ac4041c4..b53b08aa 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/interceptors/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/interceptors/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.interceptors (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.interceptors (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/net/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/net/package-summary.html index 048b484c..2ce2b4b9 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/net/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/net/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.net (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.net (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/expr/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/expr/package-summary.html index c835a206..7e09dbd7 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/expr/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/expr/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.query.expr (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.query.expr (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/package-summary.html index 60524174..3b2eccc2 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/query/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.query (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.query (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/security/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/security/package-summary.html index 7f042d03..65b206ed 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/security/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/security/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.security (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.security (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/custom/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/custom/package-summary.html index d369a9bd..2f1b005f 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/custom/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/custom/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.serialization.custom (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.serialization.custom (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/package-summary.html index de313eb6..80d6566a 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/serialization/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.serialization (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.serialization (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/services/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/services/package-summary.html index 9fa30449..e6bcebab 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/services/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/services/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.services (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.services (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/util/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/util/package-summary.html index 181aee12..d48f1edd 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/ipp/util/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/ipp/util/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.ipp.util (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.ipp.util (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/com/intuit/sb/cdm/util/v3/package-summary.html b/ipp-v3-java-devkit-javadoc/com/intuit/sb/cdm/util/v3/package-summary.html index 68df4bcc..28318bff 100644 --- a/ipp-v3-java-devkit-javadoc/com/intuit/sb/cdm/util/v3/package-summary.html +++ b/ipp-v3-java-devkit-javadoc/com/intuit/sb/cdm/util/v3/package-summary.html @@ -2,10 +2,10 @@ - + -com.intuit.sb.cdm.util.v3 (IPP V3 Java DevKit 2.9.5 API) - +com.intuit.sb.cdm.util.v3 (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ diff --git a/ipp-v3-java-devkit-javadoc/overview-summary.html b/ipp-v3-java-devkit-javadoc/overview-summary.html index 9384dd8b..3b69d1ce 100644 --- a/ipp-v3-java-devkit-javadoc/overview-summary.html +++ b/ipp-v3-java-devkit-javadoc/overview-summary.html @@ -2,10 +2,10 @@ - + -Overview (IPP V3 Java DevKit 2.9.5 API) - +Overview (IPP V3 Java DevKit 2.9.6 API) + @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@