From db12d5a17a72d048d0e53bd2d0906d827bb0bbe5 Mon Sep 17 00:00:00 2001
From: Jan Schatteman <jschatte@redhat.com>
Date: Thu, 11 Nov 2021 22:49:30 +0100
Subject: [PATCH] Remove deprecated JPA_METAMODEL_GENERATION and
 JPA_METAMODEL_POPULATION from AvailableSettings

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
---
 .../userguide/appendices/Configurations.adoc  |  9 ----
 .../org/hibernate/cfg/AvailableSettings.java  | 26 ----------
 .../JpaMetaModelPopulationSetting.java        | 52 -------------------
 .../JpaStaticMetaModelPopulationSetting.java  | 27 ----------
 .../AbstractJpaMetamodelPopulationTest.java   |  4 +-
 ...tamodelskipUnsupportedPopulationTest.java} |  4 +-
 .../paths/SingularAttributeJoinTest.java      |  2 +-
 .../contributed/EntityHidingTests.java        |  4 +-
 .../hibernate/test/idclass/IdClassTest.java   |  2 +-
 .../test/envers/RuntimeModelSmokeTests.java   |  9 +---
 10 files changed, 10 insertions(+), 129 deletions(-)
 delete mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
 rename hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/{JpaMetamodelIgnoreUnsupportedPopulationTest.java => JpaMetamodelskipUnsupportedPopulationTest.java} (77%)

diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
index dcf3ac10d56c..76b747394226 100644
--- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
+++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
@@ -1152,15 +1152,6 @@ XML configuration file to use to configure Hibernate.
 If true, the persistence context will be discarded (think `clear()` when the method is called).
 Otherwise, the persistence context will stay alive till the transaction completion: all objects will remain managed, and any change will be synchronized with the database (default to false, ie wait for transaction completion).
 
