Avoid Class to String conversions during Proxy pre-processing as well

quarkusio · Mar 17, 2021 · b66fcc8 · b66fcc8
1 parent 8fc289d
commit b66fcc8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -45,7 +45,6 @@
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
 import org.hibernate.loader.BatchFetchStyle;
-import org.hibernate.proxy.HibernateProxy;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget.Kind;
 import org.jboss.jandex.AnnotationValue;
@@ -152,6 +151,7 @@ public final class HibernateOrmProcessor {
     public static final DotName PROXY = DotName.createSimple("org.hibernate.annotations.Proxy");
 
     private static final String INTEGRATOR_SERVICE_FILE = "META-INF/services/org.hibernate.integrator.spi.Integrator";
+    public static final String HIBERNATE_PROXY_INTERFACENAME = "org.hibernate.proxy.HibernateProxy";
 
     @BuildStep
     CapabilityBuildItem capability() {
@@ -1234,18 +1234,18 @@ private PreGeneratedProxies generatedProxies(Set<String> managedClassAndPackageN
                         && !isModified(managedClassOrPackageName, changedClasses, combinedIndex)) {
                     result = proxyCache.cache.get(managedClassOrPackageName);
                 } else {
-                    Set<Class<?>> proxyInterfaces = new HashSet<>();
-                    proxyInterfaces.add(HibernateProxy.class); //always added
+                    Set<String> proxyInterfaceNames = new TreeSet<>();
+                    proxyInterfaceNames.add(HIBERNATE_PROXY_INTERFACENAME); //always added
                     String proxy = proxyAnnotations.get(managedClassOrPackageName);
                     if (proxy == null) {
                         if (!proxyHelper.isProxiable(managedClassOrPackageName)) {
                             //if there is no @Proxy we need to make sure the actual class is proxiable
                             continue;
                         }
                     } else {
-                        proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
+                        proxyInterfaceNames.add(proxy);
                     }
-                    Class<?> mappedClass = proxyHelper.uninitializedClass(managedClassOrPackageName);
+                    final String mappedClass = managedClassOrPackageName;
                     for (ClassInfo subclass : combinedIndex
                             .getAllKnownSubclasses(DotName.createSimple(managedClassOrPackageName))) {
                         String subclassName = subclass.name().toString();
@@ -1255,13 +1255,11 @@ private PreGeneratedProxies generatedProxies(Set<String> managedClassAndPackageN
                         }
                         proxy = proxyAnnotations.get(subclassName);
                         if (proxy != null) {
-                            proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
+                            proxyInterfaceNames.add(proxy);
                         }
                     }
-                    DynamicType.Unloaded<?> unloaded = proxyHelper.buildUnloadedProxy(mappedClass,
-                            toArray(proxyInterfaces));
-                    result = new CachedProxy(unloaded,
-                            proxyInterfaces.stream().map(Class::getName).collect(Collectors.toSet()));
+                    DynamicType.Unloaded<?> unloaded = proxyHelper.buildUnloadedProxy(mappedClass, proxyInterfaceNames);
+                    result = new CachedProxy(unloaded, proxyInterfaceNames);
                     proxyCache.cache.put(managedClassOrPackageName, result);
                 }
                 for (Entry<TypeDescription, byte[]> i : result.proxyDef.getAllTypes().entrySet()) {

diff --git a/...orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java b/...orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java
@@ -1,6 +1,7 @@
 package io.quarkus.hibernate.orm.deployment;
 
 import java.lang.reflect.Modifier;
+import java.util.Set;
 
 import org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl;
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
@@ -22,7 +23,13 @@ public ProxyBuildingHelper(ClassLoader contextClassLoader) {
         this.contextClassLoader = contextClassLoader;
     }
 
-    public DynamicType.Unloaded<?> buildUnloadedProxy(Class<?> mappedClass, Class[] interfaces) {
+    public DynamicType.Unloaded<?> buildUnloadedProxy(String mappedClassName, Set<String> interfaceNames) {
+        final Class[] interfaces = new Class[interfaceNames.size()];
+        int i = 0;
+        for (String name : interfaceNames) {
+            interfaces[i++] = uninitializedClass(name);
+        }
+        final Class<?> mappedClass = uninitializedClass(mappedClassName);
         return getByteBuddyProxyHelper().buildUnloadedProxy(mappedClass, interfaces);
     }
 
@@ -36,7 +43,7 @@ private ByteBuddyProxyHelper getByteBuddyProxyHelper() {
         return this.byteBuddyProxyHelper;
     }
 
-    public Class<?> uninitializedClass(String entity) {
+    private Class<?> uninitializedClass(String entity) {
         try {
             return Class.forName(entity, false, contextClassLoader);
         } catch (ClassNotFoundException e) {

diff --git a/...nsions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ConstantsTest.java b/...nsions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ConstantsTest.java
@@ -19,6 +19,7 @@
 import org.hibernate.dialect.MariaDB103Dialect;
 import org.hibernate.dialect.MySQL8Dialect;
 import org.hibernate.dialect.SQLServer2012Dialect;
+import org.hibernate.proxy.HibernateProxy;
 import org.jboss.jandex.DotName;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -45,6 +46,7 @@ public void testConstantsInHibernateOrmProcessor() {
         assertMatch(HibernateOrmProcessor.JPA_ENTITY, javax.persistence.Entity.class);
         assertMatch(HibernateOrmProcessor.MAPPED_SUPERCLASS, javax.persistence.MappedSuperclass.class);
         assertMatch(HibernateOrmProcessor.PROXY, org.hibernate.annotations.Proxy.class);
+        Assertions.assertEquals(HibernateProxy.class.getName(), HibernateOrmProcessor.HIBERNATE_PROXY_INTERFACENAME);
     }
 
     @Test