add lazy property initialization api to SystemPropertiesSupport

oracle · Dec 5, 2020 · aa2506f · aa2506f
1 parent 83326c6
commit aa2506f
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java
@@ -84,6 +84,7 @@ protected SystemPropertiesSupport() {
         properties = new Properties();
         savedProperties = new HashMap<>();
         readOnlySavedProperties = Collections.unmodifiableMap(savedProperties);
+        lazyRuntimeValues = new HashMap<>();
 
         for (String key : HOSTED_PROPERTIES) {
             String value = System.getProperty(key);
@@ -116,13 +117,12 @@ protected SystemPropertiesSupport() {
             initializeProperty("java.awt.printerjob", System.getProperty("java.awt.printerjob"));
         }
 
-        lazyRuntimeValues = new HashMap<>();
-        lazyRuntimeValues.put("user.name", this::userName);
-        lazyRuntimeValues.put("user.home", this::userHome);
-        lazyRuntimeValues.put("user.dir", this::userDir);
-        lazyRuntimeValues.put("java.io.tmpdir", this::tmpdirValue);
-        lazyRuntimeValues.put("os.version", this::osVersionValue);
-        lazyRuntimeValues.put("java.vm.version", VM::getVersion);
+        initializeLazyProperty("user.name", this::userName);
+        initializeLazyProperty("user.home", this::userHome);
+        initializeLazyProperty("user.dir", this::userDir);
+        initializeLazyProperty("java.io.tmpdir", this::tmpdirValue);
+        initializeLazyProperty("os.version", this::osVersionValue);
+        initializeLazyProperty("java.vm.version", VM::getVersion);
     }
 
     private void ensureFullyInitialized() {
@@ -176,6 +176,14 @@ public void initializeProperty(String key, String value) {
         properties.setProperty(key, value);
     }
 
+    /**
+     * Lazily initializes a property at runtime when it is first requested, based on the supplier's
+     * return value.
+     */
+    public void initializeLazyProperty(String key, Supplier<String> value) {
+        lazyRuntimeValues.put(key, value);
+    }
+
     public String setProperty(String key, String value) {
         /*
          * The return value of setProperty is the previous value of the key, so we need to ensure