Merge branch 'liferay:master' into master

modules/.releng/test/poshi/poshi-core/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=251024e90123cff1d6889aac67cdd7cf7eff2a55
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.133/com.liferay.poshi.core-1.0.133-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.133/com.liferay.poshi.core-1.0.133.jar
+artifact.git.id=3cb0d68a060738d17ff810e6619286fdb0fc0738
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.134/com.liferay.poshi.core-1.0.134-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.core/1.0.134/com.liferay.poshi.core-1.0.134.jar

modules/.releng/test/poshi/poshi-runner/artifact.properties

@@ -1,3 +1,3 @@
-artifact.git.id=a4afb859c22e4a2f2a0b39fb37a5fc7bf58ce62e
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.455/com.liferay.poshi.runner-1.0.455-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.455/com.liferay.poshi.runner-1.0.455.jar
+artifact.git.id=3cb0d68a060738d17ff810e6619286fdb0fc0738
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.456/com.liferay.poshi.runner-1.0.456-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.poshi.runner/1.0.456/com.liferay.poshi.runner-1.0.456.jar

modules/apps/commerce/commerce-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Commerce API
 Bundle-SymbolicName: com.liferay.commerce.api
-Bundle-Version: 73.0.1
+Bundle-Version: 73.0.0
 Export-Package:\
 	com.liferay.commerce.address,\
 	com.liferay.commerce.checkout.helper,\

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/model/CommerceOrderItemModel.java

