misc code cleanups

Author: gavinking

hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java

@@ -93,7 +93,7 @@ public T fromString(CharSequence string) {
 	}
 
 	protected MutabilityPlan<T> getMutabilityPlan() {
-		return this.mutabilityPlan;
+		return mutabilityPlan;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java

@@ -12,6 +12,8 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static java.lang.Character.toUpperCase;
+
 /**
  * A type that maps between {@link java.sql.Types#ARRAY ARRAY} and {@code T[]}
  *
@@ -37,7 +39,8 @@ static String determineElementTypeName(BasicType<?> baseDescriptor) {
 		final String elementName = baseDescriptor.getName();
 		return switch ( elementName ) {
 			case "boolean", "byte", "char", "short", "int", "long", "float", "double" ->
-					Character.toUpperCase( elementName.charAt( 0 ) ) + elementName.substring( 1 );
+					toUpperCase( elementName.charAt( 0 ) )
+							+ elementName.substring( 1 );
 			default -> elementName;
 		};
 	}
@@ -63,16 +66,18 @@ protected boolean registerUnderJavaType() {
 
 	@Override
 	public <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<X> domainJtd) {
-		// TODO: maybe fallback to some encoding by default if the DB doesn't support arrays natively?
-		//  also, maybe move that logic into the ArrayJdbcType
+		// TODO: maybe fall back to some encoding by default if
+		//      the database doesn't support arrays natively?
+		//      also, maybe move that logic into the ArrayJdbcType
 		//noinspection unchecked
 		return (BasicType<X>) this;
 	}
 
 	@Override
 	public boolean equals(Object object) {
-		return object == this || object.getClass() == BasicArrayType.class
-			&& Objects.equals( baseDescriptor, ( (BasicArrayType<?, ?>) object ).baseDescriptor );
+		return object == this
+			|| object instanceof BasicArrayType<?,?> arrayType // no subtypes
+			&& Objects.equals( baseDescriptor, arrayType.baseDescriptor );
 	}
 
 	@Override

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

@@ -85,32 +85,26 @@ public boolean areEqual(Date one, Date another) {
 		if ( one == another ) {
 			return true;
 		}
-		if ( one == null || another == null) {
+		else if ( one == null || another == null) {
 			return false;
 		}
-
-		long t1 = one.getTime();
-		long t2 = another.getTime();
-
-		boolean oneIsTimestamp = one instanceof Timestamp;
-		boolean anotherIsTimestamp = another instanceof Timestamp;
-
-		int n1 = oneIsTimestamp ? ( (Timestamp) one ).getNanos() : 0;
-		int n2 = anotherIsTimestamp ? ( (Timestamp) another ).getNanos() : 0;
-
-		if ( t1 != t2 ) {
-			return false;
-		}
-
-		if ( oneIsTimestamp && anotherIsTimestamp ) {
-			// both are Timestamps
-			int nn1 = n1 % 1000000;
-			int nn2 = n2 % 1000000;
-			return nn1 == nn2;
-		}
 		else {
-			// at least one is a plain old Date
-			return true;
+			final long t1 = one.getTime();
+			final long t2 = another.getTime();
+			if ( t1 != t2 ) {
+				return false;
+			}
+			else if ( one instanceof Timestamp ts1
+				&& another instanceof Timestamp ts2 ) {
+				// both are Timestamps
+				final int nn1 = ts1.getNanos() % 1000000;
+				final int nn2 = ts2.getNanos() % 1000000;
+				return nn1 == nn2;
+			}
+			else {
+				// at least one is a plain old Date
+				return true;
+			}
 		}
 	}
 
@@ -132,8 +126,8 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			return value instanceof Timestamp
-					? (Timestamp) value
+			return value instanceof Timestamp timestamp
+					? timestamp
 					: new Timestamp( value.getTime() );
 		}