diff --git a/mozu-android-sdk/build.gradle b/mozu-android-sdk/build.gradle index c0b2227e..e0561c6c 100755 --- a/mozu-android-sdk/build.gradle +++ b/mozu-android-sdk/build.gradle @@ -22,7 +22,7 @@ if (hasProperty("teamcity")) { println "TeamCity build number passed into gradle is " + version } else { // Manually insert the version numbers here when building outside of TeamCity - version = '1.9.0-SNAPSHOT' + version = '1.11.0-SNAPSHOT' } ext.isReleaseVersion = !version.endsWith("SNAPSHOT") diff --git a/mozu-java-core/build.gradle b/mozu-java-core/build.gradle index 9e147f82..5dd5945f 100644 --- a/mozu-java-core/build.gradle +++ b/mozu-java-core/build.gradle @@ -10,10 +10,9 @@ archivesBaseName='mozu-api-core' if (hasProperty("teamcity")) { version = teamcity["build.number"] println "TeamCity build number passed into gradle is " + version - } - else { -// Manually insert the version numbers here when building outside of TeamCity - version = '1.9.0-SNAPSHOT' +} else { + // Manually insert the version numbers here when building outside of TeamCity + version = '1.11.0-SNAPSHOT' } group='com.mozu' diff --git a/mozu-java-core/src/main/java/com/mozu/api/Version.java b/mozu-java-core/src/main/java/com/mozu/api/Version.java index 06d69c4e..cf83f87b 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/Version.java +++ b/mozu-java-core/src/main/java/com/mozu/api/Version.java @@ -9,5 +9,5 @@ public class Version { - public final static String API_VERSION = "1.9.14238.0"; + public final static String API_VERSION = "1.11.14239.0"; } \ No newline at end of file diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/orders/Order.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/orders/Order.java index e5ce5b23..c1d5a069 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/orders/Order.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/orders/Order.java @@ -38,6 +38,19 @@ public class Order implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; + /** + * If true, the order is exempt from applied sales tax. + */ + protected Boolean isTaxExempt; + + public Boolean getIsTaxExempt() { + return this.isTaxExempt; + } + + public void setIsTaxExempt(Boolean isTaxExempt) { + this.isTaxExempt = isTaxExempt; + } + protected DateTime acceptedDate; public DateTime getAcceptedDate() { @@ -423,19 +436,6 @@ public void setIsImport(Boolean isImport) { this.isImport = isImport; } - /** - * If true, the order is exempt from applied sales tax. - */ - protected Boolean isTaxExempt; - - public Boolean getIsTaxExempt() { - return this.isTaxExempt; - } - - public void setIsTaxExempt(Boolean isTaxExempt) { - this.isTaxExempt = isTaxExempt; - } - /** * The total amount of tax applied to items in the order. */ diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/payments/PaymentGatewayInteraction.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/payments/PaymentGatewayInteraction.java index 27cca1c3..59d5f388 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/payments/PaymentGatewayInteraction.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/payments/PaymentGatewayInteraction.java @@ -19,6 +19,29 @@ public class PaymentGatewayInteraction implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; + protected String gatewayResponseText; + + public String getGatewayResponseText() { + return this.gatewayResponseText; + } + + public void setGatewayResponseText(String gatewayResponseText) { + this.gatewayResponseText = gatewayResponseText; + } + + /** + * Unique identifier of the gateway transaction associated with the payment interaction. + */ + protected String gatewayTransactionId; + + public String getGatewayTransactionId() { + return this.gatewayTransactionId; + } + + public void setGatewayTransactionId(String gatewayTransactionId) { + this.gatewayTransactionId = gatewayTransactionId; + } + /** * If required by the payment gateway, the authorization code of the transaction. */ @@ -84,27 +107,4 @@ public void setGatewayResponseCode(String gatewayResponseCode) { this.gatewayResponseCode = gatewayResponseCode; } - protected String gatewayResponseText; - - public String getGatewayResponseText() { - return this.gatewayResponseText; - } - - public void setGatewayResponseText(String gatewayResponseText) { - this.gatewayResponseText = gatewayResponseText; - } - - /** - * Unique identifier of the gateway transaction associated with the payment interaction. - */ - protected String gatewayTransactionId; - - public String getGatewayTransactionId() { - return this.gatewayTransactionId; - } - - public void setGatewayTransactionId(String gatewayTransactionId) { - this.gatewayTransactionId = gatewayTransactionId; - } - } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/content/View.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/content/View.java index f8cf1614..1d7e3357 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/content/View.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/content/View.java @@ -66,14 +66,6 @@ public void setUsages(List usages) { this.usages = usages; } - protected List fields; - public List getFields() { - return this.fields; - } - public void setFields(List fields) { - this.fields = fields; - } - protected com.fasterxml.jackson.databind.JsonNode metadata; public com.fasterxml.jackson.databind.JsonNode getMetadata() { @@ -84,4 +76,12 @@ public void setMetadata(com.fasterxml.jackson.databind.JsonNode metadata) { this.metadata = metadata; } + protected List fields; + public List getFields() { + return this.fields; + } + public void setFields(List fields) { + this.fields = fields; + } + } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/core/UserSystemData.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/core/UserSystemData.java index 76934270..a8d268f5 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/core/UserSystemData.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/core/UserSystemData.java @@ -19,19 +19,6 @@ public class UserSystemData implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; - /** - * Date and time when the entity was created, represented in UTC Date/Time. - */ - protected DateTime createdOn; - - public DateTime getCreatedOn() { - return this.createdOn; - } - - public void setCreatedOn(DateTime createdOn) { - this.createdOn = createdOn; - } - /** * The number of failed authentication attempts associated with the user. */ @@ -149,4 +136,17 @@ public void setUpdatedOn(DateTime updatedOn) { this.updatedOn = updatedOn; } + /** + * Date and time when the entity was created, represented in UTC Date/Time. + */ + protected DateTime createdOn; + + public DateTime getCreatedOn() { + return this.createdOn; + } + + public void setCreatedOn(DateTime createdOn) { + this.createdOn = createdOn; + } + } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/core/extensible/Attribute.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/core/extensible/Attribute.java index e467332d..f03e08c5 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/core/extensible/Attribute.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/core/extensible/Attribute.java @@ -25,69 +25,6 @@ public class Attribute implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; - protected Boolean isMultiValued; - - public Boolean getIsMultiValued() { - return this.isMultiValued; - } - - public void setIsMultiValued(Boolean isMultiValued) { - this.isMultiValued = isMultiValued; - } - - protected Boolean isRequired; - - public Boolean getIsRequired() { - return this.isRequired; - } - - public void setIsRequired(Boolean isRequired) { - this.isRequired = isRequired; - } - - protected Boolean isVisible; - - public Boolean getIsVisible() { - return this.isVisible; - } - - public void setIsVisible(Boolean isVisible) { - this.isVisible = isVisible; - } - - /** - * Namespace associated with this extensible attribute. - */ - protected String namespace; - - public String getNamespace() { - return this.namespace; - } - - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - protected Integer order; - - public Integer getOrder() { - return this.order; - } - - public void setOrder(Integer order) { - this.order = order; - } - - protected String valueType; - - public String getValueType() { - return this.valueType; - } - - public void setValueType(String valueType) { - this.valueType = valueType; - } - /** * Name of this extensible attribute defined in Mozu Admin. */ @@ -183,6 +120,69 @@ public void setIsActive(Boolean isActive) { this.isActive = isActive; } + protected Boolean isMultiValued; + + public Boolean getIsMultiValued() { + return this.isMultiValued; + } + + public void setIsMultiValued(Boolean isMultiValued) { + this.isMultiValued = isMultiValued; + } + + protected Boolean isRequired; + + public Boolean getIsRequired() { + return this.isRequired; + } + + public void setIsRequired(Boolean isRequired) { + this.isRequired = isRequired; + } + + protected Boolean isVisible; + + public Boolean getIsVisible() { + return this.isVisible; + } + + public void setIsVisible(Boolean isVisible) { + this.isVisible = isVisible; + } + + /** + * Namespace associated with this extensible attribute. + */ + protected String namespace; + + public String getNamespace() { + return this.namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + protected Integer order; + + public Integer getOrder() { + return this.order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + protected String valueType; + + public String getValueType() { + return this.valueType; + } + + public void setValueType(String valueType) { + this.valueType = valueType; + } + /** * List of metadata key-value pairs defined for an extensible attribute. */ diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/CustomerContact.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/CustomerContact.java index cd01b582..29744fef 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/CustomerContact.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/CustomerContact.java @@ -10,10 +10,10 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.joda.time.DateTime; +import com.mozu.api.contracts.customer.ContactType; import com.mozu.api.contracts.core.Address; import com.mozu.api.contracts.core.AuditInfo; import com.mozu.api.contracts.core.Phone; -import com.mozu.api.contracts.customer.ContactType; /** * Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact. @@ -135,6 +135,14 @@ public void setMiddleNameOrInitial(String middleNameOrInitial) { this.middleNameOrInitial = middleNameOrInitial; } + protected List types; + public List getTypes() { + return this.types; + } + public void setTypes(List types) { + this.types = types; + } + /** * Address associated with the customer account contact. */ @@ -174,12 +182,4 @@ public void setPhoneNumbers(Phone phoneNumbers) { this.phoneNumbers = phoneNumbers; } - protected List types; - public List getTypes() { - return this.types; - } - public void setTypes(List types) { - this.types = types; - } - } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/LoginState.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/LoginState.java index 914fd9b8..8180c5fd 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/LoginState.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/customer/LoginState.java @@ -16,6 +16,16 @@ public class LoginState implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; + protected DateTime updatedOn; + + public DateTime getUpdatedOn() { + return this.updatedOn; + } + + public void setUpdatedOn(DateTime updatedOn) { + this.updatedOn = updatedOn; + } + protected DateTime createdOn; public DateTime getCreatedOn() { @@ -106,14 +116,4 @@ public void setRemainingLoginAttempts(Integer remainingLoginAttempts) { this.remainingLoginAttempts = remainingLoginAttempts; } - protected DateTime updatedOn; - - public DateTime getUpdatedOn() { - return this.updatedOn; - } - - public void setUpdatedOn(DateTime updatedOn) { - this.updatedOn = updatedOn; - } - } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/DiscountCondition.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/DiscountCondition.java index c6bf7393..d585de6e 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/DiscountCondition.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/DiscountCondition.java @@ -10,9 +10,9 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.joda.time.DateTime; -import com.mozu.api.contracts.productadmin.CustomerSegment; import com.mozu.api.contracts.productadmin.CategoryDiscountCondition; import com.mozu.api.contracts.productadmin.ProductDiscountCondition; +import com.mozu.api.contracts.productadmin.CustomerSegment; @JsonIgnoreProperties(ignoreUnknown = true) public class DiscountCondition implements Serializable @@ -20,16 +20,6 @@ public class DiscountCondition implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; - protected DateTime startDate; - - public DateTime getStartDate() { - return this.startDate; - } - - public void setStartDate(DateTime startDate) { - this.startDate = startDate; - } - protected String couponCode; public String getCouponCode() { @@ -140,6 +130,32 @@ public void setRequiresCoupon(Boolean requiresCoupon) { this.requiresCoupon = requiresCoupon; } + protected DateTime startDate; + + public DateTime getStartDate() { + return this.startDate; + } + + public void setStartDate(DateTime startDate) { + this.startDate = startDate; + } + + protected List includedCategories; + public List getIncludedCategories() { + return this.includedCategories; + } + public void setIncludedCategories(List includedCategories) { + this.includedCategories = includedCategories; + } + + protected List includedProducts; + public List getIncludedProducts() { + return this.includedProducts; + } + public void setIncludedProducts(List includedProducts) { + this.includedProducts = includedProducts; + } + protected List customerSegments; public List getCustomerSegments() { return this.customerSegments; @@ -164,20 +180,4 @@ public void setExcludedProducts(List excludedProducts) this.excludedProducts = excludedProducts; } - protected List includedCategories; - public List getIncludedCategories() { - return this.includedCategories; - } - public void setIncludedCategories(List includedCategories) { - this.includedCategories = includedCategories; - } - - protected List includedProducts; - public List getIncludedProducts() { - return this.includedProducts; - } - public void setIncludedProducts(List includedProducts) { - this.includedProducts = includedProducts; - } - } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductReservationCollection.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductReservationCollection.java index fa6e3f1b..8bf7350f 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductReservationCollection.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductReservationCollection.java @@ -21,6 +21,19 @@ public class ProductReservationCollection implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; + /** + * The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only. + */ + protected Integer totalCount; + + public Integer getTotalCount() { + return this.totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + /** * The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only. */ @@ -57,19 +70,6 @@ public void setStartIndex(Integer startIndex) { this.startIndex = startIndex; } - /** - * The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only. - */ - protected Integer totalCount; - - public Integer getTotalCount() { - return this.totalCount; - } - - public void setTotalCount(Integer totalCount) { - this.totalCount = totalCount; - } - /** * An array list of objects in the returned collection. */ diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductVariationDeltaPrice.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductVariationDeltaPrice.java index aeeb9d2c..bd5cb6e9 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductVariationDeltaPrice.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/productadmin/ProductVariationDeltaPrice.java @@ -19,50 +19,50 @@ public class ProductVariationDeltaPrice implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; - protected Double msrp; + protected Double creditValue; - public Double getMsrp() { - return this.msrp; + public Double getCreditValue() { + return this.creditValue; } - public void setMsrp(Double msrp) { - this.msrp = msrp; + public void setCreditValue(Double creditValue) { + this.creditValue = creditValue; } /** - * Positive or negative decimal value that represents the difference between this variation and the base product. + * 3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported. */ - protected Double value; + protected String currencyCode; - public Double getValue() { - return this.value; + public String getCurrencyCode() { + return this.currencyCode; } - public void setValue(Double value) { - this.value = value; + public void setCurrencyCode(String currencyCode) { + this.currencyCode = currencyCode; } - protected Double creditValue; + protected Double msrp; - public Double getCreditValue() { - return this.creditValue; + public Double getMsrp() { + return this.msrp; } - public void setCreditValue(Double creditValue) { - this.creditValue = creditValue; + public void setMsrp(Double msrp) { + this.msrp = msrp; } /** - * 3-letter ISO 4217 standard global currency code. Currently, only "USD" (US Dollar) is supported. + * Positive or negative decimal value that represents the difference between this variation and the base product. */ - protected String currencyCode; + protected Double value; - public String getCurrencyCode() { - return this.currencyCode; + public Double getValue() { + return this.value; } - public void setCurrencyCode(String currencyCode) { - this.currencyCode = currencyCode; + public void setValue(Double value) { + this.value = value; } } diff --git a/mozu-java-core/src/main/java/com/mozu/api/contracts/productruntime/Product.java b/mozu-java-core/src/main/java/com/mozu/api/contracts/productruntime/Product.java index 66f5fb39..0343a44b 100644 --- a/mozu-java-core/src/main/java/com/mozu/api/contracts/productruntime/Product.java +++ b/mozu-java-core/src/main/java/com/mozu/api/contracts/productruntime/Product.java @@ -32,19 +32,6 @@ public class Product implements Serializable // Default Serial Version UID private static final long serialVersionUID = 1L; - /** - * Date and time when the entity was created, represented in UTC Date/Time. - */ - protected DateTime createDate; - - public DateTime getCreateDate() { - return this.createDate; - } - - public void setCreateDate(DateTime createDate) { - this.createDate = createDate; - } - protected List fulfillmentTypesSupported; public List getFulfillmentTypesSupported() { return this.fulfillmentTypesSupported; @@ -226,6 +213,19 @@ public void setVariationProductCode(String variationProductCode) { this.variationProductCode = variationProductCode; } + /** + * Date and time when the entity was created, represented in UTC Date/Time. + */ + protected DateTime createDate; + + public DateTime getCreateDate() { + return this.createDate; + } + + public void setCreateDate(DateTime createDate) { + this.createDate = createDate; + } + /** * List of shipping discounts that can be applied to the product. */ diff --git a/mozu-java-sdk/build.gradle b/mozu-java-sdk/build.gradle index 4dba2f53..c48c35dc 100644 --- a/mozu-java-sdk/build.gradle +++ b/mozu-java-sdk/build.gradle @@ -13,7 +13,7 @@ if (hasProperty("teamcity")) { } else { // Manually insert the version numbers here when building outside of TeamCity - version = '1.9.0-SNAPSHOT' + version = '1.11.0-SNAPSHOT' } group='com.mozu'