refactor: enforce deserializer contract while keeping static APIs

Author: RAV64

build.gradle

@@ -8,12 +8,6 @@ subprojects {
         mavenCentral()
     }
 
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(11)
-        }
-    }
-
     dependencies {
         testImplementation 'org.junit.jupiter:junit-jupiter:5.14.2'
         testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.2'

modules/deserializer/README.md

@@ -37,8 +37,8 @@ A language module typically:
 
 The core mapper then handles the rest.
 
-`Deserializer` is a common marker interface for format modules.
-`AbstractScriptDeserializer` provides shared static helpers for script-backed modules (Lua, Groovy) to normalize injected environment/global maps.
+`Deserializer` defines the required `deserialize(CharSequence, Class<T>)` contract and provides default file/path overloads.
+`ScriptInputNormalizer` provides shared helpers for script-backed modules (Lua, Groovy) to normalize injected environment/global maps.
 
 ## Error model
 

modules/deserializer/src/main/java/org/msuo/config2java/Deserializer.java

@@ -1,8 +1,28 @@
 package org.msuo.config2java;
 
-/**
- * Marker interface for format deserializers.
- *
- * Implementations expose static `deserialize(...)` entry points.
- */
-public interface Deserializer {}
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public interface Deserializer {
+
+    <T> T deserialize(CharSequence source, Class<T> configClass);
+
+    default <T> T deserialize(Path file, Charset charset, Class<T> configClass)
+        throws IOException {
+        return deserialize((CharSequence) Files.readString(file, charset), configClass);
+    }
+
+    default <T> T deserialize(Path file, Class<T> configClass)
+        throws IOException {
+        return deserialize(file, StandardCharsets.UTF_8, configClass);
+    }
+
+    default <T> T deserialize(File file, Class<T> configClass)
+        throws IOException {
+        return deserialize(file.toPath(), configClass);
+    }
+}

…fig2java/AbstractScriptDeserializer.java …o/config2java/ScriptInputNormalizer.javamodules/deserializer/src/main/java/org/msuo/config2java/AbstractScriptDeserializer.java renamed to modules/deserializer/src/main/java/org/msuo/config2java/ScriptInputNormalizer.java modules/deserializer/src/main/java/org/msuo/config2java/AbstractScriptDeserializer.java renamed to modules/deserializer/src/main/java/org/msuo/config2java/ScriptInputNormalizer.java

@@ -4,17 +4,19 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public abstract class AbstractScriptDeserializer implements Deserializer {
+final class ScriptInputNormalizer {
 
-    protected static Map<String, String> normalizeEnvironment(
+    private ScriptInputNormalizer() {}
+
+    static Map<String, String> normalizeEnvironment(
         Map<String, String> environment
     ) {
         return environment == null
             ? Collections.emptyMap()
             : Collections.unmodifiableMap(new LinkedHashMap<>(environment));
     }
 
-    protected static Map<String, Object> normalizeGlobals(Map<String, ?> globals) {
+    static Map<String, Object> normalizeGlobals(Map<String, ?> globals) {
         return globals == null
             ? Collections.emptyMap()
             : Collections.unmodifiableMap(new LinkedHashMap<>(globals));

modules/groovy2java/src/main/java/org/msuo/config2java/GroovyDeserializer.java

@@ -5,10 +5,15 @@
 import java.util.Collections;
 import java.util.Map;
 
-public final class GroovyDeserializer extends AbstractScriptDeserializer {
+public final class GroovyDeserializer implements Deserializer {
 
     private GroovyDeserializer() {}
 
+    @Override
+    public <T> T deserialize(CharSequence source, Class<T> configClass) {
+        return deserialize(source.toString(), configClass);
+    }
+
     public static <T> T deserialize(String source, Class<T> configClass) {
         return deserialize(
             source,
@@ -25,7 +30,11 @@ public static <T> T deserialize(
         Map<String, ?> globals
     ) {
         return ObjectMapper.deserialize(
-            parse(source, normalizeEnvironment(environment), normalizeGlobals(globals)),
+            parse(
+                source,
+                ScriptInputNormalizer.normalizeEnvironment(environment),
+                ScriptInputNormalizer.normalizeGlobals(globals)
+            ),
             configClass
         );
     }

modules/json2java/src/main/java/org/msuo/config2java/JsonDeserializer.java

@@ -1,22 +1,25 @@
 package org.msuo.config2java;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Iterator;
 import java.util.Map;
 
 public final class JsonDeserializer implements Deserializer {
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
     private JsonDeserializer() {}
 
+    @Override
+    public <T> T deserialize(CharSequence source, Class<T> configClass) {
+        return deserialize(source.toString(), configClass);
+    }
+
     public static <T> T deserialize(String source, Class<T> configClass) {
         return org.msuo.config2java.ObjectMapper.deserialize(parse(source), configClass);
     }
 
     private static ConfigValue parse(String source) {
         try {
-            JsonNode root = MAPPER.readTree(source);
+            JsonNode root = JsonRuntime.MAPPER.readTree(source);
             return new JsonConfigValue(root);
         } catch (Exception e) {
             throw new ConfigSourceException("JSON", "parse", e.getMessage(), e);

modules/json2java/src/main/java/org/msuo/config2java/JsonRuntime.java

@@ -0,0 +1,10 @@
+package org.msuo.config2java;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+final class JsonRuntime {
+
+    static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private JsonRuntime() {}
+}

modules/lua2java/src/main/java/org/msuo/config2java/LuaDeserializer.java

@@ -9,10 +9,15 @@
 import org.luaj.vm2.lib.OneArgFunction;
 import org.luaj.vm2.lib.jse.JsePlatform;
 
-public final class LuaDeserializer extends AbstractScriptDeserializer {
+public final class LuaDeserializer implements Deserializer {
 
     private LuaDeserializer() {}
 
+    @Override
+    public <T> T deserialize(CharSequence source, Class<T> configClass) {
+        return deserialize(source.toString(), configClass);
+    }
+
     public static <T> T deserialize(String source, Class<T> configClass) {
         return deserialize(
             source,
@@ -29,7 +34,11 @@ public static <T> T deserialize(
         Map<String, ?> globals
     ) {
         return ObjectMapper.deserialize(
-            parse(source, normalizeEnvironment(environment), normalizeGlobals(globals)),
+            parse(
+                source,
+                ScriptInputNormalizer.normalizeEnvironment(environment),
+                ScriptInputNormalizer.normalizeGlobals(globals)
+            ),
             configClass
         );
     }

modules/toml2java/src/main/java/org/msuo/config2java/TomlDeserializer.java

@@ -11,6 +11,11 @@ public final class TomlDeserializer implements Deserializer {
 
     private TomlDeserializer() {}
 
+    @Override
+    public <T> T deserialize(CharSequence source, Class<T> configClass) {
+        return deserialize(source.toString(), configClass);
+    }
+
     public static <T> T deserialize(String source, Class<T> configClass) {
         return ObjectMapper.deserialize(parse(source), configClass);
     }

modules/xml2java/src/main/java/org/msuo/config2java/XmlDeserializer.java

@@ -6,6 +6,11 @@ public final class XmlDeserializer implements Deserializer {
 
     private XmlDeserializer() {}
 
+    @Override
+    public <T> T deserialize(CharSequence source, Class<T> configClass) {
+        return deserialize(source.toString(), configClass);
+    }
+
     public static <T> T deserialize(String source, Class<T> configClass) {
         return ObjectMapper.deserialize(parse(source), configClass);
     }