Skip to content

Commit 3347feb

Browse files
committed
misc minor cleanups
1 parent fa2c678 commit 3347feb

File tree

9 files changed

+73
-80
lines changed

9 files changed

+73
-80
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static void handleSequenceGenerator(
187187
else if ( nameFromGeneratedValue != null ) {
188188
properties.put( GENERATOR_NAME, nameFromGeneratedValue );
189189
}
190-
// we need to better handle default allocation-size here...
190+
// we need to better handle the default allocation size here
191191
properties.put( INCREMENT_PARAM, fallbackAllocationSize( generatorAnnotation, buildingContext ) );
192192
},
193193
generatorAnnotation == null
@@ -221,7 +221,7 @@ public static void handleTableGenerator(
221221
else if ( nameFromGeneratedValue != null ) {
222222
properties.put( GENERATOR_NAME, nameFromGeneratedValue );
223223
}
224-
// we need to better handle default allocation-size here...
224+
// we need to better handle the default allocation size here
225225
properties.put(
226226
INCREMENT_PARAM,
227227
fallbackAllocationSize( generatorAnnotation, buildingContext )
@@ -247,7 +247,7 @@ public static void handleIdGeneratorType(
247247
final var markerAnnotation =
248248
generatorAnnotation.annotationType().getAnnotation( IdGeneratorType.class );
249249
idValue.setCustomIdGeneratorCreator( creationContext -> {
250-
final Generator identifierGenerator =
250+
final var identifierGenerator =
251251
instantiateGenerator( beanContainer( buildingContext ), markerAnnotation.value() );
252252
prepareForUse(
253253
identifierGenerator,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ public static void callConfigure(
612612
Map<String, Object> configuration,
613613
Value value) {
614614
if ( generator instanceof Configurable configurable ) {
615-
final Properties parameters = collectParameters(
615+
final var parameters = collectParameters(
616616
value,
617617
creationContext.getDatabase().getDialect(),
618618
creationContext.getRootClass(),
@@ -762,9 +762,9 @@ private static void instantiateNamedStrategyGenerator(
762762
String generatorStrategy,
763763
Map<String, Object> configuration,
764764
MetadataBuildingContext context) {
765-
final BeanContainer beanContainer = beanContainer( context );
765+
final var beanContainer = beanContainer( context );
766766
identifierValue.setCustomIdGeneratorCreator( creationContext -> {
767-
final Generator identifierGenerator =
767+
final var identifierGenerator =
768768
instantiateGenerator( beanContainer, generatorClass( generatorStrategy, identifierValue ) );
769769
// in this code path, there's no generator annotation,
770770
// and therefore no need to call initialize()

hibernate-core/src/main/java/org/hibernate/id/enhanced/HiLoOptimizer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,28 +119,28 @@ else if ( ! generationState.upperLimit.gt( generationState.value ) ) {
119119
private GenerationState noTenantState;
120120
private Map<String,GenerationState> tenantSpecificState;
121121

122-
private GenerationState locateGenerationState(String tenantIdentifier) {
123-
if ( tenantIdentifier == null ) {
122+
private GenerationState locateGenerationState(String tenantId) {
123+
if ( tenantId == null ) {
124124
if ( noTenantState == null ) {
125125
noTenantState = new GenerationState();
126126
}
127127
return noTenantState;
128128
}
129129
else {
130-
GenerationState state;
131130
if ( tenantSpecificState == null ) {
132131
tenantSpecificState = new ConcurrentHashMap<>();
133-
state = new GenerationState();
134-
tenantSpecificState.put( tenantIdentifier, state );
132+
final var state = new GenerationState();
133+
tenantSpecificState.put( tenantId, state );
134+
return state;
135135
}
136136
else {
137-
state = tenantSpecificState.get( tenantIdentifier );
137+
var state = tenantSpecificState.get( tenantId );
138138
if ( state == null ) {
139139
state = new GenerationState();
140-
tenantSpecificState.put( tenantIdentifier, state );
140+
tenantSpecificState.put( tenantId, state );
141141
}
142+
return state;
142143
}
143-
return state;
144144
}
145145
}
146146

hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyHiLoAlgorithmOptimizer.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.hibernate.HibernateException;
88
import org.hibernate.engine.spi.SessionFactoryImplementor;
99
import org.hibernate.id.IntegralDataTypeHolder;
10-
import org.hibernate.metamodel.mapping.BasicValuedMapping;
1110
import org.hibernate.query.sqm.BinaryArithmeticOperator;
1211
import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
1312
import org.hibernate.sql.ast.tree.expression.Expression;
@@ -59,8 +58,7 @@ public LegacyHiLoAlgorithmOptimizer(Class<?> returnClass, int incrementSize) {
5958
public Serializable generate(AccessCallback callback) {
6059
lock.lock();
6160
try {
62-
final GenerationState generationState = locateGenerationState( callback.getTenantIdentifier() );
63-
61+
final var generationState = locateGenerationState( callback.getTenantIdentifier() );
6462
if ( generationState.lo > generationState.maxLo ) {
6563
generationState.lastSourceValue = callback.getNextValue();
6664
generationState.lo = generationState.lastSourceValue.eq( 0 ) ? 1 : 0;
@@ -90,25 +88,25 @@ private GenerationState locateGenerationState(String tenantIdentifier) {
9088
return noTenantState;
9189
}
9290
else {
93-
GenerationState state;
9491
if ( tenantSpecificState == null ) {
9592
tenantSpecificState = new ConcurrentHashMap<>();
96-
state = createGenerationState();
93+
final var state = createGenerationState();
9794
tenantSpecificState.put( tenantIdentifier, state );
95+
return state;
9896
}
9997
else {
100-
state = tenantSpecificState.get( tenantIdentifier );
98+
var state = tenantSpecificState.get( tenantIdentifier );
10199
if ( state == null ) {
102100
state = createGenerationState();
103101
tenantSpecificState.put( tenantIdentifier, state );
104102
}
103+
return state;
105104
}
106-
return state;
107105
}
108106
}
109107

110108
private GenerationState createGenerationState() {
111-
final GenerationState state = new GenerationState();
109+
final var state = new GenerationState();
112110
state.maxLo = initialMaxLo;
113111
state.lo = initialMaxLo + 1;
114112
return state;
@@ -156,7 +154,7 @@ public IntegralDataTypeHolder getLastValue() {
156154

157155
@Override
158156
public Expression createLowValueExpression(Expression databaseValue, SessionFactoryImplementor sessionFactory) {
159-
BasicValuedMapping integerType = sessionFactory.getTypeConfiguration().getBasicTypeForJavaType( Integer.class );
157+
final var integerType = sessionFactory.getTypeConfiguration().getBasicTypeForJavaType( Integer.class );
160158
return new BinaryArithmeticExpression(
161159
databaseValue,
162160
BinaryArithmeticOperator.MULTIPLY,

hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.hibernate.boot.model.relational.QualifiedName;
1313
import org.hibernate.boot.model.relational.QualifiedNameParser;
1414
import org.hibernate.boot.model.relational.QualifiedSequenceName;
15+
import org.hibernate.boot.model.relational.QualifiedTableName;
1516
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
1617
import org.hibernate.service.ServiceRegistry;
1718

@@ -64,18 +65,16 @@ public QualifiedName determineSequenceName(
6465
Map<?, ?> configValues,
6566
ServiceRegistry serviceRegistry) {
6667
final String sequenceName = implicitSequenceName( configValues );
68+
return sequenceName.contains( "." )
69+
? QualifiedNameParser.INSTANCE.parse( sequenceName )
70+
: new QualifiedSequenceName(
71+
catalogName,
72+
schemaName,
73+
serviceRegistry.requireService( JdbcEnvironment.class )
74+
.getIdentifierHelper()
75+
.toIdentifier( sequenceName )
76+
);
6777

68-
if ( sequenceName.contains( "." ) ) {
69-
return QualifiedNameParser.INSTANCE.parse( sequenceName );
70-
}
71-
72-
return new QualifiedSequenceName(
73-
catalogName,
74-
schemaName,
75-
serviceRegistry.requireService( JdbcEnvironment.class )
76-
.getIdentifierHelper()
77-
.toIdentifier( sequenceName )
78-
);
7978
}
8079

8180
private String implicitSequenceName(Map<?, ?> configValues) {
@@ -104,17 +103,15 @@ public QualifiedName determineTableName(
104103
ServiceRegistry serviceRegistry) {
105104
final String implicitName = implicitTableName( configValues );
106105

107-
if ( implicitName.contains( "." ) ) {
108-
return QualifiedNameParser.INSTANCE.parse( implicitName );
109-
}
110-
111-
return new QualifiedNameParser.NameParts(
112-
catalogName,
113-
schemaName,
114-
serviceRegistry.requireService( JdbcEnvironment.class )
115-
.getIdentifierHelper()
116-
.toIdentifier( implicitName )
117-
);
106+
return implicitName.contains( "." )
107+
? QualifiedNameParser.INSTANCE.parse( implicitName )
108+
: new QualifiedTableName(
109+
catalogName,
110+
schemaName,
111+
serviceRegistry.requireService( JdbcEnvironment.class )
112+
.getIdentifierHelper()
113+
.toIdentifier( implicitName )
114+
);
118115
}
119116

120117
private String implicitTableName(Map<?, ?> configValues) {

hibernate-core/src/main/java/org/hibernate/id/enhanced/NoopOptimizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Serializable generate(AccessCallback callback) {
3737
// reliable as it might be mutated by multiple threads.
3838
// The lastSourceValue field is only accessed by tests,
3939
// so this is not a concern.
40-
IntegralDataTypeHolder value = callback.getNextValue();
40+
final var value = callback.getNextValue();
4141
lastSourceValue = value;
4242
return value.makeValue();
4343
}

hibernate-core/src/main/java/org/hibernate/id/enhanced/SingleNamingStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import org.hibernate.boot.model.naming.Identifier;
1010
import org.hibernate.boot.model.relational.QualifiedName;
11-
import org.hibernate.boot.model.relational.QualifiedNameParser;
1211
import org.hibernate.boot.model.relational.QualifiedSequenceName;
12+
import org.hibernate.boot.model.relational.QualifiedTableName;
1313
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
1414
import org.hibernate.service.ServiceRegistry;
1515

@@ -49,7 +49,7 @@ public QualifiedName determineTableName(
4949
Identifier schemaName,
5050
Map<?, ?> configValues,
5151
ServiceRegistry serviceRegistry) {
52-
return new QualifiedNameParser.NameParts(
52+
return new QualifiedTableName(
5353
catalogName,
5454
schemaName,
5555
serviceRegistry.requireService( JdbcEnvironment.class )

hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.hibernate.boot.model.relational.QualifiedName;
1414
import org.hibernate.boot.model.relational.QualifiedNameParser;
1515
import org.hibernate.boot.model.relational.QualifiedSequenceName;
16+
import org.hibernate.boot.model.relational.QualifiedTableName;
1617
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
1718
import org.hibernate.service.ServiceRegistry;
1819

@@ -73,27 +74,13 @@ public QualifiedName determineSequenceName(
7374
Identifier schemaName,
7475
Map<?, ?> configValues,
7576
ServiceRegistry serviceRegistry) {
76-
7777
final String rootTableName = getString( TABLE, configValues );
78-
final String implicitName = implicitSequenceName( rootTableName, configValues, serviceRegistry );
79-
80-
if ( implicitName.contains( "." ) ) {
81-
return QualifiedNameParser.INSTANCE.parse( implicitName );
82-
}
78+
final String implicitName = implicitSequenceName( rootTableName, configValues );
79+
return qualifiedSequenceName( catalogName, schemaName, serviceRegistry, implicitName );
8380

84-
return new QualifiedSequenceName(
85-
catalogName,
86-
schemaName,
87-
serviceRegistry.requireService( JdbcEnvironment.class )
88-
.getIdentifierHelper()
89-
.toIdentifier( implicitName )
90-
);
9181
}
9282

93-
private static String implicitSequenceName(
94-
String rootTableName,
95-
Map<?, ?> configValues,
96-
ServiceRegistry serviceRegistry) {
83+
private static String implicitSequenceName(String rootTableName, Map<?, ?> configValues) {
9784
final String explicitSuffix = getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, configValues );
9885
final String base = getString( IMPLICIT_NAME_BASE, configValues, rootTableName );
9986

@@ -126,25 +113,36 @@ public QualifiedName determineTableName(
126113
Identifier schemaName,
127114
Map<?, ?> configValues,
128115
ServiceRegistry serviceRegistry) {
129-
final String tableName = implicitTableName( configValues );
130-
131-
if ( tableName.contains( "." ) ) {
132-
return QualifiedNameParser.INSTANCE.parse( tableName );
133-
}
134-
else {
135-
return new QualifiedNameParser.NameParts(
136-
catalogName,
137-
schemaName,
138-
serviceRegistry.requireService( JdbcEnvironment.class )
139-
.getIdentifierHelper()
140-
.toIdentifier( tableName )
141-
);
142-
}
116+
final String implicitName = implicitTableName( configValues );
117+
return qualifiedTableName( catalogName, schemaName, serviceRegistry, implicitName );
143118
}
144119

145120
private static String implicitTableName(Map<?, ?> configValues) {
146121
final String generatorName = getString( GENERATOR_NAME, configValues );
147122
return isNotEmpty( generatorName ) ? generatorName : DEF_TABLE;
148123
}
149124

125+
private static QualifiedName qualifiedSequenceName(Identifier catalogName, Identifier schemaName, ServiceRegistry serviceRegistry, String implicitName) {
126+
return implicitName.contains( "." )
127+
? QualifiedNameParser.INSTANCE.parse( implicitName )
128+
: new QualifiedSequenceName(
129+
catalogName,
130+
schemaName,
131+
serviceRegistry.requireService( JdbcEnvironment.class )
132+
.getIdentifierHelper()
133+
.toIdentifier( implicitName )
134+
);
135+
}
136+
137+
private static QualifiedName qualifiedTableName(Identifier catalogName, Identifier schemaName, ServiceRegistry serviceRegistry, String implicitName) {
138+
return implicitName.contains( "." )
139+
? QualifiedNameParser.INSTANCE.parse( implicitName )
140+
: new QualifiedTableName(
141+
catalogName,
142+
schemaName,
143+
serviceRegistry.requireService( JdbcEnvironment.class )
144+
.getIdentifierHelper()
145+
.toIdentifier( implicitName )
146+
);
147+
}
150148
}

hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ private IntegralDataTypeHolder nextValue(
544544
SessionEventListenerManager listener,
545545
SharedSessionContractImplementor session)
546546
throws SQLException {
547-
final IntegralDataTypeHolder value = makeValue();
547+
final var value = makeValue();
548548
int rows;
549549
do {
550550
TABLE_GENERATOR_LOGGER.retrievingCurrentValueForSegment( segmentValue );

0 commit comments

Comments
 (0)