Merge pull request #173 from Mechite/add-config-toml

Implement support for most TOML types

Author: SentryMan

avaje-config-toml/src/main/java/io/avaje/config/toml/TomlParser.java

@@ -3,6 +3,7 @@
 import io.avaje.config.ConfigParser;
 import org.jspecify.annotations.NullMarked;
 import org.tomlj.Toml;
+import org.tomlj.TomlArray;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +27,7 @@ public Map<String, String> load(Reader reader) {
     try {
       return Toml.parse(reader).dottedEntrySet()
         .stream()
-        .collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue())));
+        .collect(Collectors.toMap(Map.Entry::getKey, entry -> readTomlValue(entry.getValue())));
     } catch (IOException exception) {
       throw new UncheckedIOException(exception);
     }
@@ -37,9 +38,19 @@ public Map<String, String> load(InputStream is) {
     try {
       return Toml.parse(is).dottedEntrySet()
         .stream()
-        .collect(Collectors.toMap(Map.Entry::getKey, entry -> String.valueOf(entry.getValue())));
+        .collect(Collectors.toMap(Map.Entry::getKey, entry -> readTomlValue(entry.getValue())));
     } catch (IOException exception) {
       throw new UncheckedIOException(exception);
     }
   }
+
+  private static String readTomlValue(Object object) {
+    if (object instanceof TomlArray) {
+      TomlArray array = (TomlArray) object;
+      return array.toList().stream()
+        .map(TomlParser::readTomlValue)
+        .collect(Collectors.joining(";"));
+    }
+    return String.valueOf(object);
+  }
 }

avaje-config-toml/src/test/java/io/avaje/config/toml/TomlParserTest.java

@@ -18,34 +18,60 @@ void supportedExtensions() {
   }
 
   private static String input() {
-    return "key3 = \"c\"\n" +
+    return "key = \"c\"\n" +
       "\n" +
       "[one]\n" +
-      "key = \"a\"\n" +
-      "key2 = \"b\"\n";
+      "key1 = \"a\"\n" +
+      "key2 = \"b\"\n" +
+      "key3 = [\"a\", \"b\", \"c\"]\n" +
+      "[two]\n" +
+      "local_datetime = 2024-09-09T15:30:00\n" +
+      "local_date = 2024-09-09\n" +
+      "local_time = 15:30:00\n" +
+      "offset_datetime = 2024-09-09T15:30:00+02:00";
   }
 
   @Test
   void load_reader() {
     var parser = new TomlParser();
     Map<String, String> map = parser.load(new StringReader(input()));
 
-    assertThat(map).hasSize(3);
-    assertThat(map).containsOnlyKeys("one.key", "one.key2", "key3");
-    assertThat(map).containsEntry("one.key", "a");
+    assertThat(map).hasSize(8);
+    assertThat(map).containsOnlyKeys("key",
+      "one.key1", "one.key2", "one.key3",
+      "two.local_datetime", "two.local_date", "two.local_time", "two.offset_datetime");
+
+    assertThat(map).containsEntry("key", "c");
+
+    assertThat(map).containsEntry("one.key1", "a");
     assertThat(map).containsEntry("one.key2", "b");
-    assertThat(map).containsEntry("key3", "c");
+    assertThat(map).containsEntry("one.key3", "a;b;c");
+
+    assertThat(map).containsEntry("two.local_datetime", "2024-09-09T15:30");
+    assertThat(map).containsEntry("two.local_date", "2024-09-09");
+    assertThat(map).containsEntry("two.local_time", "15:30");
+    assertThat(map).containsEntry("two.offset_datetime", "2024-09-09T15:30+02:00");
   }
 
   @Test
   void load_inputStream() {
     var parser = new TomlParser();
     Map<String, String> map = parser.load(new ByteArrayInputStream(input().getBytes(StandardCharsets.UTF_8)));
 
-    assertThat(map).hasSize(3);
-    assertThat(map).containsOnlyKeys("one.key", "one.key2", "key3");
-    assertThat(map).containsEntry("one.key", "a");
+    assertThat(map).hasSize(8);
+    assertThat(map).containsOnlyKeys("key",
+      "one.key1", "one.key2", "one.key3",
+      "two.local_datetime", "two.local_date", "two.local_time", "two.offset_datetime");
+
+    assertThat(map).containsEntry("key", "c");
+
+    assertThat(map).containsEntry("one.key1", "a");
     assertThat(map).containsEntry("one.key2", "b");
-    assertThat(map).containsEntry("key3", "c");
+    assertThat(map).containsEntry("one.key3", "a;b;c");
+
+    assertThat(map).containsEntry("two.local_datetime", "2024-09-09T15:30");
+    assertThat(map).containsEntry("two.local_date", "2024-09-09");
+    assertThat(map).containsEntry("two.local_time", "15:30");
+    assertThat(map).containsEntry("two.offset_datetime", "2024-09-09T15:30+02:00");
   }
 }