Use application classloader for proxies (#419)

Signed-off-by: tevans <tevans@uk.ibm.com>
smallrye · Oct 14, 2020 · 3f5e25f · 3f5e25f
1 parent d86322e
commit 3f5e25f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/ConfigMappingInterface.java b/implementation/src/main/java/io/smallrye/config/ConfigMappingInterface.java
@@ -65,8 +65,7 @@ protected ConfigMappingInterface computeValue(final Class<?> type) {
     ConfigMappingInterface(final Class<?> interfaceType, final ConfigMappingInterface[] superTypes,
             final Property[] properties) {
         this.interfaceType = interfaceType;
-        this.className = getClass().getPackage().getName() + "." + interfaceType.getSimpleName()
-                + interfaceType.getName().hashCode() + "Impl";
+        this.className = interfaceType.getName() + interfaceType.getName().hashCode() + "Impl";
         this.superTypes = superTypes;
         this.properties = properties;
         this.propertiesByName = Stream.of(properties).collect(toMap(p -> p.getMethod().getName(), p -> p));

diff --git a/implementation/src/main/java/io/smallrye/config/ConfigMappingLoader.java b/implementation/src/main/java/io/smallrye/config/ConfigMappingLoader.java
@@ -58,22 +58,22 @@ static <T> T configMappingObject(Class<T> interfaceType, ConfigMappingContext co
     @SuppressWarnings("unchecked")
     static <T> Class<? extends ConfigMappingObject> getImplementationClass(Class<T> type) {
         final ConfigMappingMetadata mappingMetadata = ConfigMappingInterface.getConfigurationInterface(type);
-        return (Class<? extends ConfigMappingObject>) loadClass(type.getClassLoader(),
+        return (Class<? extends ConfigMappingObject>) loadClass(type,
                 mappingMetadata.getClassName(),
                 mappingMetadata.getClassBytes());
     }
 
-    static Class<?> loadClass(final ClassLoader classLoader, final String className, final byte[] classBytes) {
+    static Class<?> loadClass(final Class<?> parent, final String className, final byte[] classBytes) {
         // Check if the interface implementation was already loaded. If not we will load it.
         try {
-            return classLoader.loadClass(className);
+            return parent.getClassLoader().loadClass(className);
         } catch (ClassNotFoundException e) {
-            return loadClass(className, classBytes);
+            return defineClass(parent, className, classBytes);
         }
     }
 
-    private static Class<?> loadClass(final String className, final byte[] classBytes) {
-        return ClassDefiner.defineClass(LOOKUP, ConfigMappingLoader.class, className, classBytes);
+    private static Class<?> defineClass(final Class<?> parent, final String className, final byte[] classBytes) {
+        return ClassDefiner.defineClass(LOOKUP, parent, className, classBytes);
     }
 
     private static final class ConfigMappingObjectHolder {

diff --git a/implementation/src/test/java/io/smallrye/config/ConfigMappingLoaderTest.java b/implementation/src/test/java/io/smallrye/config/ConfigMappingLoaderTest.java
@@ -26,7 +26,7 @@ void multipleLoads() {
     void loadManually() {
         List<ConfigMappingMetadata> configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(ServerManual.class);
         configMappingsMetadata.forEach(
-                mappingMetadata -> ConfigMappingLoader.loadClass(ServerManual.class.getClassLoader(),
+                mappingMetadata -> ConfigMappingLoader.loadClass(ServerManual.class,
                         mappingMetadata.getClassName(), mappingMetadata.getClassBytes()));
         ConfigMappingLoader.getImplementationClass(ServerManual.class);
         ConfigMappingLoader.getImplementationClass(ServerManual.class);