as suggested by TODO in code, make ContainedBean extend ManagedBean

hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java

@@ -59,6 +59,11 @@ private BeanImpl(
 			this.fallbackProducer = fallbackProducer;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public void initialize() {
 			if ( delegateBean == null ) {
@@ -99,6 +104,11 @@ private NamedBeanImpl(
 			this.fallbackProducer = fallbackProducer;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public void initialize() {
 			if ( delegateBean == null ) {

hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java

@@ -104,6 +104,10 @@ private BeanImpl(
 			this.fallbackProducer = fallbackProducer;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
 
 		@Override
 		public void initialize() {
@@ -147,15 +151,16 @@ private NamedBeanImpl(
 			this.fallbackProducer = fallbackProducer;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public void initialize() {
 			if ( delegateContainedBean == null ) {
-				delegateContainedBean = lifecycleStrategy.createBean(
-						name,
-						beanType,
-						fallbackProducer,
-						DUMMY_BEAN_CONTAINER
-				);
+				delegateContainedBean =
+						lifecycleStrategy.createBean( name, beanType, fallbackProducer, DUMMY_BEAN_CONTAINER );
 				delegateContainedBean.initialize();
 			}
 		}

hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java

@@ -72,6 +72,11 @@ private AbstractBeanImpl(
 			this.beanManager = beanManager;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public B getBeanInstance() {
 			if ( beanInstance == null ) {

hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java

@@ -17,6 +17,8 @@
 
 import org.jboss.logging.Logger;
 
+import java.util.Set;
+
 /**
  * A {@link BeanLifecycleStrategy} to use when JPA compliance is required
  * (i.e. when the bean lifecycle is to be managed by the JPA runtime, not the CDI runtime).
@@ -77,15 +79,17 @@ private static class BeanImpl<B> implements ContainedBeanImplementor<B> {
 
 		private B beanInstance;
 
-		public BeanImpl(
-				Class<B> beanType,
-				BeanInstanceProducer fallbackProducer,
-				BeanManager beanManager) {
+		public BeanImpl(Class<B> beanType, BeanInstanceProducer fallbackProducer, BeanManager beanManager) {
 			this.beanType = beanType;
 			this.fallbackProducer = fallbackProducer;
 			this.beanManager = beanManager;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public B getBeanInstance() {
 			if ( beanInstance == null ) {
@@ -205,6 +209,11 @@ private NamedBeanImpl(
 			this.beanManager = beanManager;
 		}
 
+		@Override
+		public Class<B> getBeanClass() {
+			return beanType;
+		}
+
 		@Override
 		public B getBeanInstance() {
 			if ( beanInstance == null ) {
@@ -214,7 +223,6 @@ public B getBeanInstance() {
 		}
 
 		@Override
-		@SuppressWarnings("unchecked")
 		public void initialize() {
 			if ( beanInstance != null ) {
 				return;
@@ -243,8 +251,7 @@ public void initialize() {
 			}
 
 			try {
-				bean = (Bean<B>) beanManager.resolve( beanManager.getBeans( beanType,
-						new NamedBeanQualifier( beanName ) ) );
+				bean = resolveBean();
 				beanInstance = bean.create( creationalContext );
 			}
 			catch (Exception e) {
@@ -264,6 +271,12 @@ public void initialize() {
 			}
 		}
 
+		@SuppressWarnings("unchecked")
+		private Bean<B> resolveBean() {
+			final Set<Bean<?>> beans = beanManager.getBeans( beanType, new NamedBeanQualifier( beanName ) );
+			return (Bean<B>) beanManager.resolve( beans );
+		}
+
 		@Override
 		public void release() {
 			if ( beanInstance == null ) {

hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBean.java

@@ -4,13 +4,10 @@
  */
 package org.hibernate.resource.beans.container.spi;
 
+import org.hibernate.resource.beans.spi.ManagedBean;
+
 /**
  * @author Steve Ebersole
  */
-public interface ContainedBean<B> {
-	// todo (5.3) : can we combine ContainedBean and org.hibernate.resource.beans.spi.ManagedBean into the same thing?
-	/**
-	 * Get the bean instance producer associated with this container-backed bean
-	 */
-	B getBeanInstance();
+public interface ContainedBean<B> extends ManagedBean<B> {
 }

hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ContainedBeanImplementor.java

@@ -5,9 +5,9 @@
 package org.hibernate.resource.beans.container.spi;
 
 /**
- * Release-able extension to {@link ContainedBean}.  We make the split to make it
- * clear that generally speaking the callers to BeanContainer should not perform
- * the release
+ * Releasable extension to {@link ContainedBean}. We make this split to clarify
+ * that clients of {@link BeanContainer} are not usually responsible for calling
+ * {@link #initialize()} and {@link #release()}.
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java

@@ -8,7 +8,6 @@
 import java.util.Map;
 
 import org.hibernate.resource.beans.container.spi.BeanContainer;
-import org.hibernate.resource.beans.container.spi.ContainedBean;
 import org.hibernate.resource.beans.container.spi.FallbackContainedBean;
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBean;
@@ -87,38 +86,16 @@ public <T> ManagedBean<T> getBean(
 	}
 
 	private <T> ManagedBean<T> createBean(Class<T> beanClass, BeanInstanceProducer fallbackBeanInstanceProducer) {
-		if ( beanContainer == null ) {
-			return new FallbackContainedBean<>( beanClass, fallbackBeanInstanceProducer );
-		}
-		else {
-			final ContainedBean<T> containedBean =
-					beanContainer.getBean( beanClass, this, fallbackBeanInstanceProducer );
-			if ( containedBean instanceof ManagedBean ) {
-				//noinspection unchecked
-				return (ManagedBean<T>) containedBean;
-			}
-			else {
-				return new ContainedBeanManagedBeanAdapter<>( beanClass, containedBean );
-			}
-		}
+		return beanContainer == null
+				? new FallbackContainedBean<>( beanClass, fallbackBeanInstanceProducer )
+				: beanContainer.getBean( beanClass, this, fallbackBeanInstanceProducer );
 	}
 
 	private <T> ManagedBean<T> createBean(
 			String beanName, Class<T> beanContract, BeanInstanceProducer fallbackBeanInstanceProducer) {
-		if ( beanContainer == null ) {
-			return new FallbackContainedBean<>( beanName, beanContract, fallbackBeanInstanceProducer );
-		}
-		else {
-			final ContainedBean<T> containedBean =
-					beanContainer.getBean( beanName, beanContract, this, fallbackBeanInstanceProducer );
-			if ( containedBean instanceof ManagedBean ) {
-				//noinspection unchecked
-				return (ManagedBean<T>) containedBean;
-			}
-			else {
-				return new ContainedBeanManagedBeanAdapter<>( beanContract, containedBean );
-			}
-		}
+		return beanContainer == null
+				? new FallbackContainedBean<>( beanName, beanContract, fallbackBeanInstanceProducer )
+				: beanContainer.getBean( beanName, beanContract, this, fallbackBeanInstanceProducer );
 	}
 
 	@Override
@@ -128,24 +105,4 @@ public void stop() {
 		}
 		registrations.clear();
 	}
-
-	private static class ContainedBeanManagedBeanAdapter<B> implements ManagedBean<B> {
-		private final Class<B> beanClass;
-		private final ContainedBean<B> containedBean;
-
-		private ContainedBeanManagedBeanAdapter(Class<B> beanClass, ContainedBean<B> containedBean) {
-			this.beanClass = beanClass;
-			this.containedBean = containedBean;
-		}
-
-		@Override
-		public Class<B> getBeanClass() {
-			return beanClass;
-		}
-
-		@Override
-		public B getBeanInstance() {
-			return containedBean.getBeanInstance();
-		}
-	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionProviderFromBeanContainerTest.java

@@ -42,17 +42,35 @@ public <B> ContainedBean<B> getBean(
 					Class<B> beanType,
 					LifecycleOptions lifecycleOptions,
 					BeanInstanceProducer fallbackProducer) {
-				return () -> (B) ( beanType == DummyConnectionProvider.class ?
-						dummyConnectionProvider : fallbackProducer.produceBeanInstance( beanType ) );
+				return new ContainedBean<>() {
+					@Override
+					public B getBeanInstance() {
+						return (B) (beanType == DummyConnectionProvider.class ?
+								dummyConnectionProvider : fallbackProducer.produceBeanInstance( beanType ) );
+					}
+
+					@Override
+					public Class<B> getBeanClass() {
+						return beanType;
+					}
+				};
 			}
-
 			@Override
 			public <B> ContainedBean<B> getBean(
 					String name,
 					Class<B> beanType,
 					LifecycleOptions lifecycleOptions,
 					BeanInstanceProducer fallbackProducer) {
-				return () -> (B) fallbackProducer.produceBeanInstance( beanType );
+				return new ContainedBean<>() {
+					@Override
+					public B getBeanInstance() {
+						return fallbackProducer.produceBeanInstance( beanType );
+					}
+					@Override
+					public Class<B> getBeanClass() {
+						return beanType;
+					}
+				};
 			}
 
 			@Override

hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/SimpleBeanContainer.java

@@ -23,8 +23,17 @@ public <B> ContainedBean<B> getBean(
 			Class<B> beanType,
 			LifecycleOptions lifecycleOptions,
 			BeanInstanceProducer fallbackProducer) {
-		return () -> (B) ( beanType == SimpleGenerator.class ?
-				new SimpleGenerator( new AtomicLong( INITIAL_VALUE ) ) : fallbackProducer.produceBeanInstance( beanType ) );
+		return new ContainedBean<>() {
+			@Override
+			public B getBeanInstance() {
+				return (B) (beanType == SimpleGenerator.class ?
+						new SimpleGenerator( new AtomicLong( INITIAL_VALUE ) ) : fallbackProducer.produceBeanInstance( beanType ) );
+			}
+			@Override
+			public Class<B> getBeanClass() {
+				return beanType;
+			}
+		};
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java

@@ -65,10 +65,28 @@ public void testCreateGeneratorsByBeanContainer() {
 			if (beanType == TestIdentifierGenerator.class) {
 				assertThat( options.canUseCachedReferences(), is( false ) );
 				assertThat( options.useJpaCompliantCreation(), is( true ) );
-				return (ContainedBean<?>) TestIdentifierGenerator::new;
+				return new ContainedBean<TestIdentifierGenerator>() {
+					@Override
+					public TestIdentifierGenerator getBeanInstance() {
+						return new TestIdentifierGenerator();
+					}
+					@Override
+					public Class<TestIdentifierGenerator> getBeanClass() {
+						return TestIdentifierGenerator.class;
+					}
+				};
 			}
 			else {
-				return (ContainedBean<?>) () -> ( ( BeanInstanceProducer ) invocation.getArguments()[2] ).produceBeanInstance( beanType );
+				return new ContainedBean<>() {
+					@Override
+					public Object getBeanInstance() {
+						return ( ( BeanInstanceProducer ) invocation.getArguments()[2] ).produceBeanInstance( beanType );
+					}
+					@Override
+					public Class getBeanClass() {
+						return beanType;
+					}
+				};
 			}
 		} );
 

hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/beancontainer/MultiTenantConnectionProviderFromBeanContainerTest.java

@@ -43,7 +43,16 @@ public <B> ContainedBean<B> getBean(
 					Class<B> beanType,
 					LifecycleOptions lifecycleOptions,
 					BeanInstanceProducer fallbackProducer) {
-				return () -> (B) ( beanType == MultiTenantConnectionProvider.class ? providerFromBeanContainer : fallbackProducer.produceBeanInstance( beanType ) );
+				return new ContainedBean<>() {
+					@Override
+					public B getBeanInstance() {
+						return (B) (beanType == MultiTenantConnectionProvider.class ? providerFromBeanContainer : fallbackProducer.produceBeanInstance( beanType ) );
+					}
+					@Override
+					public Class<B> getBeanClass() {
+						return beanType;
+					}
+				};
 			}
 
 			@Override
@@ -52,7 +61,16 @@ public <B> ContainedBean<B> getBean(
 					Class<B> beanType,
 					LifecycleOptions lifecycleOptions,
 					BeanInstanceProducer fallbackProducer) {
-				return () -> (B) fallbackProducer.produceBeanInstance( beanType );
+				return new ContainedBean<>() {
+					@Override
+					public B getBeanInstance() {
+						return fallbackProducer.produceBeanInstance( beanType );
+					}
+					@Override
+					public Class<B> getBeanClass() {
+						return beanType;
+					}
+				};
 			}
 
 			@Override