add not-null assertions to catch something that should not be allowed to happen

gavinking · gavinking · commit fd7f897f040a · 2025-05-17T12:22:27.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java
@@ -68,7 +68,7 @@ public String generateHashedFkName(
 			Identifier... columnNames) {
 		// Use a concatenation that guarantees uniqueness, even if identical
 		// names exist between all table and column identifiers.
-		final StringBuilder sb = new StringBuilder()
+		final StringBuilder text = new StringBuilder()
 				.append( "table`" ).append( tableName ).append( "`" )
 				.append( "references`" ).append( referencedTableName ).append( "`" );
 		// Ensure a consistent ordering of columns, regardless of the order
@@ -78,9 +78,10 @@ public String generateHashedFkName(
 		final Identifier[] alphabeticalColumns = columnNames.clone();
 		Arrays.sort( alphabeticalColumns, comparing( Identifier::getCanonicalName ) );
 		for ( Identifier columnName : alphabeticalColumns ) {
-			sb.append( "column`" ).append( columnName ).append( "`" );
+			assert columnName != null;
+			text.append( "column`" ).append( columnName ).append( "`" );
 		}
-		return prefix + hashedName( sb.toString() );
+		return prefix + hashedName( text.toString() );
 	}
 
 	/**
@@ -93,17 +94,18 @@ public String generateHashedConstraintName(
 			String prefix, Identifier tableName, Identifier... columnNames ) {
 		// Use a concatenation that guarantees uniqueness, even if identical
 		// names exist between all table and column identifiers.
-		final StringBuilder sb = new StringBuilder( "table`" + tableName + "`" );
+		final StringBuilder text = new StringBuilder( "table`" + tableName + "`" );
 		// Ensure a consistent ordering of columns, regardless of the order
 		// they were bound.
 		// Clone the list, as sometimes a set of order-dependent Column
 		// bindings are given.
 		final Identifier[] alphabeticalColumns = columnNames.clone();
 		Arrays.sort( alphabeticalColumns, comparing(Identifier::getCanonicalName) );
 		for ( Identifier columnName : alphabeticalColumns ) {
-			sb.append( "column`" ).append( columnName ).append( "`" );
+			assert columnName != null;
+			text.append( "column`" ).append( columnName ).append( "`" );
 		}
-		return prefix + hashedName( sb.toString() );
+		return prefix + hashedName( text.toString() );
 	}
 
 	/**