-`*hibernate.ejb.metamodel.population*` (e.g. `enabled` or `disabled`, or `ignoreUnsupported` (default value))::
-Setting that indicates whether to build the Jakarta Persistence types.
-+
-Accepts three values:
-+
-enabled::: Do the build.
-disabled::: Do not do the build.
-ignoreUnsupported::: Do the build, but ignore any non-Jakarta Persistence features that would otherwise result in a failure (e.g. `@Any` annotation).
-
 `*hibernate.jpa.static_metamodel.population*` (e.g. `enabled` or `disabled`, or `skipUnsupported` (default value))::
 Setting that controls whether we seek out Jakarta Persistence _static metamodel_ classes and populate them.
 +
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
index 27044847ee24..3534d2a4c7d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
@@ -269,32 +269,6 @@ public interface AvailableSettings {
 	@Deprecated
 	String ENVIRONMENT_CLASSLOADER = "hibernate.classLoader.environment";
 
-	/**
-	 * @deprecated use {@link #JPA_METAMODEL_POPULATION} instead.
-	 */
-	@Deprecated
-	String JPA_METAMODEL_GENERATION = "hibernate.ejb.metamodel.generation";
-
-	/**
-	 * Setting that indicates whether to build the JPA types. Accepts
-	 * 3 values:<ul>
-	 *     <li>
-	 *         <b>enabled</b> - Do the build
-	 *     </li>
-	 *     <li>
-	 *         <b>disabled</b> - Do not do the build
-	 *     </li>
-	 *     <li>
-	 *         <b>ignoreUnsupported</b> - Do the build, but ignore any non-JPA features that would otherwise
-	 *         result in a failure.
-	 *     </li>
-	 * </ul>
-	 *
-	 *
-	 */
-	@Deprecated
-	String JPA_METAMODEL_POPULATION = "hibernate.ejb.metamodel.population";
-
 	/**
 	 * Setting that controls whether we seek out JPA "static metamodel" classes and populate them.  Accepts
 	 * 3 values:<ul>
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
deleted file mode 100644
index eafbc0d1017a..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
- */
-package org.hibernate.metamodel.internal;
-
-import java.util.Map;
-
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.log.DeprecationLogger;
-import org.hibernate.internal.util.config.ConfigurationHelper;
-
-/**
- * @author Steve Ebersole
- */
-public enum JpaMetaModelPopulationSetting {
-	ENABLED,
-	DISABLED,
-	IGNORE_UNSUPPORTED;
-
-	public static JpaMetaModelPopulationSetting parse(String setting) {
-		if ( "enabled".equalsIgnoreCase( setting ) ) {
-			return ENABLED;
-		}
-		else if ( "disabled".equalsIgnoreCase( setting ) ) {
-			return DISABLED;
-		}
-		else {
-			return IGNORE_UNSUPPORTED;
-		}
-	}
-
-	public static JpaMetaModelPopulationSetting determineJpaMetaModelPopulationSetting(Map configurationValues) {
-		String setting = ConfigurationHelper.getString(
-				AvailableSettings.JPA_METAMODEL_POPULATION,
-				configurationValues,
-				null
-		);
-		if ( setting == null ) {
-			setting = ConfigurationHelper.getString( AvailableSettings.JPA_METAMODEL_GENERATION, configurationValues, null );
-			if ( setting != null ) {
-				DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-						AvailableSettings.JPA_METAMODEL_GENERATION,
-						AvailableSettings.JPA_METAMODEL_POPULATION
-				);
-			}
-		}
-		return JpaMetaModelPopulationSetting.parse( setting );
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
index cfab1b41fcf6..d44b0e41e57e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java
@@ -9,7 +9,6 @@
 import java.util.Map;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 
 /**
@@ -61,32 +60,6 @@ private static String determineSetting(Map configurationValues) {
 			return setting;
 		}
 
-		final String legacySetting1 = ConfigurationHelper.getString(
-				AvailableSettings.JPA_METAMODEL_POPULATION,
-				configurationValues,
-				null
-		);
-		if ( legacySetting1 != null ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_METAMODEL_POPULATION,
-					AvailableSettings.STATIC_METAMODEL_POPULATION
-			);
-			return legacySetting1;
-		}
-
-		final String legacySetting2 = ConfigurationHelper.getString(
-				AvailableSettings.JPA_METAMODEL_GENERATION,
-				configurationValues,
-				null
-		);
-		if ( legacySetting2 != null ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_METAMODEL_GENERATION,
-					AvailableSettings.STATIC_METAMODEL_POPULATION
-			);
-			return legacySetting1;
-		}
-
 		return null;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java
index f1cc8a15bf88..609fbd5001c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java
@@ -76,7 +76,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	@Override
 	protected void addConfigOptions(Map options) {
 		super.addConfigOptions( options );
-		options.put( AvailableSettings.JPA_METAMODEL_POPULATION, getJpaMetamodelPopulationValue() );
+		options.put( AvailableSettings.STATIC_METAMODEL_POPULATION, getJpaMetamodelPopulationValue() );
 	}
 
 	@Test
@@ -120,7 +120,7 @@ private void assertManagedTypes(Metamodel metamodel) {
 			assertEquals( 8, metamodel.getManagedTypes().size() );
 		}
 		else {
-			// When ignoreUnsupported is used, any managed-type that refers to a dynamic-map entity type
+			// When skipUnsupported is used, any managed-type that refers to a dynamic-map entity type
 			// or a managed type that is owned by said dynamic-map entity type should be excluded.
 			// Therefore this collection should only include 3 elements
 			// EntityType(SimpleAnnotated)
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelskipUnsupportedPopulationTest.java
similarity index 77%
rename from hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
rename to hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelskipUnsupportedPopulationTest.java
index b54d40d7bb72..73dd523c383e 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/JpaMetamodelskipUnsupportedPopulationTest.java
@@ -12,9 +12,9 @@
  * @author Chris Cranford
  */
 @TestForIssue(jiraKey = "HHH-12871")
-public class JpaMetamodelIgnoreUnsupportedPopulationTest extends AbstractJpaMetamodelPopulationTest {
+public class JpaMetamodelskipUnsupportedPopulationTest extends AbstractJpaMetamodelPopulationTest {
 	@Override
 	protected String getJpaMetamodelPopulationValue() {
-		return "ignoreUnsupported";
+		return "skipUnsupported";
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
index 5e04d2e8a7b2..ec22d72adb5c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java
@@ -24,7 +24,7 @@
  * @author Brad Koehn
  */
 @Jpa(
-        integrationSettings = { @Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "enabled") },
+        integrationSettings = { @Setting(name = AvailableSettings.STATIC_METAMODEL_POPULATION, value = "enabled") },
         xmlMappings = { "org/hibernate/orm/test/jpa/criteria/paths/PolicyAndDistribution.hbm.xml" }
 )
 public class SingularAttributeJoinTest {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
index eb66ef24dee9..2231e353c5ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java
@@ -33,8 +33,8 @@
 )
 @ServiceRegistry(
 		settings = @Setting(
-				name = AvailableSettings.JPA_METAMODEL_POPULATION,
-				value = "ignoreUnsupported"
+				name = AvailableSettings.STATIC_METAMODEL_POPULATION,
+				value = "skipUnsupported"
 		)
 )
 @DomainModel( annotatedClasses = BasicContributorTests.MainEntity.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java
index 039f15389d4d..6389a4c1f297 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java
@@ -28,7 +28,7 @@ public String[] getMappings() {
 	@Override
 	protected void configure(Configuration configuration) {
 		// the Customer entity has a composite id that is not embeddable ( not supported by JPA ).
-		configuration.setProperty( AvailableSettings.JPA_METAMODEL_POPULATION, "disabled" );
+		configuration.setProperty( AvailableSettings.STATIC_METAMODEL_POPULATION, "disabled" );
 	}
 
 	@Test
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
index ab578a7ccb52..984bb68d3bc1 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java
@@ -10,17 +10,13 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
-import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.envers.Audited;
-import org.hibernate.envers.DefaultRevisionEntity;
-import org.hibernate.mapping.PersistentClass;
 import org.hibernate.metamodel.RuntimeMetamodels;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.persister.entity.EntityPersister;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,7 +24,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
 /**
@@ -36,8 +31,8 @@
  */
 @ServiceRegistry(
 		settings = @Setting(
-				name = AvailableSettings.JPA_METAMODEL_POPULATION,
-				value = "ignoreUnsupported"
+				name = AvailableSettings.STATIC_METAMODEL_POPULATION,
+				value = "skipUnsupported"
 		)
 )
 @DomainModel(