#21619 Changes on Config class

dotCMS/src/integration-test/java/com/dotmarketing/util/ConfigTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -15,6 +16,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.tuckey.web.filters.urlrewrite.Conf;
 
 public class ConfigTest {
 
@@ -261,6 +263,30 @@ public void test_get_string_array_from_env() {
         assertEquals(notArray, "VALUE1,VALUE2");
     }
 
+    /**
+     * Method to test {@link Config#getBooleanProperty(String, boolean)}
+     * Here we test that the "same" property seen as an environmental var overrides the other regular property already set in the map
+     */
+    @Test
+    public void Test_Env_Prop_Overrides_Regular_Prop(){
+
+        final String DOT_MY_BOOLEAN_PROPERTY = "DOT_MY_BOOLEAN_PROPERTY";
+        final String MY_BOOLEAN_PROPERTY = "my.boolean.property";
+
+        //Now lets suppose the two properties exits in the Config
+        Config.setProperty(DOT_MY_BOOLEAN_PROPERTY, false);
+        Config.setProperty(MY_BOOLEAN_PROPERTY, true);
+        //But one must take precedence over the other and that's the one that starts with dot.
+
+        //if I request the dot prop one should easily expect the value it was initialized with
+        assertFalse(Config.getBooleanProperty(DOT_MY_BOOLEAN_PROPERTY,true));
+        //if I request the regular non-dot prop we should still get the value assigned to the dot prop because it overrides it
+        assertFalse(Config.getBooleanProperty(MY_BOOLEAN_PROPERTY,true));
+
+        //The second I get rid of the DOT property now I should get the original regular prop
+        Config.setProperty(DOT_MY_BOOLEAN_PROPERTY, null);
+        assertTrue(Config.getBooleanProperty(MY_BOOLEAN_PROPERTY,false));
+    }
 
     /*
      *

dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java

@@ -43,6 +43,7 @@
 import com.dotmarketing.util.VelocityUtil;
 import com.google.common.collect.ImmutableSet;
 import com.liferay.util.StringPool;
+import io.vavr.Lazy;
 import io.vavr.control.Try;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -57,7 +58,8 @@
 
 public class ContentTypeFactoryImpl implements ContentTypeFactory {
 
-  final ContentTypeSql contentTypeSql;
+    private static final String LOAD_CONTENTTYPE_DETAILS_FROM_CACHE = "LOAD_CONTENTTYPE_DETAILS_FROM_CACHE";
+    final ContentTypeSql contentTypeSql;
   final ContentTypeCache2 cache;
 
 
@@ -626,7 +628,8 @@ private boolean dbDelete(final ContentType type) throws DotDataException {
     return true;
   }
 
-  final boolean LOAD_FROM_CACHE=Config.getBooleanProperty("LOAD_CONTENTTYPE_DETAILS_FROM_CACHE", true);
+  final Lazy<Boolean> LOAD_FROM_CACHE=Lazy.of(()->Config.getBooleanProperty(
+          LOAD_CONTENTTYPE_DETAILS_FROM_CACHE, true));
 
   private List<ContentType> dbSearch(final String search, final int baseType, String orderBy, int limit, final int offset,final String hostId)
       throws DotDataException {
@@ -647,7 +650,7 @@ private List<ContentType> dbSearch(final String search, final int baseType, Stri
     final String hostParam = UtilMethods.isSet(hostId) ? StringPool.PERCENT + hostId + StringPool.PERCENT : StringPool.PERCENT;
     DotConnect dc = new DotConnect();
 
-    if(LOAD_FROM_CACHE) {
+    if(LOAD_FROM_CACHE.get()) {
         dc.setSQL( String.format( this.contentTypeSql.SELECT_INODE_ONLY_QUERY_CONDITION, SQLUtil.sanitizeCondition( searchCondition.condition ), orderBy ) );
     }else {
         dc.setSQL( String.format( this.contentTypeSql.SELECT_QUERY_CONDITION, SQLUtil.sanitizeCondition( searchCondition.condition ), orderBy ) );
@@ -663,7 +666,7 @@ private List<ContentType> dbSearch(final String search, final int baseType, Stri
 
     Logger.debug(this, ()-> "QUERY " + dc.getSQL());
 
-    if(LOAD_FROM_CACHE) {
+    if(LOAD_FROM_CACHE.get()) {
         return dc.loadObjectResults()
                     .stream()
                     .map(m-> Try.of(()->find((String) m.get("inode")))

dotCMS/src/main/java/com/dotmarketing/util/Config.java

@@ -1,5 +1,6 @@
 package com.dotmarketing.util;
 
+import com.google.common.collect.ImmutableList;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,6 +10,7 @@
 import java.nio.file.Files;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.configuration.Configuration;
@@ -522,9 +524,8 @@ public static boolean getBooleanProperty (String name) {
 	 * @return
 	 */
 	public static boolean getBooleanProperty (String name, boolean defaultVal) {
-	    _refreshProperties ();
-        Boolean value = Try.of(()->props.getBoolean(envKey(name))).getOrNull();
-        if(value!=null) {
+        final Boolean value = props.containsKey(envKey(name))  ? Try.of(()->props.getBoolean(envKey(name))).getOrNull() : null;
+        if(null != value) {
             return value;
         }
         return props.getBoolean(name, defaultVal);