Lps 99326

modules/apps/layout/layout-page-template-api/src/main/java/com/liferay/layout/page/template/service/LayoutPageTemplateCollectionService.java

@@ -21,7 +21,6 @@
 import com.liferay.portal.kernel.security.access.control.AccessControlled;
 import com.liferay.portal.kernel.service.BaseService;
 import com.liferay.portal.kernel.service.ServiceContext;
-import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties;
 import com.liferay.portal.kernel.transaction.Isolation;
 import com.liferay.portal.kernel.transaction.Propagation;
 import com.liferay.portal.kernel.transaction.Transactional;
@@ -42,13 +41,6 @@
  */
 @AccessControlled
 @JSONWebService
-@OSGiBeanProperties(
-	property = {
-		"json.web.service.context.name=layout",
-		"json.web.service.context.path=LayoutPageTemplateCollection"
-	},
-	service = LayoutPageTemplateCollectionService.class
-)
 @ProviderType
 @Transactional(
 	isolation = Isolation.PORTAL,

modules/apps/layout/layout-page-template-api/src/main/java/com/liferay/layout/page/template/service/LayoutPageTemplateEntryService.java

@@ -21,7 +21,6 @@
 import com.liferay.portal.kernel.security.access.control.AccessControlled;
 import com.liferay.portal.kernel.service.BaseService;
 import com.liferay.portal.kernel.service.ServiceContext;
-import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties;
 import com.liferay.portal.kernel.transaction.Isolation;
 import com.liferay.portal.kernel.transaction.Propagation;
 import com.liferay.portal.kernel.transaction.Transactional;
@@ -42,13 +41,6 @@
  */
 @AccessControlled
 @JSONWebService
-@OSGiBeanProperties(
-	property = {
-		"json.web.service.context.name=layout",
-		"json.web.service.context.path=LayoutPageTemplateEntry"
-	},
-	service = LayoutPageTemplateEntryService.class
-)
 @ProviderType
 @Transactional(
 	isolation = Isolation.PORTAL,

modules/apps/layout/layout-page-template-api/src/main/java/com/liferay/layout/page/template/service/LayoutPageTemplateStructureService.java

@@ -20,7 +20,6 @@
 import com.liferay.portal.kernel.jsonwebservice.JSONWebService;
 import com.liferay.portal.kernel.security.access.control.AccessControlled;
 import com.liferay.portal.kernel.service.BaseService;
-import com.liferay.portal.kernel.spring.osgi.OSGiBeanProperties;
 import com.liferay.portal.kernel.transaction.Isolation;
 import com.liferay.portal.kernel.transaction.Transactional;
 
@@ -37,13 +36,6 @@
  */
 @AccessControlled
 @JSONWebService
-@OSGiBeanProperties(
-	property = {
-		"json.web.service.context.name=layout",
-		"json.web.service.context.path=LayoutPageTemplateStructure"
-	},
-	service = LayoutPageTemplateStructureService.class
-)
 @ProviderType
 @Transactional(
 	isolation = Isolation.PORTAL,

modules/apps/layout/layout-page-template-service/bnd.bnd

@@ -6,4 +6,5 @@ Import-Package:\
 	\
 	*
 Liferay-Require-SchemaVersion: 3.0.1
-Liferay-Service: true
+Liferay-Service: true
+-dsannotations-options: inherit

modules/apps/layout/layout-page-template-service/build.gradle

@@ -18,8 +18,8 @@ dependencies {
 	compileOnly project(":apps:layout:layout-admin-api")
 	compileOnly project(":apps:layout:layout-api")
 	compileOnly project(":apps:layout:layout-page-template-api")
+	compileOnly project(":apps:portal:portal-aop-api")
 	compileOnly project(":apps:portal:portal-dao-orm-custom-sql-api")
-	compileOnly project(":apps:portal:portal-spring-extender-api")
 	compileOnly project(":apps:portal:portal-upgrade-api")
 	compileOnly project(":apps:segments:segments-api")
 	compileOnly project(":apps:staging:staging-api")

modules/apps/layout/layout-page-template-service/service.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 7.2.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_7_2_0.dtd">
 
-<service-builder auto-import-default-references="false" auto-namespace-tables="false" package-path="com.liferay.layout.page.template">
+<service-builder auto-import-default-references="false" auto-namespace-tables="false" dependency-injector="ds" package-path="com.liferay.layout.page.template">
 	<namespace>Layout</namespace>
 	<entity local-service="true" name="LayoutPageTemplateCollection" remote-service="true" uuid="true">
 
@@ -49,7 +49,6 @@
 
 		<!-- References -->
 
-		<reference entity="LayoutPageTemplateEntry" package-path="com.liferay.layout.page.template" />
 		<reference entity="Resource" package-path="com.liferay.portal" />
 		<reference entity="User" package-path="com.liferay.portal" />
 	</entity>
@@ -246,8 +245,6 @@
 
 		<!-- References -->
 
-		<reference entity="LayoutPageTemplateEntry" package-path="com.liferay.layout.page.template" />
-		<reference entity="LayoutPageTemplateStructureRel" package-path="com.liferay.layout.page.template" />
 		<reference entity="User" package-path="com.liferay.portal" />
 	</entity>
 	<entity local-service="true" name="LayoutPageTemplateStructureRel" remote-service="false" uuid="true">

modules/apps/layout/layout-page-template-service/src/main/java/com/liferay/layout/page/template/model/impl/LayoutPageTemplateCollectionModelImpl.java

@@ -122,21 +122,6 @@ public class LayoutPageTemplateCollectionModelImpl
 
 	public static final String TX_MANAGER = "liferayTransactionManager";
 
-	public static final boolean ENTITY_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.entity.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateCollection"),
-		true);
-
-	public static final boolean FINDER_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.finder.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateCollection"),
-		true);
-
-	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.column.bitmask.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateCollection"),
-		true);
-
 	public static final long COMPANYID_COLUMN_BITMASK = 1L;
 
 	public static final long GROUPID_COLUMN_BITMASK = 2L;
@@ -145,6 +130,14 @@ public class LayoutPageTemplateCollectionModelImpl
 
 	public static final long UUID_COLUMN_BITMASK = 8L;
 
+	public static void setEntityCacheEnabled(boolean entityCacheEnabled) {
+		_entityCacheEnabled = entityCacheEnabled;
+	}
+
+	public static void setFinderCacheEnabled(boolean finderCacheEnabled) {
+		_finderCacheEnabled = finderCacheEnabled;
+	}
+
 	/**
 	 * Converts the soap model instance into a normal model instance.
 	 *
@@ -200,10 +193,6 @@ public static List<LayoutPageTemplateCollection> toModels(
 		return models;
 	}
 
-	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"lock.expiration.time.com.liferay.layout.page.template.model.LayoutPageTemplateCollection"));
-
 	public LayoutPageTemplateCollectionModelImpl() {
 	}
 
@@ -731,12 +720,12 @@ public int hashCode() {
 
 	@Override
 	public boolean isEntityCacheEnabled() {
-		return ENTITY_CACHE_ENABLED;
+		return _entityCacheEnabled;
 	}
 
 	@Override
 	public boolean isFinderCacheEnabled() {
-		return FINDER_CACHE_ENABLED;
+		return _finderCacheEnabled;
 	}
 
 	@Override
@@ -923,6 +912,9 @@ private static class EscapedModelProxyProviderFunctionHolder {
 
 	}
 
+	private static boolean _entityCacheEnabled;
+	private static boolean _finderCacheEnabled;
+
 	private String _uuid;
 	private String _originalUuid;
 	private long _layoutPageTemplateCollectionId;

modules/apps/layout/layout-page-template-service/src/main/java/com/liferay/layout/page/template/model/impl/LayoutPageTemplateEntryModelImpl.java

@@ -140,21 +140,6 @@ public class LayoutPageTemplateEntryModelImpl
 
 	public static final String TX_MANAGER = "liferayTransactionManager";
 
-	public static final boolean ENTITY_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.entity.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateEntry"),
-		true);
-
-	public static final boolean FINDER_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.finder.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateEntry"),
-		true);
-
-	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.column.bitmask.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateEntry"),
-		true);
-
 	public static final long CLASSNAMEID_COLUMN_BITMASK = 1L;
 
 	public static final long CLASSTYPEID_COLUMN_BITMASK = 2L;
@@ -180,6 +165,14 @@ public class LayoutPageTemplateEntryModelImpl
 
 	public static final long UUID_COLUMN_BITMASK = 2048L;
 
+	public static void setEntityCacheEnabled(boolean entityCacheEnabled) {
+		_entityCacheEnabled = entityCacheEnabled;
+	}
+
+	public static void setFinderCacheEnabled(boolean finderCacheEnabled) {
+		_finderCacheEnabled = finderCacheEnabled;
+	}
+
 	/**
 	 * Converts the soap model instance into a normal model instance.
 	 *
@@ -246,10 +239,6 @@ public static List<LayoutPageTemplateEntry> toModels(
 		return models;
 	}
 
-	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"lock.expiration.time.com.liferay.layout.page.template.model.LayoutPageTemplateEntry"));
-
 	public LayoutPageTemplateEntryModelImpl() {
 	}
 
@@ -1188,12 +1177,12 @@ public int hashCode() {
 
 	@Override
 	public boolean isEntityCacheEnabled() {
-		return ENTITY_CACHE_ENABLED;
+		return _entityCacheEnabled;
 	}
 
 	@Override
 	public boolean isFinderCacheEnabled() {
-		return FINDER_CACHE_ENABLED;
+		return _finderCacheEnabled;
 	}
 
 	@Override
@@ -1451,6 +1440,9 @@ private static class EscapedModelProxyProviderFunctionHolder {
 
 	}
 
+	private static boolean _entityCacheEnabled;
+	private static boolean _finderCacheEnabled;
+
 	private String _uuid;
 	private String _originalUuid;
 	private long _layoutPageTemplateEntryId;

modules/apps/layout/layout-page-template-service/src/main/java/com/liferay/layout/page/template/model/impl/LayoutPageTemplateStructureModelImpl.java

@@ -121,21 +121,6 @@ public class LayoutPageTemplateStructureModelImpl
 
 	public static final String TX_MANAGER = "liferayTransactionManager";
 
-	public static final boolean ENTITY_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.entity.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructure"),
-		true);
-
-	public static final boolean FINDER_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.finder.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructure"),
-		true);
-
-	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.column.bitmask.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructure"),
-		true);
-
 	public static final long CLASSNAMEID_COLUMN_BITMASK = 1L;
 
 	public static final long CLASSPK_COLUMN_BITMASK = 2L;
@@ -148,6 +133,14 @@ public class LayoutPageTemplateStructureModelImpl
 
 	public static final long LAYOUTPAGETEMPLATESTRUCTUREID_COLUMN_BITMASK = 32L;
 
+	public static void setEntityCacheEnabled(boolean entityCacheEnabled) {
+		_entityCacheEnabled = entityCacheEnabled;
+	}
+
+	public static void setFinderCacheEnabled(boolean finderCacheEnabled) {
+		_finderCacheEnabled = finderCacheEnabled;
+	}
+
 	/**
 	 * Converts the soap model instance into a normal model instance.
 	 *
@@ -202,10 +195,6 @@ public static List<LayoutPageTemplateStructure> toModels(
 		return models;
 	}
 
-	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"lock.expiration.time.com.liferay.layout.page.template.model.LayoutPageTemplateStructure"));
-
 	public LayoutPageTemplateStructureModelImpl() {
 	}
 
@@ -739,12 +728,12 @@ public int hashCode() {
 
 	@Override
 	public boolean isEntityCacheEnabled() {
-		return ENTITY_CACHE_ENABLED;
+		return _entityCacheEnabled;
 	}
 
 	@Override
 	public boolean isFinderCacheEnabled() {
-		return FINDER_CACHE_ENABLED;
+		return _finderCacheEnabled;
 	}
 
 	@Override
@@ -914,6 +903,9 @@ private static class EscapedModelProxyProviderFunctionHolder {
 
 	}
 
+	private static boolean _entityCacheEnabled;
+	private static boolean _finderCacheEnabled;
+
 	private String _uuid;
 	private String _originalUuid;
 	private long _layoutPageTemplateStructureId;

modules/apps/layout/layout-page-template-service/src/main/java/com/liferay/layout/page/template/model/impl/LayoutPageTemplateStructureRelModelImpl.java

@@ -116,21 +116,6 @@ public class LayoutPageTemplateStructureRelModelImpl
 
 	public static final String TX_MANAGER = "liferayTransactionManager";
 
-	public static final boolean ENTITY_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.entity.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructureRel"),
-		true);
-
-	public static final boolean FINDER_CACHE_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.finder.cache.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructureRel"),
-		true);
-
-	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"value.object.column.bitmask.enabled.com.liferay.layout.page.template.model.LayoutPageTemplateStructureRel"),
-		true);
-
 	public static final long COMPANYID_COLUMN_BITMASK = 1L;
 
 	public static final long GROUPID_COLUMN_BITMASK = 2L;
@@ -144,9 +129,13 @@ public class LayoutPageTemplateStructureRelModelImpl
 	public static final long LAYOUTPAGETEMPLATESTRUCTURERELID_COLUMN_BITMASK =
 		32L;
 
-	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(
-		com.liferay.layout.page.template.service.util.ServiceProps.get(
-			"lock.expiration.time.com.liferay.layout.page.template.model.LayoutPageTemplateStructureRel"));
+	public static void setEntityCacheEnabled(boolean entityCacheEnabled) {
+		_entityCacheEnabled = entityCacheEnabled;
+	}
+
+	public static void setFinderCacheEnabled(boolean finderCacheEnabled) {
+		_finderCacheEnabled = finderCacheEnabled;
+	}
 
 	public LayoutPageTemplateStructureRelModelImpl() {
 	}
@@ -683,12 +672,12 @@ public int hashCode() {
 
 	@Override
 	public boolean isEntityCacheEnabled() {
-		return ENTITY_CACHE_ENABLED;
+		return _entityCacheEnabled;
 	}
 
 	@Override
 	public boolean isFinderCacheEnabled() {
-		return FINDER_CACHE_ENABLED;
+		return _finderCacheEnabled;
 	}
 
 	@Override
@@ -875,6 +864,9 @@ private static class EscapedModelProxyProviderFunctionHolder {
 
 	}
 
+	private static boolean _entityCacheEnabled;
+	private static boolean _finderCacheEnabled;
+
 	private String _uuid;
 	private String _originalUuid;
 	private long _layoutPageTemplateStructureRelId;