You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2020/04/20 10:10:23 UTC

svn commit: r1876749 - /jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java

Author: reschke
Date: Mon Apr 20 10:10:23 2020
New Revision: 1876749

URL: http://svn.apache.org/viewvc?rev=1876749&view=rev
Log:
OAK-9018: use SystemPropertySupplier in RDBVersionGCSupport

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java?rev=1876749&r1=1876748&r2=1876749&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java Mon Apr 20 10:10:23 2020
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.QueryCondition;
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.UnsupportedIndexedPropertyException;
 import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterable;
+import org.apache.jackrabbit.oak.plugins.document.util.SystemPropertySupplier;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.slf4j.Logger;
@@ -59,34 +60,12 @@ public class RDBVersionGCSupport extends
 
     // 1: seek using historical, paging mode
     // 2: use custom single query directly using RDBDocumentStore API
-    private static final int MODE;
-
     private static final int DEFAULTMODE = 2;
 
-    static {
-        String propName = RDBVersionGCSupport.class.getName() + ".MODE";
-        String value = System.getProperty(propName, "");
-        switch (value) {
-            case "":
-                MODE = DEFAULTMODE;
-                break;
-            case "1":
-                MODE = 1;
-                break;
-            case "2":
-                MODE = 2;
-                break;
-            default:
-                LOG.error("Ignoring unexpected value '" + value + "' for system property " + propName);
-                MODE = DEFAULTMODE;
-                break;
-        }
-
-        if (DEFAULTMODE != MODE) {
-            LOG.info("Strategy for " + RDBVersionGCSupport.class.getName() + " set to " + MODE + " (via system property "
-                    + propName + ")");
-        }
-    }
+    private static final int MODE = SystemPropertySupplier.create(RDBVersionGCSupport.class.getName() + ".MODE", DEFAULTMODE)
+            .loggingTo(LOG).validateWith(value -> (value == 1 || value == 2)).formatSetMessage((name, value) -> String
+                    .format("Strategy for %s set to %s (via system property %s)", RDBVersionGCSupport.class.getName(), value, name))
+            .get();
 
     public RDBVersionGCSupport(RDBDocumentStore store) {
         super(store);
@@ -303,4 +282,4 @@ public class RDBVersionGCSupport extends
             }
         };
     }
- }
\ No newline at end of file
+ }