misc cleanups in the legacy id package

gavinking · gavinking · commit 0d12041ab070 · 2025-09-27T21:00:03.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java
@@ -8,6 +8,8 @@
 
 import org.hibernate.internal.util.BytesHelper;
 
+import static java.lang.System.currentTimeMillis;
+
 /**
  * The base class for identifier generators that use a UUID algorithm. This
  * class implements the algorithm, subclasses define the identifier
@@ -34,7 +36,7 @@ public abstract class AbstractUUIDGenerator implements IdentifierGenerator {
 	}
 
 	private static short counter = (short) 0;
-	private static final int JVM = (int) ( System.currentTimeMillis() >>> 8 );
+	private static final int JVM = (int) ( currentTimeMillis() >>> 8 );
 
 	public AbstractUUIDGenerator() {
 	}
@@ -72,10 +74,10 @@ protected int getIP() {
 	 * Unique down to millisecond
 	 */
 	protected short getHiTime() {
-		return (short) ( System.currentTimeMillis() >>> 32 );
+		return (short) ( currentTimeMillis() >>> 32 );
 	}
 
 	protected int getLoTime() {
-		return (int) System.currentTimeMillis();
+		return (int) currentTimeMillis();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
@@ -8,7 +8,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.ExportableProducer;
@@ -131,32 +130,9 @@ public void addGeneratedValuePlan(GenerationPlan plan) {
 	}
 
 	@Override
-	public Object generate(SharedSessionContractImplementor session, Object object) throws HibernateException {
+	public Object generate(SharedSessionContractImplementor session, Object object) {
 		final Object context = generationContextLocator.locateGenerationContext( session, object );
-
-		final List<Object> generatedValues = compositeType.isMutable() ?
-				null :
-				new ArrayList<>( generationPlans.size() );
-		for ( GenerationPlan generationPlan : generationPlans ) {
-			final BeforeExecutionGenerator generator = generationPlan.getGenerator();
-			final Object generated;
-			if ( generator.generatedBeforeExecution( object, session ) ) {
-				final Object currentValue = generator.allowAssignedIdentifiers()
-						? compositeType.getPropertyValue( context, generationPlan.getPropertyIndex(), session )
-						: null;
-				generated = generator.generate( session, object, currentValue, INSERT );
-			}
-			else {
-				throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
-			}
-			if ( generatedValues != null ) {
-				generatedValues.add( generated );
-			}
-			else {
-				generationPlan.getInjector().set( context, generated );
-			}
-		}
-
+		final List<Object> generatedValues = generatedValues( session, object, context );
 		if ( generatedValues != null) {
 			final Object[] values = compositeType.getPropertyValues( context );
 			for ( int i = 0; i < generatedValues.size(); i++ ) {
@@ -169,16 +145,41 @@ public Object generate(SharedSessionContractImplementor session, Object object)
 		}
 	}
 
+	private List<Object> generatedValues(SharedSessionContractImplementor session, Object object, Object context) {
+		final List<Object> generatedValues =
+				compositeType.isMutable()
+						? null
+						: new ArrayList<>( generationPlans.size() );
+		for ( var generationPlan : generationPlans ) {
+			final var generator = generationPlan.getGenerator();
+			if ( !generator.generatedBeforeExecution( object, session ) ) {
+				throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
+			}
+			final Object currentValue =
+					generator.allowAssignedIdentifiers()
+							? compositeType.getPropertyValue( context, generationPlan.getPropertyIndex(), session )
+							: null;
+			final Object generated = generator.generate( session, object, currentValue, INSERT );
+			if ( generatedValues != null ) {
+				generatedValues.add( generated );
+			}
+			else {
+				generationPlan.getInjector().set( context, generated );
+			}
+		}
+		return generatedValues;
+	}
+
 	@Override
 	public void registerExportables(Database database) {
-		for ( GenerationPlan plan : generationPlans ) {
+		for ( var plan : generationPlans ) {
 			plan.registerExportables( database );
 		}
 	}
 
 	@Override
 	public void initialize(SqlStringGenerationContext context) {
-		for ( GenerationPlan plan : generationPlans ) {
+		for ( var plan : generationPlans ) {
 			plan.initialize( context );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
@@ -38,21 +38,22 @@ public Object generate(SharedSessionContractImplementor session, Object obj) thr
 		final String sql = session.getJdbcServices().getJdbcEnvironment().getDialect().getSelectGUIDString();
 		try {
 			final var jdbcCoordinator = session.getJdbcCoordinator();
-			final var st = jdbcCoordinator.getStatementPreparer().prepareStatement( sql );
+			final var statement = jdbcCoordinator.getStatementPreparer().prepareStatement( sql );
+			final var resourceRegistry = jdbcCoordinator.getLogicalConnection().getResourceRegistry();
 			try {
-				final var rs = jdbcCoordinator.getResultSetReturn().extract( st, sql );
+				final var resultSet = jdbcCoordinator.getResultSetReturn().extract( statement, sql );
 				try {
-					if ( !rs.next() ) {
+					if ( !resultSet.next() ) {
 						throw new HibernateException( "The database returned no GUID identity value" );
 					}
-					return rs.getString( 1 );
+					return resultSet.getString( 1 );
 				}
 				finally {
-					jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( rs, st );
+					resourceRegistry.release( resultSet, statement );
 				}
 			}
 			finally {
-				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( st );
+				resourceRegistry.release( statement );
 				jdbcCoordinator.afterStatementExecution();
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
@@ -27,7 +27,6 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.EntityType;
-import org.hibernate.type.Type;
 
 import static org.hibernate.cfg.MappingSettings.ID_DB_STRUCTURE_NAMING_STRATEGY;
 import static org.hibernate.engine.internal.ForeignKeys.getEntityIdentifierIfNotUnsaved;
@@ -83,7 +82,7 @@ else if ( integralType == BigDecimal.class ) {
 
 	public static Object getForeignId(
 			String entityName, String propertyName, SharedSessionContractImplementor sessionImplementor, Object object) {
-		final EntityPersister entityDescriptor =
+		final var persister =
 				sessionImplementor.getFactory().getMappingMetamodel()
 						.getEntityDescriptor( entityName );
 		if ( sessionImplementor instanceof SessionImplementor statefulSession
@@ -93,8 +92,8 @@ public static Object getForeignId(
 			//throw new IdentifierGenerationException("save associated object first, or disable cascade for inverse association");
 		}
 		else {
-			return identifier( sessionImplementor, entityType( propertyName, entityDescriptor ),
-					associatedEntity( entityName, propertyName, object, entityDescriptor ) );
+			return identifier( sessionImplementor, entityType( propertyName, persister ),
+					associatedEntity( entityName, propertyName, object, persister ) );
 		}
 	}
 
@@ -109,19 +108,19 @@ private static Object associatedEntity(
 	}
 
 	private static Object identifier(
-			SharedSessionContractImplementor sessionImplementor,
+			SharedSessionContractImplementor session,
 			EntityType foreignValueSourceType,
 			Object associatedEntity) {
 		final String associatedEntityName = foreignValueSourceType.getAssociatedEntityName();
 		try {
-			return getEntityIdentifierIfNotUnsaved( associatedEntityName, associatedEntity, sessionImplementor );
+			return getEntityIdentifierIfNotUnsaved( associatedEntityName, associatedEntity, session );
 		}
 		catch (TransientObjectException toe) {
-			if ( sessionImplementor instanceof Session statefulSession ) {
+			if ( session instanceof Session statefulSession ) {
 				statefulSession.persist( associatedEntityName, associatedEntity );
-				return sessionImplementor.getContextEntityIdentifier( associatedEntity );
+				return session.getContextEntityIdentifier( associatedEntity );
 			}
-			else if ( sessionImplementor instanceof StatelessSession statelessSession ) {
+			else if ( session instanceof StatelessSession statelessSession ) {
 				return statelessSession.insert( associatedEntityName, associatedEntity );
 			}
 			else {
@@ -131,10 +130,9 @@ else if ( sessionImplementor instanceof StatelessSession statelessSession ) {
 	}
 
 	private static EntityType entityType(String propertyName, EntityPersister entityDescriptor) {
-		final Type propertyType = entityDescriptor.getPropertyType( propertyName );
-		if ( propertyType instanceof EntityType ) {
+		if ( entityDescriptor.getPropertyType( propertyName ) instanceof EntityType entityType ) {
 			// the normal case
-			return (EntityType) propertyType;
+			return entityType;
 		}
 		else {
 			// try identifier mapper
@@ -246,7 +244,7 @@ public boolean gt(long value) {
 		}
 
 		public IntegralDataTypeHolder copy() {
-			BasicHolder copy = new BasicHolder( exactType );
+			final var copy = new BasicHolder( exactType );
 			copy.value = value;
 			return copy;
 		}
@@ -301,14 +299,16 @@ public String toString() {
 		}
 
 		@Override
-		public boolean equals(Object o) {
-			if ( this == o ) {
+		public boolean equals(Object object) {
+			if ( this == object ) {
 				return true;
 			}
-			if ( !(o instanceof BasicHolder that) ) {
+			else if ( !(object instanceof BasicHolder that) ) {
 				return false;
 			}
-			return value == that.value;
+			else {
+				return this.value == that.value;
+			}
 		}
 
 		@Override
@@ -326,7 +326,7 @@ public IntegralDataTypeHolder initialize(long value) {
 		}
 
 		public IntegralDataTypeHolder initialize(ResultSet resultSet, long defaultValue) throws SQLException {
-			final BigDecimal rsValue = resultSet.getBigDecimal( 1 );
+			final var rsValue = resultSet.getBigDecimal( 1 );
 			if ( resultSet.wasNull() ) {
 				return initialize( defaultValue );
 			}
@@ -411,7 +411,7 @@ public boolean gt(long value) {
 		}
 
 		public IntegralDataTypeHolder copy() {
-			BigIntegerHolder copy = new BigIntegerHolder();
+			final var copy = new BigIntegerHolder();
 			copy.value = value;
 			return copy;
 		}
@@ -457,14 +457,16 @@ public String toString() {
 		}
 
 		@Override
-		public boolean equals(Object o) {
-			if ( this == o ) {
+		public boolean equals(Object object) {
+			if ( this == object ) {
 				return true;
 			}
-			if ( !(o instanceof BigIntegerHolder that) ) {
+			else if ( !(object instanceof BigIntegerHolder that) ) {
 				return false;
 			}
-			return Objects.equals( value, that.value );
+			else {
+				return Objects.equals( this.value, that.value );
+			}
 		}
 
 		@Override
@@ -482,7 +484,7 @@ public IntegralDataTypeHolder initialize(long value) {
 		}
 
 		public IntegralDataTypeHolder initialize(ResultSet resultSet, long defaultValue) throws SQLException {
-			final BigDecimal rsValue = resultSet.getBigDecimal( 1 );
+			final var rsValue = resultSet.getBigDecimal( 1 );
 			if ( resultSet.wasNull() ) {
 				return initialize( defaultValue );
 			}
@@ -567,7 +569,7 @@ public boolean gt(long value) {
 		}
 
 		public IntegralDataTypeHolder copy() {
-			BigDecimalHolder copy = new BigDecimalHolder();
+			final var copy = new BigDecimalHolder();
 			copy.value = value;
 			return copy;
 		}
@@ -613,14 +615,16 @@ public String toString() {
 		}
 
 		@Override
-		public boolean equals(Object o) {
-			if ( this == o ) {
+		public boolean equals(Object object) {
+			if ( this == object ) {
 				return true;
 			}
-			if ( !(o instanceof BigDecimalHolder that) ) {
+			else if ( !(object instanceof BigDecimalHolder that) ) {
 				return false;
 			}
-			return Objects.equals( this.value, that.value );
+			else {
+				return Objects.equals( this.value, that.value );
+			}
 		}
 
 		@Override
@@ -630,8 +634,6 @@ public int hashCode() {
 	}
 
 	public static ImplicitDatabaseObjectNamingStrategy getNamingStrategy(Properties params, ServiceRegistry serviceRegistry) {
-		final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );
-
 		final String namingStrategySetting = coalesceSuppliedValues(
 				() -> {
 					final String localSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, params );
@@ -641,17 +643,17 @@ public static ImplicitDatabaseObjectNamingStrategy getNamingStrategy(Properties
 					return localSetting;
 				},
 				() -> {
-					final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
-					final String globalSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, configurationService.getSettings() );
+					final var settings = serviceRegistry.requireService( ConfigurationService.class ).getSettings();
+					final String globalSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, settings );
 					if ( globalSetting != null ) {
 						INCUBATION_LOGGER.incubatingSetting( ID_DB_STRUCTURE_NAMING_STRATEGY );
 					}
 					return globalSetting;
 				},
 				StandardNamingStrategy.class::getName
 		);
-
-		return strategySelector.resolveStrategy( ImplicitDatabaseObjectNamingStrategy.class, namingStrategySetting );
+		return serviceRegistry.requireService( StrategySelector.class )
+				.resolveStrategy( ImplicitDatabaseObjectNamingStrategy.class, namingStrategySetting );
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
@@ -4,17 +4,13 @@
  */
 package org.hibernate.id;
 
-import java.util.List;
-
-import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.id.insert.BasicSelectingDelegate;
 import org.hibernate.id.insert.GetGeneratedKeysDelegate;
 import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
 import org.hibernate.id.insert.InsertReturningDelegate;
 import org.hibernate.id.insert.UniqueKeySelectingDelegate;
-import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.persister.entity.EntityPersister;
 
 import static org.hibernate.generator.EventType.INSERT;
@@ -54,9 +50,9 @@ public String[] getReferencedColumnValues(Dialect dialect) {
 
 	@Override
 	public InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
-		final Dialect dialect = persister.getFactory().getJdbcServices().getDialect();
-		final SessionFactoryOptions sessionFactoryOptions = persister.getFactory().getSessionFactoryOptions();
-		final List<? extends ModelPart> generatedProperties = persister.getGeneratedProperties( INSERT );
+		final var dialect = persister.getFactory().getJdbcServices().getDialect();
+		final var sessionFactoryOptions = persister.getFactory().getSessionFactoryOptions();
+		final var generatedProperties = persister.getGeneratedProperties( INSERT );
 		if ( generatedProperties.size() == 1 && sessionFactoryOptions.isGetGeneratedKeysEnabled() ) {
 			// Use Connection#prepareStatement(sql, Statement.RETURN_GENERATED_KEYS) when only retrieving identity
 			assert generatedProperties.get( 0 ).isEntityIdentifierMapping();
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
diff --git a/hibernate-core/src/main/java/org/hibernate/id/NativeGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/NativeGenerator.java

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`import org.hibernate.internal.util.BytesHelper;`
`10`	`10`
	`11`	`+import static java.lang.System.currentTimeMillis;`
	`12`	`+`
`11`	`13`	`/**`
`12`	`14`	`* The base class for identifier generators that use a UUID algorithm. This`
`13`	`15`	`* class implements the algorithm, subclasses define the identifier`
`@@ -34,7 +36,7 @@ public abstract class AbstractUUIDGenerator implements IdentifierGenerator {`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`private static short counter = (short) 0;`
`37`		`- private static final int JVM = (int) ( System.currentTimeMillis() >>> 8 );`
	`39`	`+ private static final int JVM = (int) ( currentTimeMillis() >>> 8 );`
`38`	`40`
`39`	`41`	`public AbstractUUIDGenerator() {`
`40`	`42`	`}`
`@@ -72,10 +74,10 @@ protected int getIP() {`
`72`	`74`	`* Unique down to millisecond`
`73`	`75`	`*/`
`74`	`76`	`protected short getHiTime() {`
`75`		`- return (short) ( System.currentTimeMillis() >>> 32 );`
	`77`	`+ return (short) ( currentTimeMillis() >>> 32 );`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`protected int getLoTime() {`
`79`		`- return (int) System.currentTimeMillis();`
	`81`	`+ return (int) currentTimeMillis();`
`80`	`82`	`}`
`81`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,21 +38,22 @@ public Object generate(SharedSessionContractImplementor session, Object obj) thr`
`38`	`38`	`final String sql = session.getJdbcServices().getJdbcEnvironment().getDialect().getSelectGUIDString();`
`39`	`39`	`try {`
`40`	`40`	`final var jdbcCoordinator = session.getJdbcCoordinator();`
`41`		`- final var st = jdbcCoordinator.getStatementPreparer().prepareStatement( sql );`
	`41`	`+ final var statement = jdbcCoordinator.getStatementPreparer().prepareStatement( sql );`
	`42`	`+ final var resourceRegistry = jdbcCoordinator.getLogicalConnection().getResourceRegistry();`
`42`	`43`	`try {`
`43`		`- final var rs = jdbcCoordinator.getResultSetReturn().extract( st, sql );`
	`44`	`+ final var resultSet = jdbcCoordinator.getResultSetReturn().extract( statement, sql );`
`44`	`45`	`try {`
`45`		`- if ( !rs.next() ) {`
	`46`	`+ if ( !resultSet.next() ) {`
`46`	`47`	`throw new HibernateException( "The database returned no GUID identity value" );`
`47`	`48`	`}`
`48`		`- return rs.getString( 1 );`
	`49`	`+ return resultSet.getString( 1 );`
`49`	`50`	`}`
`50`	`51`	`finally {`
`51`		`- jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( rs, st );`
	`52`	`+ resourceRegistry.release( resultSet, statement );`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`	`finally {`
`55`		`- jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( st );`
	`56`	`+ resourceRegistry.release( statement );`
`56`	`57`	`jdbcCoordinator.afterStatementExecution();`
`57`	`58`	`}`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`import org.hibernate.persister.entity.EntityPersister;`
`28`	`28`	`import org.hibernate.service.ServiceRegistry;`
`29`	`29`	`import org.hibernate.type.EntityType;`
`30`		`-import org.hibernate.type.Type;`
`31`	`30`
`32`	`31`	`import static org.hibernate.cfg.MappingSettings.ID_DB_STRUCTURE_NAMING_STRATEGY;`
`33`	`32`	`import static org.hibernate.engine.internal.ForeignKeys.getEntityIdentifierIfNotUnsaved;`
`@@ -83,7 +82,7 @@ else if ( integralType == BigDecimal.class ) {`
`83`	`82`
`84`	`83`	`public static Object getForeignId(`
`85`	`84`	`String entityName, String propertyName, SharedSessionContractImplementor sessionImplementor, Object object) {`
`86`		`- final EntityPersister entityDescriptor =`
	`85`	`+ final var persister =`
`87`	`86`	`sessionImplementor.getFactory().getMappingMetamodel()`
`88`	`87`	`.getEntityDescriptor( entityName );`
`89`	`88`	`if ( sessionImplementor instanceof SessionImplementor statefulSession`
`@@ -93,8 +92,8 @@ public static Object getForeignId(`
`93`	`92`	`//throw new IdentifierGenerationException("save associated object first, or disable cascade for inverse association");`
`94`	`93`	`}`
`95`	`94`	`else {`
`96`		`- return identifier( sessionImplementor, entityType( propertyName, entityDescriptor ),`
`97`		`- associatedEntity( entityName, propertyName, object, entityDescriptor ) );`
	`95`	`+ return identifier( sessionImplementor, entityType( propertyName, persister ),`
	`96`	`+ associatedEntity( entityName, propertyName, object, persister ) );`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`@@ -109,19 +108,19 @@ private static Object associatedEntity(`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`private static Object identifier(`
`112`		`- SharedSessionContractImplementor sessionImplementor,`
	`111`	`+ SharedSessionContractImplementor session,`
`113`	`112`	`EntityType foreignValueSourceType,`
`114`	`113`	`Object associatedEntity) {`
`115`	`114`	`final String associatedEntityName = foreignValueSourceType.getAssociatedEntityName();`
`116`	`115`	`try {`
`117`		`- return getEntityIdentifierIfNotUnsaved( associatedEntityName, associatedEntity, sessionImplementor );`
	`116`	`+ return getEntityIdentifierIfNotUnsaved( associatedEntityName, associatedEntity, session );`
`118`	`117`	`}`
`119`	`118`	`catch (TransientObjectException toe) {`
`120`		`- if ( sessionImplementor instanceof Session statefulSession ) {`
	`119`	`+ if ( session instanceof Session statefulSession ) {`
`121`	`120`	`statefulSession.persist( associatedEntityName, associatedEntity );`
`122`		`- return sessionImplementor.getContextEntityIdentifier( associatedEntity );`
	`121`	`+ return session.getContextEntityIdentifier( associatedEntity );`
`123`	`122`	`}`
`124`		`- else if ( sessionImplementor instanceof StatelessSession statelessSession ) {`
	`123`	`+ else if ( session instanceof StatelessSession statelessSession ) {`
`125`	`124`	`return statelessSession.insert( associatedEntityName, associatedEntity );`
`126`	`125`	`}`
`127`	`126`	`else {`
`@@ -131,10 +130,9 @@ else if ( sessionImplementor instanceof StatelessSession statelessSession ) {`
`131`	`130`	`}`
`132`	`131`
`133`	`132`	`private static EntityType entityType(String propertyName, EntityPersister entityDescriptor) {`
`134`		`- final Type propertyType = entityDescriptor.getPropertyType( propertyName );`
`135`		`- if ( propertyType instanceof EntityType ) {`
	`133`	`+ if ( entityDescriptor.getPropertyType( propertyName ) instanceof EntityType entityType ) {`
`136`	`134`	`// the normal case`
`137`		`- return (EntityType) propertyType;`
	`135`	`+ return entityType;`
`138`	`136`	`}`
`139`	`137`	`else {`
`140`	`138`	`// try identifier mapper`
`@@ -246,7 +244,7 @@ public boolean gt(long value) {`
`246`	`244`	`}`
`247`	`245`
`248`	`246`	`public IntegralDataTypeHolder copy() {`
`249`		`- BasicHolder copy = new BasicHolder( exactType );`
	`247`	`+ final var copy = new BasicHolder( exactType );`
`250`	`248`	`copy.value = value;`
`251`	`249`	`return copy;`
`252`	`250`	`}`
`@@ -301,14 +299,16 @@ public String toString() {`
`301`	`299`	`}`
`302`	`300`
`303`	`301`	`@Override`
`304`		`- public boolean equals(Object o) {`
`305`		`- if ( this == o ) {`
	`302`	`+ public boolean equals(Object object) {`
	`303`	`+ if ( this == object ) {`
`306`	`304`	`return true;`
`307`	`305`	`}`
`308`		`- if ( !(o instanceof BasicHolder that) ) {`
	`306`	`+ else if ( !(object instanceof BasicHolder that) ) {`
`309`	`307`	`return false;`
`310`	`308`	`}`
`311`		`- return value == that.value;`
	`309`	`+ else {`
	`310`	`+ return this.value == that.value;`
	`311`	`+ }`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`@Override`
`@@ -326,7 +326,7 @@ public IntegralDataTypeHolder initialize(long value) {`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`public IntegralDataTypeHolder initialize(ResultSet resultSet, long defaultValue) throws SQLException {`
`329`		`- final BigDecimal rsValue = resultSet.getBigDecimal( 1 );`
	`329`	`+ final var rsValue = resultSet.getBigDecimal( 1 );`
`330`	`330`	`if ( resultSet.wasNull() ) {`
`331`	`331`	`return initialize( defaultValue );`
`332`	`332`	`}`
`@@ -411,7 +411,7 @@ public boolean gt(long value) {`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`public IntegralDataTypeHolder copy() {`
`414`		`- BigIntegerHolder copy = new BigIntegerHolder();`
	`414`	`+ final var copy = new BigIntegerHolder();`
`415`	`415`	`copy.value = value;`
`416`	`416`	`return copy;`
`417`	`417`	`}`
`@@ -457,14 +457,16 @@ public String toString() {`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`@Override`
`460`		`- public boolean equals(Object o) {`
`461`		`- if ( this == o ) {`
	`460`	`+ public boolean equals(Object object) {`
	`461`	`+ if ( this == object ) {`
`462`	`462`	`return true;`
`463`	`463`	`}`
`464`		`- if ( !(o instanceof BigIntegerHolder that) ) {`
	`464`	`+ else if ( !(object instanceof BigIntegerHolder that) ) {`
`465`	`465`	`return false;`
`466`	`466`	`}`
`467`		`- return Objects.equals( value, that.value );`
	`467`	`+ else {`
	`468`	`+ return Objects.equals( this.value, that.value );`
	`469`	`+ }`
`468`	`470`	`}`
`469`	`471`
`470`	`472`	`@Override`
`@@ -482,7 +484,7 @@ public IntegralDataTypeHolder initialize(long value) {`
`482`	`484`	`}`
`483`	`485`
`484`	`486`	`public IntegralDataTypeHolder initialize(ResultSet resultSet, long defaultValue) throws SQLException {`
`485`		`- final BigDecimal rsValue = resultSet.getBigDecimal( 1 );`
	`487`	`+ final var rsValue = resultSet.getBigDecimal( 1 );`
`486`	`488`	`if ( resultSet.wasNull() ) {`
`487`	`489`	`return initialize( defaultValue );`
`488`	`490`	`}`
`@@ -567,7 +569,7 @@ public boolean gt(long value) {`
`567`	`569`	`}`
`568`	`570`
`569`	`571`	`public IntegralDataTypeHolder copy() {`
`570`		`- BigDecimalHolder copy = new BigDecimalHolder();`
	`572`	`+ final var copy = new BigDecimalHolder();`
`571`	`573`	`copy.value = value;`
`572`	`574`	`return copy;`
`573`	`575`	`}`
`@@ -613,14 +615,16 @@ public String toString() {`
`613`	`615`	`}`
`614`	`616`
`615`	`617`	`@Override`
`616`		`- public boolean equals(Object o) {`
`617`		`- if ( this == o ) {`
	`618`	`+ public boolean equals(Object object) {`
	`619`	`+ if ( this == object ) {`
`618`	`620`	`return true;`
`619`	`621`	`}`
`620`		`- if ( !(o instanceof BigDecimalHolder that) ) {`
	`622`	`+ else if ( !(object instanceof BigDecimalHolder that) ) {`
`621`	`623`	`return false;`
`622`	`624`	`}`
`623`		`- return Objects.equals( this.value, that.value );`
	`625`	`+ else {`
	`626`	`+ return Objects.equals( this.value, that.value );`
	`627`	`+ }`
`624`	`628`	`}`
`625`	`629`
`626`	`630`	`@Override`
`@@ -630,8 +634,6 @@ public int hashCode() {`
`630`	`634`	`}`
`631`	`635`
`632`	`636`	`public static ImplicitDatabaseObjectNamingStrategy getNamingStrategy(Properties params, ServiceRegistry serviceRegistry) {`
`633`		`- final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );`
`634`		`-`
`635`	`637`	`final String namingStrategySetting = coalesceSuppliedValues(`
`636`	`638`	`() -> {`
`637`	`639`	`final String localSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, params );`
`@@ -641,17 +643,17 @@ public static ImplicitDatabaseObjectNamingStrategy getNamingStrategy(Properties`
`641`	`643`	`return localSetting;`
`642`	`644`	`},`
`643`	`645`	`() -> {`
`644`		`- final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );`
`645`		`- final String globalSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, configurationService.getSettings() );`
	`646`	`+ final var settings = serviceRegistry.requireService( ConfigurationService.class ).getSettings();`
	`647`	`+ final String globalSetting = getString( ID_DB_STRUCTURE_NAMING_STRATEGY, settings );`
`646`	`648`	`if ( globalSetting != null ) {`
`647`	`649`	`INCUBATION_LOGGER.incubatingSetting( ID_DB_STRUCTURE_NAMING_STRATEGY );`
`648`	`650`	`}`
`649`	`651`	`return globalSetting;`
`650`	`652`	`},`
`651`	`653`	`StandardNamingStrategy.class::getName`
`652`	`654`	`);`
`653`		`-`
`654`		`- return strategySelector.resolveStrategy( ImplicitDatabaseObjectNamingStrategy.class, namingStrategySetting );`
	`655`	`+ return serviceRegistry.requireService( StrategySelector.class )`
	`656`	`+ .resolveStrategy( ImplicitDatabaseObjectNamingStrategy.class, namingStrategySetting );`
`655`	`657`	`}`
`656`	`658`
`657`	`659`	`/**`