very minor code changes in Helper

Author: gavinking

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java

@@ -23,7 +23,6 @@
 import org.hibernate.engine.jdbc.internal.Formatter;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.resource.transaction.spi.DdlTransactionIsolator;
 import org.hibernate.service.ServiceRegistry;
@@ -45,6 +44,7 @@
 import org.hibernate.tool.schema.spi.ScriptTargetOutput;
 import org.hibernate.tool.schema.spi.SqlScriptCommandExtractor;
 
+import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.StringHelper.splitAtCommas;
 
 /**
@@ -92,13 +92,10 @@ private static AbstractScriptSourceInput interpretScriptSourceSetting(
 		log.trace( "Trying as URL..." );
 		// ClassLoaderService.locateResource() first tries the given resource name as url form...
 		final URL url = classLoaderService.locateResource( scriptSourceSettingString );
-		if ( url != null ) {
-			return new ScriptSourceInputFromUrl( url, charsetName );
-		}
-
-		// assume it is a File path
-		final File file = new File( scriptSourceSettingString );
-		return new ScriptSourceInputFromFile( file, charsetName );
+		return url != null
+				? new ScriptSourceInputFromUrl( url, charsetName )
+				// assume it is a File path
+				: new ScriptSourceInputFromFile( new File( scriptSourceSettingString ), charsetName );
 	}
 
 	public static ScriptTargetOutput interpretScriptTargetSetting(
@@ -109,8 +106,8 @@ public static ScriptTargetOutput interpretScriptTargetSetting(
 		if ( scriptTargetSetting == null ) {
 			return null;
 		}
-		else if ( scriptTargetSetting instanceof Writer ) {
-			return new ScriptTargetOutputToWriter( (Writer) scriptTargetSetting );
+		else if ( scriptTargetSetting instanceof Writer writer ) {
+			return new ScriptTargetOutputToWriter( writer );
 		}
 		else {
 			final String scriptTargetSettingString = scriptTargetSetting.toString();
@@ -124,31 +121,15 @@ else if ( scriptTargetSetting instanceof Writer ) {
 			log.trace( "Trying as URL..." );
 			// ClassLoaderService.locateResource() first tries the given resource name as url form...
 			final URL url = classLoaderService.locateResource( scriptTargetSettingString );
-			if ( url != null ) {
-				return new ScriptTargetOutputToUrl( url, charsetName );
-			}
-
-			// assume it is a File path
-			final File file = new File( scriptTargetSettingString );
-			return new ScriptTargetOutputToFile( file, charsetName, append );
+			return url != null
+					? new ScriptTargetOutputToUrl( url, charsetName )
+					// assume it is a File path
+					: new ScriptTargetOutputToFile( new File( scriptTargetSettingString ), charsetName, append );
 		}
 	}
 
 	public static boolean interpretNamespaceHandling(Map<String,Object> configurationValues) {
-		//Print a warning if multiple conflicting properties are being set:
-		int count = 0;
-		if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_SCHEMAS ) ) {
-			count++;
-		}
-		if ( configurationValues.containsKey( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS ) ) {
-			count++;
-		}
-		if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_NAMESPACES ) ) {
-			count++;
-		}
-		if ( count > 1 ) {
-			log.multipleSchemaCreationSettingsDefined();
-		}
+		warnIfConflictingPropertiesSet( configurationValues );
 		// prefer the JPA setting...
 		return ConfigurationHelper.getBoolean(
 				AvailableSettings.HBM2DDL_CREATE_SCHEMAS,
@@ -166,19 +147,33 @@ public static boolean interpretNamespaceHandling(Map<String,Object> configuratio
 		);
 	}
 
+	private static void warnIfConflictingPropertiesSet(Map<String, Object> configurationValues) {
+		//Print a warning if multiple conflicting properties are being set:
+		int count = 0;
+		if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_SCHEMAS ) ) {
+			count++;
+		}
+		if ( configurationValues.containsKey( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS ) ) {
+			count++;
+		}
+		if ( configurationValues.containsKey( AvailableSettings.HBM2DDL_CREATE_NAMESPACES ) ) {
+			count++;
+		}
+		if ( count > 1 ) {
+			log.multipleSchemaCreationSettingsDefined();
+		}
+	}
+
 	public static boolean interpretFormattingEnabled(Map<String,Object> configurationValues) {
-		return ConfigurationHelper.getBoolean(
-				AvailableSettings.FORMAT_SQL,
-				configurationValues
-		);
+		return ConfigurationHelper.getBoolean( AvailableSettings.FORMAT_SQL, configurationValues );
 	}
 
 	public static DatabaseInformation buildDatabaseInformation(
 			ServiceRegistry serviceRegistry,
 			DdlTransactionIsolator ddlTransactionIsolator,
 			SqlStringGenerationContext context,
 			SchemaManagementTool tool) {
-		final JdbcEnvironment jdbcEnvironment = serviceRegistry.getService( JdbcEnvironment.class );
+		final JdbcEnvironment jdbcEnvironment = serviceRegistry.requireService( JdbcEnvironment.class );
 		try {
 			return new DatabaseInformationImpl(
 					serviceRegistry,
@@ -207,12 +202,10 @@ public static void applySqlStrings(
 			Formatter formatter,
 			ExecutionOptions options,
 			GenerationTarget... targets) {
-		if ( sqlStrings == null ) {
-			return;
-		}
-
-		for ( String sqlString : sqlStrings ) {
-			applySqlString( sqlString, formatter, options, targets );
+		if ( sqlStrings != null ) {
+			for ( String sqlString : sqlStrings ) {
+				applySqlString( sqlString, formatter, options, targets );
+			}
 		}
 	}
 
@@ -221,17 +214,15 @@ public static void applySqlString(
 			Formatter formatter,
 			ExecutionOptions options,
 			GenerationTarget... targets) {
-		if ( StringHelper.isEmpty( sqlString ) ) {
-			return;
-		}
-
-		String sqlStringFormatted = formatter.format( sqlString );
-		for ( GenerationTarget target : targets ) {
-			try {
-				target.accept( sqlStringFormatted );
-			}
-			catch (CommandAcceptanceException e) {
-				options.getExceptionHandler().handleException( e );
+		if ( !isEmpty( sqlString ) ) {
+			final String sqlStringFormatted = formatter.format( sqlString );
+			for ( GenerationTarget target : targets ) {
+				try {
+					target.accept( sqlStringFormatted );
+				}
+				catch (CommandAcceptanceException e) {
+					options.getExceptionHandler().handleException( e );
+				}
 			}
 		}
 	}