added annotation converters #21

needs unit tests
CubeEngine · Dec 27, 2014 · 5173757 · 5173757
1 parent 76ea07f
commit 5173757
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/core/src/main/java/de/cubeisland/engine/reflect/annotations/Converter.java b/core/src/main/java/de/cubeisland/engine/reflect/annotations/Converter.java
@@ -34,7 +34,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
-public @interface Converter
+public @interface Converter // TODO Unit tests!
 {
     /**
      * The class of the Converter to use for the annotated field

diff --git a/core/src/main/java/de/cubeisland/engine/reflect/codec/ConverterManager.java b/core/src/main/java/de/cubeisland/engine/reflect/codec/ConverterManager.java
@@ -167,6 +167,7 @@ public final void registerConverter(Class clazz, Converter converter)
             return;
         }
         converters.put(clazz, converter);
+        annotationConverters.put(converter.getClass(), converter);
     }
 
     /**
@@ -231,6 +232,10 @@ private Converter getConverter(Class<?> clazz)
         }
         return converter;
     }
+    public Converter getAnnotationConverter(Class<? extends Converter> clazz)
+    {
+        return this.annotationConverters.get(clazz);
+    }
 
     private Converter findConverter(Class clazz)
     {

diff --git a/core/src/main/java/de/cubeisland/engine/reflect/codec/converter/SectionConverter.java b/core/src/main/java/de/cubeisland/engine/reflect/codec/converter/SectionConverter.java
@@ -34,6 +34,7 @@
 
 import de.cubeisland.engine.reflect.Section;
 import de.cubeisland.engine.reflect.annotations.Comment;
+import de.cubeisland.engine.reflect.annotations.Converter;
 import de.cubeisland.engine.reflect.annotations.Name;
 import de.cubeisland.engine.reflect.codec.ConverterManager;
 import de.cubeisland.engine.reflect.exception.ConversionException;
@@ -94,7 +95,7 @@ protected final ReflectedPath getPathFor(Field field)
             }
             else
             {
-                path = ReflectedPath.forName(StringUtils.fieldNameToPath(field.getName()));
+                path = ReflectedPath.forName(StringUtils.fieldNameToPath(field.getName())); // TODO configurable Naming convention #20
             }
             this.paths.put(field, path);
         }
@@ -122,7 +123,7 @@ public Node toNode(Section section, ConverterManager manager) throws ConversionE
             }
             try
             {
-                Node newNode = manager.convertToNode(field.get(section));
+                Node newNode = toNode(section, manager, field);
                 addComment(newNode, field);
 
                 Node prevNode = baseNode.getNodeAt(getPathFor(field));
@@ -154,6 +155,21 @@ public Node toNode(Section section, ConverterManager manager) throws ConversionE
         return baseNode;
     }
 
+    @SuppressWarnings("unchecked")
+    private Node toNode(Section section, ConverterManager manager, Field field) throws ConversionException, IllegalAccessException
+    {
+        Node newNode;
+        if (field.isAnnotationPresent(Converter.class))
+        {
+            newNode = manager.getAnnotationConverter(field.getAnnotation(Converter.class).value()).toNode(field.get(section), manager);
+        }
+        else
+        {
+            newNode = manager.convertToNode(field.get(section));
+        }
+        return newNode;
+    }
+
     /**
      * Adds a comment to the given Node
      *
@@ -212,8 +228,7 @@ else if (e instanceof ConversionException)
      * @param manager the manager
      */
     @SuppressWarnings("unchecked")
-    public void fromNode(Section section, MapNode node, MapNode defaultNode,
-                         ConverterManager manager) throws ConversionException
+    public void fromNode(Section section, MapNode node, MapNode defaultNode, ConverterManager manager) throws ConversionException
     {
         for (Field field : this.getReflectedFields(section.getClass()))
         {
@@ -240,10 +255,13 @@ public void fromNode(Section section, MapNode node, MapNode defaultNode,
                     }
                 }
 
-                if (Section.class.isAssignableFrom(field.getType()))
+                if (field.isAnnotationPresent(Converter.class))
+                {
+                    value = manager.getAnnotationConverter(field.getAnnotation(Converter.class).value()).fromNode(fieldNode, manager);
+                }
+                else if (Section.class.isAssignableFrom(field.getType()))
                 {
-                    Section fillSection = SectionFactory.newSectionInstance((Class<? extends Section>)field.getType(),
-                                                                            section);
+                    Section fillSection = SectionFactory.newSectionInstance((Class<? extends Section>)field.getType(), section);
                     manager.convertFromNode((MapNode)fieldNode, (MapNode)defaultNode.getNodeAt(fieldPath), fillSection);
                     value = fillSection;
                 }