HHH-16073 Remove legacy references to BytecodeProvider configuration …

…from Environment
hibernate · Aug 22, 2023 · abe74a8 · abe74a8
1 parent 4e16d00
commit abe74a8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 42 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
@@ -13,8 +13,6 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.Version;
-import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
-import org.hibernate.bytecode.spi.BytecodeProvider;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ConfigHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
@@ -195,36 +193,4 @@ public static Properties getProperties() {
 		return copy;
 	}
 
-	/**
-	 * @deprecated Replaced by {@code org.hibernate.bytecode.internal.BytecodeProviderInitiator#BYTECODE_PROVIDER_NAME_BYTEBUDDY},
-	 * however note that that's an internal contract: a different BytecodeProvider Initiator might ignore these constants
-	 * or interpret them differently.
-	 */
-	@Deprecated(forRemoval = true)
-	public static final String BYTECODE_PROVIDER_NAME_BYTEBUDDY = "bytebuddy";
-
-	/**
-	 * @deprecated Replaced by {@code org.hibernate.bytecode.internal.BytecodeProviderInitiator#BYTECODE_PROVIDER_NAME_NONE},
-	 * however note that that's an internal contract: a different BytecodeProvider Initiator might ignore these constants
-	 * or interpret them differently.
-	 */
-	@Deprecated(forRemoval = true)
-	public static final String BYTECODE_PROVIDER_NAME_NONE = "none";
-
-	/**
-	 * @deprecated Replaced by {@code org.hibernate.bytecode.internal.BytecodeProviderInitiator#BYTECODE_PROVIDER_NAME_DEFAULT}
-	 * however note that that's an internal contract: a different BytecodeProvider Initiator might apply a different default.
-	 */
-	@Deprecated(forRemoval = true)
-	public static final String BYTECODE_PROVIDER_NAME_DEFAULT = BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY;
-
-	/**
-	 * @deprecated this will be removed; retrieval of the BytecodeProvider should be performed via the {@link org.hibernate.service.ServiceRegistry}.
-	 */
-	@Deprecated(forRemoval = true)
-	public static BytecodeProvider buildBytecodeProvider(Properties properties) {
-		String provider = ConfigurationHelper.getString( BYTECODE_PROVIDER, properties, BYTECODE_PROVIDER_NAME_DEFAULT );
-		return BytecodeProviderInitiator.buildBytecodeProvider( provider );
-	}
-
 }
diff --git a/...e/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java b/...e/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java
@@ -20,6 +20,7 @@
 
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 
@@ -51,7 +52,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Override
 	protected void applyMetadataSources(MetadataSources sources) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/.../bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java b/.../bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java
@@ -19,6 +19,7 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
@@ -51,7 +52,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Override
 	protected void applyMetadataSources(MetadataSources sources) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/.../enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java b/.../enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java
@@ -15,6 +15,7 @@
 
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -51,7 +52,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Override
 	protected void applyMetadataSources(MetadataSources sources) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/.../bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java b/.../bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java
@@ -19,6 +19,7 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.Table;
 
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
@@ -53,7 +54,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	@Override
 	protected void addMappings(Map settings) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/.../inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java b/.../inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.OneToOne;
 
 import org.hibernate.FlushMode;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
@@ -49,7 +50,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	protected void addMappings(Map settings) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
 		settings.put( AvailableSettings.FLUSH_MODE, FlushMode.ALWAYS );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/...orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java b/...orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java
@@ -17,6 +17,7 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
@@ -50,7 +51,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Override
 	protected void applyMetadataSources(MetadataSources sources) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/...ncement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java b/...ncement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java
@@ -15,6 +15,7 @@
 
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -54,7 +55,7 @@ protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBu
 	@Override
 	protected void applyMetadataSources(MetadataSources sources) {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider != null && !Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider != null && !BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			// skip the test if the bytecode provider is Javassist
 			skipTest = true;
 		}

diff --git a/...rnate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/...rnate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java
@@ -15,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
+import org.hibernate.bytecode.internal.BytecodeProviderInitiator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.internal.CoreMessageLogger;
@@ -88,7 +89,7 @@ public void test(EntityManagerFactoryScope scope) {
 
 	private static Class<? extends ProxyFactory> proxyFactoryClass() {
 		String byteCodeProvider = Environment.getProperties().getProperty( AvailableSettings.BYTECODE_PROVIDER );
-		if ( byteCodeProvider == null || Environment.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
+		if ( byteCodeProvider == null || BytecodeProviderInitiator.BYTECODE_PROVIDER_NAME_BYTEBUDDY.equals( byteCodeProvider ) ) {
 			return ByteBuddyProxyFactory.class;
 		}
 		else {