Merge pull request #52 from 398ja/fix/config-without-commons-0.1.2

fix/config-without-commons-0.1.2

Author: tcheeric

AGENTS.md

@@ -15,7 +15,6 @@ A simple Java client for ACINQ's [phoenixd REST API](https://phoenix.acinq.co/se
     - [Design Patterns](https://github.com/iluwatar/java-design-patterns)
         - Follow design patterns as described in the book, whenever possible.
 - When commiting code, follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
-- When adding new features, ensure they are compliant with the Cashu specification (NUTs) provided above.
 
 ## Documentation
 

phoenixd-base/pom.xml

@@ -24,16 +24,7 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-            <version>${commons.configuration2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
-        </dependency>
+        <!-- No external runtime dependencies required for configuration reading -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/util/Configuration.java

@@ -4,20 +4,20 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.apache.commons.configuration2.builder.fluent.Configurations;
 
+import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
+import java.util.Set;
 
 @RequiredArgsConstructor
 @Data
 public class Configuration {
 
     private final @NonNull String prefix;
-    private final PropertiesConfiguration properties;
+    private final Properties properties;
 
     private String envKey(@NonNull String key) {
         return (prefix + "_" + key).toUpperCase().replace('.', '_');
@@ -33,29 +33,41 @@ private String resolve(@NonNull String key) {
         if (env != null) {
             return env;
         }
-        return properties.getString(prefix + "." + key, null);
+        return properties.getProperty(prefix + "." + key);
     }
 
     @SneakyThrows
     public Configuration(@NonNull String prefix, @NonNull URL fileUrl) {
         this.prefix = prefix;
-            this.properties = new Configurations().properties(fileUrl);
+        this.properties = new Properties();
+        try (InputStream in = fileUrl.openStream()) {
+            if (in != null) {
+                this.properties.load(in);
+            }
+        }
     }
 
     @SneakyThrows
     public Configuration(@NonNull String prefix) {
         this.prefix = prefix;
-        this.properties = new Configurations().properties(getClass().getResource("/app.properties"));
+        this.properties = new Properties();
+        URL resource = getClass().getResource("/app.properties");
+        if (resource != null) {
+            try (InputStream in = resource.openStream()) {
+                if (in != null) {
+                    this.properties.load(in);
+                }
+            }
+        }
     }
 
     public List<String> keys() {
         List<String> result = new ArrayList<>();
-        Iterator<String> keysIterator = properties.getKeys(prefix);
-        while (keysIterator.hasNext()) {
-            String key = keysIterator.next();
-            if (key.startsWith(prefix + ".")) {
-                String strippedKey = key.substring(prefix.length() + 1); // +1 for the dot
-                result.add(strippedKey);
+        Set<String> names = properties.stringPropertyNames();
+        String prefixDot = prefix + ".";
+        for (String key : names) {
+            if (key.startsWith(prefixDot)) {
+                result.add(key.substring(prefixDot.length()));
             }
         }
         return result;
@@ -109,4 +121,4 @@ public boolean getBoolean(@NonNull String key, boolean defaultValue) {
         String value = resolve(key);
         return value != null ? Boolean.parseBoolean(value) : defaultValue;
     }
-}
+}