Fix additional modules not applied on ModifyableConfigurations and parent modules ignored

Author: rainbowdashlabs

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 publishData {
     useEldoNexusRepos(false)
-    publishingVersion = "1.0.0"
+    publishingVersion = "1.0.1"
 }
 
 group = "dev.chojo"

docs/index.md

@@ -3,3 +3,26 @@
 Ocular is a library that allows managing multiple configuration files. It uses jackson to interact with different dataformats.
 Everything is customizable, but reasonable defaults are given to start right away.
 
+Latest version:  
+![Maven Central Version](https://img.shields.io/maven-central/v/dev.chojo/ocular?style=for-the-badge)
+
+
+=== "gradle.build.kts"
+
+    ```java
+    implementation("dev.chojo", "ocular", "version")
+    ```
+
+=== "pom.xml"
+
+    ```xml
+    <dependency>
+        <groupId>dev.chojo</groupId>
+        <artifactId>ocular</artifactId>
+        <version>version</version>
+    </dependency>
+    ```
+
+!!! warning
+
+    You will need to import your desired data format for jackson additionally.

src/main/java/dev/chojo/ocular/Configurations.java

@@ -14,6 +14,9 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+import dev.chojo.ocular.components.FileWrapper;
+import dev.chojo.ocular.components.Format;
+import dev.chojo.ocular.components.Wrapper;
 import dev.chojo.ocular.dataformats.Configurator;
 import dev.chojo.ocular.dataformats.DataFormat;
 import dev.chojo.ocular.exceptions.ConfigurationException;
@@ -30,6 +33,7 @@
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,7 +57,7 @@ public class Configurations<T> implements Configurator<ObjectMapper, MapperBuild
     private static final Logger log = getLogger(Configurations.class);
     private final Path base;
     private final Key<T> main;
-    private final Configurations<?> parent;
+    protected final Configurations<?> parent;
     private final List<Format<?, ?>> formats = new LinkedList<>();
     private final ClassLoader classLoader;
     private final Map<Key<?>, FileWrapper<?>> files = new HashMap<>();
@@ -313,7 +317,10 @@ public Path base() {
      *
      * @return list of modules.
      */
-    protected List<Module> additionalModules() {
+    public List<Module> additionalModules() {
+        if(parent != null) {
+            return parent.additionalModules();
+        }
         return Collections.emptyList();
     }
 
@@ -360,7 +367,7 @@ private Path resolvePath(Key<?> key) {
         return key.path().isAbsolute() ? key.path() : base.resolve(key.path());
     }
 
-    protected Format<?, ?> determineFormat(Key<?> key) {
+    private Format<?, ?> determineFormat(Key<?> key) {
         for (var format : formats) {
             if (format.format().matches(key)) {
                 return format;

src/main/java/dev/chojo/ocular/ConfigurationsBuilder.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
 import dev.chojo.ocular.dataformats.DataFormat;
+import dev.chojo.ocular.impl.ModifyableConfigurations;
 import dev.chojo.ocular.key.Key;
 import dev.chojo.ocular.util.Consumers;
 import org.jetbrains.annotations.NotNull;

…n/java/dev/chojo/ocular/FileWrapper.java …chojo/ocular/components/FileWrapper.javasrc/main/java/dev/chojo/ocular/FileWrapper.java renamed to src/main/java/dev/chojo/ocular/components/FileWrapper.java src/main/java/dev/chojo/ocular/FileWrapper.java renamed to src/main/java/dev/chojo/ocular/components/FileWrapper.java

@@ -3,7 +3,7 @@
  *
  *     Copyright (C) RainbowDashLabs and Contributor
  */
-package dev.chojo.ocular;
+package dev.chojo.ocular.components;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -15,15 +15,15 @@
  *
  * @param <T> the type of the file object being wrapped
  */
-record FileWrapper<T>(Format<?, ?> format, T file) {
+public record FileWrapper<T>(Format<?, ?> format, T file) {
     /**
      * Serializes the encapsulated file object into its JSON string representation
      * using the configured writer of the associated format.
      *
      * @return the JSON string representation of the file object
      * @throws JsonProcessingException if an error occurs during serialization
      */
-    String asString() throws JsonProcessingException {
+    public String asString() throws JsonProcessingException {
         return format.writer().writeValueAsString(file);
     }
 }

…c/main/java/dev/chojo/ocular/Format.java …/dev/chojo/ocular/components/Format.javasrc/main/java/dev/chojo/ocular/Format.java renamed to src/main/java/dev/chojo/ocular/components/Format.java src/main/java/dev/chojo/ocular/Format.java renamed to src/main/java/dev/chojo/ocular/components/Format.java

@@ -3,10 +3,11 @@
  *
  *     Copyright (C) RainbowDashLabs and Contributor
  */
-package dev.chojo.ocular;
+package dev.chojo.ocular.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
+import dev.chojo.ocular.Configurations;
 import dev.chojo.ocular.dataformats.DataFormat;
 
 /**

…/main/java/dev/chojo/ocular/Wrapper.java …dev/chojo/ocular/components/Wrapper.javasrc/main/java/dev/chojo/ocular/Wrapper.java renamed to src/main/java/dev/chojo/ocular/components/Wrapper.java src/main/java/dev/chojo/ocular/Wrapper.java renamed to src/main/java/dev/chojo/ocular/components/Wrapper.java

@@ -3,8 +3,9 @@
  *
  *     Copyright (C) RainbowDashLabs and Contributor
  */
-package dev.chojo.ocular;
+package dev.chojo.ocular.components;
 
+import dev.chojo.ocular.Configurations;
 import dev.chojo.ocular.key.Key;
 
 import java.io.Closeable;

src/main/java/dev/chojo/ocular/exceptions/UnknownFormatException.java

@@ -5,7 +5,7 @@
  */
 package dev.chojo.ocular.exceptions;
 
-import dev.chojo.ocular.Format;
+import dev.chojo.ocular.components.Format;
 import dev.chojo.ocular.key.Key;
 
 import java.util.Collection;

…ojo/ocular/ModifyableConfigurations.java …cular/impl/ModifyableConfigurations.javasrc/main/java/dev/chojo/ocular/ModifyableConfigurations.java renamed to src/main/java/dev/chojo/ocular/impl/ModifyableConfigurations.java src/main/java/dev/chojo/ocular/ModifyableConfigurations.java renamed to src/main/java/dev/chojo/ocular/impl/ModifyableConfigurations.java

@@ -3,16 +3,18 @@
  *
  *     Copyright (C) RainbowDashLabs and Contributor
  */
-package dev.chojo.ocular;
+package dev.chojo.ocular.impl;
 
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
+import dev.chojo.ocular.Configurations;
 import dev.chojo.ocular.dataformats.DataFormat;
 import dev.chojo.ocular.key.Key;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -44,6 +46,16 @@ public ModifyableConfigurations(Path base, @NotNull Key<T> main, List<DataFormat
         this.modules = modules;
     }
 
+    @Override
+    public List<Module> additionalModules() {
+        if (parent != null) {
+            LinkedList<Module> combinedModules = new LinkedList<>(parent.additionalModules());
+            combinedModules.addAll(modules);
+            return combinedModules;
+        }
+        return modules;
+    }
+
     @Override
     public void configureReader(ObjectMapper mapper) {
         configureReaderMapper.accept(mapper);