LPD-16000 Use non local service so that permission is checked for vir…

…tual instances
is-solutions-delivery · Feb 8, 2024 · 75c39ea · 75c39ea
1 parent 4466c94
commit 75c39ea
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/...iferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java b/...iferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java
@@ -22,7 +22,7 @@
 import com.liferay.commerce.model.CommerceShippingMethod;
 import com.liferay.commerce.product.model.CommerceChannel;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -76,7 +76,7 @@ public class CommerceShipmentDisplayContext
 	public CommerceShipmentDisplayContext(
 		ActionHelper actionHelper,
 		CommerceAddressFormatter commerceAddressFormatter,
-		CommerceAddressLocalService commerceAddressLocalService,
+		CommerceAddressService commerceAddressService,
 		CommerceChannelService commerceChannelService,
 		CommerceOrderItemService commerceOrderItemService,
 		CommerceOrderLocalService commerceOrderLocalService,
@@ -89,7 +89,7 @@ public CommerceShipmentDisplayContext(
 		super(actionHelper, httpServletRequest, portletResourcePermission);
 
 		_commerceAddressFormatter = commerceAddressFormatter;
-		_commerceAddressLocalService = commerceAddressLocalService;
+		_commerceAddressService = commerceAddressService;
 		_commerceChannelService = commerceChannelService;
 		_commerceOrderItemService = commerceOrderItemService;
 		_commerceOrderLocalService = commerceOrderLocalService;
@@ -186,7 +186,7 @@ public List<CommerceShippingMethod> getCommerceShippingMethods()
 		}
 
 		CommerceAddress commerceAddress =
-			_commerceAddressLocalService.getCommerceAddress(
+			_commerceAddressService.getCommerceAddress(
 				commerceShipment.getCommerceAddressId());
 
 		return _commerceShippingMethodService.getCommerceShippingMethods(
@@ -413,7 +413,7 @@ else if ((commerceShipment.getStatus() > shipmentStatus) ||
 	public CommerceAddress getShippingAddress() throws PortalException {
 		CommerceShipment commerceShipment = getCommerceShipment();
 
-		return _commerceAddressLocalService.fetchCommerceAddress(
+		return _commerceAddressService.fetchCommerceAddress(
 			commerceShipment.getCommerceAddressId());
 	}
 
@@ -488,7 +488,7 @@ private SearchContext _buildSearchContext() throws PortalException {
 		CommerceShipmentDisplayContext.class);
 
 	private final CommerceAddressFormatter _commerceAddressFormatter;
-	private final CommerceAddressLocalService _commerceAddressLocalService;
+	private final CommerceAddressService _commerceAddressService;
 	private final CommerceChannelService _commerceChannelService;
 	private final CommerceOrderItemService _commerceOrderItemService;
 	private final CommerceOrderLocalService _commerceOrderLocalService;

diff --git a/...main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java b/...main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -68,7 +68,7 @@ public void render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -87,7 +87,7 @@ public void render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...mmerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java b/...mmerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -51,7 +51,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -70,7 +70,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...ay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java b/...ay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -50,7 +50,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -69,7 +69,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...rce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java b/...rce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -51,7 +51,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -70,7 +70,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...ipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java b/...ipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -51,7 +51,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -70,7 +70,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...hipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java b/...hipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -51,7 +51,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -70,7 +70,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...y/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java b/...y/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -55,7 +55,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -111,7 +111,7 @@ private void _populatePortletDisplay(RenderRequest renderRequest) {
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;

diff --git a/...hipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java b/...hipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java
@@ -9,7 +9,7 @@
 import com.liferay.commerce.constants.CommerceConstants;
 import com.liferay.commerce.constants.CommercePortletKeys;
 import com.liferay.commerce.product.service.CommerceChannelService;
-import com.liferay.commerce.service.CommerceAddressLocalService;
+import com.liferay.commerce.service.CommerceAddressService;
 import com.liferay.commerce.service.CommerceOrderItemService;
 import com.liferay.commerce.service.CommerceOrderLocalService;
 import com.liferay.commerce.service.CommerceShipmentItemService;
@@ -51,7 +51,7 @@ public String render(
 		CommerceShipmentDisplayContext commerceShipmentDisplayContext =
 			new CommerceShipmentDisplayContext(
 				_actionHelper, _commerceAddressFormatter,
-				_commerceAddressLocalService, _commerceChannelService,
+				_commerceAddressService, _commerceChannelService,
 				_commerceOrderItemService, _commerceOrderLocalService,
 				_commerceShipmentItemService, _commerceShippingMethodService,
 				_countryService, _portal.getHttpServletRequest(renderRequest),
@@ -70,7 +70,7 @@ public String render(
 	private CommerceAddressFormatter _commerceAddressFormatter;
 
 	@Reference
-	private CommerceAddressLocalService _commerceAddressLocalService;
+	private CommerceAddressService _commerceAddressService;
 
 	@Reference
 	private CommerceChannelService _commerceChannelService;