Properties parse fix (#207)

Tinkoff · Jul 19, 2023 · 68975fd · 68975fd
1 parent 8f52432
commit 68975fd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/...g/config-common/src/main/java/ru/tinkoff/kora/config/common/factory/MapConfigFactory.java b/...g/config-common/src/main/java/ru/tinkoff/kora/config/common/factory/MapConfigFactory.java
@@ -87,6 +87,27 @@ public static Config fromProperties(ConfigOrigin origin, Properties properties)
                     }
                 } else {
                     var field = (PathElement.Key) element;
+                    if (!(currentObject instanceof Map<?, ?>)) {
+                        var prev = (Object) map;
+                        for (int j = 0; j < i - 1; j++) {
+                            if (parts.get(j) instanceof PathElement.Key k) {
+                                prev = ((Map<String, Object>) prev).get(k.name());
+                            } else if (parts.get(j) instanceof PathElement.Index index) {
+                                prev = ((List<Object>) prev).get(index.index());
+                            } else {
+                                throw new IllegalStateException();
+                            }
+                        }
+                        var prevPath = parts.get(i - 1);
+                        currentObject = new LinkedHashMap<String, Object>();
+                        if (prevPath instanceof PathElement.Key k) {
+                            ((Map<String, Object>) prev).put(k.name(), currentObject);
+                        } else if (prevPath instanceof PathElement.Index index) {
+                            ((List<Object>) prev).set(index.index(), currentObject);
+                        } else {
+                            throw new IllegalStateException();
+                        }
+                    }
                     var object = (Map<String, Object>) currentObject;
                     var currentValue = object.get(field.name());
                     if (currentValue == null) {
@@ -105,7 +126,7 @@ public static Config fromProperties(ConfigOrigin origin, Properties properties)
                     } else {
                         if (i + 1 < parts.size()) {
                             currentObject = currentValue;
-                        } else {
+                        } else if (!(currentValue instanceof Map<?, ?>)) {
                             object.put(field.name(), value);
                         }
                     }

diff --git a/config/config-common/src/test/java/ru/tinkoff/kora/config/common/CommonConfigModuleTest.java b/config/config-common/src/test/java/ru/tinkoff/kora/config/common/CommonConfigModuleTest.java
@@ -0,0 +1,13 @@
+package ru.tinkoff.kora.config.common;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+
+class CommonConfigModuleTest {
+    @Test
+    void testSystemProperties() {
+        Assertions.assertNotNull(new CommonConfigModule() {}.systemProperties());
+        System.out.println(new CommonConfigModule() {}.systemProperties());
+    }
+}