Merge pull request #61 from bhewett/Dev

Checkin for Generated Mozu Code 1.11

Author: Bob Hewett

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")

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'

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";
 }

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.
 	 */

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;
-	}
-
 }

mozu-java-core/src/main/java/com/mozu/api/contracts/content/View.java

@@ -66,14 +66,6 @@ public void setUsages(List<String> usages) {
 		this.usages = usages;
 	}
 
-	protected List<ViewFields> fields;
-	public List<ViewFields> getFields() {
-		return this.fields;
-	}
-	public void setFields(List<ViewFields> 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<ViewFields> fields;
+	public List<ViewFields> getFields() {
+		return this.fields;
+	}
+	public void setFields(List<ViewFields> fields) {
+		this.fields = fields;
+	}
+
 }

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;
+	}
+
 }

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.
 	 */

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<ContactType> types;
+	public List<ContactType> getTypes() {
+		return this.types;
+	}
+	public void setTypes(List<ContactType> 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<ContactType> types;
-	public List<ContactType> getTypes() {
-		return this.types;
-	}
-	public void setTypes(List<ContactType> types) {
-		this.types = types;
-	}
-
 }