LPS-23927 Revert renaming, but kept property doc change.

felipelorenz · Apr 23, 2024 · 0b5da79 · 0b5da79
1 parent ff8e394
commit 0b5da79
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/portal-impl/src/com/liferay/portal/spring/bean/LiferayBeanFactory.java b/portal-impl/src/com/liferay/portal/spring/bean/LiferayBeanFactory.java
@@ -49,7 +49,7 @@ protected void invokeCustomInitMethod(
 			String beanName, Object bean, RootBeanDefinition rootBeanDefinition)
 		throws Throwable {
 
-		if (!PropsValues.SPRING_BEAN_FACTORY_STRICT_LIFECYCLE_ENABLED) {
+		if (!PropsValues.SPRING_BEANFACTORY_STRICT_LIFECYCLE_ENABLED) {
 			super.invokeCustomInitMethod(beanName, bean, rootBeanDefinition);
 
 			return;
@@ -176,7 +176,7 @@ protected void populateBean(
 	protected void registerDisposableBeanIfNecessary(
 		String beanName, Object bean, RootBeanDefinition rootBeanDefinition) {
 
-		if (!PropsValues.SPRING_BEAN_FACTORY_STRICT_LIFECYCLE_ENABLED) {
+		if (!PropsValues.SPRING_BEANFACTORY_STRICT_LIFECYCLE_ENABLED) {
 			super.registerDisposableBeanIfNecessary(
 				beanName, bean, rootBeanDefinition);
 

diff --git a/portal-impl/src/com/liferay/portal/util/PropsValues.java b/portal-impl/src/com/liferay/portal/util/PropsValues.java
@@ -2197,10 +2197,10 @@ public class PropsValues {
 	public static String SOCIAL_ACTIVITY_SETS_SELECTOR = GetterUtil.getString(
 		PropsUtil.get(PropsKeys.SOCIAL_ACTIVITY_SETS_SELECTOR));
 
-	public static boolean SPRING_BEAN_FACTORY_STRICT_LIFECYCLE_ENABLED =
+	public static boolean SPRING_BEANFACTORY_STRICT_LIFECYCLE_ENABLED =
 		GetterUtil.getBoolean(
 			PropsUtil.get(
-				PropsKeys.SPRING_BEAN_FACTORY_STRICT_LIFECYCLE_ENABLED));
+				PropsKeys.SPRING_BEANFACTORY_STRICT_LIFECYCLE_ENABLED));
 
 	public static final String[] SPRING_CONFIGS = PropsUtil.getArray(
 		PropsKeys.SPRING_CONFIGS);

diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
@@ -781,12 +781,12 @@
     # Set this property to true to enable Spring bean factory strict lifecycle
     # methods. This will remove Spring's inferring for bean lifecycle methods
     # which can avoid large amount of NoSuchMethodException during bean factory
-    # initialization. Set this to property to fallback to Spring's default
+    # initialization. Set this to false to fallback to Spring's default
     # behavior.
     #
-    # Env: LIFERAY_SPRING_PERIOD_BEAN_PERIOD_FACTORY_PERIOD_STRICT_PERIOD_LIFECYCLE_PERIOD_ENABLED
+    # Env: LIFERAY_SPRING_PERIOD_BEANFACTORY_PERIOD_STRICT_PERIOD_LIFECYCLE_PERIOD_ENABLED
     #
-    spring.bean.factory.strict.lifecycle.enabled=true
+    spring.beanfactory.strict.lifecycle.enabled=true
 
     #
     # Input a list of comma delimited Spring configurations. These will be

diff --git a/portal-kernel/src/com/liferay/portal/kernel/util/PropsKeys.java b/portal-kernel/src/com/liferay/portal/kernel/util/PropsKeys.java
@@ -2536,8 +2536,8 @@ public interface PropsKeys {
 
 	public static final String SOURCE_FORGE_MIRRORS = "source.forge.mirrors";
 
-	public static final String SPRING_BEAN_FACTORY_STRICT_LIFECYCLE_ENABLED =
-		"spring.bean.factory.strict.lifecycle.enabled";
+	public static final String SPRING_BEANFACTORY_STRICT_LIFECYCLE_ENABLED =
+		"spring.beanfactory.strict.lifecycle.enabled";
 
 	public static final String SPRING_CONFIGS = "spring.configs";