Some cleanups done automatically by IntelliJ with some revision by me

Author: gavinking

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

@@ -15,7 +15,7 @@ public class DuplicateMappingException extends MappingException {
 	/**
 	 * Enumeration of the types of things that can be duplicated.
 	 */
-	public static enum Type {
+	public enum Type {
 		/**
 		 * A duplicate entity definition was encountered.
 		 */

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -213,7 +213,7 @@ private void addCollectionKey(
 			PersistenceContext persistenceContext) {
 		if ( o instanceof PersistentCollection ) {
 			final CollectionPersister collectionPersister = pluralAttributeMapping.getCollectionDescriptor();
-			final Object key = ( (AbstractEntityPersister) getPersister() ).getCollectionKey(
+			final Object key = AbstractEntityPersister.getCollectionKey(
 					collectionPersister,
 					getInstance(),
 					persistenceContext.getEntry( getInstance() ),

hibernate-core/src/main/java/org/hibernate/binder/internal/BatchSizeBinder.java

@@ -37,8 +37,7 @@ public void bind(BatchSize batchSize, MetadataBuildingContext context, Component
 	@Override
 	public void bind(BatchSize batchSize, MetadataBuildingContext context, PersistentClass persistentClass, Property property) {
 		final Value value = property.getValue();
-		if ( value instanceof Collection ) {
-			final Collection collection = (Collection) value;
+		if ( value instanceof Collection collection ) {
 			collection.setBatchSize( batchSize.size() );
 		}
 		else {

hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java

@@ -34,8 +34,7 @@ public void bind(Comment comment, MetadataBuildingContext context, PersistentCla
 			throw new AnnotationException( "One to many association '" + property.getName()
 					+ "' was annotated '@Comment'");
 		}
-		else if ( value instanceof Collection ) {
-			Collection collection = (Collection) value;
+		else if ( value instanceof Collection collection ) {
 			Table table = collection.getTable();
 			// by default, the comment goes on the table
 			if ( on.isEmpty() || table.getName().equalsIgnoreCase( on ) ) {

hibernate-core/src/main/java/org/hibernate/binder/internal/DiscriminatorOptionsBinder.java

@@ -22,8 +22,7 @@
 public class DiscriminatorOptionsBinder implements TypeBinder<DiscriminatorOptions> {
 	@Override
 	public void bind(DiscriminatorOptions options, MetadataBuildingContext context, PersistentClass persistentClass) {
-		if ( persistentClass instanceof RootClass ) {
-			final RootClass rootClass = (RootClass) persistentClass;
+		if ( persistentClass instanceof RootClass rootClass ) {
 			if ( !rootClass.hasDiscriminator() ) {
 				throw new AnnotationException( "Root entity '" + rootClass.getEntityName()
 						+ "' is annotated '@DiscriminatorOptions' but has no discriminator column" );

hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java

@@ -632,8 +632,8 @@ public MetadataSources addJar(File jar) {
 	 * processing the contained mapping documents.
 	 */
 	public MetadataSources addDirectory(File dir) {
-		File[] files = dir.listFiles();
-		if ( files != null && files.length > 0 ) {
+		final File[] files = dir.listFiles();
+		if ( files != null ) {
 			for ( File file : files ) {
 				if ( file.isDirectory() ) {
 					addDirectory( file );

hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java

@@ -143,8 +143,7 @@ private void addMappingReference(MappingReference mappingReference) {
 	}
 
 	private static CacheRegionDefinition parseCacheRegionDefinition(Object cacheDeclaration) {
-		if ( cacheDeclaration instanceof JaxbCfgEntityCacheType ) {
-			final JaxbCfgEntityCacheType jaxbClassCache = (JaxbCfgEntityCacheType) cacheDeclaration;
+		if ( cacheDeclaration instanceof JaxbCfgEntityCacheType jaxbClassCache ) {
 			return new CacheRegionDefinition(
 					CacheRegionDefinition.CacheRegionType.ENTITY,
 					jaxbClassCache.getClazz(),

hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java

@@ -49,13 +49,11 @@ public boolean equals(Object o) {
 		if ( this == o ) {
 			return true;
 		}
-		if ( !( o instanceof Origin ) ) {
+		if ( !(o instanceof Origin other) ) {
 			return false;
 		}
-
-		final Origin other = (Origin) o;
 		return type == other.type
-				&& Objects.equals( name, other.name );
+			&& Objects.equals( name, other.name );
 
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java

@@ -1914,7 +1914,7 @@ else if ( source instanceof JaxbHbmMapType map ) {
 			}
 			target.setOrderBy( map.getOrderBy() );
 
-			transferMapKey( (JaxbHbmMapType) source, target );
+			transferMapKey( map, target );
 			target.setClassification( LimitedCollectionClassification.MAP );
 		}
 		else if ( source instanceof JaxbHbmIdBagCollectionType ) {

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

@@ -81,7 +81,7 @@ private StartElement wrap(StartElement startElement) {
 		// so that the event we ask it to generate for us has the same location info
 		xmlEventFactory.setLocation( startElement.getLocation() );
 		return xmlEventFactory.createStartElement(
-				new QName( MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri(), startElement.getName().getLocalPart() ),
+				new QName( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri(), startElement.getName().getLocalPart() ),
 				newElementAttributeList.iterator(),
 				newNamespaceList.iterator()
 		);
@@ -100,7 +100,6 @@ private List<Attribute> mapAttributes(StartElement startElement) {
 		return mappedAttributes;
 	}
 
-	@SuppressWarnings("unchecked")
 	private Iterator<Attribute> existingXmlAttributesIterator(StartElement startElement) {
 		return startElement.getAttributes();
 	}
@@ -143,13 +142,12 @@ private List<Namespace> mapNamespaces(Iterator<Namespace> originalNamespaceItera
 		}
 
 		if ( mappedNamespaces.isEmpty() ) {
-			mappedNamespaces.add( xmlEventFactory.createNamespace( MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri() ) );
+			mappedNamespaces.add( xmlEventFactory.createNamespace( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri() ) );
 		}
 
 		return mappedNamespaces;
 	}
 
-	@SuppressWarnings("unchecked")
 	private Iterator<Namespace> existingXmlNamespacesIterator(StartElement startElement) {
 		return startElement.getNamespaces();
 	}
@@ -159,7 +157,7 @@ private Namespace mapNamespace(Namespace originalNamespace) {
 			// this is a namespace "to map" so map it
 			return xmlEventFactory.createNamespace(
 					originalNamespace.getPrefix(),
-					MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri()
+					MappingXsdSupport.latestJpaDescriptor().getNamespaceUri()
 			);
 		}
 
@@ -173,12 +171,11 @@ private XMLEvent wrap(EndElement endElement) {
 		// so that the event we ask it to generate for us has the same location info
 		xmlEventFactory.setLocation( endElement.getLocation() );
 		return xmlEventFactory.createEndElement(
-				new QName( MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri(), endElement.getName().getLocalPart() ),
+				new QName( MappingXsdSupport.latestJpaDescriptor().getNamespaceUri(), endElement.getName().getLocalPart() ),
 				targetNamespaces.iterator()
 		);
 	}
 
-	@SuppressWarnings("unchecked")
 	private Iterator<Namespace> existingXmlNamespacesIterator(EndElement endElement) {
 		return endElement.getNamespaces();
 	}