Merge pull request #1 from MachineMC/1.1.2

1.1.2
MachineMC · Jun 11, 2024 · cd2a503 · cd2a503
2 parents 47a5ceb + 6378723
commit cd2a503
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 16 deletions.
diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/annotations/FormatKeyWith.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/annotations/FormatKeyWith.java
@@ -27,7 +27,7 @@
  * @see KeyFormatter
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.RECORD_COMPONENT})
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.RECORD_COMPONENT})
 public @interface FormatKeyWith {
 
     Class<? extends KeyFormatter> value();

diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/ConfigProperties.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/ConfigProperties.java
@@ -5,7 +5,7 @@
 import org.machinemc.cogwheel.serialization.SerializerRegistry;
 import org.machinemc.cogwheel.*;
 
-public class ConfigProperties {
+public class ConfigProperties implements Cloneable {
 
     SerializerRegistry serializerRegistry = new SerializerRegistry();
     ClassInitiator classInitiator = ClassInitiator.DEFAULT;
@@ -43,4 +43,13 @@ public ErrorHandler errorHandler() {
         return errorHandler;
     }
 
+    @Override
+    public ConfigProperties clone() {
+        try {
+            return (ConfigProperties) super.clone();
+        } catch (CloneNotSupportedException exception) {
+            throw new AssertionError();
+        }
+    }
+
 }
diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/ConfigSerializer.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/ConfigSerializer.java
@@ -1,12 +1,14 @@
 package org.machinemc.cogwheel.config;
 
+import org.machinemc.cogwheel.annotations.FormatKeyWith;
 import org.machinemc.cogwheel.keyformatter.KeyFormatter;
 import org.machinemc.cogwheel.*;
 import org.machinemc.cogwheel.serialization.Serializer;
 import org.machinemc.cogwheel.serialization.SerializerContext;
 import org.machinemc.cogwheel.serialization.SerializerFactory;
 import org.machinemc.cogwheel.serialization.SerializerRegistry;
 import org.machinemc.cogwheel.serialization.*;
+import org.machinemc.cogwheel.util.JavaUtils;
 
 import java.io.File;
 
@@ -45,7 +47,7 @@ public <C extends Configuration> C load(T config, Class<C> configurationClass) {
     }
 
     private <C extends Configuration> C load(ConfigAdapter<T> adapter, Class<C> configurationClass) {
-        SerializerContext context = createContext();
+        SerializerContext context = createContext(configurationClass);
         Serializers.ConfigurationSerializer<C> serializer =
                 new Serializers.ConfigurationSerializer<>(configurationClass, context);
         C configuration = Serializer.deserialize(serializer, adapter, context.errorContainer());
@@ -60,14 +62,20 @@ private <C extends Configuration> Serializers.ConfigurationSerializer<C> getSeri
     }
 
     private <C extends Configuration> Serializers.ConfigurationSerializer<C> getSerializerForConfigClass(Class<C> configurationClass) {
-        return getSerializerForConfigClass(configurationClass, createContext());
+        return getSerializerForConfigClass(configurationClass, createContext(configurationClass));
     }
 
     private <C extends Configuration> Serializers.ConfigurationSerializer<C> getSerializerForConfigClass(Class<C> configurationClass, SerializerContext context) {
         return new Serializers.ConfigurationSerializer<>(configurationClass, context);
     }
 
-    private SerializerContext createContext() {
+    private <C extends Configuration> SerializerContext createContext(Class<C> configurationClass) {
+        ConfigProperties properties = this.properties.clone();
+
+        if (configurationClass.isAnnotationPresent(FormatKeyWith.class)) {
+            properties.keyFormatter = JavaUtils.newInstance(configurationClass.getAnnotation(FormatKeyWith.class).value());
+        }
+
         return new SerializerContext(properties, this::newAdapter);
     }
 

diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/MemoryConfigAdapter.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/config/MemoryConfigAdapter.java
@@ -2,17 +2,14 @@
 
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 
 public class MemoryConfigAdapter extends ConfigAdapter<Map<String, Object>> {
 
     private final Map<String, Object> map;
 
     public MemoryConfigAdapter() {
-        this(new HashMap<>());
+        this(new LinkedHashMap<>());
     }
 
     protected MemoryConfigAdapter(Map<String, Object> map) {

diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/serialization/SerializerRegistry.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/serialization/SerializerRegistry.java
@@ -26,7 +26,7 @@ public SerializerRegistry() {
     }
 
     public SerializerRegistry(boolean useDefaults) {
-        this(HashMap::new, useDefaults);
+        this(LinkedHashMap::new, useDefaults);
     }
 
     public SerializerRegistry(Supplier<Map<Class<?>, SerializerFactory<?>>> factory, boolean useDefaults) {
@@ -130,7 +130,7 @@ private DefaultSerializerRegistry() {
                     context -> new CollectionSerializer<>(length -> new LinkedList<>(), context));
 
             //noinspection unchecked, rawtypes
-            addSerializer(Map.class, ArrayUtils.array(SequencedMap.class, HashMap.class, LinkedHashMap.class),
+            addSerializer(Map.class, ArrayUtils.array(SequencedMap.class, HashMap.class, LinkedHashMap.class, TreeMap.class),
                     context -> new MapSerializer(context));
 
             allowRegistration = false;

diff --git a/cogwheel-core/src/main/java/org/machinemc/cogwheel/serialization/Serializers.java b/cogwheel-core/src/main/java/org/machinemc/cogwheel/serialization/Serializers.java
@@ -319,7 +319,7 @@ public MapSerializer(SerializerContext context) {
 
         @Override
         public void serialize(Map<K, V> map, DataVisitor visitor) {
-            Map<String, Object> serializedMap = HashMap.newHashMap(map.size());
+            Map<String, Object> serializedMap = LinkedHashMap.newLinkedHashMap(map.size());
             Serializer<V> serializer = context.writeWith();
             map.forEach((key, value) -> {
                 Object serialized = serializer != null ? Serializer.serialize(serializer, value) : value;

diff --git a/cogwheel-json/src/main/java/org/machinemc/cogwheel/json/JSONConfigAdapter.java b/cogwheel-json/src/main/java/org/machinemc/cogwheel/json/JSONConfigAdapter.java
@@ -130,7 +130,7 @@ private static Object[] mapJSONArray(JsonArray jsonArray) {
     }
 
     private static Map<String, Object> mapJSONObject(JsonObject jsonObject) {
-        Map<String, Object> map = new HashMap<>(jsonObject.size());
+        Map<String, Object> map = LinkedHashMap.newLinkedHashMap(jsonObject.size());
         jsonObject.asMap().forEach((entry, jsonElement) -> map.put(entry, mapJSONElement(jsonElement)));
         return map;
     }

diff --git a/cogwheel-yaml/src/main/java/org/machinemc/cogwheel/yaml/YamlElementRepresenter.java b/cogwheel-yaml/src/main/java/org/machinemc/cogwheel/yaml/YamlElementRepresenter.java
@@ -106,7 +106,7 @@ public YamlElementRepresenter(DumpSettings settings) {
             return representers.get(YamlPrimitive.class).representData(wrapped);
         });
 
-        classTags = new HashMap<>();
+        classTags = new LinkedHashMap<>();
         this.settings = settings;
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Group and version
 group = org.machinemc.cogwheel
-version = 1.1.1
+version = 1.1.2
 
 # Dependency versions
 jetbrainsAnnotations = 24.1.0