Merge pull request #76 from bhewett/master

Bump version to coincide with Release 5.1

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.11.14269.0";
+	public final static String API_VERSION = "1.12.14289.0";
 }

mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/orders/Order.java

@@ -525,16 +525,6 @@ public void setOriginalCartId(String originalCartId) {
 		this.originalCartId = originalCartId;
 	}
 
-	protected String parentOrderId;
-
-	public String getParentOrderId() {
-		return this.parentOrderId;
-	}
-
-	public void setParentOrderId(String parentOrderId) {
-		this.parentOrderId = parentOrderId;
-	}
-
 	/**
 	 * If this order was created to fulfill an item replacement as part of a return merchandise authorization (RMA), the unique identifier of the return.
 	 */

mozu-java-core/src/main/java/com/mozu/api/contracts/commerceruntime/products/ProductOption.java

@@ -19,19 +19,6 @@ public class ProductOption implements Serializable
 	// Default Serial Version UID
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * If the value if an object, the value selected.
-	 */
-	protected Object value;
-
-	public Object getValue() {
-		return this.value;
-	}
-
-	public void setValue(Object value) {
-		this.value = value;
-	}
-
 	/**
 	 * The fully qualified name of the attribute, which is a user defined attribute identifier.
 	 */
@@ -97,4 +84,17 @@ public void setStringValue(String stringValue) {
 		this.stringValue = stringValue;
 	}
 
+	/**
+	 * If the value if an object, the value selected.
+	 */
+	protected Object value;
+
+	public Object getValue() {
+		return this.value;
+	}
+
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
 }

mozu-java-core/src/main/java/com/mozu/api/contracts/mzdb/ListView.java

@@ -18,6 +18,16 @@ public class ListView implements Serializable
 	// Default Serial Version UID
 	private static final long serialVersionUID = 1L;
 
+	protected String defaultSort;
+
+	public String getDefaultSort() {
+		return this.defaultSort;
+	}
+
+	public void setDefaultSort(String defaultSort) {
+		this.defaultSort = defaultSort;
+	}
+
 	/**
 	 * A set of expressions that consist of a field, operator, and value and represent search parameter syntax when filtering results of a query. Valid operators include equals (eq), does not equal (ne), greater than (gt), less than (lt), greater than or equal to (ge), less than or equal to (le), starts with (sw), or contains (cont). For example - "filter=IsDisplayed+eq+true"
 	 */
@@ -59,16 +69,6 @@ public void setUsages(List<String> usages) {
 		this.usages = usages;
 	}
 
-	protected String defaultSort;
-
-	public String getDefaultSort() {
-		return this.defaultSort;
-	}
-
-	public void setDefaultSort(String defaultSort) {
-		this.defaultSort = defaultSort;
-	}
-
 	protected List<ListViewField> fields;
 	public List<ListViewField> getFields() {
 		return this.fields;

mozu-java-core/src/main/java/com/mozu/api/contracts/shippingruntime/ShippingRateLocalizedContent.java

@@ -20,29 +20,29 @@ public class ShippingRateLocalizedContent implements Serializable
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * The name of the shipping rate in the language specified by the defined locale code.
+	 * Language used for the entity. Currently, only "en-US" is supported.
 	 */
-	protected String name;
+	protected String localeCode;
 
-	public String getName() {
-		return this.name;
+	public String getLocaleCode() {
+		return this.localeCode;
 	}
 
-	public void setName(String name) {
-		this.name = name;
+	public void setLocaleCode(String localeCode) {
+		this.localeCode = localeCode;
 	}
 
 	/**
-	 * Language used for the entity. Currently, only "en-US" is supported.
+	 * The name of the shipping rate in the language specified by the defined locale code.
 	 */
-	protected String localeCode;
+	protected String name;
 
-	public String getLocaleCode() {
-		return this.localeCode;
+	public String getName() {
+		return this.name;
 	}
 
-	public void setLocaleCode(String localeCode) {
-		this.localeCode = localeCode;
+	public void setName(String name) {
+		this.name = name;
 	}
 
 }