allow construct ArangoConfigProperties from java.util.Properties (DE-976)

rashtao · rashtao · commit 4e13f6c5aec0 · 2025-01-27T22:33:46.000+01:00
diff --git a/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java b/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Properties;
 
 public interface ArangoConfigProperties {
 
@@ -34,6 +35,22 @@ static ArangoConfigProperties fromFile(final String fileName, final String prefi
         return new ArangoConfigPropertiesImpl(fileName, prefix);
     }
 
+    /**
+     * Creates {@code ArangoConfigProperties} from Java properties ({@link java.util.Properties}).
+     * Properties must be prefixed with @{code "arangodb"}, eg. @{code "arangodb.hosts=localhost:8529"}.
+     */
+    static ArangoConfigProperties fromProperties(final Properties properties) {
+        return new ArangoConfigPropertiesImpl(properties);
+    }
+
+    /**
+     * Creates {@code ArangoConfigProperties} from Java properties ({@link java.util.Properties}).
+     * Properties must be prefixed with @{code prefix}, eg. @{code "<prefix>.hosts=localhost:8529"}.
+     */
+    static ArangoConfigProperties fromProperties(final Properties properties, final String prefix) {
+        return new ArangoConfigPropertiesImpl(properties, prefix);
+    }
+
     default Optional<List<HostDescription>> getHosts() {
         return Optional.empty();
     }
diff --git a/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java b/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java
@@ -31,29 +31,37 @@ public ArangoConfigPropertiesImpl(final String fileName) {
         this(fileName, DEFAULT_PREFIX);
     }
 
-    public  ArangoConfigPropertiesImpl(final String fileName, final String prefix) {
-        properties = initProperties(fileName);
-        this.prefix = initPrefix(prefix);
+    public ArangoConfigPropertiesImpl(final String fileName, final String prefix) {
+        this(initProperties(fileName), prefix);
     }
 
-    private String initPrefix(String p) {
-        if (p == null) {
-            return "";
-        } else {
-            return p + ".";
-        }
+    public ArangoConfigPropertiesImpl(final Properties properties) {
+        this(properties, DEFAULT_PREFIX);
+    }
+
+    public ArangoConfigPropertiesImpl(final Properties properties, final String prefix) {
+        this.properties = properties;
+        this.prefix = initPrefix(prefix);
     }
 
-    private Properties initProperties(String fileName) {
+    private static Properties initProperties(String fileName) {
         Properties p = new Properties();
-        try (InputStream is = getClass().getClassLoader().getResourceAsStream(fileName)) {
+        try (InputStream is = ArangoConfigPropertiesImpl.class.getClassLoader().getResourceAsStream(fileName)) {
             p.load(is);
         } catch (Exception e) {
             throw ArangoDBException.of("Got exception while reading properties file " + fileName, e);
         }
         return p;
     }
 
+    private String initPrefix(String p) {
+        if (p == null) {
+            return "";
+        } else {
+            return p + ".";
+        }
+    }
+
     private String getProperty(String key) {
         return properties.getProperty(prefix + key);
     }
diff --git a/test-functional/src/test/java/com/arangodb/ArangoDBTest.java b/test-functional/src/test/java/com/arangodb/ArangoDBTest.java
@@ -672,14 +672,27 @@ void loadproperties() {
 
     @ParameterizedTest
     @MethodSource("arangos")
-    void loadpropertiesWithPrefix() {
+    void loadPropertiesWithPrefix() {
         ArangoDB adb = new ArangoDB.Builder()
                 .loadProperties(ConfigUtils.loadConfig("arangodb-with-prefix.properties", "adb"))
                 .build();
         adb.getVersion();
         adb.shutdown();
     }
 
+    @ParameterizedTest
+    @MethodSource("arangos")
+    void loadConfigFromPropertiesWithPrefix() {
+        Properties props = new Properties();
+        props.setProperty("adb.hosts", "172.28.0.1:8529");
+        props.setProperty("adb.password", "test");
+        ArangoDB adb = new ArangoDB.Builder()
+                .loadProperties(ConfigUtils.loadConfig(props, "adb"))
+                .build();
+        adb.getVersion();
+        adb.shutdown();
+    }
+
     @ParameterizedTest
     @MethodSource("arangos")
     void accessMultipleDatabases(ArangoDB arangoDB) {
diff --git a/test-functional/src/test/java/com/arangodb/config/ConfigUtils.java b/test-functional/src/test/java/com/arangodb/config/ConfigUtils.java
@@ -1,5 +1,7 @@
 package com.arangodb.config;
 
+import java.util.Properties;
+
 public class ConfigUtils {
 
     public static ArangoConfigProperties loadConfig() {
@@ -14,4 +16,8 @@ public static ArangoConfigProperties loadConfig(final String location, final Str
         return ArangoConfigProperties.fromFile(location, prefix);
     }
 
+    public static ArangoConfigProperties loadConfig(final Properties properties, final String prefix) {
+        return ArangoConfigProperties.fromProperties(properties, prefix);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package com.arangodb.config;`
`2`	`2`
	`3`	`+import java.util.Properties;`
	`4`	`+`
`3`	`5`	`public class ConfigUtils {`
`4`	`6`
`5`	`7`	`public static ArangoConfigProperties loadConfig() {`
`@@ -14,4 +16,8 @@ public static ArangoConfigProperties loadConfig(final String location, final Str`
`14`	`16`	`return ArangoConfigProperties.fromFile(location, prefix);`
`15`	`17`	`}`
`16`	`18`
	`19`	`+ public static ArangoConfigProperties loadConfig(final Properties properties, final String prefix) {`
	`20`	`+ return ArangoConfigProperties.fromProperties(properties, prefix);`
	`21`	`+ }`
	`22`	`+`
`17`	`23`	`}`