Ignore access-checks when creating annotated type-(de)serializers

Author: TBlueF

src/main/java/de/bluecolored/bluenbt/adapter/DefaultDeserializerFactory.java

@@ -144,6 +144,8 @@ public DefaultAdapter(TypeToken<T> type, BlueNBT blueNBT) {
             this.type = type;
             this.constructor = blueNBT.getInstanceCreator(type);
 
+            Map<Class<? extends TypeDeserializer<?>>, TypeDeserializer<?>> typeDeserializerCache = new HashMap<>();
+
             TypeToken<?> typeToken = type;
             Class<?> raw;
             while (typeToken != null && (raw = typeToken.getRawType()) != Object.class) {
@@ -163,11 +165,10 @@ public DefaultAdapter(TypeToken<T> type, BlueNBT blueNBT) {
                     TypeDeserializer<?> typeDeserializer;
                     Class<? extends TypeDeserializer<?>> deserializerType = findDeserializerType(field, fieldType.getRawType());
                     if (deserializerType != null) {
-                        try {
-                            typeDeserializer = createTypeDeserializerInstance(deserializerType, fieldType, blueNBT);
-                        } catch (Exception ex) {
-                            throw new IllegalStateException("Failed to create instance of TypeDeserializer: " + deserializerType, ex);
-                        }
+                        typeDeserializer = typeDeserializerCache.computeIfAbsent(
+                                deserializerType,
+                                t -> createTypeDeserializerInstance(t, fieldType, blueNBT)
+                        );
                     } else if (SPECIAL_ACCESSORS.containsKey(fieldType.getType())) {
                         FieldAccessor accessor = SPECIAL_ACCESSORS.get(fieldType.getType()).apply(field);
                         for (String name : names)
@@ -247,24 +248,35 @@ private TypeDeserializer<?> createTypeDeserializerInstance(
                 Class<? extends TypeDeserializer<?>> deserializerType,
                 TypeToken<?> fieldType,
                 BlueNBT blueNBT
-        ) throws ReflectiveOperationException {
-            // try TypeToken & BlueNBT constructor
+        ) {
             try {
-                return deserializerType.getDeclaredConstructor(TypeToken.class, BlueNBT.class).newInstance(fieldType, blueNBT);
-            } catch (NoSuchMethodException ignore) {}
 
-            // try TypeToken constructor
-            try {
-                return deserializerType.getDeclaredConstructor(TypeToken.class).newInstance(fieldType);
-            } catch (NoSuchMethodException ignore) {}
+                // try TypeToken & BlueNBT constructor
+                try {
+                    return callConstructor(deserializerType.getDeclaredConstructor(TypeToken.class, BlueNBT.class), fieldType, blueNBT);
+                } catch (NoSuchMethodException ignore) {}
 
-            // try BlueNBT constructor
-            try {
-                return deserializerType.getDeclaredConstructor(BlueNBT.class).newInstance(blueNBT);
-            } catch (NoSuchMethodException ignore) {}
+                // try TypeToken constructor
+                try {
+                    return callConstructor(deserializerType.getDeclaredConstructor(TypeToken.class), fieldType);
+                } catch (NoSuchMethodException ignore) {}
+
+                // try BlueNBT constructor
+                try {
+                    return callConstructor(deserializerType.getDeclaredConstructor(BlueNBT.class), blueNBT);
+                } catch (NoSuchMethodException ignore) {}
+
+                // use no-args constructor
+                return callConstructor(deserializerType.getDeclaredConstructor());
+
+            } catch (ReflectiveOperationException ex) {
+                throw new IllegalStateException("Failed to create instance of TypeDeserializer: " + deserializerType, ex);
+            }
+        }
 
-            // use no-args constructor
-            return deserializerType.getDeclaredConstructor().newInstance();
+        private <U> U callConstructor(Constructor<U> constructor, Object... args) throws ReflectiveOperationException {
+            constructor.setAccessible(true);
+            return constructor.newInstance(args);
         }
 
     }

src/main/java/de/bluecolored/bluenbt/adapter/DefaultSerializerFactory.java

@@ -26,9 +26,11 @@
 
 import de.bluecolored.bluenbt.*;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
@@ -73,8 +75,7 @@ static class DefaultAdapter<T> implements TypeSerializer<T>  {
         public DefaultAdapter(TypeToken<T> type, BlueNBT blueNBT) {
             this.type = type;
 
-            Map<Class<? extends TypeSerializer<?>>, TypeSerializer<?>> typeSerializerCache =
-                    new HashMap<>();
+            Map<Class<? extends TypeSerializer<?>>, TypeSerializer<?>> typeSerializerCache = new HashMap<>();
 
             TypeToken<?> typeToken = type;
             Class<?> raw;
@@ -95,19 +96,10 @@ public DefaultAdapter(TypeToken<T> type, BlueNBT blueNBT) {
                     TypeSerializer<?> typeSerializer;
                     Class<? extends TypeSerializer<?>> serializerType = findSerializerType(field, fieldType.getRawType());
                     if (serializerType != null) {
-                        typeSerializer = typeSerializerCache.computeIfAbsent(serializerType, t -> {
-                            try {
-                                // try BlueNBT constructor
-                                try {
-                                    return t.getDeclaredConstructor(BlueNBT.class).newInstance(blueNBT);
-                                } catch (NoSuchMethodException ignore) {}
-
-                                // use no-args constructor
-                                return t.getDeclaredConstructor().newInstance();
-                            } catch (Exception ex) {
-                                throw new RuntimeException("Failed to create Instance of TypeSerializer!", ex);
-                            }
-                        });
+                        typeSerializer = typeSerializerCache.computeIfAbsent(
+                                serializerType,
+                                t -> createTypeSerializerInstance(t, fieldType, blueNBT)
+                        );
                     } else if (SPECIAL_ACCESSORS.containsKey(fieldType.getType())) {
                         FieldWriter accessor = SPECIAL_ACCESSORS.get(fieldType.getType()).apply(field);
                         fields.put(name, accessor);
@@ -156,6 +148,41 @@ public void write(T value, NBTWriter writer) throws IOException {
             return null;
         }
 
+        private TypeSerializer<?> createTypeSerializerInstance(
+                Class<? extends TypeSerializer<?>> serializerType,
+                TypeToken<?> fieldType,
+                BlueNBT blueNBT
+        ) {
+            try {
+
+                // try TypeToken & BlueNBT constructor
+                try {
+                    return callConstructor(serializerType.getDeclaredConstructor(TypeToken.class, BlueNBT.class), fieldType, blueNBT);
+                } catch (NoSuchMethodException ignore) {}
+
+                // try TypeToken constructor
+                try {
+                    return callConstructor(serializerType.getDeclaredConstructor(TypeToken.class), fieldType);
+                } catch (NoSuchMethodException ignore) {}
+
+                // try BlueNBT constructor
+                try {
+                    return callConstructor(serializerType.getDeclaredConstructor(BlueNBT.class), blueNBT);
+                } catch (NoSuchMethodException ignore) {}
+
+                // use no-args constructor
+                return callConstructor(serializerType.getDeclaredConstructor());
+
+            } catch (ReflectiveOperationException ex) {
+                throw new IllegalStateException("Failed to create instance of TypeSerializer: " + serializerType, ex);
+            }
+        }
+
+        private <U> U callConstructor(Constructor<U> constructor, Object... args) throws ReflectiveOperationException {
+            constructor.setAccessible(true);
+            return constructor.newInstance(args);
+        }
+
     }
 
     private interface FieldWriter {