very minor cleanups

Author: gavinking

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IncomparableComparator.java

@@ -15,7 +15,6 @@ public class IncomparableComparator implements Comparator {
 	public static final IncomparableComparator INSTANCE = new IncomparableComparator();
 
 	@Override
-	@SuppressWarnings("ComparatorMethodParameterNotUsed")
 	public int compare(Object o1, Object o2) {
 		return 0;
 	}

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java

@@ -34,13 +34,13 @@ public String getStructName() {
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
-		final BasicType<T> basicType = context.getTypeConfiguration().getBasicTypeForJavaType( getJavaType() );
+		final var basicType = context.getTypeConfiguration().getBasicTypeForJavaType( getJavaType() );
 		if ( basicType != null ) {
 			return basicType.getJdbcType();
 		}
 		if ( structName != null ) {
-			final JdbcTypeRegistry jdbcTypeRegistry = context.getTypeConfiguration().getJdbcTypeRegistry();
-			final AggregateJdbcType aggregateDescriptor = jdbcTypeRegistry.findAggregateDescriptor( structName );
+			final var jdbcTypeRegistry = context.getTypeConfiguration().getJdbcTypeRegistry();
+			final var aggregateDescriptor = jdbcTypeRegistry.findAggregateDescriptor( structName );
 			if ( aggregateDescriptor != null ) {
 				return aggregateDescriptor;
 			}
@@ -49,9 +49,10 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 			}
 		}
 		// When the column is mapped as XML array, the component type must be SQLXML
-		if ( context.getExplicitJdbcTypeCode() != null && context.getExplicitJdbcTypeCode() == SqlTypes.XML_ARRAY
-			// Also prefer XML is the Dialect prefers XML arrays
-			|| context.getDialect().getPreferredSqlTypeCodeForArray() == SqlTypes.XML_ARRAY ) {
+		final Integer explicitJdbcTypeCode = context.getExplicitJdbcTypeCode();
+		if ( explicitJdbcTypeCode != null && explicitJdbcTypeCode == SqlTypes.XML_ARRAY
+				// Also prefer XML as the Dialect prefers XML arrays
+				|| context.getDialect().getPreferredSqlTypeCodeForArray() == SqlTypes.XML_ARRAY ) {
 			final var descriptor = context.getJdbcType( SqlTypes.SQLXML );
 			if ( descriptor != null ) {
 				return descriptor;

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java

@@ -44,11 +44,11 @@ public boolean areEqual(T one, T another) {
 
 	@Override
 	public boolean isInstance(Object value) {
-		final LazyInitializer lazyInitializer = extractLazyInitializer( value );
-		final Class<T> javaTypeClass = getJavaTypeClass();
+		final var lazyInitializer = extractLazyInitializer( value );
+		final var javaTypeClass = getJavaTypeClass();
 		if ( lazyInitializer != null ) {
 			return javaTypeClass.isAssignableFrom( lazyInitializer.getPersistentClass() )
-					|| javaTypeClass.isAssignableFrom( lazyInitializer.getImplementationClass() );
+				|| javaTypeClass.isAssignableFrom( lazyInitializer.getImplementationClass() );
 		}
 		else {
 			return javaTypeClass.isAssignableFrom( value.getClass() );