COMMERCE-2014 Switch to CPField constant

liferay · Dec 12, 2019 · 37b2912 · 37b2912
1 parent 101f39b
commit 37b2912
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.../liferay/commerce/payment/service/impl/CommercePaymentMethodGroupRelLocalServiceImpl.java b/.../liferay/commerce/payment/service/impl/CommercePaymentMethodGroupRelLocalServiceImpl.java
@@ -24,9 +24,9 @@
 import com.liferay.commerce.payment.service.base.CommercePaymentMethodGroupRelLocalServiceBaseImpl;
 import com.liferay.commerce.product.catalog.CPCatalogEntry;
 import com.liferay.commerce.product.catalog.CPQuery;
+import com.liferay.commerce.product.constants.CPField;
 import com.liferay.commerce.product.data.source.CPDataSourceResult;
 import com.liferay.commerce.product.model.CPDefinition;
-import com.liferay.commerce.product.search.CPDefinitionIndexer;
 import com.liferay.commerce.product.service.CPDefinitionLocalService;
 import com.liferay.commerce.product.service.CommerceCatalogService;
 import com.liferay.commerce.product.util.CPDefinitionHelper;
@@ -365,9 +365,8 @@ public CommercePaymentMethodGroupRel setActive(
 
 				attributes.put(Field.STATUS, WorkflowConstants.STATUS_APPROVED);
 
-				attributes.put(CPDefinitionIndexer.FIELD_PUBLISHED, true);
-				attributes.put(
-					CPDefinitionIndexer.FIELD_SUBSCRIPTION_ENABLED, true);
+				attributes.put(CPField.PUBLISHED, true);
+				attributes.put(CPField.SUBSCRIPTION_ENABLED, true);
 
 				long groupId = commercePaymentMethodGroupRel.getGroupId();
 

diff --git a/...ce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java b/...ce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java
@@ -27,8 +27,8 @@
 import com.liferay.commerce.payment.util.comparator.CommercePaymentMethodGroupRelNameOrderByComparator;
 import com.liferay.commerce.payment.web.internal.admin.PaymentMethodsCommerceAdminModule;
 import com.liferay.commerce.product.catalog.CPQuery;
+import com.liferay.commerce.product.constants.CPField;
 import com.liferay.commerce.product.data.source.CPDataSourceResult;
-import com.liferay.commerce.product.search.CPDefinitionIndexer;
 import com.liferay.commerce.product.service.CommerceChannelLocalService;
 import com.liferay.commerce.product.util.CPDefinitionHelper;
 import com.liferay.commerce.service.CommerceOrderLocalService;
@@ -192,8 +192,8 @@ public int getRecurringCPDefinitionsCount(
 
 		attributes.put(Field.STATUS, WorkflowConstants.STATUS_APPROVED);
 
-		attributes.put(CPDefinitionIndexer.FIELD_PUBLISHED, true);
-		attributes.put(CPDefinitionIndexer.FIELD_SUBSCRIPTION_ENABLED, true);
+		attributes.put(CPField.PUBLISHED, true);
+		attributes.put(CPField.SUBSCRIPTION_ENABLED, true);
 
 		long groupId = commercePaymentMethodGroupRel.getGroupId();