remove DefaultArrayConverterProvider

Array is too complex for reflections
HSGamer · Apr 13, 2024 · ff15ba1 · ff15ba1
1 parent a0d976e
commit ff15ba1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 65 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
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
@@ -21,7 +21,6 @@ public final class DefaultConverterManager {
 
   static {
     registerProvider(new PrimitiveConverterProvider());
-    registerProvider(new DefaultArrayConverterProvider());
     registerConverter(String.class, new SimpleConverter(Objects::toString));
     registerConverter(URI.class, StringConverter.of(URI::create, URI::toString));
     registerConverter(URL.class, StringConverter.of(s -> {
@@ -78,18 +77,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;
   }

diff --git a/...ig/config-proxy/src/main/java/me/hsgamer/hscore/config/proxy/ConfigInvocationHandler.java b/...ig/config-proxy/src/main/java/me/hsgamer/hscore/config/proxy/ConfigInvocationHandler.java
@@ -173,7 +173,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
       }
       if (nodes.containsKey(methodName)) {
         Object value = nodes.get(methodName).getValue();
-        if ((isPrimitiveOrWrapper(method.getReturnType()) && isPrimitiveOrWrapper(value.getClass())) || method.getReturnType().isInstance(value)) {
+        if ((isPrimitiveOrWrapper(method.getReturnType()) && isPrimitiveOrWrapper(value.getClass())) || method.getReturnType().isInstance(value)
+        ) {
           return value;
         }
       }