Added @ConfigAttribute for attr names with dash

Author: KartoffelChipss

zetacore/src/main/java/com/zetaplugins/zetacore/annotations/ConfigAttribute.java

@@ -0,0 +1,19 @@
+package com.zetaplugins.zetacore.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a field represents a configuration attribute.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface ConfigAttribute {
+    /**
+     * The name of the configuration attribute.
+     * @return The name of the configuration attribute.
+     */
+    String name();
+}

zetacore/src/main/java/com/zetaplugins/zetacore/services/config/ConfigMapper.java

@@ -1,5 +1,6 @@
 package com.zetaplugins.zetacore.services.config;
 
+import com.zetaplugins.zetacore.annotations.ConfigAttribute;
 import com.zetaplugins.zetacore.annotations.PluginConfig;
 import com.zetaplugins.zetacore.annotations.NestedConfig;
 import org.bukkit.configuration.ConfigurationSection;
@@ -54,10 +55,11 @@ private static <T> void mapSection(ConfigurationSection section, T instance) thr
         for (Field field : configClass.getDeclaredFields()) {
             field.setAccessible(true);
             Class<?> fieldType = field.getType();
+            String fieldName = getFieldName(field);
 
             // Nested objects annotated with @NestedConfig
             if (fieldType.isAnnotationPresent(NestedConfig.class)) {
-                ConfigurationSection nestedSection = section.getConfigurationSection(field.getName());
+                ConfigurationSection nestedSection = section.getConfigurationSection(fieldName);
                 if (nestedSection == null) continue;
                 Object nestedInstance = fieldType.getConstructor().newInstance();
                 mapSection(nestedSection, nestedInstance);
@@ -67,9 +69,9 @@ private static <T> void mapSection(ConfigurationSection section, T instance) thr
 
             // Lists
             if (isListType(fieldType)) {
-                Object rawListObj = section.get(field.getName());
+                Object rawListObj = section.get(fieldName);
                 if (rawListObj instanceof List<?> rawList) {
-                    List<Object> mappedList = convertList(field.getGenericType(), rawList, field.getName());
+                    List<Object> mappedList = convertList(field.getGenericType(), rawList, fieldName);
                     field.set(instance, mappedList);
                 } else if (rawListObj == null) {
                     // nothing present - skip
@@ -82,13 +84,13 @@ private static <T> void mapSection(ConfigurationSection section, T instance) thr
             // Maps
             if (isMapType(fieldType)) {
                 // raw can be a ConfigurationSection or a Map/LinkedHashMap
-                Object rawMap = section.get(field.getName());
-                ConfigurationSection rawSection = section.getConfigurationSection(field.getName());
+                Object rawMap = section.get(fieldName);
+                ConfigurationSection rawSection = section.getConfigurationSection(fieldName);
                 if (rawSection != null) {
-                    Map<?, ?> mapped = convertMap(field.getGenericType(), rawSection, field.getName());
+                    Map<?, ?> mapped = convertMap(field.getGenericType(), rawSection, fieldName);
                     field.set(instance, mapped);
                 } else if (rawMap instanceof LinkedHashMap<?, ?> || rawMap instanceof Map<?, ?>) {
-                    Map<?, ?> mapped = convertMap(field.getGenericType(), rawMap, field.getName());
+                    Map<?, ?> mapped = convertMap(field.getGenericType(), rawMap, fieldName);
                     field.set(instance, mapped);
                 } else if (rawMap == null) {
                     // nothing present - skip
@@ -100,7 +102,7 @@ private static <T> void mapSection(ConfigurationSection section, T instance) thr
 
             // Enum types
             if (fieldType.isEnum()) {
-                String enumName = section.getString(field.getName());
+                String enumName = section.getString(fieldName);
                 if (enumName == null) continue;
                 String upperEnumName = enumName.toUpperCase();
                 Object enumValue = Enum.valueOf((Class<Enum>) fieldType, upperEnumName);
@@ -110,7 +112,7 @@ private static <T> void mapSection(ConfigurationSection section, T instance) thr
 
             // Primitive / String / basic types
             if (isSimpleType(fieldType)) {
-                Object value = section.get(field.getName());
+                Object value = section.get(fieldName);
                 if (value != null) {
                     field.set(instance, value);
                 }
@@ -135,7 +137,7 @@ private static void mapFromMap(LinkedHashMap<?, ?> map, Object instance) throws
         Class<?> clazz = instance.getClass();
         for (Field field : clazz.getDeclaredFields()) {
             field.setAccessible(true);
-            Object value = map.get(field.getName());
+            Object value = map.get(getFieldName(field));
             if (value == null) continue;
 
             Class<?> fieldType = field.getType();
@@ -146,11 +148,11 @@ private static void mapFromMap(LinkedHashMap<?, ?> map, Object instance) throws
                 field.set(instance, nestedInstance);
 
             } else if (isListType(fieldType) && value instanceof List<?> rawList) {
-                List<Object> mappedList = convertList(field.getGenericType(), rawList, field.getName());
+                List<Object> mappedList = convertList(field.getGenericType(), rawList, getFieldName(field));
                 field.set(instance, mappedList);
 
             } else if (isMapType(fieldType) && value instanceof LinkedHashMap<?, ?> rawLinkedMap) {
-                Map<?, ?> mappedMap = convertMap(field.getGenericType(), rawLinkedMap, field.getName());
+                Map<?, ?> mappedMap = convertMap(field.getGenericType(), rawLinkedMap, getFieldName(field));
                 field.set(instance, mappedMap);
 
             } else if (isSimpleType(fieldType)) {
@@ -348,4 +350,12 @@ private static boolean isListType(Class<?> type) {
     private static boolean isMapType(Class<?> type) {
         return Map.class.isAssignableFrom(type);
     }
+
+    private static String getFieldName(Field field) {
+        if (field.isAnnotationPresent(ConfigAttribute.class)) {
+            ConfigAttribute annotation = field.getAnnotation(ConfigAttribute.class);
+            return annotation.name();
+        }
+        return field.getName();
+    }
 }

zetacore/src/test/java/com/zetaplugins/zetacore/services/config/ConfigMapperTest.java

@@ -33,6 +33,7 @@ void testBasicMapping() {
         assertNotNull(myConfig.settings);
         assertTrue(myConfig.settings.enableFeature);
         assertEquals(List.of("LustigerName1", "LustigerName2", "LustigerName3"), myConfig.settings.funnynames);
+        assertEquals("test-value", myConfig.attrWithDash);
 
         assertNotNull(myConfig.items);
         assertEquals(2, myConfig.items.size());

zetacore/src/test/java/com/zetaplugins/zetacore/services/config/testconfigs/MyConfig.java

@@ -1,6 +1,7 @@
 package com.zetaplugins.zetacore.services.config.testconfigs;
 
 
+import com.zetaplugins.zetacore.annotations.ConfigAttribute;
 import com.zetaplugins.zetacore.annotations.PluginConfig;
 
 import java.util.List;
@@ -10,6 +11,8 @@
 public class MyConfig {
     public String lang = "de-DE";
     public SomeStatus someStatus = SomeStatus.ACTIVE;
+    @ConfigAttribute(name = "attr-with-dash")
+    public String attrWithDash = "default-test-value";
     public List<SomeStatus> statusList = List.of(SomeStatus.ACTIVE, SomeStatus.INACTIVE);
     public Map<SomeStatus, Integer> statusToCodeMap = Map.of(
             SomeStatus.ACTIVE, 200,

zetacore/src/test/resources/test-config.yml

@@ -3,6 +3,8 @@ lang: "de-DE"
 
 someStatus: "active"
 
+attr-with-dash: "test-value"
+
 statusList:
   - "active"
   - "inactive"