Skip to content

Commit 166e3e7

Browse files
gavinkinggavinking
committed
some cleanups in mapping package
even more 'var'
1 parent d4d3403 commit 166e3e7

30 files changed

+398
-408
lines changed

‎hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void configure(GeneratorCreationContext creationContext, Properties param
217217
SEQUENCE_GENERATOR_LOGGER.forcingTableUse();
218218
}
219219

220-
this.databaseStructure = buildDatabaseStructure(
220+
databaseStructure = buildDatabaseStructure(
221221
identifierType,
222222
parameters,
223223
jdbcEnvironment,

‎hibernate-core/src/main/java/org/hibernate/mapping/AbstractUserDefinedType.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ public boolean isQuoted() {
6868
}
6969

7070
public void setQuoted(boolean quoted) {
71-
if ( quoted == name.isQuoted() ) {
72-
return;
71+
if ( quoted != name.isQuoted() ) {
72+
name = new Identifier( name.getText(), quoted );
7373
}
74-
this.name = new Identifier( name.getText(), quoted );
7574
}
7675

7776
public void setSchema(String schema) {
@@ -126,7 +125,9 @@ public int hashCode() {
126125

127126
@Override
128127
public boolean equals(Object object) {
129-
return object != null && object.getClass() == getClass() && equals( (AbstractUserDefinedType) object);
128+
return object != null
129+
&& object.getClass() == getClass()
130+
&& equals( (AbstractUserDefinedType) object );
130131
}
131132

132133
public boolean equals(AbstractUserDefinedType table) {
@@ -144,22 +145,22 @@ else if ( this == table ) {
144145
}
145146

146147
public String toString() {
147-
final StringBuilder buf = new StringBuilder()
148+
final var string = new StringBuilder()
148149
.append( getClass().getSimpleName() )
149150
.append( '(' );
150151
if ( getCatalog() != null ) {
151-
buf.append( getCatalog() ).append( "." );
152+
string.append( getCatalog() ).append( "." );
152153
}
153154
if ( getSchema() != null ) {
154-
buf.append( getSchema() ).append( "." );
155+
string.append( getSchema() ).append( "." );
155156
}
156-
buf.append( getName() ).append( ')' );
157-
return buf.toString();
157+
string.append( getName() ).append( ')' );
158+
return string.toString();
158159
}
159160

160161
@Override
161162
public String getExportIdentifier() {
162-
final StringBuilder qualifiedName = new StringBuilder();
163+
final var qualifiedName = new StringBuilder();
163164
if ( catalog != null ) {
164165
qualifiedName.append( catalog.render() ).append( '.' );
165166
}

‎hibernate-core/src/main/java/org/hibernate/mapping/AggregateColumn.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public SelectablePath getSelectablePath() {
5858
}
5959

6060
private static SelectablePath getSelectablePath(Component component) {
61-
final AggregateColumn aggregateColumn = component.getAggregateColumn();
62-
final AggregateColumn parent = component.getParentAggregateColumn();
61+
final var aggregateColumn = component.getAggregateColumn();
62+
final var parent = component.getParentAggregateColumn();
6363
final String simpleAggregateName = aggregateColumn.getQuotedName();
6464
return parent == null
6565
? new SelectablePath( simpleAggregateName )
@@ -71,8 +71,8 @@ public String getAggregateReadExpressionTemplate(Dialect dialect) {
7171
}
7272

7373
private static String getAggregateReadExpressionTemplate(Dialect dialect, Component component) {
74-
final AggregateColumn aggregateColumn = component.getAggregateColumn();
75-
final AggregateColumn parent = component.getParentAggregateColumn();
74+
final var aggregateColumn = component.getAggregateColumn();
75+
final var parent = component.getParentAggregateColumn();
7676
final String simpleAggregateName = aggregateColumn.getQuotedName( dialect );
7777
// If the aggregate column is an array, drop the parent read expression, because this is a NestedColumnReference
7878
// and will require special rendering
@@ -105,8 +105,8 @@ public String getAggregateAssignmentExpressionTemplate(Dialect dialect) {
105105
}
106106

107107
private static String getAggregateAssignmentExpressionTemplate(Dialect dialect, Component component) {
108-
final AggregateColumn aggregateColumn = component.getAggregateColumn();
109-
final AggregateColumn parent = component.getParentAggregateColumn();
108+
final var aggregateColumn = component.getAggregateColumn();
109+
final var parent = component.getParentAggregateColumn();
110110
final String simpleAggregateName = aggregateColumn.getQuotedName( dialect );
111111
return parent == null
112112
? Template.TEMPLATE + "." + simpleAggregateName

‎hibernate-core/src/main/java/org/hibernate/mapping/Array.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Class<?> getElementClass() throws MappingException {
5656
}
5757
else {
5858
try {
59-
return classForName( elementClassName, getBuildingContext().getBootstrapContext() );
59+
return classForName( elementClassName, getBootstrapContext() );
6060
}
6161
catch (ClassLoadingException e) {
6262
throw new MappingException( e );

‎hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ private ConverterDescriptor<Boolean,?> getSoftDeleteConverterDescriptor(
476476
SoftDelete.UnspecifiedConversion.class.equals( attributeConverterDescriptor.getAttributeConverterClass() );
477477
if ( conversionWasUnspecified ) {
478478
final var jdbcType = BooleanJdbcType.INSTANCE.resolveIndicatedType( this, javaType );
479-
final var classmateContext = getBuildingContext().getBootstrapContext().getClassmateContext();
479+
final var classmateContext = getBootstrapContext().getClassmateContext();
480480
if ( jdbcType.isNumber() ) {
481481
return ConverterDescriptors.of( NumericBooleanConverter.INSTANCE, classmateContext );
482482
}
@@ -657,7 +657,7 @@ private <T> Resolution<?> resolution(BasicJavaType explicitJavaType, JavaType<T>
657657

658658
@Override
659659
public ManagedBeanRegistry getManagedBeanRegistry() {
660-
return getBuildingContext().getBootstrapContext().getManagedBeanRegistry();
660+
return getBootstrapContext().getManagedBeanRegistry();
661661
}
662662

663663
private Resolution<?> converterResolution(JavaType<?> javaType, ConverterDescriptor<?,?> attributeConverterDescriptor) {
@@ -702,8 +702,7 @@ private Resolution<?> converterResolution(JavaType<?> javaType, ConverterDescrip
702702
}
703703

704704
private JavaType<?> determineJavaType() {
705-
final JavaType<?> javaType = getExplicitJavaType();
706-
//
705+
final var javaType = getExplicitJavaType();
707706
// if ( javaType == null ) {
708707
// if ( implicitJavaTypeAccess != null ) {
709708
// final java.lang.reflect.Type implicitJtd = implicitJavaTypeAccess.apply( getTypeConfiguration() );
@@ -752,7 +751,7 @@ else if ( ownerName != null && propertyName != null ) {
752751
}
753752

754753
private JavaType<?> javaType(TypeConfiguration typeConfiguration, java.lang.reflect.Type impliedJavaType) {
755-
final JavaType<?> javaType = typeConfiguration.getJavaTypeRegistry().findDescriptor( impliedJavaType );
754+
final var javaType = typeConfiguration.getJavaTypeRegistry().findDescriptor( impliedJavaType );
756755
return javaType == null ? specialJavaType( typeConfiguration, impliedJavaType ) : javaType;
757756
}
758757

@@ -765,14 +764,14 @@ private JavaType<?> specialJavaType(
765764
// and implement toString/fromString as well as copying based on FormatMapper operations
766765
switch ( jdbcTypeCode ) {
767766
case SqlTypes.JSON:
768-
final JavaType<?> jsonJavaType =
767+
final var jsonJavaType =
769768
new JsonJavaType<>( impliedJavaType,
770769
mutabilityPlan( typeConfiguration, impliedJavaType ),
771770
typeConfiguration );
772771
javaTypeRegistry.addDescriptor( jsonJavaType );
773772
return jsonJavaType;
774773
case SqlTypes.SQLXML:
775-
final JavaType<?> xmlJavaType =
774+
final var xmlJavaType =
776775
new XmlJavaType<>( impliedJavaType,
777776
mutabilityPlan( typeConfiguration, impliedJavaType ),
778777
typeConfiguration );
@@ -808,7 +807,6 @@ private static Resolution<?> interpretExplicitlyNamedType(
808807
MetadataBuildingContext context) {
809808

810809
final var bootstrapContext = context.getBootstrapContext();
811-
812810
final var managedBeanRegistry = bootstrapContext.getManagedBeanRegistry();
813811
final var typeConfiguration = bootstrapContext.getTypeConfiguration();
814812

@@ -1106,7 +1104,7 @@ private UserType<?> getConfiguredUserTypeBean(Class<? extends UserType<?>> expli
11061104
}
11071105

11081106
private <T> ManagedBean<? extends T> getUserTypeBean(Class<T> explicitCustomType, Properties properties) {
1109-
final var producer = getBuildingContext().getBootstrapContext().getCustomTypeProducer();
1107+
final var producer = getBootstrapContext().getCustomTypeProducer();
11101108
final var managedBeanRegistry = getManagedBeanRegistry();
11111109
if ( isNotEmpty( properties ) ) {
11121110
final String name = explicitCustomType.getName() + COUNTER++;

‎hibernate-core/src/main/java/org/hibernate/mapping/Collection.java‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,10 @@ public MetadataBuildingContext getBuildingContext() {
185185
return buildingContext;
186186
}
187187

188+
BootstrapContext getBootstrapContext() {
189+
return getBuildingContext().getBootstrapContext();
190+
}
191+
188192
public MetadataImplementor getMetadata() {
189193
return getBuildingContext().getMetadataCollector();
190194
}
@@ -224,17 +228,13 @@ public boolean isSorted() {
224228

225229
public Comparator<?> getComparator() {
226230
if ( comparator == null && comparatorClassName != null ) {
227-
@SuppressWarnings("rawtypes")
228-
final Class<? extends Comparator> clazz =
229-
classForName( Comparator.class, comparatorClassName, getBuildingContext().getBootstrapContext() );
231+
final var clazz = classForName( Comparator.class, comparatorClassName, getBootstrapContext() );
230232
try {
231233
comparator = clazz.getConstructor().newInstance();
232234
}
233235
catch (Exception e) {
234-
throw new MappingException(
235-
"Could not instantiate comparator class [" + comparatorClassName
236-
+ "] for collection " + getRole()
237-
);
236+
throw new MappingException( "Could not instantiate comparator class ["
237+
+ comparatorClassName + "] for collection " + getRole() );
238238
}
239239
}
240240
return comparator;
@@ -466,7 +466,7 @@ else if ( typeName == null ) {
466466
}
467467

468468
private ManagedBean<? extends UserCollectionType> userTypeBean() {
469-
final BootstrapContext bootstrapContext = getBuildingContext().getBootstrapContext();
469+
final var bootstrapContext = getBootstrapContext();
470470
return createUserTypeBean(
471471
role,
472472
classForName( UserCollectionType.class, typeName, bootstrapContext ),
@@ -546,7 +546,7 @@ private void createForeignKeys() throws MappingException {
546546
key.createForeignKeyOfEntity( entityName );
547547
}
548548
else {
549-
final Property property = owner.getProperty( referencedPropertyName );
549+
final var property = owner.getProperty( referencedPropertyName );
550550
assert property != null;
551551
key.createForeignKeyOfEntity( entityName,
552552
property.getValue().getConstraintColumns() );
@@ -657,16 +657,14 @@ public void addFilter(
657657
boolean autoAliasInjection,
658658
java.util.Map<String, String> aliasTableMap,
659659
java.util.Map<String, String> aliasEntityMap) {
660-
filters.add(
661-
new FilterConfiguration(
662-
name,
663-
condition,
664-
autoAliasInjection,
665-
aliasTableMap,
666-
aliasEntityMap,
667-
null
668-
)
669-
);
660+
filters.add( new FilterConfiguration(
661+
name,
662+
condition,
663+
autoAliasInjection,
664+
aliasTableMap,
665+
aliasEntityMap,
666+
null
667+
) );
670668
}
671669

672670
@Override
@@ -680,16 +678,14 @@ public void addManyToManyFilter(
680678
boolean autoAliasInjection,
681679
java.util.Map<String, String> aliasTableMap,
682680
java.util.Map<String, String> aliasEntityMap) {
683-
manyToManyFilters.add(
684-
new FilterConfiguration(
685-
name,
686-
condition,
687-
autoAliasInjection,
688-
aliasTableMap,
689-
aliasEntityMap,
690-
null
691-
)
692-
);
681+
manyToManyFilters.add( new FilterConfiguration(
682+
name,
683+
condition,
684+
autoAliasInjection,
685+
aliasTableMap,
686+
aliasEntityMap,
687+
null
688+
) );
693689
}
694690

695691
public List<FilterConfiguration> getManyToManyFilters() {

‎hibernate-core/src/main/java/org/hibernate/mapping/Column.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ Size calculateColumnSize(Dialect dialect, MappingContext mappingContext) {
468468
if ( type == null ) {
469469
throw new AssertionFailure( "no typing information available to determine column size" );
470470
}
471-
final JdbcMapping jdbcMapping = (JdbcMapping) type;
471+
final var jdbcMapping = (JdbcMapping) type;
472472
final Size size = dialect.getSizeStrategy().resolveSize(
473473
jdbcMapping.getJdbcType(),
474474
jdbcMapping.getJdbcJavaType(),
@@ -550,19 +550,19 @@ public boolean isSqlTypeLob() {
550550
}
551551

552552
public boolean isSqlTypeLob(Metadata mapping) {
553-
final Database database = mapping.getDatabase();
554-
final DdlTypeRegistry ddlTypeRegistry = database.getTypeConfiguration().getDdlTypeRegistry();
555-
final Dialect dialect = database.getDialect();
553+
final var database = mapping.getDatabase();
554+
final var ddlTypeRegistry = database.getTypeConfiguration().getDdlTypeRegistry();
555+
final var dialect = database.getDialect();
556556
if ( sqlTypeLob == null ) {
557557
try {
558558
final int typeCode = getSqlTypeCode( mapping );
559-
final DdlType descriptor = ddlTypeRegistry.getDescriptor( typeCode );
560-
if ( descriptor == null ) {
559+
final var ddlType = ddlTypeRegistry.getDescriptor( typeCode );
560+
if ( ddlType == null ) {
561561
sqlTypeLob = JdbcType.isLob( typeCode );
562562
}
563563
else {
564564
final Size size = getColumnSize( dialect, mapping );
565-
sqlTypeLob = descriptor.isLob( size );
565+
sqlTypeLob = ddlType.isLob( size );
566566
}
567567
}
568568
catch ( MappingException cause ) {

0 commit comments

Comments
 (0)