Mapper improved x3

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.alterdekim.game</groupId>
     <artifactId>actionScriptDecompiler</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>jar</packaging>
 
     <name>SWFDissect</name>

src/main/java/com/alterdekim/flash/decompiler/mapper/FlashClass.java

@@ -0,0 +1,12 @@
+package com.alterdekim.flash.decompiler.mapper;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface FlashClass {
+    String name() default "";
+}

src/main/java/com/alterdekim/flash/decompiler/mapper/FlashMapper.java

@@ -1,12 +1,16 @@
 package com.alterdekim.flash.decompiler.mapper;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Slf4j
 public class FlashMapper {
@@ -38,4 +42,58 @@ public class FlashMapper {
         }
         return null;
     }
+
+    public static void mapToObj(Map<String, Object> o, List<OutputObject> objs) {
+        for( OutputObject object : objs ) {
+            String entryName = object.getObjectClass().getAnnotation(FlashClass.class).name();
+            Map<String, Object> m = (Map<String, Object>) o.get(entryName);
+            if( object.getIsSimple() ) {
+                m.keySet().forEach(k -> {
+                    try {
+                        Object entry = object.getObjectClass().getDeclaredConstructor().newInstance();
+
+                        Arrays.stream(object.getObjectClass().getDeclaredFields())
+                                        .filter(f -> f.isAnnotationPresent(FlashValue.class))
+                                        .forEach(f -> {
+                                            try {
+                                                f.setAccessible(true);
+                                                switch (f.getAnnotation(FlashValue.class).type()) {
+                                                    case Id -> f.set(entry, Long.parseLong(k));
+                                                    case Value -> f.set(entry, m.get(k));
+                                                }
+                                            } catch (IllegalAccessException e) {
+                                                log.error("FlashMapper valueSet error: {}", e);
+                                            }
+                                        });
+                        object.getCallback().onOutputObjectReady(entry);
+                    } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
+                             NoSuchMethodException e) {
+                        log.error("FlashMapper class error: {}", e.getMessage());
+                    }
+                });
+                continue;
+            }
+
+            m.keySet().forEach(k -> {
+                Long id = Long.parseLong(k);
+                Map<String, Object> obj = (Map<String, Object>) m.get(k);
+                Object entity = FlashMapper.mapToObj(obj, object.getObjectClass());
+                Optional<Field> f1 = Arrays.stream(object.getObjectClass().getDeclaredFields())
+                        .filter(f -> f.isAnnotationPresent(FlashValue.class) && f.getAnnotation(FlashValue.class).type() == FlashValueType.Id)
+                        .findFirst();
+                if( f1.isEmpty() ) {
+                    log.error("FlashMapper valueSet error; can't find Id field for object.");
+                    return;
+                }
+                f1.get().setAccessible(true);
+                try {
+                    f1.get().set(entity, id);
+                } catch (IllegalAccessException e) {
+                    log.error("FlashMapper valueSet error: {}", e);
+                    return;
+                }
+                object.getCallback().onOutputObjectReady(entity);
+            });
+        }
+    }
 }

src/main/java/com/alterdekim/flash/decompiler/mapper/FlashValue.java

@@ -0,0 +1,12 @@
+package com.alterdekim.flash.decompiler.mapper;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface FlashValue {
+    FlashValueType type() default FlashValueType.Value;
+}

src/main/java/com/alterdekim/flash/decompiler/mapper/FlashValueType.java

@@ -0,0 +1,6 @@
+package com.alterdekim.flash.decompiler.mapper;
+
+public enum FlashValueType {
+    Id,
+    Value;
+}

src/main/java/com/alterdekim/flash/decompiler/mapper/OutputObject.java

@@ -0,0 +1,12 @@
+package com.alterdekim.flash.decompiler.mapper;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class OutputObject {
+    private final Class<?> objectClass;
+    private final Boolean isSimple;
+    private final OutputObjectCallback callback;
+}

src/main/java/com/alterdekim/flash/decompiler/mapper/OutputObjectCallback.java

@@ -0,0 +1,5 @@
+package com.alterdekim.flash.decompiler.mapper;
+
+public interface OutputObjectCallback {
+    void onOutputObjectReady(Object entity);
+}