Skip to content

Commit 5a35187

Browse files
gavinkinggavinking
committed
use lots of 'var' in boot.model.internal
1 parent 9178e32 commit 5a35187

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1444
-1703
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66

77
import java.lang.annotation.Annotation;
88
import java.util.HashMap;
9-
import java.util.List;
109
import java.util.Map;
1110

1211
import org.hibernate.MappingException;
1312
import org.hibernate.annotations.IdGeneratorType;
1413
import org.hibernate.boot.model.IdentifierGeneratorDefinition;
15-
import org.hibernate.boot.model.relational.Database;
1614
import org.hibernate.boot.spi.MetadataBuildingContext;
17-
import org.hibernate.dialect.Dialect;
18-
import org.hibernate.generator.Generator;
1915
import org.hibernate.internal.util.collections.CollectionHelper;
2016
import org.hibernate.mapping.Column;
2117
import org.hibernate.mapping.PersistentClass;
@@ -27,6 +23,9 @@
2723
import jakarta.persistence.GeneratedValue;
2824

2925
import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.handleIdGeneratorType;
26+
import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.handleIdentityStrategy;
27+
import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.locatePackageInfoDetails;
28+
import static org.hibernate.boot.model.internal.GeneratorBinder.createGeneratorFrom;
3029
import static org.hibernate.boot.model.internal.GeneratorParameters.identityTablesString;
3130
import static org.hibernate.boot.model.internal.GeneratorStrategies.mapLegacyNamedGenerator;
3231
import static org.hibernate.id.IdentifierGenerator.ENTITY_NAME;
@@ -65,7 +64,7 @@ public AbstractEntityIdGeneratorResolver(
6564
public final void doSecondPass(Map<String, PersistentClass> persistentClasses) throws MappingException {
6665
switch ( generatedValue.strategy() ) {
6766
case UUID -> handleUuidStrategy();
68-
case IDENTITY -> GeneratorAnnotationHelper.handleIdentityStrategy( idValue );
67+
case IDENTITY -> handleIdentityStrategy( idValue );
6968
case SEQUENCE -> handleSequenceStrategy();
7069
case TABLE -> handleTableStrategy();
7170
case AUTO -> handleAutoStrategy();
@@ -134,7 +133,8 @@ protected boolean handleAsMetaAnnotated() {
134133
return true;
135134
}
136135

137-
final ClassDetails packageInfoDetails = GeneratorAnnotationHelper.locatePackageInfoDetails( idMember.getDeclaringType(), buildingContext );
136+
final ClassDetails packageInfoDetails =
137+
locatePackageInfoDetails( idMember.getDeclaringType(), buildingContext );
138138
if ( packageInfoDetails != null ) {
139139
final Annotation fromPackage = findGeneratorAnnotation( packageInfoDetails );
140140
if ( fromPackage != null ) {
@@ -147,7 +147,7 @@ protected boolean handleAsMetaAnnotated() {
147147
}
148148

149149
private Annotation findGeneratorAnnotation(AnnotationTarget annotationTarget) {
150-
final List<? extends Annotation> metaAnnotated =
150+
final var metaAnnotated =
151151
annotationTarget.getMetaAnnotated( IdGeneratorType.class,
152152
buildingContext.getBootstrapContext().getModelsContext() );
153153
if ( CollectionHelper.size( metaAnnotated ) > 0 ) {
@@ -161,12 +161,12 @@ protected boolean handleAsLegacyGenerator() {
161161
// Handle a few legacy Hibernate generators...
162162
final String nameFromGeneratedValue = generatedValue.generator();
163163
if ( !nameFromGeneratedValue.isBlank() ) {
164-
final Class<? extends Generator> legacyNamedGenerator =
164+
final var legacyNamedGenerator =
165165
mapLegacyNamedGenerator( nameFromGeneratedValue, idValue );
166166
if ( legacyNamedGenerator != null ) {
167-
final Map<String,String> configuration = buildLegacyGeneratorConfig();
167+
final var configuration = buildLegacyGeneratorConfig();
168168
//noinspection unchecked,rawtypes
169-
GeneratorBinder.createGeneratorFrom(
169+
createGeneratorFrom(
170170
new IdentifierGeneratorDefinition( nameFromGeneratedValue,
171171
legacyNamedGenerator.getName(), configuration ),
172172
idValue,
@@ -181,15 +181,15 @@ protected boolean handleAsLegacyGenerator() {
181181
}
182182

183183
private HashMap<String, String> buildLegacyGeneratorConfig() {
184-
final Database database = buildingContext.getMetadataCollector().getDatabase();
185-
final Dialect dialect = database.getDialect();
184+
final var database = buildingContext.getMetadataCollector().getDatabase();
185+
final var dialect = database.getDialect();
186186

187187
final HashMap<String, String> configuration = new HashMap<>();
188188

189189
final String tableName = idValue.getTable().getQuotedName( dialect );
190190
configuration.put( TABLE, tableName );
191191

192-
final Column idColumn = (Column) idValue.getSelectables().get( 0);
192+
final var idColumn = (Column) idValue.getSelectables().get( 0);
193193
final String idColumnName = idColumn.getQuotedName( dialect );
194194
configuration.put( PK, idColumnName );
195195

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

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public abstract class AbstractPropertyHolder implements PropertyHolder {
8787

8888
@Override
8989
public ConverterDescriptor<?,?> resolveAttributeConverterDescriptor(MemberDetails attributeMember, boolean autoApply) {
90-
final AttributeConversionInfo info = locateAttributeConversionInfo( attributeMember );
90+
final var info = locateAttributeConversionInfo( attributeMember );
9191
if ( info != null ) {
9292
if ( info.isConversionDisabled() ) {
9393
return null;
@@ -185,36 +185,36 @@ protected void setCurrentProperty(MemberDetails attributeMember) {
185185
// todo (jpa32) : some of this (association override handling esp) does the same work multiple times - consolidate
186186

187187
if ( attributeMember == null ) {
188-
this.currentPropertyColumnOverride = null;
189-
this.currentPropertyColumnTransformerOverride = null;
190-
this.currentPropertyJoinColumnOverride = null;
191-
this.currentPropertyJoinTableOverride = null;
192-
this.currentPropertyForeignKeyOverride = null;
188+
currentPropertyColumnOverride = null;
189+
currentPropertyColumnTransformerOverride = null;
190+
currentPropertyJoinColumnOverride = null;
191+
currentPropertyJoinTableOverride = null;
192+
currentPropertyForeignKeyOverride = null;
193193
}
194194
else {
195-
this.currentPropertyColumnOverride = buildColumnOverride( attributeMember, getPath(), context );
196-
if ( this.currentPropertyColumnOverride.isEmpty() ) {
197-
this.currentPropertyColumnOverride = null;
195+
currentPropertyColumnOverride = buildColumnOverride( attributeMember, getPath(), context );
196+
if ( currentPropertyColumnOverride.isEmpty() ) {
197+
currentPropertyColumnOverride = null;
198198
}
199199

200-
this.currentPropertyColumnTransformerOverride = buildColumnTransformerOverride( attributeMember, context );
201-
if ( this.currentPropertyColumnTransformerOverride.isEmpty() ) {
202-
this.currentPropertyColumnTransformerOverride = null;
200+
currentPropertyColumnTransformerOverride = buildColumnTransformerOverride( attributeMember, context );
201+
if ( currentPropertyColumnTransformerOverride.isEmpty() ) {
202+
currentPropertyColumnTransformerOverride = null;
203203
}
204204

205-
this.currentPropertyJoinColumnOverride = buildJoinColumnOverride( attributeMember, getPath(), context );
206-
if ( this.currentPropertyJoinColumnOverride.isEmpty() ) {
207-
this.currentPropertyJoinColumnOverride = null;
205+
currentPropertyJoinColumnOverride = buildJoinColumnOverride( attributeMember, getPath(), context );
206+
if ( currentPropertyJoinColumnOverride.isEmpty() ) {
207+
currentPropertyJoinColumnOverride = null;
208208
}
209209

210-
this.currentPropertyJoinTableOverride = buildJoinTableOverride( attributeMember, getPath(), context );
211-
if ( this.currentPropertyJoinTableOverride.isEmpty() ) {
212-
this.currentPropertyJoinTableOverride = null;
210+
currentPropertyJoinTableOverride = buildJoinTableOverride( attributeMember, getPath(), context );
211+
if ( currentPropertyJoinTableOverride.isEmpty() ) {
212+
currentPropertyJoinTableOverride = null;
213213
}
214214

215-
this.currentPropertyForeignKeyOverride = buildForeignKeyOverride( attributeMember, getPath(), context );
216-
if ( this.currentPropertyForeignKeyOverride.isEmpty() ) {
217-
this.currentPropertyForeignKeyOverride = null;
215+
currentPropertyForeignKeyOverride = buildForeignKeyOverride( attributeMember, getPath(), context );
216+
if ( currentPropertyForeignKeyOverride.isEmpty() ) {
217+
currentPropertyForeignKeyOverride = null;
218218
}
219219
}
220220
}
@@ -291,7 +291,9 @@ public JoinColumn[] getOverriddenJoinColumn(String propertyName) {
291291
//TODO cache the underlying regexp
292292
return getExactOverriddenJoinColumn( propertyName.replace( ".{element}.", "." ) );
293293
}
294-
return result;
294+
else {
295+
return result;
296+
}
295297
}
296298

297299
/**
@@ -349,10 +351,9 @@ private ForeignKey getExactOverriddenForeignKey(String propertyName) {
349351
public JoinTable getJoinTable(MemberDetails attributeMember) {
350352
final String propertyName = qualify( getPath(), attributeMember.getName() );
351353
final JoinTable result = getOverriddenJoinTable( propertyName );
352-
if ( result == null ) {
353-
return attributeMember.getDirectAnnotationUsage( JoinTable.class );
354-
}
355-
return result;
354+
return result == null
355+
? attributeMember.getDirectAnnotationUsage( JoinTable.class )
356+
: result;
356357
}
357358

358359
/**
@@ -368,7 +369,9 @@ public JoinTable getOverriddenJoinTable(String propertyName) {
368369
//TODO cache the underlying regexp
369370
return getExactOverriddenJoinTable( propertyName.replace( ".{element}.", "." ) );
370371
}
371-
return result;
372+
else {
373+
return result;
374+
}
372375
}
373376

374377
/**
@@ -435,8 +438,7 @@ private static Map<String, Column[]> buildColumnOverride(
435438
return result;
436439
}
437440

438-
final ModelsContext sourceModelContext =
439-
context.getBootstrapContext().getModelsContext();
441+
final var sourceModelContext = context.getBootstrapContext().getModelsContext();
440442
final Map<String, List<Column>> columnOverrideMap = new HashMap<>();
441443

442444
final AttributeOverride[] overrides =
@@ -489,11 +491,13 @@ private static Column createTimeZoneColumn(
489491
AnnotationTarget element,
490492
Column column,
491493
MetadataBuildingContext context) {
492-
final TimeZoneColumn timeZoneColumn = element.getDirectAnnotationUsage( TimeZoneColumn.class );
493-
final ColumnJpaAnnotation created = JpaAnnotations.COLUMN.createUsage( context.getBootstrapContext().getModelsContext() );
494-
final String columnName = timeZoneColumn != null
495-
? timeZoneColumn.name()
496-
: column.name() + "_tz";
494+
final var timeZoneColumn = element.getDirectAnnotationUsage( TimeZoneColumn.class );
495+
final ColumnJpaAnnotation created =
496+
JpaAnnotations.COLUMN.createUsage( context.getBootstrapContext().getModelsContext() );
497+
final String columnName =
498+
timeZoneColumn != null
499+
? timeZoneColumn.name()
500+
: column.name() + "_tz";
497501
created.name( columnName );
498502
created.nullable( column.nullable() );
499503

@@ -523,7 +527,7 @@ private static Column createTemporalColumn(
523527
MetadataBuildingContext context) {
524528
int precision;
525529
int secondPrecision;
526-
final Column annotatedColumn = element.getDirectAnnotationUsage( Column.class );
530+
final var annotatedColumn = element.getDirectAnnotationUsage( Column.class );
527531
if ( annotatedColumn != null ) {
528532
if ( isNotBlank( annotatedColumn.name() ) ) {
529533
return annotatedColumn;
@@ -571,7 +575,7 @@ public MetadataBuildingContext getBuildingContext() {
571575
}
572576

573577
private static Map<String, ColumnTransformer> buildColumnTransformerOverride(AnnotationTarget element, MetadataBuildingContext context) {
574-
final ModelsContext sourceModelContext = context.getBootstrapContext().getModelsContext();
578+
final var sourceModelContext = context.getBootstrapContext().getModelsContext();
575579
final Map<String, ColumnTransformer> columnOverride = new HashMap<>();
576580
if ( element != null ) {
577581
element.forEachAnnotationUsage( ColumnTransformer.class, sourceModelContext, (usage) -> {
@@ -584,7 +588,7 @@ private static Map<String, ColumnTransformer> buildColumnTransformerOverride(Ann
584588
private static Map<String, JoinColumn[]> buildJoinColumnOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
585589
final Map<String, JoinColumn[]> columnOverride = new HashMap<>();
586590
if ( element != null ) {
587-
for ( AssociationOverride override : buildAssociationOverrides( element, path, context ) ) {
591+
for ( var override : buildAssociationOverrides( element, path, context ) ) {
588592
columnOverride.put( qualify( path, override.name() ), override.joinColumns() );
589593
}
590594
}
@@ -594,7 +598,7 @@ private static Map<String, JoinColumn[]> buildJoinColumnOverride(AnnotationTarge
594598
private static Map<String, ForeignKey> buildForeignKeyOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
595599
final Map<String, ForeignKey> foreignKeyOverride = new HashMap<>();
596600
if ( element != null ) {
597-
for ( AssociationOverride override : buildAssociationOverrides( element, path, context ) ) {
601+
for ( var override : buildAssociationOverrides( element, path, context ) ) {
598602
foreignKeyOverride.put( qualify( path, override.name() ), override.foreignKey() );
599603
}
600604
}
@@ -608,7 +612,7 @@ private static AssociationOverride[] buildAssociationOverrides(AnnotationTarget
608612
private static Map<String, JoinTable> buildJoinTableOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
609613
final Map<String, JoinTable> result = new HashMap<>();
610614
if ( element != null ) {
611-
for ( AssociationOverride override : buildAssociationOverrides( element, path, context ) ) {
615+
for ( var override : buildAssociationOverrides( element, path, context ) ) {
612616
if ( isEmpty( override.joinColumns() ) ) {
613617
result.put( qualify( path, override.name() ), override.joinTable() );
614618
}

0 commit comments

Comments
 (0)