From 2e541f3b15c7db27d6c3ba23d1c839886e423655 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 16 Jan 2018 14:30:09 -0600 Subject: [PATCH] HHH-12133 - Create ManagedBeanRegistry and ManagedBean - reapplied backwards compatibility wrt ExtendedBeanManager for WildFly --- .../jpa/event/spi/jpa/ExtendedBeanManager.java | 13 +++++++++++++ .../container/internal/CdiBeanContainerBuilder.java | 2 +- .../CdiBeanContainerExtendedAccessImpl.java | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java index dd174fd066..784ddf5684 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java @@ -11,4 +11,17 @@ package org.hibernate.jpa.event.spi.jpa; */ @Deprecated public interface ExtendedBeanManager extends org.hibernate.resource.beans.container.spi.ExtendedBeanManager { + void registerLifecycleListener(LifecycleListener lifecycleListener); + + @Override + default void registerLifecycleListener(org.hibernate.resource.beans.container.spi.ExtendedBeanManager.LifecycleListener lifecycleListener) { + registerLifecycleListener( (LifecycleListener) lifecycleListener ); + } + + /** + * @deprecated Use {@link org.hibernate.resource.beans.container.spi.ExtendedBeanManager.LifecycleListener} instead + */ + @Deprecated + interface LifecycleListener extends org.hibernate.resource.beans.container.spi.ExtendedBeanManager.LifecycleListener { + } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java index 58bf289e80..3477cc5e01 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java @@ -35,7 +35,7 @@ public class CdiBeanContainerBuilder { private static final String CONTAINER_FQN_DELAYED = "org.hibernate.resource.beans.container.internal.CdiBeanContainerDelayedAccessImpl"; private static final String CONTAINER_FQN_EXTENDED = "org.hibernate.resource.beans.container.internal.CdiBeanContainerExtendedAccessImpl"; - private static final String BEAN_MANAGER_EXTENSION_FQN = "org.hibernate.resource.beans.container.spi.ExtendedBeanManager"; + private static final String BEAN_MANAGER_EXTENSION_FQN = "org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager"; @SuppressWarnings("unchecked") public static BeanContainerImplementor fromBeanManagerReference( diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java index 6ea2bfbbc1..95b985248e 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java @@ -8,11 +8,11 @@ package org.hibernate.resource.beans.container.internal; import javax.enterprise.inject.spi.BeanManager; +import org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager; import org.hibernate.resource.beans.container.spi.AbstractBeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; import org.hibernate.resource.beans.container.spi.ContainedBean; import org.hibernate.resource.beans.container.spi.ContainedBeanImplementor; -import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; import org.hibernate.resource.beans.internal.Helper; import org.hibernate.resource.beans.spi.BeanInstanceProducer; @@ -25,6 +25,9 @@ import org.jboss.logging.Logger; public class CdiBeanContainerExtendedAccessImpl extends AbstractBeanContainer implements ExtendedBeanManager.LifecycleListener { + + // NOTE : we continue to use the deprecated form for now since that is what WildFly needs for the time being still + private static final Logger log = Logger.getLogger( CdiBeanContainerExtendedAccessImpl.class ); private BeanManager usableBeanManager;