Skip to content

Commit 350a139

Browse files
gavinkinggavinking
committed
use 'var' in metamodel.mapping, collection.mutation, entity.mutation
along with other minor code refactorings
1 parent f04ec9c commit 350a139

31 files changed

+618
-691
lines changed

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,7 @@ default Object[] extractConcreteTypeStateValues(
493493
Map<AttributeMapping, DomainResultAssembler> assemblerMapping,
494494
RowProcessingState rowProcessingState) {
495495
// todo (6.0) : getNumberOfAttributeMappings() needs to be fixed for this to work - bad walking of hierarchy
496-
final Object[] values = new Object[ getNumberOfAttributeMappings() ];
497-
496+
final var values = new Object[ getNumberOfAttributeMappings() ];
498497
forEachAttributeMapping(
499498
attribute -> {
500499
final DomainResultAssembler<?> assembler = assemblerMapping.get( attribute );
@@ -509,7 +508,6 @@ default Object[] extractConcreteTypeStateValues(
509508
values[attribute.getStateArrayPosition()] = value;
510509
}
511510
);
512-
513511
return values;
514512
}
515513

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public Object[] getValues(Object compositeInstance) {
132132
}
133133

134134
protected Object[] getAttributeValues(Object compositeInstance) {
135-
final Object[] results = new Object[getNumberOfAttributeMappings()];
135+
final var results = new Object[getNumberOfAttributeMappings()];
136136
for ( int i = 0; i < results.length; i++ ) {
137137
results[i] = getValue( compositeInstance, i );
138138
}
@@ -659,7 +659,7 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
659659
return null;
660660
}
661661
final int size = attributeMappings.size();
662-
final Object[] result = new Object[ size ];
662+
final var result = new Object[ size ];
663663
for ( int i = 0; i < size; i++ ) {
664664
final var attributeMapping = attributeMappings.get( i );
665665
final Object object = attributeMapping.getValue( value );
@@ -708,7 +708,7 @@ public <X, Y> int forEachDisassembledJdbcValue(
708708
}
709709
}
710710
else {
711-
final Object[] values = (Object[]) value;
711+
final var values = (Object[]) value;
712712
for ( int i = 0; i < attributeMappings.size(); i++ ) {
713713
final var mapping = attributeMappings.get( i );
714714
span += mapping.forEachDisassembledJdbcValue( values[i], span + offset, x, y, valuesConsumer, session );

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ else if ( state.length == attributes.size() ) {
108108
return state;
109109
}
110110
else {
111-
final Object[] values = new Object[attributes.size()];
111+
final var values = new Object[attributes.size()];
112112
for ( int i = 0; i <= attributes.size() - 1; i++ ) {
113113
final var attributeMapping = attributes.get( i );
114114
values[i] = state[attributeMapping.getStateArrayPosition()];
@@ -119,7 +119,7 @@ else if ( state.length == attributes.size() ) {
119119

120120
@Override
121121
public Object[] extractNaturalIdFromEntity(Object entity) {
122-
final Object[] values = new Object[ attributes.size() ];
122+
final var values = new Object[ attributes.size() ];
123123
for ( int i = 0; i < attributes.size(); i++ ) {
124124
values[i] = attributes.get( i ).getPropertyAccess().getGetter().get( entity );
125125
}
@@ -133,7 +133,7 @@ public Object[] normalizeInput(Object incoming) {
133133
}
134134
else if ( incoming instanceof Map<?,?> valueMap ) {
135135
final var attributes = getNaturalIdAttributes();
136-
final Object[] values = new Object[ attributes.size() ];
136+
final var values = new Object[ attributes.size() ];
137137
for ( int i = 0; i < attributes.size(); i++ ) {
138138
values[ i ] = valueMap.get( attributes.get( i ).getAttributeName() );
139139
}
@@ -169,7 +169,7 @@ public int calculateHashCode(Object value) {
169169
return 0;
170170
}
171171
else {
172-
final Object[] values = (Object[]) value;
172+
final var values = (Object[]) value;
173173
int hashcode = 0;
174174
for ( int i = 0; i < attributes.size(); i++ ) {
175175
final Object o = values[i];
@@ -222,8 +222,8 @@ public void verifyFlushState(Object id, Object[] currentState, Object[] loadedSt
222222

223223
@Override
224224
public boolean areEqual(Object one, Object other, SharedSessionContractImplementor session) {
225-
final Object[] oneArray = (Object[]) one;
226-
final Object[] otherArray = (Object[]) other;
225+
final var oneArray = (Object[]) one;
226+
final var otherArray = (Object[]) other;
227227
final var naturalIdAttributes = getNaturalIdAttributes();
228228
for ( int i = 0; i < naturalIdAttributes.size(); i++ ) {
229229
if ( !naturalIdAttributes.get( i ).areEqual( oneArray[i], otherArray[i], session ) ) {
@@ -387,7 +387,7 @@ public Object disassemble(Object value, SharedSessionContractImplementor session
387387
}
388388
else if ( value instanceof Object[] incoming ) {
389389
assert incoming.length == attributes.size();
390-
final Object[] outgoing = new Object[incoming.length];
390+
final var outgoing = new Object[incoming.length];
391391
for ( int i = 0; i < attributes.size(); i++ ) {
392392
outgoing[i] = attributes.get( i ).disassemble( incoming[i], session );
393393
}
@@ -630,7 +630,7 @@ private AssemblerImpl(ImmutableFetchList fetches, JavaType<Object[]> jtd, Assemb
630630

631631
@Override
632632
public Object[] assemble(RowProcessingState rowProcessingState) {
633-
final Object[] result = new Object[ subAssemblers.length ];
633+
final var result = new Object[ subAssemblers.length ];
634634
for ( int i = 0; i < subAssemblers.length; i++ ) {
635635
result[ i ] = subAssemblers[i].assemble( rowProcessingState );
636636
}

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public <X, Y> int forEachDisassembledJdbcValue(
318318
}
319319
else {
320320
if ( value.getClass().isArray() ) {
321-
final Object[] values = (Object[]) value;
321+
final var values = (Object[]) value;
322322
valuesConsumer.consume(
323323
offset,
324324
x,

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ protected Object[] getAttributeValues(Object compositeInstance) {
871871
}
872872
else {
873873
final int numberOfAttributes = getNumberOfAttributeMappings();
874-
final Object[] results = new Object[numberOfAttributes + 1];
874+
final var results = new Object[numberOfAttributes + 1];
875875
final var concreteEmbeddableType = findSubtypeBySubclass( compositeInstance.getClass().getName() );
876876
int i = 0;
877877
for ( ; i < numberOfAttributes; i++ ) {

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public EmbeddableValuedModelPart getEmbeddedPart() {
161161
public Object getIdentifier(Object entity, SharedSessionContractImplementor session) {
162162
final Object id = representationStrategy.getInstantiator().instantiate( null );
163163

164-
final Object[] propertyValues = new Object[virtualIdEmbeddable.getNumberOfAttributeMappings()];
164+
final var propertyValues = new Object[virtualIdEmbeddable.getNumberOfAttributeMappings()];
165165

166166
for ( int i = 0; i < propertyValues.length; i++ ) {
167167
final var attributeMapping = virtualIdEmbeddable.getAttributeMapping( i );
@@ -203,7 +203,7 @@ public void setIdentifier(Object entity, Object id, SharedSessionContractImpleme
203203
final var entityDescriptor =
204204
factory.getMappingMetamodel()
205205
.getEntityDescriptor( entity.getClass() );
206-
final Object[] propertyValues = new Object[attributeMappings.size()];
206+
final var propertyValues = new Object[attributeMappings.size()];
207207
virtualIdEmbeddable.forEachAttribute(
208208
(position, virtualIdAttribute) -> {
209209
final var idClassAttribute = attributeMappings.get( position );

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public Object getIdentifier(Object entity, MergeContext mergeContext) {
196196
if ( hasContainingClass() ) {
197197
final Object id = identifierValueMapper.getRepresentationStrategy().getInstantiator().instantiate( null );
198198
final var embeddableTypeDescriptor = getEmbeddableTypeDescriptor();
199-
final Object[] propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];
199+
final var propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];
200200
for ( int i = 0; i < propertyValues.length; i++ ) {
201201
final var attributeMapping = embeddableTypeDescriptor.getAttributeMapping( i );
202202
final Object object = attributeMapping.getValue( entity );
@@ -247,7 +247,7 @@ private static Object getIfMerged(Object o, MergeContext mergeContext) {
247247

248248
@Override
249249
public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
250-
final Object[] propertyValues = new Object[identifierValueMapper.getNumberOfAttributeMappings()];
250+
final var propertyValues = new Object[identifierValueMapper.getNumberOfAttributeMappings()];
251251
final var embeddableTypeDescriptor = getEmbeddableTypeDescriptor();
252252
for ( int position = 0; position < propertyValues.length; position++ ) {
253253
final var attribute = embeddableTypeDescriptor.getAttributeMapping( position );

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public Object getIdentifier(Object entity, MergeContext mergeContext) {
235235
return lazyInitializer.getInternalIdentifier();
236236
}
237237
final var embeddableTypeDescriptor = getEmbeddableTypeDescriptor();
238-
final Object[] propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];
238+
final var propertyValues = new Object[embeddableTypeDescriptor.getNumberOfAttributeMappings()];
239239
for ( int i = 0; i < propertyValues.length; i++ ) {
240240
final var attributeMapping = embeddableTypeDescriptor.getAttributeMapping( i );
241241
final Object o = attributeMapping.getValue( entity );
@@ -281,7 +281,7 @@ private static Object getIfMerged(Object o, MergeContext mergeContext) {
281281

282282
@Override
283283
public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
284-
final Object[] propertyValues = new Object[identifierValueMapper.getNumberOfAttributeMappings()];
284+
final var propertyValues = new Object[identifierValueMapper.getNumberOfAttributeMappings()];
285285
final var embeddableTypeDescriptor = getEmbeddableTypeDescriptor();
286286
for ( int i = 0; i < propertyValues.length; i++ ) {
287287
final var attribute = embeddableTypeDescriptor.getAttributeMapping( i );

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void validateInternalForm(Object naturalIdValue) {
112112
final var naturalIdValueClass = naturalIdValue.getClass();
113113
if ( naturalIdValueClass.isArray() && !naturalIdValueClass.getComponentType().isPrimitive() ) {
114114
// be flexible
115-
final Object[] values = (Object[]) naturalIdValue;
115+
final var values = (Object[]) naturalIdValue;
116116
if ( values.length == 1 ) {
117117
naturalIdValue = values[0];
118118
}

‎hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdRepresentationStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public InstantiatorAdapter(VirtualIdEmbeddable virtualIdEmbeddable, EntityMappin
8888
public Object instantiate(ValueAccess valuesAccess) {
8989
final Object instantiated = entityInstantiator.instantiate();
9090
if ( valuesAccess != null ) {
91-
final Object[] values = valuesAccess.getValues();
91+
final var values = valuesAccess.getValues();
9292
if ( values != null ) {
9393
virtualIdEmbeddable.setValues( instantiated, values );
9494
}

0 commit comments

Comments
 (0)