use Array reflect on DefaultArrayConverterProvider

HSGamer · Apr 14, 2024 · 98d3574 · 98d3574
1 parent 588b1b9
commit 98d3574
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 40 deletions.
diff --git a/...ava/me/hsgamer/hscore/config/annotation/converter/impl/DefaultArrayConverterProvider.java b/...ava/me/hsgamer/hscore/config/annotation/converter/impl/DefaultArrayConverterProvider.java
@@ -4,7 +4,7 @@
 import me.hsgamer.hscore.config.annotation.converter.ConverterProvider;
 import me.hsgamer.hscore.config.annotation.converter.manager.DefaultConverterManager;
 
-import java.util.Arrays;
+import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.Optional;
 
@@ -14,40 +14,60 @@
 public class DefaultArrayConverterProvider implements ConverterProvider {
   @Override
   public Optional<Converter> getConverter(Class<?> type) {
-    return Optional.ofNullable(type.getComponentType())
-      .map(DefaultConverterManager::getConverter)
-      .map(converter -> new Converter() {
-        @Override
-        public Object convert(Object raw) {
-          if (raw == null) {
-            return null;
+    Class<?> componentClass = type.getComponentType();
+    if (componentClass == null) return Optional.empty();
+    Converter converter = DefaultConverterManager.getConverter(componentClass);
+
+    Converter arrayConverter = new Converter() {
+      @Override
+      public Object convert(Object raw) {
+        if (raw == null) {
+          return null;
+        }
+        Class<?> rawClass = raw.getClass();
+        if (rawClass.isArray()) {
+          Object parsedArray = Array.newInstance(componentClass, Array.getLength(raw));
+          for (int i = 0; i < Array.getLength(raw); i++) {
+            Object value = Array.get(raw, i);
+            Object parsedValue = converter.convert(value);
+            Array.set(parsedArray, i, parsedValue);
           }
-          if (raw instanceof Object[]) {
-            return Arrays.stream((Object[]) raw)
-              .map(converter::convert)
-              .toArray();
-          } else if (raw instanceof Collection) {
-            return ((Collection<?>) raw).stream()
-              .map(converter::convert)
-              .toArray();
-          } else {
-            return null;
+          return parsedArray;
+        } else if (raw instanceof Collection) {
+          Collection<?> collection = (Collection<?>) raw;
+          Object parsedArray = Array.newInstance(componentClass, collection.size());
+          int size = collection.size();
+          for (int i = 0; i < size; i++) {
+            Object value = collection.toArray()[i];
+            Object parsedValue = converter.convert(value);
+            Array.set(parsedArray, i, parsedValue);
           }
+          return parsedArray;
+        } else {
+          return null;
         }
+      }
 
-        @Override
-        public Object convertToRaw(Object value) {
-          if (value == null) {
-            return null;
-          }
-          if (value instanceof Object[]) {
-            return Arrays.stream((Object[]) value)
-              .map(converter::convertToRaw)
-              .toArray();
-          } else {
-            return null;
+      @Override
+      public Object convertToRaw(Object value) {
+        if (value == null) {
+          return null;
+        }
+        Class<?> valueClass = value.getClass();
+        if (valueClass.isArray()) {
+          Object[] rawArray = new Object[Array.getLength(value)];
+          for (int i = 0; i < Array.getLength(value); i++) {
+            Object element = Array.get(value, i);
+            Object rawElement = converter.convertToRaw(element);
+            rawArray[i] = rawElement;
           }
+          return rawArray;
+        } else {
+          return null;
         }
-      });
+      }
+    };
+
+    return Optional.of(arrayConverter);
   }
 }
diff --git a/...n/java/me/hsgamer/hscore/config/annotation/converter/manager/DefaultConverterManager.java b/...n/java/me/hsgamer/hscore/config/annotation/converter/manager/DefaultConverterManager.java
@@ -78,18 +78,21 @@ public static void unregisterConverter(Type type) {
    */
   public static Converter getConverterIfDefault(Type type, Converter converter) {
     if (converter instanceof DefaultConverter) {
-      return CONVERTER_MAP.computeIfAbsent(type, key -> {
-        if (key instanceof Class) {
-          Class<?> clazz = (Class<?>) key;
-          for (ConverterProvider provider : PROVIDERS) {
-            Optional<Converter> optionalConverter = provider.getConverter(clazz);
-            if (optionalConverter.isPresent()) {
-              return optionalConverter.get();
-            }
+      if (CONVERTER_MAP.containsKey(type)) {
+        return CONVERTER_MAP.get(type);
+      }
+
+      if (type instanceof Class) {
+        Class<?> clazz = (Class<?>) type;
+        for (ConverterProvider provider : PROVIDERS) {
+          Optional<Converter> optionalConverter = provider.getConverter(clazz);
+          if (optionalConverter.isPresent()) {
+            Converter finalConverter = optionalConverter.get();
+            CONVERTER_MAP.put(type, finalConverter);
+            return finalConverter;
           }
         }
-        return converter;
-      });
+      }
     }
     return converter;
   }