lots of safe type casts through whole code base

Author: gavinking

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java

@@ -64,7 +64,8 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 	@Override
 	public void visitOver(Over<?> over) {
 		final Expression expression = over.getExpression();
-		if ( expression instanceof FunctionExpression && "row_number".equals( ( (FunctionExpression) expression ).getFunctionName() ) ) {
+		if ( expression instanceof FunctionExpression functionExpression
+				&& "row_number".equals( functionExpression.getFunctionName() ) ) {
 			if ( over.getPartitions().isEmpty() && over.getOrderList().isEmpty()
 					&& over.getStartKind() == FrameKind.UNBOUNDED_PRECEDING
 					&& over.getEndKind() == FrameKind.CURRENT_ROW

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

@@ -40,16 +40,13 @@ public static ConnectionAcquisitionMode interpret(Object setting) {
 		if ( setting == null ) {
 			return null;
 		}
-
-		if ( setting instanceof ConnectionAcquisitionMode mode ) {
+		else if ( setting instanceof ConnectionAcquisitionMode mode ) {
 			return mode;
 		}
-
-		final String value = setting.toString();
-		if ( isEmpty( value ) ) {
-			return null;
+		else {
+			final String value = setting.toString();
+			return isEmpty( value ) ? null : interpret( value );
 		}
 
-		return interpret( value );
 	}
 }

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

@@ -71,21 +71,21 @@ public static ConnectionReleaseMode interpret(Object setting) {
 		if ( setting == null ) {
 			return null;
 		}
-
-		if ( setting instanceof ConnectionReleaseMode mode ) {
+		else if ( setting instanceof ConnectionReleaseMode mode ) {
 			return mode;
 		}
-
-		final String value = setting.toString();
-		if ( isEmpty( value ) ) {
-			return null;
+		else {
+			final String value = setting.toString();
+			if ( isEmpty( value ) ) {
+				return null;
+			}
+			// here we disregard "auto"
+			else if ( value.equalsIgnoreCase( "auto" ) ) {
+				return null;
+			}
+			else {
+				return parse( value );
+			}
 		}
-
-		// here we disregard "auto"
-		if ( value.equalsIgnoreCase( "auto" ) ) {
-			return null;
-		}
-
-		return parse( value );
 	}
 }

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

@@ -65,7 +65,7 @@
  *     delegate.
  * <li>The proxy does not have the same concrete type as the proxied delegate, and so
  *     {@link #getClass(Object)} must be used in place of {@link Object#getClass()},
- *     and this method fetches the entity by side-effect.
+ *     and this method fetches the entity by side effect.
  * <li>For a polymorphic association, the concrete type of the associated entity is
  *     not known until the delegate is fetched from the database, and so
  *     {@link #unproxy(Object, Class)}} must be used to perform typecasts, and

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

@@ -51,10 +51,9 @@ public PropertySetterAccessException(
 	}
 
 	public static String loggablePropertyValueString(Object value) {
-		if ( value instanceof Collection || value instanceof HibernateProxy ) {
-			return value.getClass().getSimpleName();
-		}
-		return value.toString();
+		return value instanceof Collection || value instanceof HibernateProxy
+				? value.getClass().getSimpleName()
+				: value.toString();
 	}
 
 	@Override

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

@@ -211,9 +211,9 @@ else if ( attribute.isEmbeddedAttributeMapping() ) {
 
 	private void addCollectionKey(
 			PluralAttributeMapping pluralAttributeMapping,
-			Object o,
+			Object object,
 			PersistenceContext persistenceContext) {
-		if ( o instanceof PersistentCollection ) {
+		if ( object instanceof PersistentCollection ) {
 			final CollectionPersister collectionPersister = pluralAttributeMapping.getCollectionDescriptor();
 			final Object key = AbstractEntityPersister.getCollectionKey(
 					collectionPersister,
@@ -223,7 +223,7 @@ private void addCollectionKey(
 			);
 			if ( key != null ) {
 				final CollectionKey collectionKey = new CollectionKey( collectionPersister, key );
-				persistenceContext.addCollectionByKey( collectionKey, (PersistentCollection<?>) o );
+				persistenceContext.addCollectionByKey( collectionKey, (PersistentCollection<?>) object );
 			}
 		}
 	}

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

@@ -234,8 +234,8 @@ protected void postCommitDelete(boolean success) {
 	}
 
 	private static void postCommitDeleteOnUnsuccessful(PostDeleteEventListener listener, PostDeleteEvent event) {
-		if ( listener instanceof PostCommitDeleteEventListener ) {
-			( (PostCommitDeleteEventListener) listener ).onPostDeleteCommitFailed( event );
+		if ( listener instanceof PostCommitDeleteEventListener postCommitDeleteEventListener ) {
+			postCommitDeleteEventListener.onPostDeleteCommitFailed( event );
 		}
 		else {
 			//default to the legacy implementation that always fires the event

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

@@ -383,8 +383,8 @@ protected void postCommitUpdate(boolean success) {
 	}
 
 	private void onPostCommitFailure(PostUpdateEventListener listener, PostUpdateEvent event) {
-		if ( listener instanceof PostCommitUpdateEventListener ) {
-			((PostCommitUpdateEventListener) listener).onPostUpdateCommitFailed( event );
+		if ( listener instanceof PostCommitUpdateEventListener postCommitUpdateEventListener ) {
+			postCommitUpdateEventListener.onPostUpdateCommitFailed( event );
 		}
 		else {
 			//default to the legacy implementation that always fires the event

hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java

@@ -63,25 +63,25 @@ public static OnDeleteAction fromExternalForm(Object value) {
 		if ( value == null ) {
 			return null;
 		}
-
-		if ( value instanceof OnDeleteAction onDeleteAction ) {
+		else if ( value instanceof OnDeleteAction onDeleteAction ) {
 			return onDeleteAction;
 		}
+		else {
+			final String valueString = value.toString();
+			try {
+				return valueOf( valueString );
+			}
+			catch (IllegalArgumentException e) {
+				// the name did not match the enum value name...
+			}
 
-		final String valueString = value.toString();
-		try {
-			return valueOf( valueString );
-		}
-		catch (IllegalArgumentException e) {
-			// the name did not match the enum value name...
-		}
-
-		for ( OnDeleteAction checkAction : values() ) {
-			if ( checkAction.getAlternativeName().equalsIgnoreCase( valueString ) ) {
-				return checkAction;
+			for ( OnDeleteAction checkAction : values() ) {
+				if ( checkAction.getAlternativeName().equalsIgnoreCase( valueString ) ) {
+					return checkAction;
+				}
 			}
-		}
 
-		return null;
+			return null;
+		}
 	}
 }

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

@@ -35,7 +35,7 @@ public void bind(Comment comment, MetadataBuildingContext context, PersistentCla
 					+ "' was annotated '@Comment'");
 		}
 		else if ( value instanceof Collection collection ) {
-			Table table = collection.getCollectionTable();
+			final Table table = collection.getCollectionTable();
 			// by default, the comment goes on the table
 			if ( on.isEmpty() || table.getName().equalsIgnoreCase( on ) ) {
 				table.setComment( text );