minor code cleanups

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java

@@ -1002,7 +1002,7 @@ public void setBootstrapContext(BootstrapContext bootstrapContext) {
 
 	private static TimeZoneStorageType resolveTimeZoneStorageStrategy(
 			ConfigurationService configService) {
-		return  configService.getSetting(
+		return configService.getSetting(
 				AvailableSettings.TIMEZONE_DEFAULT_STORAGE,
 				value -> TimeZoneStorageType.valueOf( value.toString() ),
 				TimeZoneStorageType.DEFAULT
@@ -1017,7 +1017,7 @@ private static WrapperArrayHandling resolveWrapperArrayHandling(
 						WRAPPER_ARRAY_HANDLING,
 						WrapperArrayHandling::interpretExternalSettingLeniently
 				),
-				() -> resolveFallbackWrapperArrayHandling( configService, serviceRegistry )
+				() -> resolveFallbackWrapperArrayHandling( configService )
 		);
 
 		if ( setting == WrapperArrayHandling.PICK ) {
@@ -1035,9 +1035,8 @@ private static WrapperArrayHandling resolveWrapperArrayHandling(
 	};
 
 	private static WrapperArrayHandling resolveFallbackWrapperArrayHandling(
-			ConfigurationService configService,
-			StandardServiceRegistry serviceRegistry) {
-		if ( configService.getSetting( JPA_COMPLIANCE, BOOLEAN ) == Boolean.TRUE ) {
+			ConfigurationService configService) {
+		if ( configService.getSetting( JPA_COMPLIANCE, BOOLEAN, false ) ) {
 			// JPA compliance was enabled.  Use PICK
 			return WrapperArrayHandling.PICK;
 		}

hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java

@@ -126,6 +126,7 @@
 
 import jakarta.persistence.TemporalType;
 
+import static org.hibernate.dialect.HANAServerConfiguration.MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE;
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BOOLEAN;
@@ -1763,7 +1764,7 @@ private X extract(NClob nclob, WrapperOptions options) throws SQLException {
 					if ( nclob == null ) {
 						return null;
 					}
-					if ( nclob.length() < HANANClobJdbcType.this.maxLobPrefetchSize ) {
+					if ( nclob.length() < maxLobPrefetchSize ) {
 						X retVal = javaType.wrap(nclob, options);
 						nclob.free();
 						return retVal;
@@ -1790,14 +1791,14 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o
 		}
 
 		public int getMaxLobPrefetchSize() {
-			return this.maxLobPrefetchSize;
+			return maxLobPrefetchSize;
 		}
 	}
 
 	public static class HANABlobType implements JdbcType {
 
 		private static final long serialVersionUID = 5874441715643764323L;
-		public static final JdbcType INSTANCE = new HANABlobType( HANAServerConfiguration.MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE );
+		public static final JdbcType INSTANCE = new HANABlobType( MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE );
 
 		final int maxLobPrefetchSize;
 
@@ -1815,7 +1816,7 @@ public int getJdbcTypeCode() {
 
 		@Override
 		public String getFriendlyName() {
-			return "BLOB (hana)";
+			return "BLOB (HANA)";
 		}
 
 		@Override
@@ -1830,7 +1831,7 @@ private X extract(Blob blob, WrapperOptions options) throws SQLException {
 					if ( blob == null ) {
 						return null;
 					}
-					if (blob.length() < HANABlobType.this.maxLobPrefetchSize ) {
+					if ( blob.length() < maxLobPrefetchSize ) {
 						X retVal = javaType.wrap(blob, options);
 						blob.free();
 						return retVal;
@@ -1868,7 +1869,7 @@ protected void doBind(PreparedStatement st, X value, int index, WrapperOptions o
 						descriptor = BlobJdbcType.PRIMITIVE_ARRAY_BINDING;
 					}
 					else if ( options.useStreamForLobBinding() ) {
-						descriptor = HANABlobType.this.hanaStreamBlobTypeDescriptor;
+						descriptor = hanaStreamBlobTypeDescriptor;
 					}
 					descriptor.getBinder( javaType ).bind( st, value, index, options );
 				}
@@ -1881,15 +1882,15 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						descriptor = BlobJdbcType.PRIMITIVE_ARRAY_BINDING;
 					}
 					else if ( options.useStreamForLobBinding() ) {
-						descriptor = HANABlobType.this.hanaStreamBlobTypeDescriptor;
+						descriptor = hanaStreamBlobTypeDescriptor;
 					}
 					descriptor.getBinder( javaType ).bind( st, value, name, options );
 				}
 			};
 		}
 
 		public int getMaxLobPrefetchSize() {
-			return this.maxLobPrefetchSize;
+			return maxLobPrefetchSize;
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

@@ -895,17 +895,9 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 
 		// account for Oracle's deprecated support for LONGVARBINARY
 		// prefer BLOB, unless the user explicitly opts out
-		boolean preferLong = serviceRegistry.requireService( ConfigurationService.class ).getSetting(
-				PREFER_LONG_RAW,
-				StandardConverters.BOOLEAN,
-				false
-		);
-
-		BlobJdbcType descriptor = preferLong ?
-				BlobJdbcType.PRIMITIVE_ARRAY_BINDING :
-				BlobJdbcType.DEFAULT;
-
-		typeContributions.contributeJdbcType( descriptor );
+		final boolean preferLong = serviceRegistry.requireService( ConfigurationService.class )
+				.getSetting( PREFER_LONG_RAW, StandardConverters.BOOLEAN, false );
+		typeContributions.contributeJdbcType( preferLong ? BlobJdbcType.PRIMITIVE_ARRAY_BINDING : BlobJdbcType.DEFAULT );
 
 		if ( getVersion().isSameOrAfter( 21 ) ) {
 			typeContributions.contributeJdbcType( OracleJsonJdbcType.INSTANCE );