diff --git a/core/src/main/java/io/xpipe/core/util/JacksonExtension.java b/core/src/main/java/io/xpipe/core/util/JacksonExtension.java deleted file mode 100644 index 425c74fe9..000000000 --- a/core/src/main/java/io/xpipe/core/util/JacksonExtension.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.xpipe.core.util; - -public interface JacksonExtension { - - Class getType(); -} diff --git a/core/src/main/java/io/xpipe/core/util/JacksonMapper.java b/core/src/main/java/io/xpipe/core/util/JacksonMapper.java index 7e6bd3015..f7be57103 100644 --- a/core/src/main/java/io/xpipe/core/util/JacksonMapper.java +++ b/core/src/main/java/io/xpipe/core/util/JacksonMapper.java @@ -64,29 +64,8 @@ public class JacksonMapper { public void init(ModuleLayer layer) { List modules = findModules(layer); INSTANCE.registerModules(modules); - var extensions = findExtensions(layer); - for (var extension : extensions) { - var mod = new SimpleModule(); - if (extension instanceof JsonSerializer s) { - add(mod, extension.getType(), s); - } - if (extension instanceof JsonDeserializer d) { - add(mod, extension.getType(), d); - } - INSTANCE.registerModule(mod); - } init = true; } - - @SuppressWarnings("unchecked") - private void add(SimpleModule mod, Class c, JsonSerializer s) { - mod.addSerializer((Class) c, (JsonSerializer) s); - } - - @SuppressWarnings("unchecked") - private void add(SimpleModule mod, Class c, JsonDeserializer s) { - mod.addDeserializer((Class) c, (JsonDeserializer) s); - } } private static List findModules(ModuleLayer layer) { @@ -99,17 +78,6 @@ public class JacksonMapper { return modules; } - private static List findExtensions(ModuleLayer layer) { - ArrayList exts = new ArrayList<>(); - ServiceLoader loader = layer != null - ? ServiceLoader.load(layer, JacksonExtension.class) - : ServiceLoader.load(JacksonExtension.class); - for (JacksonExtension module : loader) { - exts.add(module); - } - return exts; - } - /** * Constructs a new ObjectMapper that is able to map all required XPipe classes and also possible extensions. */ diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index cab54c3c4..6c1c2b116 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -1,7 +1,6 @@ import io.xpipe.core.process.ShellDialect; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.util.CoreJacksonModule; -import io.xpipe.core.util.JacksonExtension; import io.xpipe.core.util.JacksonMapper; import io.xpipe.core.util.ModuleLayerLoader; @@ -22,7 +21,6 @@ open module io.xpipe.core { uses io.xpipe.core.util.DataStateProvider; uses ModuleLayerLoader; uses ShellDialect; - uses JacksonExtension; provides ModuleLayerLoader with JacksonMapper.Loader,