cleaner code by adding some static imports

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java

@@ -7,11 +7,16 @@
 import org.hibernate.Incubating;
 import org.hibernate.boot.model.TypeDefinitionRegistry;
 import org.hibernate.boot.model.naming.ObjectNameNormalizer;
-import org.hibernate.cfg.MappingSettings;
+import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
 
+import static org.hibernate.cfg.MappingSettings.JAVA_TIME_USE_DIRECT_JDBC;
+import static org.hibernate.cfg.MappingSettings.PREFER_LOCALE_LANGUAGE_TAG;
+import static org.hibernate.cfg.MappingSettings.PREFER_NATIVE_ENUM_TYPES;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
+
 /**
  * Describes the context in which the process of building {@link org.hibernate.boot.Metadata}
  * from {@link org.hibernate.boot.MetadataSources} occurs.
@@ -53,44 +58,48 @@ public interface MetadataBuildingContext {
 	 */
 	ObjectNameNormalizer getObjectNameNormalizer();
 
+	private StandardServiceRegistry getRegistry() {
+		return getBootstrapContext().getServiceRegistry();
+	}
+
 	@Incubating
 	default int getPreferredSqlTypeCodeForBoolean() {
-		return ConfigurationHelper.getPreferredSqlTypeCodeForBoolean( getBootstrapContext().getServiceRegistry() );
+		return ConfigurationHelper.getPreferredSqlTypeCodeForBoolean( getRegistry() );
 	}
 
 	@Incubating
 	default int getPreferredSqlTypeCodeForDuration() {
-		return ConfigurationHelper.getPreferredSqlTypeCodeForDuration( getBootstrapContext().getServiceRegistry() );
+		return ConfigurationHelper.getPreferredSqlTypeCodeForDuration( getRegistry() );
 	}
 
 	@Incubating
 	default int getPreferredSqlTypeCodeForUuid() {
-		return ConfigurationHelper.getPreferredSqlTypeCodeForUuid( getBootstrapContext().getServiceRegistry() );
+		return ConfigurationHelper.getPreferredSqlTypeCodeForUuid( getRegistry() );
 	}
 
 	@Incubating
 	default int getPreferredSqlTypeCodeForInstant() {
-		return ConfigurationHelper.getPreferredSqlTypeCodeForInstant( getBootstrapContext().getServiceRegistry() );
+		return ConfigurationHelper.getPreferredSqlTypeCodeForInstant( getRegistry() );
 	}
 
 	@Incubating
 	default int getPreferredSqlTypeCodeForArray() {
-		return ConfigurationHelper.getPreferredSqlTypeCodeForArray( getBootstrapContext().getServiceRegistry() );
+		return ConfigurationHelper.getPreferredSqlTypeCodeForArray( getRegistry() );
 	}
 
 	@Incubating
 	default boolean isPreferJavaTimeJdbcTypesEnabled() {
-		return isPreferJavaTimeJdbcTypesEnabled( getBootstrapContext().getServiceRegistry() );
+		return isPreferJavaTimeJdbcTypesEnabled( getRegistry() );
 	}
 
 	@Incubating
 	default boolean isPreferNativeEnumTypesEnabled() {
-		return isPreferNativeEnumTypesEnabled( getBootstrapContext().getServiceRegistry() );
+		return isPreferNativeEnumTypesEnabled( getRegistry() );
 	}
 
 	@Incubating
 	default boolean isPreferLocaleLanguageTagEnabled() {
-		return isPreferLocaleLanguageTagEnabled( getBootstrapContext().getServiceRegistry() );
+		return isPreferLocaleLanguageTagEnabled( getRegistry() );
 	}
 
 	static boolean isPreferJavaTimeJdbcTypesEnabled(ServiceRegistry serviceRegistry) {
@@ -106,29 +115,16 @@ static boolean isPreferLocaleLanguageTagEnabled(ServiceRegistry serviceRegistry)
 	}
 
 	static boolean isPreferJavaTimeJdbcTypesEnabled(ConfigurationService configurationService) {
-		return ConfigurationHelper.getBoolean(
-				MappingSettings.JAVA_TIME_USE_DIRECT_JDBC,
-				configurationService.getSettings(),
-				// todo : true would be better eventually so maybe just rip off that band aid
-				false
-		);
+		return getBoolean( JAVA_TIME_USE_DIRECT_JDBC, configurationService.getSettings() );
 	}
 
 	static boolean isPreferNativeEnumTypesEnabled(ConfigurationService configurationService) {
-		return ConfigurationHelper.getBoolean(
-				MappingSettings.PREFER_NATIVE_ENUM_TYPES,
-				configurationService.getSettings(),
-				// todo: switch to true with HHH-17905
-				false
-		);
+		//TODO: HHH-17905 proposes to switch this default to true
+		return getBoolean( PREFER_NATIVE_ENUM_TYPES, configurationService.getSettings() );
 	}
 
 	static boolean isPreferLocaleLanguageTagEnabled(ConfigurationService configurationService) {
-		return ConfigurationHelper.getBoolean(
-				MappingSettings.PREFER_LOCALE_LANGUAGE_TAG,
-				configurationService.getSettings(),
-				false
-		);
+		return getBoolean( PREFER_LOCALE_LANGUAGE_TAG, configurationService.getSettings() );
 	}
 
 	TypeDefinitionRegistry getTypeDefinitionRegistry();

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

@@ -9,6 +9,9 @@
 
 import org.hibernate.type.descriptor.WrapperOptions;
 
+import static java.lang.Character.isLetter;
+import static java.lang.Character.toLowerCase;
+
 /**
  * Descriptor for {@link Locale} handling.
  *
@@ -48,13 +51,13 @@ public Locale fromString(CharSequence sequence) {
 			return null;
 		}
 
-		String string = sequence.toString();
+		final String string = sequence.toString();
 		if ( string.isEmpty() ) {
 			return Locale.ROOT;
 		}
 
 		final char[] chars = string.toCharArray();
-		final Locale.Builder builder = new Locale.Builder();
+		final var builder = new Locale.Builder();
 		State state = State.LANGUAGE;
 		int position = 0;
 
@@ -148,17 +151,17 @@ State parseNext(char[] chars, int start, int length, Locale.Builder builder) {
 
 		private boolean isScript(char[] chars, int start, int length) {
 			return length == 4
-				&& Character.isLetter( chars[start] )
-				&& Character.isLetter( chars[start + 1] )
-				&& Character.isLetter( chars[start + 2] )
-				&& Character.isLetter( chars[start + 3] );
+				&& isLetter( chars[start] )
+				&& isLetter( chars[start + 1] )
+				&& isLetter( chars[start + 2] )
+				&& isLetter( chars[start + 3] );
 		}
 
 		private void handleExtension(char[] chars, int start, int length, Locale.Builder builder) {
 			if ( length < 3 || chars[start + 1] != '-' ) {
 				throw new IllegalArgumentException( "Invalid extension: " + new String( chars, start, length ) );
 			}
-			if ( Character.toLowerCase( chars[start] ) == 'u' ) {
+			if ( toLowerCase( chars[start] ) == 'u' ) {
 				// After a Unicode extension, there could come a private use extension which we need to detect
 				int unicodeStart = start + 2;
 				int unicodeLength = length - 2;