@@ -360,20 +360,6 @@ public void setCustomerCommerceOrderItemId(
 	 */
 	public void setShippingAddressId(long shippingAddressId);
 
-	/**
-	 * Returns the decimal quantity of this commerce order item.
-	 *
-	 * @return the decimal quantity of this commerce order item
-	 */
-	public BigDecimal getDecimalQuantity();
-
-	/**
-	 * Sets the decimal quantity of this commerce order item.
-	 *
-	 * @param decimalQuantity the decimal quantity of this commerce order item
-	 */
-	public void setDecimalQuantity(BigDecimal decimalQuantity);
-
 	/**
 	 * Returns the delivery group of this commerce order item.
 	 *
@@ -934,14 +920,14 @@ public void setDiscountPercentageLevel4WithTaxAmount(
 	 *
 	 * @return the quantity of this commerce order item
 	 */
-	public int getQuantity();
+	public BigDecimal getQuantity();
 
 	/**
 	 * Sets the quantity of this commerce order item.
 	 *
 	 * @param quantity the quantity of this commerce order item
 	 */
-	public void setQuantity(int quantity);
+	public void setQuantity(BigDecimal quantity);
 
 	/**
 	 * Returns the replaced cp instance ID of this commerce order item.

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/model/CommerceOrderItemTable.java

@@ -83,10 +83,6 @@ public class CommerceOrderItemTable extends BaseTable<CommerceOrderItemTable> {
 	public final Column<CommerceOrderItemTable, Long> shippingAddressId =
 		createColumn(
 			"shippingAddressId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
-	public final Column<CommerceOrderItemTable, BigDecimal> decimalQuantity =
-		createColumn(
-			"decimalQuantity", BigDecimal.class, Types.DECIMAL,
-			Column.FLAG_DEFAULT);
 	public final Column<CommerceOrderItemTable, String> deliveryGroup =
 		createColumn(
 			"deliveryGroup", String.class, Types.VARCHAR, Column.FLAG_DEFAULT);
@@ -194,9 +190,9 @@ public class CommerceOrderItemTable extends BaseTable<CommerceOrderItemTable> {
 		promoPriceWithTaxAmount = createColumn(
 			"promoPriceWithTaxAmount", BigDecimal.class, Types.DECIMAL,
 			Column.FLAG_DEFAULT);
-	public final Column<CommerceOrderItemTable, Integer> quantity =
+	public final Column<CommerceOrderItemTable, BigDecimal> quantity =
 		createColumn(
-			"quantity", Integer.class, Types.INTEGER, Column.FLAG_DEFAULT);
+			"quantity", BigDecimal.class, Types.DECIMAL, Column.FLAG_DEFAULT);
 	public final Column<CommerceOrderItemTable, Long> replacedCPInstanceId =
 		createColumn(
 			"replacedCPInstanceId", Long.class, Types.BIGINT,

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/model/CommerceOrderItemWrapper.java

@@ -57,7 +57,6 @@ public Map<String, Object> getModelAttributes() {
 		attributes.put(
 			"parentCommerceOrderItemId", getParentCommerceOrderItemId());
 		attributes.put("shippingAddressId", getShippingAddressId());
-		attributes.put("decimalQuantity", getDecimalQuantity());
 		attributes.put("deliveryGroup", getDeliveryGroup());
 		attributes.put(
 			"deliveryMaxSubscriptionCycles",
@@ -249,13 +248,6 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setShippingAddressId(shippingAddressId);
 		}
 
-		BigDecimal decimalQuantity = (BigDecimal)attributes.get(
-			"decimalQuantity");
-
-		if (decimalQuantity != null) {
-			setDecimalQuantity(decimalQuantity);
-		}
-
 		String deliveryGroup = (String)attributes.get("deliveryGroup");
 
 		if (deliveryGroup != null) {
@@ -461,7 +453,7 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setPromoPriceWithTaxAmount(promoPriceWithTaxAmount);
 		}
 
-		Integer quantity = (Integer)attributes.get("quantity");
+		BigDecimal quantity = (BigDecimal)attributes.get("quantity");
 
 		if (quantity != null) {
 			setQuantity(quantity);
@@ -749,16 +741,6 @@ public long getCustomerCommerceOrderItemId() {
 		return model.getCustomerCommerceOrderItemId();
 	}
 
-	/**
-	 * Returns the decimal quantity of this commerce order item.
-	 *
-	 * @return the decimal quantity of this commerce order item
-	 */
-	@Override
-	public BigDecimal getDecimalQuantity() {
-		return model.getDecimalQuantity();
-	}
-
 	@Override
 	public String getDefaultLanguageId() {
 		return model.getDefaultLanguageId();
@@ -1249,7 +1231,7 @@ public BigDecimal getPromoPriceWithTaxAmount() {
 	 * @return the quantity of this commerce order item
 	 */
 	@Override
-	public int getQuantity() {
+	public BigDecimal getQuantity() {
 		return model.getQuantity();
 	}
 
@@ -1695,16 +1677,6 @@ public void setCustomerCommerceOrderItemId(
 		model.setCustomerCommerceOrderItemId(customerCommerceOrderItemId);
 	}
 
-	/**
-	 * Sets the decimal quantity of this commerce order item.
-	 *
-	 * @param decimalQuantity the decimal quantity of this commerce order item
-	 */
-	@Override
-	public void setDecimalQuantity(BigDecimal decimalQuantity) {
-		model.setDecimalQuantity(decimalQuantity);
-	}
-
 	/**
 	 * Sets the delivery group of this commerce order item.
 	 *
@@ -2149,7 +2121,7 @@ public void setPromoPriceWithTaxAmount(BigDecimal promoPriceWithTaxAmount) {
 	 * @param quantity the quantity of this commerce order item
 	 */
 	@Override
-	public void setQuantity(int quantity) {
+	public void setQuantity(BigDecimal quantity) {
 		model.setQuantity(quantity);
 	}
 

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderHttpHelper.java

@@ -8,6 +8,8 @@
 import com.liferay.commerce.model.CommerceOrder;
 import com.liferay.portal.kernel.exception.PortalException;
 
+import java.math.BigDecimal;
+
 import javax.portlet.ActionRequest;
 import javax.portlet.PortletURL;
 
@@ -43,7 +45,7 @@ public PortletURL getCommerceCheckoutPortletURL(
 			HttpServletRequest httpServletRequest)
 		throws PortalException;
 
-	public int getCommerceOrderItemsQuantity(
+	public BigDecimal getCommerceOrderItemsQuantity(
 			HttpServletRequest httpServletRequest)
 		throws PortalException;
 

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderValidator.java

@@ -10,6 +10,8 @@
 import com.liferay.commerce.product.model.CPInstance;
 import com.liferay.portal.kernel.exception.PortalException;
 
+import java.math.BigDecimal;
+
 import java.util.Locale;
 
 /**
@@ -28,7 +30,7 @@ public default CommerceOrderValidatorResult validate(
 
 	public CommerceOrderValidatorResult validate(
 			Locale locale, CommerceOrder commerceOrder, CPInstance cpInstance,
-			int quantity)
+			BigDecimal quantity)
 		throws PortalException;
 
 	public CommerceOrderValidatorResult validate(

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderValidatorRegistry.java

@@ -10,6 +10,8 @@
 import com.liferay.commerce.product.model.CPInstance;
 import com.liferay.portal.kernel.exception.PortalException;
 
+import java.math.BigDecimal;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -41,7 +43,7 @@ public default List<CommerceOrderValidatorResult> validate(
 
 	public List<CommerceOrderValidatorResult> validate(
 			Locale locale, CommerceOrder commerceOrder, CPInstance cpInstance,
-			int quantity)
+			BigDecimal quantity)
 		throws PortalException;
 
 	public List<CommerceOrderValidatorResult> validate(

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/item/CommerceOrderImporterItem.java

@@ -7,6 +7,8 @@
 
 import com.liferay.commerce.price.CommerceOrderItemPrice;
 
+import java.math.BigDecimal;
+
 import java.util.Locale;
 
 /**
@@ -28,14 +30,16 @@ public interface CommerceOrderImporterItem {
 
 	public long getParentCommerceOrderItemCPDefinitionId();
 
-	public int getQuantity();
+	public BigDecimal getQuantity();
 
 	public String getReplacingSKU();
 
 	public String getRequestedDeliveryDateString();
 
 	public String getSKU();
 
+	public String getUnitOfMeasureKey();
+
 	public boolean hasParentCommerceOrderItem();
 
 	public boolean isValid();

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/item/CommerceOrderImporterItemImpl.java

@@ -7,6 +7,8 @@
 
 import com.liferay.commerce.price.CommerceOrderItemPrice;
 
+import java.math.BigDecimal;
+
 import java.util.Locale;
 import java.util.Map;
 
@@ -56,7 +58,7 @@ public long getParentCommerceOrderItemCPDefinitionId() {
 	}
 
 	@Override
-	public int getQuantity() {
+	public BigDecimal getQuantity() {
 		return _quantity;
 	}
 
@@ -75,6 +77,10 @@ public String getSKU() {
 		return _sku;
 	}
 
+	public String getUnitOfMeasureKey() {
+		return _unitOfMeasureKey;
+	}
+
 	@Override
 	public boolean hasParentCommerceOrderItem() {
 		if (getParentCommerceOrderItemCPDefinitionId() > 0) {
@@ -128,7 +134,7 @@ public void setParentCommerceOrderItemCPDefinitionId(
 			parentCommerceOrderItemCPDefinitionId;
 	}
 
-	public void setQuantity(int quantity) {
+	public void setQuantity(BigDecimal quantity) {
 		_quantity = quantity;
 	}
 
@@ -146,16 +152,21 @@ public void setSku(String sku) {
 		_sku = sku;
 	}
 
+	public void setUnitOfMeasureKey(String unitOfMeasureKey) {
+		_unitOfMeasureKey = unitOfMeasureKey;
+	}
+
 	private CommerceOrderItemPrice _commerceOrderItemPrice;
 	private long _cpDefinitionId;
 	private long _cpInstanceId;
 	private String[] _errorMessages;
 	private String _json;
 	private Map<Locale, String> _nameMap;
 	private long _parentCommerceOrderItemCPDefinitionId;
-	private int _quantity;
+	private BigDecimal _quantity;
 	private String _replacingSKU;
 	private String _requestedDeliveryDateString;
 	private String _sku;
+	private String _unitOfMeasureKey;
 
 }