Jrenaat 6.0 deprecation removals (#4718)

* Removed deprecated org.hibernate.boot.jaxb.internal.stax.LocalSchema

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Remove some deprecations from org.hibernate.engine.jdbc

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Remove deprecated misspelled method in PostActionEventListener

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Remove deprecated getSource() from AbstractPreDatabaseOperationEvent

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Privatize deprecated buildOptimizer method in OptimizerFactory

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Remove deprecated ServiceContributingIntegrator

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

* Remove some more deprecated features

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

Author: jrenaat

documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc

@@ -17,7 +17,7 @@ During the bootstrap process, you might want to customize Hibernate behavior so
 === Native Bootstrapping
 
 This section discusses the process of bootstrapping a Hibernate `SessionFactory`.
-Specifically, it addresses the bootstrapping APIs as redesigned in 5.0.
+Specifically, it addresses the bootstrapping APIs.
 For a discussion of the legacy bootstrapping API, see <<appendices/Legacy_Bootstrap.adoc#appendix-legacy-bootstrap,Legacy Bootstrapping>>.
 
 [[bootstrap-native-registry]]
@@ -86,8 +86,7 @@ include::{sourcedir}/BootstrapTest.java[tags=bootstrap-bootstrap-native-registry
 [[bootstrap-event-listener-registration]]
 ==== Event Listener registration
 
-The main use cases for an `org.hibernate.integrator.spi.Integrator` right now are registering event listeners and providing services (see `org.hibernate.integrator.spi.ServiceContributingIntegrator`).
-With 5.0 we plan on expanding that to allow altering the metamodel describing the mapping between object and relational models.
+The main use cases for an `org.hibernate.integrator.spi.Integrator` right now are registering event listeners.
 
 [[bootstrap-event-listener-registration-example]]
 .Configuring an event listener

hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java

@@ -75,20 +75,7 @@ public static enum Type {
 	 * @param name The name of the duplicated thing.
 	 */
 	public DuplicateMappingException(Type type, String name) {
-		this( type.text, name );
-	}
-
-	/**
-	 * Creates a DuplicateMappingException using the given type and name.
-	 *
-	 * @param type The type of the duplicated thing.
-	 * @param name The name of the duplicated thing.
-	 *
-	 * @deprecated Use the for taking {@link Type} instead.
-	 */
-	@Deprecated
-	public DuplicateMappingException(String type, String name) {
-		this( "Duplicate " + type + " mapping " + name, type, name );
+		this ( "Duplicate " + type.text + " mapping " + name, type, name );
 	}
 
 	/**
@@ -99,23 +86,9 @@ public DuplicateMappingException(String type, String name) {
 	 * @param name The name of the duplicated thing.
 	 */
 	public DuplicateMappingException(String customMessage, Type type, String name) {
-		this( customMessage, type.name(), name );
-	}
-
-	/**
-	 * Creates a DuplicateMappingException using the given customMessage, type and name.
-	 *
-	 * @param customMessage A custom exception message explaining the exception condition
-	 * @param type The type of the duplicated thing.
-	 * @param name The name of the duplicated thing.
-	 *
-	 * @deprecated Use the for taking {@link Type} instead.
-	 */
-	@Deprecated
-	public DuplicateMappingException(String customMessage, String type, String name) {
 		super( customMessage );
-		this.type=type;
-		this.name=name;
+		this.type = type.name();
+		this.name = name;
 	}
 
 	public String getType() {

hibernate-core/src/main/java/org/hibernate/InstantiationException.java

@@ -48,18 +48,6 @@ public InstantiationException(String message, Class<?> clazz, Exception cause) {
 		this.clazz = clazz;
 	}
 
-	/**
-	 * Returns the Class we were attempting to instantiate.
-	 *
-	 * @deprecated Use {@link #getUninstantiatableClass} instead
-	 *
-	 * @return The class we are unable to instantiate
-	 */
-	@Deprecated
-	public Class<?> getPersistentClass() {
-		return clazz;
-	}
-
 	/**
 	 * Returns the Class we were attempting to instantiate.
 	 *

hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java

@@ -137,12 +137,6 @@ private List<Namespace> mapNamespaces(StartElement startElement) {
 	private List<Namespace> mapNamespaces(Iterator<Namespace> originalNamespaceIterator ) {
 		final List<Namespace> mappedNamespaces = new ArrayList<>();
 
-//		final String elementNamespacePrefix = startElement.getName().getPrefix();
-//		if ( EMPTY_NAMESPACE_PREFIX.equals( elementNamespacePrefix ) ) {
-//			// add the default namespace mapping
-//			mappedNamespaces.add( xmlEventFactory.createNamespace( LocalSchema.ORM.getNamespaceUri() ) );
-//		}
-
 		while ( originalNamespaceIterator.hasNext() ) {
 			final Namespace originalNamespace  = originalNamespaceIterator.next();
 			final Namespace mappedNamespace = mapNamespace( originalNamespace );

hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java

@@ -20,8 +20,6 @@
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
-import org.hibernate.integrator.spi.Integrator;
-import org.hibernate.integrator.spi.IntegratorService;
 import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.Service;
@@ -382,7 +380,6 @@ public StandardServiceRegistryBuilder enableAutoClose() {
 	 * @return A newly-instantiated {@link StandardServiceRegistry}
 	 */
 	public StandardServiceRegistry build() {
-		applyServiceContributingIntegrators();
 		applyServiceContributors();
 
 		final Map<String,Object> settingsCopy = new HashMap<>( settings );
@@ -398,17 +395,6 @@ public StandardServiceRegistry build() {
 		);
 	}
 
-	@SuppressWarnings("deprecation")
-	private void applyServiceContributingIntegrators() {
-		for ( Integrator integrator : bootstrapServiceRegistry.getService( IntegratorService.class )
-				.getIntegrators() ) {
-			if ( integrator instanceof org.hibernate.integrator.spi.ServiceContributingIntegrator ) {
-				( (org.hibernate.integrator.spi.ServiceContributingIntegrator) integrator )
-						.prepareServices(this );
-			}
-		}
-	}
-
 	private void applyServiceContributors() {
 		final Iterable<ServiceContributor> serviceContributors =
 				bootstrapServiceRegistry.getService( ClassLoaderService.class )

hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java

@@ -70,7 +70,7 @@ public void onPostInsert(PostInsertEvent event) {
 	}
 
 	@Override
-	public boolean requiresPostCommitHanding(EntityPersister persister) {
+	public boolean requiresPostCommitHandling(EntityPersister persister) {
 		return true;
 	}
 

hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java

@@ -14,14 +14,6 @@
  * @author Steve Ebersole
  */
 public interface WrappedNClob extends WrappedClob {
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @deprecated Use {@link #getWrappedNClob()} instead
-	 */
-	@Override
-	@Deprecated
-	NClob getWrappedClob();
 
 	/**
 	 * Retrieve the wrapped {@link java.sql.Blob} reference

hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedNClob.java

@@ -15,7 +15,6 @@
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.jdbc.WorkExecutorVisitable;
-import org.hibernate.resource.jdbc.ResourceRegistry;
 import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor;
 import org.hibernate.resource.transaction.backend.jdbc.spi.JdbcResourceTransactionAccess;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner;
@@ -27,12 +26,6 @@
  * @author Brett Meyer
  */
 public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwner, JdbcResourceTransactionAccess {
-//	/**
-//	 * Retrieve the transaction coordinator associated with this JDBC coordinator.
-//	 *
-//	 * @return The transaction coordinator
-//	 */
-//	public TransactionCoordinator getTransactionCoordinator();
 
 	/**
 	 * Retrieves the logical connection associated with this JDBC coordinator.
@@ -128,10 +121,10 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn
     /**
 	 * Calculate the amount of time, in seconds, still remaining before transaction timeout occurs.
 	 *
-	 * @return The number of seconds remaining until until a transaction timeout occurs.  A negative value indicates
+	 * @return The number of seconds remaining until a transaction timeout occurs.  A negative value indicates
 	 * no timeout was requested.
 	 *
-	 * @throws org.hibernate.TransactionException Indicates the time out period has already been exceeded.
+	 * @throws org.hibernate.TransactionException Indicates the timeout period has already been exceeded.
 	 */
 	int determineRemainingTransactionTimeOutPeriod();
 
@@ -159,14 +152,6 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn
 	 */
 	boolean isReadyForSerialization();
 
-	/**
-	 * @deprecated access via {@link #getLogicalConnection} instead
-	 */
-	@Deprecated(since = "5.2")
-	default ResourceRegistry getResourceRegistry() {
-		return getLogicalConnection().getResourceRegistry();
-	}
-
 	void serialize(ObjectOutputStream objectOutputStream) throws IOException;
 
 }

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java

@@ -85,32 +85,10 @@ public boolean isLogToStdout() {
 		return logToStdout;
 	}
 
-	/**
-	 * Enable (true) or disable (false) logging to stdout.
-	 *
-	 * @param logToStdout True to enable logging to stdout; false to disable.
-	 *
-	 * @deprecated Will likely be removed:
-	 * Should either become immutable or threadsafe.
-	 */
-	@Deprecated
-	public void setLogToStdout(boolean logToStdout) {
-		this.logToStdout = logToStdout;
-	}
-
 	public boolean isFormat() {
 		return format;
 	}
 
-	/**
-	 * @deprecated Will likely be removed:
-	 * Should either become immutable or threadsafe.
-	 */
-	@Deprecated
-	public void setFormat(boolean format) {
-		this.format = format;
-	}
-
 	public long getLogSlowQuery() {
 		return logSlowQuery;
 	}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java

@@ -32,7 +32,7 @@ public void onPostDelete(PostDeleteEvent event) {
 	}
 
 	@Override
-	public boolean requiresPostCommitHanding(EntityPersister persister) {
+	public boolean requiresPostCommitHandling(EntityPersister persister) {
 		return callbackRegistry.hasRegisteredCallbacks( persister.getMappedClass(), CallbackType.POST_REMOVE );
 	}
 }

hibernate-core/src/main/java/org/hibernate/event/internal/PostDeleteEventListenerStandardImpl.java

@@ -32,7 +32,7 @@ public void onPostInsert(PostInsertEvent event) {
 	}
 
 	@Override
-	public boolean requiresPostCommitHanding(EntityPersister persister) {
+	public boolean requiresPostCommitHandling(EntityPersister persister) {
 		return callbackRegistry.hasRegisteredCallbacks( persister.getMappedClass(), CallbackType.POST_PERSIST );
 	}
 }

hibernate-core/src/main/java/org/hibernate/event/internal/PostInsertEventListenerStandardImpl.java

@@ -41,7 +41,7 @@ private void handlePostUpdate(Object entity, EventSource source) {
 	}
 
 	@Override
-	public boolean requiresPostCommitHanding(EntityPersister persister) {
+	public boolean requiresPostCommitHandling(EntityPersister persister) {
 		return callbackRegistry.hasRegisteredCallbacks( persister.getMappedClass(), CallbackType.POST_UPDATE );
 	}
 }

hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java

@@ -64,21 +64,5 @@ public Object getId() {
 	public EntityPersister getPersister() {
 		return persister;
 	}
-
-	/**
-	 * Getter for property 'source'.  This is the session from which the event
-	 * originated.
-	 * <p/>
-	 * Some of the pre-* events had previous exposed the event source using
-	 * getSource() because they had not originally extended from
-	 * {@link AbstractEvent}.
-	 *
-	 * @return Value for property 'source'.
-	 *
-	 * @deprecated Use {@link #getSession} instead
-	 */
-	@Deprecated
-	public EventSource getSource() {
-		return getSession();
-	}
 }
+