HHH-19372 HHH-19369 Add Code Source Location HashCode to proxy generated classes

Author: dreab8

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java

@@ -15,6 +15,7 @@
 
 import net.bytebuddy.description.modifier.Visibility;
 import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
+import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
 
 public class BasicProxyFactoryImpl implements BasicProxyFactory {
 
@@ -36,7 +37,7 @@ public BasicProxyFactoryImpl(final Class superClass, final Class interfaceClass,
 
 		final Class<?> superClassOrMainInterface = superClass != null ? superClass : interfaceClass;
 		final ByteBuddyState.ProxyDefinitionHelpers helpers = byteBuddyState.getProxyDefinitionHelpers();
-		final String proxyClassName = superClassOrMainInterface.getName() + "$" + PROXY_NAMING_SUFFIX;
+		final String proxyClassName = ByteBuddyProxyHelper.getClassNameWithSuffix( superClassOrMainInterface, PROXY_NAMING_SUFFIX );
 
 		this.proxyClass = byteBuddyState.loadBasicProxy( superClassOrMainInterface, proxyClassName, (byteBuddy, namingStrategy) ->
 				helpers.appendIgnoreAlsoAtEnd( byteBuddy

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java

@@ -148,7 +148,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				fastClass = null;
 			}
 			else {
-				final String className = clazz.getName() + "$" + INSTANTIATOR_PROXY_NAMING_SUFFIX;
+				final String className = ByteBuddyProxyHelper.getClassNameWithSuffix( clazz, INSTANTIATOR_PROXY_NAMING_SUFFIX );
 				fastClass = byteBuddyState.load( clazz, className, (byteBuddy, namingStrategy) -> byteBuddy
 						.with( namingStrategy )
 						.subclass( ReflectionOptimizer.InstantiationOptimizer.class )
@@ -210,7 +210,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				fastClass = null;
 			}
 			else {
-				final String className = clazz.getName() + "$" + INSTANTIATOR_PROXY_NAMING_SUFFIX;
+				final String className = ByteBuddyProxyHelper.getClassNameWithSuffix( clazz, INSTANTIATOR_PROXY_NAMING_SUFFIX );
 				fastClass = byteBuddyState.load( clazz, className, (byteBuddy, namingStrategy) -> byteBuddy
 						.with( namingStrategy )
 						.subclass( ReflectionOptimizer.InstantiationOptimizer.class )
@@ -236,7 +236,8 @@ public ReflectionOptimizer getReflectionOptimizer(
 		final String[] propertyNames = propertyAccessMap.keySet().toArray( new String[0] );
 		final Class<?> superClass = determineAccessOptimizerSuperClass( clazz, propertyNames, getters, setters );
 
-		final String className = clazz.getName() + "$" + OPTIMIZER_PROXY_NAMING_SUFFIX + encodeName( propertyNames, getters, setters );
+		final String className = ByteBuddyProxyHelper.getClassNameWithSuffix( clazz, OPTIMIZER_PROXY_NAMING_SUFFIX )
+								+ encodeName( propertyNames, getters, setters );
 		final Class<?> bulkAccessor;
 		if ( className.getBytes( StandardCharsets.UTF_8 ).length >= 0x10000 ) {
 			// The JVM has a 64K byte limit on class name length, so fallback to random name if encoding exceeds that
@@ -322,7 +323,7 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 			final ForeignPackageClassInfo foreignPackageClassInfo = foreignPackageClassInfos.get( i );
 			final Class<?> newSuperClass = superClass;
 
-			final String className = foreignPackageClassInfo.clazz.getName() + "$" + OPTIMIZER_PROXY_NAMING_SUFFIX + encodeName( foreignPackageClassInfo.propertyNames, foreignPackageClassInfo.getters, foreignPackageClassInfo.setters );
+			final String className = ByteBuddyProxyHelper.getClassNameWithSuffix( foreignPackageClassInfo.clazz, OPTIMIZER_PROXY_NAMING_SUFFIX ) + encodeName( foreignPackageClassInfo.propertyNames, foreignPackageClassInfo.getters, foreignPackageClassInfo.setters );
 			superClass = byteBuddyState.load(
 					foreignPackageClassInfo.clazz,
 					className,

hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java

@@ -6,6 +6,7 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -185,4 +186,17 @@ private static Method resolveIdSetterMethod(SerializableProxy serializableProxy)
 			);
 		}
 	}
+
+	public static String getClassNameWithSuffix(Class<?> clazz, String suffix) {
+		return getClassNameWithCodeSourceLocationHashCode(clazz) + "$" + suffix;
+	}
+
+	private static String getClassNameWithCodeSourceLocationHashCode(Class<?> clazz) {
+		final java.security.CodeSource codeSource = clazz.getProtectionDomain().getCodeSource();
+		if ( codeSource == null ) {
+			return clazz.getName();
+		}
+		final URL url = codeSource.getLocation();
+		return url == null ? clazz.getName() : clazz.getName() + url.toString().hashCode();
+	}
 }