From de09e67872d6a2112bb32afcd2000ecce056e2d2 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Wed, 27 Mar 2019 22:56:07 -0700
Subject: [PATCH] HHH-13343 : Bytecode enhancement using ByteBuddy fails when
 the class is not available from the provided ClassLoader

(cherry picked from commit af3f48519353fcbc4e550faf5b3ebbb852dcf37f)
---
 .../internal/bytebuddy/EnhancerImpl.java      | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
index b543750cf8..a4f655c29a 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
@@ -7,26 +7,22 @@
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
 import static net.bytebuddy.matcher.ElementMatchers.isDefaultFinalizer;
-import static net.bytebuddy.matcher.ElementMatchers.isGetter;
 
+import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Transient;
 
-import org.hibernate.MappingException;
 import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker;
 import org.hibernate.bytecode.enhance.spi.CollectionTracker;
@@ -64,12 +60,10 @@ import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.description.type.TypeDescription.Generic;
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.DynamicType;
-import net.bytebuddy.dynamic.scaffold.MethodGraph;
 import net.bytebuddy.implementation.FieldAccessor;
 import net.bytebuddy.implementation.FixedValue;
 import net.bytebuddy.implementation.Implementation;
 import net.bytebuddy.implementation.StubMethod;
-import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.pool.TypePool;
 
 public class EnhancerImpl implements Enhancer {
@@ -79,6 +73,7 @@ public class EnhancerImpl implements Enhancer {
 	protected final ByteBuddyEnhancementContext enhancementContext;
 	private final ByteBuddyState byteBuddyState;
 
+	private final EnhancerClassFileLocator classFileLocator;
 	private final TypePool typePool;
 
 	/**
@@ -112,7 +107,8 @@ public class EnhancerImpl implements Enhancer {
 	public EnhancerImpl(final EnhancementContext enhancementContext, final ByteBuddyState byteBuddyState) {
 		this.enhancementContext = new ByteBuddyEnhancementContext( enhancementContext );
 		this.byteBuddyState = byteBuddyState;
-		this.typePool = buildTypePool( this.enhancementContext );
+		this.classFileLocator = new EnhancerClassFileLocator( enhancementContext.getLoadingClassLoader() );
+		this.typePool = buildTypePool( classFileLocator );
 	}
 
 	/**
@@ -130,6 +126,7 @@ public class EnhancerImpl implements Enhancer {
 	public synchronized byte[] enhance(String className, byte[] originalBytes) throws EnhancementException {
 		//Classpool#describe does not accept '/' in the description name as it expects a class name. See HHH-12545
 		final String safeClassName = className.replace( '/', '.' );
+		classFileLocator.addNameAndBytes( safeClassName, originalBytes );
 		try {
 			final TypeDescription typeDescription = typePool.describe( safeClassName ).resolve();
 
@@ -143,8 +140,8 @@ public class EnhancerImpl implements Enhancer {
 		}
 	}
 
-	private TypePool buildTypePool(final ByteBuddyEnhancementContext enhancementContext) {
-		return TypePool.Default.WithLazyResolution.of( enhancementContext.getLoadingClassLoader() );
+	private TypePool buildTypePool(final ClassFileLocator classFileLocator) {
+		return TypePool.Default.WithLazyResolution.of( classFileLocator );
 	}
 
 	private DynamicType.Builder<?> doEnhance(DynamicType.Builder<?> builder, TypeDescription managedCtClass) {
@@ -539,4 +536,35 @@ public class EnhancerImpl implements Enhancer {
 			}
 		}
 	}
+
+	private class EnhancerClassFileLocator extends ClassFileLocator.ForClassLoader {
+
+		private Map<String,Resolution> nameToResolutionMap = new HashMap<>();
+
+		/**
+		 * Creates a new class file locator for the given class loader.
+		 *
+		 * @param classLoader The class loader to query which must not be the bootstrap class loader, i.e. {@code null}.
+		 */
+		protected EnhancerClassFileLocator(ClassLoader classLoader) {
+			super( classLoader );
+		}
+
+		@Override
+		public Resolution locate(String name) throws IOException {
+			Resolution resolution = nameToResolutionMap.get( name );
+			if ( resolution != null ) {
+				return resolution;
+			}
+			else {
+				return super.locate( name );
+			}
+		}
+
+		void addNameAndBytes(String name, byte[] bytes ) {
+			assert name != null;
+			assert bytes != null;
+			nameToResolutionMap.put( name, new Resolution.Explicit( bytes) );
+		}
+	}
 }