rationalize diverse ways to split strings

+ a couple of other code cleanups

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

Author: gavinking

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

@@ -48,6 +48,7 @@
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.sqm.IntervalType;
 import org.hibernate.dialect.NullOrdering;
@@ -169,7 +170,7 @@ protected static DatabaseVersion parseVersion(String versionString ) {
 		// What the DB select returns is similar to "CockroachDB CCL v21.2.10 (x86_64-unknown-linux-gnu, built 2022/05/02 17:38:58, go1.16.6)"
 		Matcher m = CRDB_VERSION_PATTERN.matcher( versionString == null ? "" : versionString );
 		if ( m.find() ) {
-			String[] versionParts = m.group().substring( 1 ).split( "\\." );
+			String[] versionParts = StringHelper.split( ".", m.group().substring( 1 ) );
 			// if we got to this point, there is at least a major version, so no need to check [].length > 0
 			int majorVersion = Integer.parseInt( versionParts[0] );
 			int minorVersion = versionParts.length > 1 ? Integer.parseInt( versionParts[1] ) : 0;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java

@@ -46,6 +46,7 @@
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.query.sqm.FetchClauseType;
@@ -189,7 +190,7 @@ private static int parseBuildId(DialectResolutionInfo info) {
 			return 0;
 		}
 
-		final String[] bits = databaseVersion.split("[. ]");
+		final String[] bits = StringHelper.split( ". ", databaseVersion );
 		return bits.length > 2 ? Integer.parseInt( bits[2] ) : 0;
 	}
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java

@@ -173,7 +173,7 @@ public MySQLLegacyDialect(DialectResolutionInfo info) {
 
 	protected static DatabaseVersion createVersion(DialectResolutionInfo info) {
 		final String versionString = info.getDatabaseVersion();
-		final String[] components = versionString.split( "\\." );
+		final String[] components = StringHelper.split( ".", versionString );
 		if ( components.length >= 3 ) {
 			try {
 				final int majorVersion = Integer.parseInt( components[0] );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java

@@ -58,6 +58,7 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.mapping.Column;
@@ -184,7 +185,7 @@ public SingleStoreDialect(
 	private static DatabaseVersion createVersion(DialectResolutionInfo info) {
 		final String versionString = info.getDatabaseVersion();
 		if ( versionString != null ) {
-			final String[] components = versionString.split( "\\." );
+			final String[] components = StringHelper.split( ".", versionString );
 			if ( components.length >= 3 ) {
 				try {
 					final int majorVersion = Integer.parseInt( components[0] );

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/GroupsPerOperation.java

@@ -13,6 +13,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.ClassLoaderAccess;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 import jakarta.validation.groups.Default;
@@ -72,7 +73,7 @@ public static Class<?>[] buildGroupsForOperation(Operation operation, Map settin
 
 		if ( property instanceof String ) {
 			String stringProperty = (String) property;
-			String[] groupNames = stringProperty.split( "," );
+			String[] groupNames = StringHelper.split( ",", stringProperty );
 			if ( groupNames.length == 1 && groupNames[0].isEmpty() ) {
 				return EMPTY_GROUPS;
 			}

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/ValidationMode.java

@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import org.hibernate.HibernateException;
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 /**
@@ -35,7 +36,7 @@ public static Set<ValidationMode> getModes(Object modeProperty) {
 			modes.add( ValidationMode.AUTO );
 		}
 		else {
-			for ( String modeInString : modeProperty.toString().split( "," ) ) {
+			for ( String modeInString : StringHelper.split( ",", modeProperty.toString() ) ) {
 				modes.add( getMode(modeInString) );
 			}
 		}

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

@@ -9,15 +9,13 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import java.util.regex.Pattern;
 
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
@@ -62,19 +60,17 @@
 import org.hibernate.mapping.UserDefinedObjectType;
 import org.hibernate.mapping.UserDefinedType;
 import org.hibernate.metamodel.mapping.DiscriminatorType;
-import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.query.internal.NamedObjectRepositoryImpl;
 import org.hibernate.query.named.NamedObjectRepository;
-import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
-import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.tool.schema.Action;
 import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.cfg.AvailableSettings.EVENT_LISTENER_PREFIX;
+import static org.hibernate.internal.util.StringHelper.splitAtCommas;
 
 /**
  * Container for configuration data collected during binding the metamodel.
@@ -84,7 +80,6 @@
  * @author Gail Badner
  */
 public class MetadataImpl implements MetadataImplementor, Serializable {
-	private static final Pattern LISTENER_SEPARATION_PATTERN = Pattern.compile( "\\s*,\\s*" );
 
 	private final UUID uuid;
 	private final MetadataBuildingOptions metadataBuildingOptions;
@@ -370,30 +365,6 @@ public NamedObjectRepository buildNamedQueryRepository(SessionFactoryImplementor
 		);
 	}
 
-	private Map<String, NamedSqmQueryMemento<?>> buildNamedSqmMementos(SessionFactoryImplementor sessionFactory) {
-		final HashMap<String, NamedSqmQueryMemento<?>> map = new HashMap<>();
-		if ( namedQueryMap != null ) {
-			namedQueryMap.forEach( (key, value) -> map.put( key, value.resolve( sessionFactory ) ) );
-		}
-		return map;
-	}
-
-	private Map<String, NamedNativeQueryMemento<?>> buildNamedNativeMementos(SessionFactoryImplementor sessionFactory) {
-		final HashMap<String, NamedNativeQueryMemento<?>> map = new HashMap<>();
-		if ( namedNativeQueryMap != null ) {
-			namedNativeQueryMap.forEach( (key, value) -> map.put( key, value.resolve( sessionFactory ) ) );
-		}
-		return map;
-	}
-
-	private Map<String, NamedCallableQueryMemento> buildProcedureCallMementos(SessionFactoryImplementor sessionFactory) {
-		final Map<String, NamedCallableQueryMemento> map = new HashMap<>();
-		if ( namedProcedureCallMap != null ) {
-			namedProcedureCallMap.forEach( (key, value) -> map.put( key, value.resolve( sessionFactory ) ) );
-		}
-		return map;
-	}
-
 	@Override
 	public void orderColumns(boolean forceOrdering) {
 		final ColumnOrderingStrategy columnOrderingStrategy = metadataBuildingOptions.getColumnOrderingStrategy();
@@ -544,7 +515,7 @@ private <T> void appendListeners(
 			String listeners,
 			EventType<T> eventType) {
 		final EventListenerGroup<T> eventListenerGroup = eventListenerRegistry.getEventListenerGroup( eventType );
-		for ( String listenerImpl : LISTENER_SEPARATION_PATTERN.split( listeners ) ) {
+		for ( String listenerImpl : splitAtCommas( listeners ) ) {
 			@SuppressWarnings("unchecked")
 			T listener = (T) instantiate( listenerImpl, classLoaderService );
 			if ( !eventType.baseListenerInterface().isInstance( listener ) ) {

hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java

@@ -3370,7 +3370,7 @@ private static JaxbCascadeTypeImpl convertCascadeType(String s) {
 
 		if ( isNotEmpty( s ) ) {
 			s = s.toLowerCase( Locale.ROOT ).replaceAll( " ", "" );
-			final String[] split = s.split( "," );
+			final String[] split = StringHelper.split( ",", s );
 			for ( String hbmCascade : split ) {
 				if ( hbmCascade.contains( "all" ) ) {
 					cascadeType.setCascadeAll( new JaxbEmptyTypeImpl() );

hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java

@@ -134,7 +134,7 @@ public NameParts parse(String text, Identifier defaultCatalog, Identifier defaul
 		boolean schemaWasQuoted = false;
 		boolean nameWasQuoted;
 
-		final String[] tokens = text.split( "\\." );
+		final String[] tokens = StringHelper.split( ".", text );
 		if ( tokens.length == 0 || tokens.length == 1 ) {
 			// we have just a local name...
 			name = text;

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/BasicAttributeColumnsAndFormulasSource.java

@@ -12,6 +12,8 @@
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmBasicAttributeType;
 import org.hibernate.boot.model.source.spi.SizeSource;
 
+import static org.hibernate.internal.util.StringHelper.splitAtCommas;
+
 /**
  * ColumnAndFormulaSource implementation handling basic attribute mappings.
  *
@@ -69,7 +71,7 @@ public Boolean isNullable() {
 
 	@Override
 	public Set<String> getIndexConstraintNames() {
-		return CommaSeparatedStringHelper.split( basicAttributeMapping.getIndex() );
+		return Set.of( splitAtCommas( basicAttributeMapping.getIndex() ) );
 	}
 
 	@Override
@@ -79,6 +81,6 @@ public boolean isUnique() {
 
 	@Override
 	public Set<String> getUniqueKeyConstraintNames() {
-		return CommaSeparatedStringHelper.split( basicAttributeMapping.getUniqueKey() );
+		return Set.of( splitAtCommas( basicAttributeMapping.getUniqueKey() ) );
 	}
 }