Skip to content

Commit 7e5374e

Browse files
gavinkinggavinking
committed
minor changes (mainly use of 'var')
1 parent 545c0a4 commit 7e5374e

File tree

3 files changed

+50
-52
lines changed

3 files changed

+50
-52
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
266266

267267
// we cannot use context.getConfigurationService() here because it might be missing some settings
268268
// (the StandardServiceRegistry passed in here does not need to be the bootstrap service registry)
269-
final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
269+
final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
270270

271-
final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );
272-
final JdbcServices jdbcServices = serviceRegistry.requireService( JdbcServices.class );
271+
final var strategySelector = serviceRegistry.requireService( StrategySelector.class );
272+
final var jdbcServices = serviceRegistry.requireService( JdbcServices.class );
273273

274-
final Dialect dialect = jdbcServices.getJdbcEnvironment().getDialect();
274+
final var dialect = jdbcServices.getJdbcEnvironment().getDialect();
275275

276276
final Map<String,Object> settings = new HashMap<>();
277277
settings.putAll( map( dialect.getDefaultProperties() ) );
@@ -631,7 +631,9 @@ private SqmMultiTableMutationStrategy resolveSqmMutationStrategy(
631631
else if ( parameterTypes.length == 0 ) {
632632
emptyConstructor = constructor;
633633
}
634-
else if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
634+
else if ( parameterTypes.length == 2
635+
&& parameterTypes[0] == EntityMappingType.class
636+
&& parameterTypes[1] == RuntimeModelCreationContext.class ) {
635637
entityBasedConstructor = (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
636638
}
637639
}
@@ -668,19 +670,18 @@ else if ( emptyConstructor != null ) {
668670
private Constructor<SqmMultiTableMutationStrategy> resolveSqmMutationStrategyConstructor(
669671
String strategyName,
670672
StrategySelector strategySelector) {
671-
if ( strategyName == null ) {
672-
return null;
673-
}
674-
675-
Class<? extends SqmMultiTableMutationStrategy> strategyClass =
676-
strategySelector.selectStrategyImplementor( SqmMultiTableMutationStrategy.class, strategyName );
677-
for ( Constructor<?> declaredConstructor : strategyClass.getDeclaredConstructors() ) {
678-
final Class<?>[] parameterTypes = declaredConstructor.getParameterTypes();
679-
if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
680-
return (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
673+
if ( strategyName != null ) {
674+
final var strategyClass =
675+
strategySelector.selectStrategyImplementor( SqmMultiTableMutationStrategy.class, strategyName );
676+
for ( var declaredConstructor : strategyClass.getDeclaredConstructors() ) {
677+
final var parameterTypes = declaredConstructor.getParameterTypes();
678+
if ( parameterTypes.length == 2
679+
&& parameterTypes[0] == EntityMappingType.class
680+
&& parameterTypes[1] == RuntimeModelCreationContext.class ) {
681+
return (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
682+
}
681683
}
682684
}
683-
684685
return null;
685686
}
686687

@@ -714,7 +715,9 @@ private SqmMultiTableInsertStrategy resolveSqmInsertStrategy(
714715
else if ( parameterTypes.length == 0 ) {
715716
emptyConstructor = constructor;
716717
}
717-
else if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
718+
else if ( parameterTypes.length == 2
719+
&& parameterTypes[0] == EntityMappingType.class
720+
&& parameterTypes[1] == RuntimeModelCreationContext.class ) {
718721
entityBasedConstructor = (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
719722
}
720723
}
@@ -751,19 +754,18 @@ else if ( emptyConstructor != null ) {
751754
private Constructor<SqmMultiTableInsertStrategy> resolveSqmInsertStrategyConstructor(
752755
String strategyName,
753756
StrategySelector strategySelector) {
754-
if ( strategyName == null ) {
755-
return null;
756-
}
757-
758-
Class<? extends SqmMultiTableInsertStrategy> strategyClass =
759-
strategySelector.selectStrategyImplementor( SqmMultiTableInsertStrategy.class, strategyName );
760-
for ( Constructor<?> declaredConstructor : strategyClass.getDeclaredConstructors() ) {
761-
final Class<?>[] parameterTypes = declaredConstructor.getParameterTypes();
762-
if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
763-
return (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
757+
if ( strategyName != null ) {
758+
final var strategyClass =
759+
strategySelector.selectStrategyImplementor( SqmMultiTableInsertStrategy.class, strategyName );
760+
for ( var declaredConstructor : strategyClass.getDeclaredConstructors() ) {
761+
final var parameterTypes = declaredConstructor.getParameterTypes();
762+
if ( parameterTypes.length == 2
763+
&& parameterTypes[0] == EntityMappingType.class
764+
&& parameterTypes[1] == RuntimeModelCreationContext.class ) {
765+
return (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
766+
}
764767
}
765768
}
766-
767769
return null;
768770
}
769771

@@ -844,7 +846,7 @@ private static Supplier<? extends Interceptor> interceptorSupplier(Class<? exten
844846
private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(
845847
Map<String,Object> configurationSettings,
846848
StandardServiceRegistry serviceRegistry) {
847-
final PhysicalConnectionHandlingMode specifiedHandlingMode =
849+
final var specifiedHandlingMode =
848850
PhysicalConnectionHandlingMode.interpret( configurationSettings.get( CONNECTION_HANDLING ) );
849851
return specifiedHandlingMode != null
850852
? specifiedHandlingMode

‎hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6129,7 +6129,7 @@ else if ( literal instanceof Period period ) {
61296129
appender.appendSql( '(' );
61306130
}
61316131
boolean first = true;
6132-
for ( java.time.temporal.TemporalUnit unit : literal.getUnits() ) {
6132+
for ( var unit : literal.getUnits() ) {
61336133
final long value = literal.get( unit );
61346134
if ( value != 0 ) {
61356135
if ( first ) {

‎hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.concurrent.ConcurrentHashMap;
2121
import java.util.function.Consumer;
2222
import java.util.function.Function;
23-
import java.util.function.Supplier;
2423
import java.util.function.UnaryOperator;
2524
import javax.naming.Reference;
2625
import javax.naming.StringRefAddr;
@@ -83,14 +82,11 @@
8382
import org.hibernate.integrator.spi.IntegratorService;
8483
import org.hibernate.jpa.internal.ExceptionMapperLegacyJpaImpl;
8584
import org.hibernate.jpa.internal.PersistenceUnitUtilImpl;
86-
import org.hibernate.mapping.Collection;
8785
import org.hibernate.mapping.GeneratorSettings;
88-
import org.hibernate.mapping.PersistentClass;
8986
import org.hibernate.mapping.RootClass;
9087
import org.hibernate.metamodel.MappingMetamodel;
9188
import org.hibernate.metamodel.RepresentationMode;
9289
import org.hibernate.metamodel.internal.RuntimeMetamodelsImpl;
93-
import org.hibernate.metamodel.mapping.JdbcMapping;
9490
import org.hibernate.metamodel.model.domain.EntityDomainType;
9591
import org.hibernate.metamodel.model.domain.internal.MappingMetamodelImpl;
9692
import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
@@ -254,23 +250,23 @@ public SessionFactoryImpl(
254250

255251
jpaPersistenceUnitUtil = new PersistenceUnitUtilImpl( this );
256252

257-
for ( SessionFactoryObserver sessionFactoryObserver : options.getSessionFactoryObservers() ) {
253+
for ( var sessionFactoryObserver : options.getSessionFactoryObservers() ) {
258254
observer.addObserver( sessionFactoryObserver );
259255
}
260256

261257
filters = new HashMap<>( bootMetamodel.getFilterDefinitions() );
262258

263-
final FilterDefinition tenantFilter = filters.get( TenantIdBinder.FILTER_NAME );
259+
final var tenantFilter = filters.get( TenantIdBinder.FILTER_NAME );
264260
if ( tenantFilter == null ) {
265261
tenantIdentifierJavaType = options.getDefaultTenantIdentifierJavaType();
266262
}
267263
else {
268-
final JdbcMapping jdbcMapping = tenantFilter.getParameterJdbcMapping( TenantIdBinder.PARAMETER_NAME );
264+
final var jdbcMapping = tenantFilter.getParameterJdbcMapping( TenantIdBinder.PARAMETER_NAME );
269265
assert jdbcMapping != null;
270266
//noinspection unchecked
271267
tenantIdentifierJavaType = jdbcMapping.getJavaTypeDescriptor();
272268
}
273-
for ( Map.Entry<String, FilterDefinition> filterEntry : filters.entrySet() ) {
269+
for ( var filterEntry : filters.entrySet() ) {
274270
if ( filterEntry.getValue().isAutoEnabled() ) {
275271
autoEnabledFilters.add( filterEntry.getValue() );
276272
}
@@ -283,7 +279,7 @@ public SessionFactoryImpl(
283279
classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
284280
jdbcValuesMappingProducerProvider = serviceRegistry.requireService( JdbcValuesMappingProducerProvider.class );
285281

286-
final IntegratorObserver integratorObserver = new IntegratorObserver();
282+
final var integratorObserver = new IntegratorObserver();
287283
observer.addObserver( integratorObserver );
288284
try {
289285
integrate( bootMetamodel, bootstrapContext, integratorObserver );
@@ -294,7 +290,7 @@ public SessionFactoryImpl(
294290
primeSecondLevelCacheRegions( bootMetamodel );
295291

296292
// create the empty runtime metamodels object
297-
final RuntimeMetamodelsImpl runtimeMetamodelsImpl = new RuntimeMetamodelsImpl( typeConfiguration );
293+
final var runtimeMetamodelsImpl = new RuntimeMetamodelsImpl( typeConfiguration );
298294
runtimeMetamodels = runtimeMetamodelsImpl;
299295

300296
// we build this before creating the runtime metamodels
@@ -305,7 +301,7 @@ public SessionFactoryImpl(
305301
sqlTranslationEngine = new SqlTranslationEngineImpl( this, typeConfiguration, fetchProfiles );
306302

307303
// now actually create the mapping and JPA metamodels
308-
final MappingMetamodelImpl mappingMetamodelImpl = new MappingMetamodelImpl( typeConfiguration, serviceRegistry );
304+
final var mappingMetamodelImpl = new MappingMetamodelImpl( typeConfiguration, serviceRegistry );
309305
runtimeMetamodelsImpl.setMappingMetamodel( mappingMetamodelImpl );
310306
mappingMetamodelImpl.finishInitialization(
311307
new ModelCreationContext( bootstrapContext, bootMetamodel, mappingMetamodelImpl, typeConfiguration ) );
@@ -432,22 +428,22 @@ class IntegratorObserver implements SessionFactoryObserver {
432428
private final ArrayList<Integrator> integrators = new ArrayList<>();
433429
@Override
434430
public void sessionFactoryClosed(SessionFactory factory) {
435-
for ( Integrator integrator : integrators ) {
431+
for ( var integrator : integrators ) {
436432
integrator.disintegrate( SessionFactoryImpl.this, SessionFactoryImpl.this.serviceRegistry );
437433
}
438434
integrators.clear();
439435
}
440436
}
441437

442438
private void integrate(MetadataImplementor bootMetamodel, BootstrapContext bootstrapContext, IntegratorObserver integratorObserver) {
443-
for ( Integrator integrator : serviceRegistry.requireService( IntegratorService.class ).getIntegrators() ) {
439+
for ( var integrator : serviceRegistry.requireService( IntegratorService.class ).getIntegrators() ) {
444440
integrator.integrate( bootMetamodel, bootstrapContext, this );
445441
integratorObserver.integrators.add( integrator );
446442
}
447443
}
448444

449445
private void disintegrate(Exception startupException, IntegratorObserver integratorObserver) {
450-
for ( Integrator integrator : integratorObserver.integrators ) {
446+
for ( var integrator : integratorObserver.integrators ) {
451447
try {
452448
integrator.disintegrate( this, serviceRegistry );
453449
}
@@ -483,10 +479,9 @@ private void primeSecondLevelCacheRegions(MetadataImplementor mappingMetadata) {
483479
// TODO: ultimately this code can be made more efficient when we have
484480
// a better intrinsic understanding of the hierarchy as a whole
485481

486-
for ( PersistentClass bootEntityDescriptor : mappingMetadata.getEntityBindings() ) {
482+
for ( var bootEntityDescriptor : mappingMetadata.getEntityBindings() ) {
487483
final AccessType accessType =
488484
AccessType.fromExternalName( bootEntityDescriptor.getCacheConcurrencyStrategy() );
489-
490485
if ( accessType != null ) {
491486
if ( bootEntityDescriptor.isCached() ) {
492487
regionConfigBuilders.computeIfAbsent(
@@ -508,8 +503,9 @@ private void primeSecondLevelCacheRegions(MetadataImplementor mappingMetadata) {
508503
}
509504
}
510505

511-
for ( Collection collection : mappingMetadata.getCollectionBindings() ) {
512-
final AccessType accessType = AccessType.fromExternalName( collection.getCacheConcurrencyStrategy() );
506+
for ( var collection : mappingMetadata.getCollectionBindings() ) {
507+
final AccessType accessType =
508+
AccessType.fromExternalName( collection.getCacheConcurrencyStrategy() );
513509
if ( accessType != null ) {
514510
regionConfigBuilders.computeIfAbsent(
515511
collection.getCacheRegionName(),
@@ -525,7 +521,7 @@ private void primeSecondLevelCacheRegions(MetadataImplementor mappingMetadata) {
525521
}
526522
else {
527523
regionConfigs = new HashSet<>();
528-
for ( DomainDataRegionConfigImpl.Builder builder : regionConfigBuilders.values() ) {
524+
for ( var builder : regionConfigBuilders.values() ) {
529525
regionConfigs.add( builder.build() );
530526
}
531527
}
@@ -735,12 +731,12 @@ public boolean isOpen() {
735731

736732
@Override
737733
public RootGraph<Map<String, ?>> createGraphForDynamicEntity(String entityName) {
738-
final EntityDomainType<?> entity = getJpaMetamodel().entity( entityName );
734+
final var entity = getJpaMetamodel().entity( entityName );
739735
if ( entity.getRepresentationMode() != RepresentationMode.MAP ) {
740736
throw new IllegalArgumentException( "Entity '" + entityName + "' is not a dynamic entity" );
741737
}
742738
@SuppressWarnings("unchecked") //Safe, because we just checked
743-
final EntityDomainType<Map<String, ?>> dynamicEntity = (EntityDomainType<Map<String, ?>>) entity;
739+
final var dynamicEntity = (EntityDomainType<Map<String, ?>>) entity;
744740
return new RootGraphImpl<>( null, dynamicEntity );
745741
}
746742

@@ -1108,7 +1104,7 @@ public static Interceptor configuredInterceptor(Interceptor interceptor, boolean
11081104
}
11091105

11101106
// then check the Session-scoped interceptor prototype
1111-
final Supplier<? extends Interceptor> statelessInterceptorImplementorSupplier =
1107+
final var statelessInterceptorImplementorSupplier =
11121108
options.getStatelessInterceptorImplementorSupplier();
11131109
if ( statelessInterceptorImplementorSupplier != null ) {
11141110
return statelessInterceptorImplementorSupplier.get();

0 commit comments

Comments
 (0)