#1034 Minor improvements

Dockbox-OSS · Dec 22, 2023 · 77c231f · 77c231f
1 parent e56037c
commit 77c231f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...c/main/java/org/dockbox/hartshorn/config/properties/ConfigurationObjectPostProcessor.java b/...c/main/java/org/dockbox/hartshorn/config/properties/ConfigurationObjectPostProcessor.java
@@ -50,7 +50,7 @@ private <T> T createOrUpdate(ComponentKey<T> key, T instance, ConfigurationObjec
         Option<T> configuration;
         Class<T> type = instance == null
                 ? key.type()
-                : TypeUtils.adjustWildcards(instance.getClass(), Class.class);
+                : TypeUtils.getClass(instance);
 
         if (instance == null) {
             configuration = this.propertyHolder.get(configurationObject.prefix(), type);

diff --git a/...fig/src/main/java/org/dockbox/hartshorn/config/properties/StandardURIConfigProcessor.java b/...fig/src/main/java/org/dockbox/hartshorn/config/properties/StandardURIConfigProcessor.java
@@ -28,7 +28,7 @@
 import org.dockbox.hartshorn.config.FileFormats;
 import org.dockbox.hartshorn.config.ObjectMapper;
 import org.dockbox.hartshorn.config.ObjectMappingException;
-import org.dockbox.hartshorn.util.TypeUtils;
+import org.dockbox.hartshorn.util.GenericType;
 
 import jakarta.inject.Singleton;
 
@@ -49,10 +49,10 @@ public void process(ApplicationContext context, Set<ConfigurationURIContext> con
             }
 
             try {
-                Map<String, Object> cache = TypeUtils.adjustWildcards(context.get(ObjectMapper.class)
+                Map<String, Object> cache = context.get(ObjectMapper.class)
                         .fileType(format)
-                        .read(uri, Map.class)
-                        .orElseGet(HashMap::new), Map.class);
+                        .read(uri, new GenericType<Map<String, Object>>() {})
+                        .orElseGet(HashMap::new);
 
                 context.log().debug("Located " + cache.size() + " properties in " + uri.getPath());
                 context.get(PropertyHolder.class).set(cache);

diff --git a/hartshorn-util/src/main/java/org/dockbox/hartshorn/util/TypeUtils.java b/hartshorn-util/src/main/java/org/dockbox/hartshorn/util/TypeUtils.java
@@ -197,4 +197,9 @@ public static boolean isAssignable(Class<?> source, Class<?> target) {
         }
         return source.isPrimitive() && TypeUtils.isPrimitiveWrapper(target, source);
     }
+
+    public static <T> Class<T> getClass(T instance) {
+        //noinspection unchecked
+        return (Class<T>) instance.getClass();
+    }
 }