From 64177430bd7fb2e2965fa8f31626ae96eab956ad Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 8 Oct 2021 12:05:29 -0300 Subject: [PATCH] COMMERCE-7414 regen --- .../service/http/COREntryRelServiceHttp.java | 122 +++++++++--------- .../service/http/COREntryRelServiceSoap.java | 72 +++++------ .../impl/COREntryPersistenceImpl.java | 8 +- .../impl/COREntryRelPersistenceImpl.java | 8 +- ...ants.java => CORPersistenceConstants.java} | 2 +- .../src/main/resources/service.properties | 2 +- 6 files changed, 107 insertions(+), 107 deletions(-) rename modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/{CommercePersistenceConstants.java => CORPersistenceConstants.java} (97%) diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceHttp.java b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceHttp.java index d3c24af6d413a6..d3895393b62f1f 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceHttp.java +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceHttp.java @@ -462,17 +462,21 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static com.liferay.commerce.order.rule.model.COREntryRel - getCOREntryRel(HttpPrincipal httpPrincipal, long corEntryRelId) - throws com.liferay.portal.kernel.exception.PortalException { + public static java.util.List + + getCommerceOrderTypeCOREntryRels( + HttpPrincipal httpPrincipal, long corEntryId, + String keywords, int start, int end) + throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, "getCOREntryRel", - _getCOREntryRelParameterTypes10); + COREntryRelServiceUtil.class, + "getCommerceOrderTypeCOREntryRels", + _getCommerceOrderTypeCOREntryRelsParameterTypes10); MethodHandler methodHandler = new MethodHandler( - methodKey, corEntryRelId); + methodKey, corEntryId, keywords, start, end); Object returnObj = null; @@ -491,7 +495,8 @@ public static int getCommerceChannelCOREntryRelsCount( exception); } - return (com.liferay.commerce.order.rule.model.COREntryRel)returnObj; + return (java.util.List + )returnObj; } catch (com.liferay.portal.kernel.exception.SystemException systemException) { @@ -502,18 +507,18 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static java.util.List - getCOREntryRels( - HttpPrincipal httpPrincipal, long corEntryId) - throws com.liferay.portal.kernel.exception.PortalException { + public static int getCommerceOrderTypeCOREntryRelsCount( + HttpPrincipal httpPrincipal, long corEntryId, String keywords) + throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, "getCOREntryRels", - _getCOREntryRelsParameterTypes11); + COREntryRelServiceUtil.class, + "getCommerceOrderTypeCOREntryRelsCount", + _getCommerceOrderTypeCOREntryRelsCountParameterTypes11); MethodHandler methodHandler = new MethodHandler( - methodKey, corEntryId); + methodKey, corEntryId, keywords); Object returnObj = null; @@ -532,8 +537,7 @@ getCOREntryRels( exception); } - return (java.util.List - )returnObj; + return ((Integer)returnObj).intValue(); } catch (com.liferay.portal.kernel.exception.SystemException systemException) { @@ -544,22 +548,17 @@ getCOREntryRels( } } - public static java.util.List - getCOREntryRels( - HttpPrincipal httpPrincipal, long corEntryId, int start, - int end, - com.liferay.portal.kernel.util.OrderByComparator - - orderByComparator) - throws com.liferay.portal.kernel.exception.PortalException { + public static com.liferay.commerce.order.rule.model.COREntryRel + getCOREntryRel(HttpPrincipal httpPrincipal, long corEntryRelId) + throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, "getCOREntryRels", - _getCOREntryRelsParameterTypes12); + COREntryRelServiceUtil.class, "getCOREntryRel", + _getCOREntryRelParameterTypes12); MethodHandler methodHandler = new MethodHandler( - methodKey, corEntryId, start, end, orderByComparator); + methodKey, corEntryRelId); Object returnObj = null; @@ -578,8 +577,7 @@ getCOREntryRels( exception); } - return (java.util.List - )returnObj; + return (com.liferay.commerce.order.rule.model.COREntryRel)returnObj; } catch (com.liferay.portal.kernel.exception.SystemException systemException) { @@ -590,14 +588,15 @@ getCOREntryRels( } } - public static int getCOREntryRelsCount( - HttpPrincipal httpPrincipal, long corEntryId) - throws com.liferay.portal.kernel.exception.PortalException { + public static java.util.List + getCOREntryRels( + HttpPrincipal httpPrincipal, long corEntryId) + throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, "getCOREntryRelsCount", - _getCOREntryRelsCountParameterTypes13); + COREntryRelServiceUtil.class, "getCOREntryRels", + _getCOREntryRelsParameterTypes13); MethodHandler methodHandler = new MethodHandler( methodKey, corEntryId); @@ -619,7 +618,8 @@ public static int getCOREntryRelsCount( exception); } - return ((Integer)returnObj).intValue(); + return (java.util.List + )returnObj; } catch (com.liferay.portal.kernel.exception.SystemException systemException) { @@ -631,20 +631,21 @@ public static int getCOREntryRelsCount( } public static java.util.List - - getCommerceOrderTypeCOREntryRels( - HttpPrincipal httpPrincipal, long corEntryId, - String keywords, int start, int end) + getCOREntryRels( + HttpPrincipal httpPrincipal, long corEntryId, int start, + int end, + com.liferay.portal.kernel.util.OrderByComparator + + orderByComparator) throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, - "getCommerceOrderTypeCOREntryRels", - _getCommerceOrderTypeCOREntryRelsParameterTypes14); + COREntryRelServiceUtil.class, "getCOREntryRels", + _getCOREntryRelsParameterTypes14); MethodHandler methodHandler = new MethodHandler( - methodKey, corEntryId, keywords, start, end); + methodKey, corEntryId, start, end, orderByComparator); Object returnObj = null; @@ -675,18 +676,17 @@ public static int getCOREntryRelsCount( } } - public static int getCommerceOrderTypeCOREntryRelsCount( - HttpPrincipal httpPrincipal, long corEntryId, String keywords) + public static int getCOREntryRelsCount( + HttpPrincipal httpPrincipal, long corEntryId) throws com.liferay.portal.kernel.exception.PortalException { try { MethodKey methodKey = new MethodKey( - COREntryRelServiceUtil.class, - "getCommerceOrderTypeCOREntryRelsCount", - _getCommerceOrderTypeCOREntryRelsCountParameterTypes15); + COREntryRelServiceUtil.class, "getCOREntryRelsCount", + _getCOREntryRelsCountParameterTypes15); MethodHandler methodHandler = new MethodHandler( - methodKey, corEntryId, keywords); + methodKey, corEntryId); Object returnObj = null; @@ -753,24 +753,24 @@ public static int getCommerceOrderTypeCOREntryRelsCount( _getCommerceChannelCOREntryRelsCountParameterTypes9 = new Class[] { long.class, String.class }; - private static final Class[] _getCOREntryRelParameterTypes10 = + private static final Class[] + _getCommerceOrderTypeCOREntryRelsParameterTypes10 = new Class[] { + long.class, String.class, int.class, int.class + }; + private static final Class[] + _getCommerceOrderTypeCOREntryRelsCountParameterTypes11 = new Class[] { + long.class, String.class + }; + private static final Class[] _getCOREntryRelParameterTypes12 = new Class[] {long.class}; - private static final Class[] _getCOREntryRelsParameterTypes11 = + private static final Class[] _getCOREntryRelsParameterTypes13 = new Class[] {long.class}; - private static final Class[] _getCOREntryRelsParameterTypes12 = + private static final Class[] _getCOREntryRelsParameterTypes14 = new Class[] { long.class, int.class, int.class, com.liferay.portal.kernel.util.OrderByComparator.class }; - private static final Class[] _getCOREntryRelsCountParameterTypes13 = + private static final Class[] _getCOREntryRelsCountParameterTypes15 = new Class[] {long.class}; - private static final Class[] - _getCommerceOrderTypeCOREntryRelsParameterTypes14 = new Class[] { - long.class, String.class, int.class, int.class - }; - private static final Class[] - _getCommerceOrderTypeCOREntryRelsCountParameterTypes15 = new Class[] { - long.class, String.class - }; } \ No newline at end of file diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceSoap.java b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceSoap.java index a77c13b6252812..f7fac628d0e304 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceSoap.java +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/http/COREntryRelServiceSoap.java @@ -244,16 +244,19 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static com.liferay.commerce.order.rule.model.COREntryRelSoap - getCOREntryRel(long corEntryRelId) + public static com.liferay.commerce.order.rule.model.COREntryRelSoap[] + getCommerceOrderTypeCOREntryRels( + long corEntryId, String keywords, int start, int end) throws RemoteException { try { - com.liferay.commerce.order.rule.model.COREntryRel returnValue = - COREntryRelServiceUtil.getCOREntryRel(corEntryRelId); + java.util.List + returnValue = + COREntryRelServiceUtil.getCommerceOrderTypeCOREntryRels( + corEntryId, keywords, start, end); return com.liferay.commerce.order.rule.model.COREntryRelSoap. - toSoapModel(returnValue); + toSoapModels(returnValue); } catch (Exception exception) { _log.error(exception, exception); @@ -262,17 +265,16 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static com.liferay.commerce.order.rule.model.COREntryRelSoap[] - getCOREntryRels(long corEntryId) + public static int getCommerceOrderTypeCOREntryRelsCount( + long corEntryId, String keywords) throws RemoteException { try { - java.util.List - returnValue = COREntryRelServiceUtil.getCOREntryRels( - corEntryId); + int returnValue = + COREntryRelServiceUtil.getCommerceOrderTypeCOREntryRelsCount( + corEntryId, keywords); - return com.liferay.commerce.order.rule.model.COREntryRelSoap. - toSoapModels(returnValue); + return returnValue; } catch (Exception exception) { _log.error(exception, exception); @@ -281,21 +283,16 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static com.liferay.commerce.order.rule.model.COREntryRelSoap[] - getCOREntryRels( - long corEntryId, int start, int end, - com.liferay.portal.kernel.util.OrderByComparator - - orderByComparator) + public static com.liferay.commerce.order.rule.model.COREntryRelSoap + getCOREntryRel(long corEntryRelId) throws RemoteException { try { - java.util.List - returnValue = COREntryRelServiceUtil.getCOREntryRels( - corEntryId, start, end, orderByComparator); + com.liferay.commerce.order.rule.model.COREntryRel returnValue = + COREntryRelServiceUtil.getCOREntryRel(corEntryRelId); return com.liferay.commerce.order.rule.model.COREntryRelSoap. - toSoapModels(returnValue); + toSoapModel(returnValue); } catch (Exception exception) { _log.error(exception, exception); @@ -304,14 +301,17 @@ public static int getCommerceChannelCOREntryRelsCount( } } - public static int getCOREntryRelsCount(long corEntryId) + public static com.liferay.commerce.order.rule.model.COREntryRelSoap[] + getCOREntryRels(long corEntryId) throws RemoteException { try { - int returnValue = COREntryRelServiceUtil.getCOREntryRelsCount( - corEntryId); + java.util.List + returnValue = COREntryRelServiceUtil.getCOREntryRels( + corEntryId); - return returnValue; + return com.liferay.commerce.order.rule.model.COREntryRelSoap. + toSoapModels(returnValue); } catch (Exception exception) { _log.error(exception, exception); @@ -321,15 +321,17 @@ public static int getCOREntryRelsCount(long corEntryId) } public static com.liferay.commerce.order.rule.model.COREntryRelSoap[] - getCommerceOrderTypeCOREntryRels( - long corEntryId, String keywords, int start, int end) + getCOREntryRels( + long corEntryId, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator + + orderByComparator) throws RemoteException { try { java.util.List - returnValue = - COREntryRelServiceUtil.getCommerceOrderTypeCOREntryRels( - corEntryId, keywords, start, end); + returnValue = COREntryRelServiceUtil.getCOREntryRels( + corEntryId, start, end, orderByComparator); return com.liferay.commerce.order.rule.model.COREntryRelSoap. toSoapModels(returnValue); @@ -341,14 +343,12 @@ public static int getCOREntryRelsCount(long corEntryId) } } - public static int getCommerceOrderTypeCOREntryRelsCount( - long corEntryId, String keywords) + public static int getCOREntryRelsCount(long corEntryId) throws RemoteException { try { - int returnValue = - COREntryRelServiceUtil.getCommerceOrderTypeCOREntryRelsCount( - corEntryId, keywords); + int returnValue = COREntryRelServiceUtil.getCOREntryRelsCount( + corEntryId); return returnValue; } diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryPersistenceImpl.java b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryPersistenceImpl.java index d81ddc2cfb1357..fde9d63efa63fd 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryPersistenceImpl.java +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryPersistenceImpl.java @@ -20,7 +20,7 @@ import com.liferay.commerce.order.rule.model.impl.COREntryImpl; import com.liferay.commerce.order.rule.model.impl.COREntryModelImpl; import com.liferay.commerce.order.rule.service.persistence.COREntryPersistence; -import com.liferay.commerce.order.rule.service.persistence.impl.constants.CommercePersistenceConstants; +import com.liferay.commerce.order.rule.service.persistence.impl.constants.CORPersistenceConstants; import com.liferay.petra.string.StringBundler; import com.liferay.portal.kernel.configuration.Configuration; import com.liferay.portal.kernel.dao.orm.EntityCache; @@ -6005,7 +6005,7 @@ public void deactivate() { @Override @Reference( - target = CommercePersistenceConstants.SERVICE_CONFIGURATION_FILTER, + target = CORPersistenceConstants.SERVICE_CONFIGURATION_FILTER, unbind = "-" ) public void setConfiguration(Configuration configuration) { @@ -6013,7 +6013,7 @@ public void setConfiguration(Configuration configuration) { @Override @Reference( - target = CommercePersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, + target = CORPersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, unbind = "-" ) public void setDataSource(DataSource dataSource) { @@ -6022,7 +6022,7 @@ public void setDataSource(DataSource dataSource) { @Override @Reference( - target = CommercePersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, + target = CORPersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, unbind = "-" ) public void setSessionFactory(SessionFactory sessionFactory) { diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryRelPersistenceImpl.java b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryRelPersistenceImpl.java index 4b5567a0db6cd5..51edf6e10bfb21 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryRelPersistenceImpl.java +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/COREntryRelPersistenceImpl.java @@ -20,7 +20,7 @@ import com.liferay.commerce.order.rule.model.impl.COREntryRelImpl; import com.liferay.commerce.order.rule.model.impl.COREntryRelModelImpl; import com.liferay.commerce.order.rule.service.persistence.COREntryRelPersistence; -import com.liferay.commerce.order.rule.service.persistence.impl.constants.CommercePersistenceConstants; +import com.liferay.commerce.order.rule.service.persistence.impl.constants.CORPersistenceConstants; import com.liferay.petra.string.StringBundler; import com.liferay.portal.kernel.configuration.Configuration; import com.liferay.portal.kernel.dao.orm.EntityCache; @@ -1993,7 +1993,7 @@ public void deactivate() { @Override @Reference( - target = CommercePersistenceConstants.SERVICE_CONFIGURATION_FILTER, + target = CORPersistenceConstants.SERVICE_CONFIGURATION_FILTER, unbind = "-" ) public void setConfiguration(Configuration configuration) { @@ -2001,7 +2001,7 @@ public void setConfiguration(Configuration configuration) { @Override @Reference( - target = CommercePersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, + target = CORPersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, unbind = "-" ) public void setDataSource(DataSource dataSource) { @@ -2010,7 +2010,7 @@ public void setDataSource(DataSource dataSource) { @Override @Reference( - target = CommercePersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, + target = CORPersistenceConstants.ORIGIN_BUNDLE_SYMBOLIC_NAME_FILTER, unbind = "-" ) public void setSessionFactory(SessionFactory sessionFactory) { diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CommercePersistenceConstants.java b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CORPersistenceConstants.java similarity index 97% rename from modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CommercePersistenceConstants.java rename to modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CORPersistenceConstants.java index 37db63e35ed15f..05998e159f4704 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CommercePersistenceConstants.java +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/java/com/liferay/commerce/order/rule/service/persistence/impl/constants/CORPersistenceConstants.java @@ -27,7 +27,7 @@ * @generated */ @Component(immediate = true, service = {}) -public class CommercePersistenceConstants { +public class CORPersistenceConstants { public static final String BUNDLE_SYMBOLIC_NAME = "com.liferay.commerce.order.rule.service"; diff --git a/modules/apps/commerce/commerce-order-rule-service/src/main/resources/service.properties b/modules/apps/commerce/commerce-order-rule-service/src/main/resources/service.properties index 7c97138643894e..5474181ae5fc9d 100644 --- a/modules/apps/commerce/commerce-order-rule-service/src/main/resources/service.properties +++ b/modules/apps/commerce/commerce-order-rule-service/src/main/resources/service.properties @@ -12,6 +12,6 @@ ## Build ## - build.namespace=Commerce + build.namespace=COR build.number=1 build.date=1633010268193 \ No newline at end of file