Skip to content

Commit 9bf7773

Browse files
gavinkinggavinking
committed
get rid of an unused parameter in constrictors of XxxxAttributeImpl
and thereby simplify the MockSessionFactory
1 parent aeaa65c commit 9bf7773

File tree

9 files changed

+67
-91
lines changed

9 files changed

+67
-91
lines changed

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import org.hibernate.AssertionFailure;
1414
import org.hibernate.PropertyNotFoundException;
15-
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
1615
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
1716
import org.hibernate.internal.CoreLogging;
1817
import org.hibernate.internal.CoreMessageLogger;
@@ -145,8 +144,7 @@ public static <X, Y> PersistentAttribute<X, Y> buildAttribute(
145144
false,
146145
false,
147146
property.isOptional(),
148-
property.isGeneric(),
149-
metadataContext
147+
property.isGeneric()
150148
);
151149
}
152150

@@ -188,8 +186,7 @@ public <X, Y> SingularPersistentAttribute<X, Y> buildIdAttribute(
188186
(SqmDomainType<Y>) domainType,
189187
attributeMetadata.getMember(),
190188
attributeMetadata.getAttributeClassification(),
191-
property.isGeneric(),
192-
context
189+
property.isGeneric()
193190
);
194191
}
195192

@@ -218,8 +215,7 @@ public <X, Y> SingularAttributeImpl<X, Y> buildVersionAttribute(
218215
property.getName(),
219216
attributeMetadata.getAttributeClassification(),
220217
(SqmDomainType<Y>) domainType,
221-
attributeMetadata.getMember(),
222-
context
218+
attributeMetadata.getMember()
223219
);
224220
}
225221

@@ -382,8 +378,9 @@ private static JavaType<?> determineRelationalJavaType(
382378
DomainType<?> metaModelType,
383379
MetadataContext context) {
384380
if ( typeContext.getValueClassification() == ValueClassification.BASIC ) {
385-
final ConverterDescriptor descriptor =
386-
( (SimpleValue) typeContext.getHibernateValue() ).getJpaAttributeConverterDescriptor();
381+
final var descriptor =
382+
( (SimpleValue) typeContext.getHibernateValue() )
383+
.getJpaAttributeConverterDescriptor();
387384
if ( descriptor != null ) {
388385
return context.getJavaTypeRegistry().resolveDescriptor(
389386
descriptor.getRelationalValueResolvedType().getErasedType()

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.util.Collection;
99

1010
import org.hibernate.metamodel.CollectionClassification;
11-
import org.hibernate.metamodel.internal.MetadataContext;
1211
import org.hibernate.metamodel.mapping.CollectionPart;
1312
import org.hibernate.metamodel.model.domain.SimpleDomainType;
1413
import org.hibernate.query.sqm.tree.domain.SqmPluralPersistentAttribute;
@@ -37,9 +36,7 @@ public abstract class AbstractPluralAttribute<D, C, E>
3736
private final CollectionClassification classification;
3837
private final SqmPathSource<E> elementPathSource;
3938

40-
protected AbstractPluralAttribute(
41-
PluralAttributeBuilder<D,C,E,?> builder,
42-
MetadataContext metadataContext) {
39+
protected AbstractPluralAttribute(PluralAttributeBuilder<D,C,E,?> builder) {
4340
super(
4441
builder.getDeclaringType(),
4542
builder.getProperty().getName(),

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.Collection;
88

9-
import org.hibernate.metamodel.internal.MetadataContext;
109
import org.hibernate.query.hql.spi.SqmCreationState;
1110
import org.hibernate.query.sqm.tree.SqmJoinType;
1211
import org.hibernate.query.sqm.tree.domain.SqmBagJoin;
@@ -21,8 +20,8 @@ public class BagAttributeImpl<X, E>
2120
extends AbstractPluralAttribute<X, Collection<E>, E>
2221
implements SqmBagPersistentAttribute<X, E> {
2322

24-
public BagAttributeImpl(PluralAttributeBuilder<X, Collection<E>, E, ?> xceBuilder, MetadataContext metadataContext) {
25-
super( xceBuilder, metadataContext );
23+
public BagAttributeImpl(PluralAttributeBuilder<X, Collection<E>, E, ?> xceBuilder) {
24+
super( xceBuilder );
2625
}
2726

2827
@Override

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.List;
88

9-
import org.hibernate.metamodel.internal.MetadataContext;
109
import org.hibernate.metamodel.mapping.CollectionPart;
1110
import org.hibernate.query.sqm.SqmPathSource;
1211
import org.hibernate.query.hql.spi.SqmCreationState;
@@ -25,8 +24,8 @@ public class ListAttributeImpl<X, E>
2524
implements SqmListPersistentAttribute<X, E> {
2625
private final SqmPathSource<Integer> indexPathSource;
2726

28-
public ListAttributeImpl(PluralAttributeBuilder<X, List<E>, E, ?> builder, MetadataContext metadataContext) {
29-
super( builder, metadataContext );
27+
public ListAttributeImpl(PluralAttributeBuilder<X, List<E>, E, ?> builder) {
28+
super( builder );
3029

3130
//noinspection unchecked
3231
this.indexPathSource = (SqmPathSource<Integer>) SqmMappingModelHelper.resolveSqmKeyPathSource(

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.Map;
88

9-
import org.hibernate.metamodel.internal.MetadataContext;
109
import org.hibernate.metamodel.mapping.CollectionPart;
1110
import org.hibernate.metamodel.model.domain.SimpleDomainType;
1211
import org.hibernate.query.sqm.SqmPathSource;
@@ -26,8 +25,8 @@ public class MapAttributeImpl<X, K, V>
2625
implements SqmMapPersistentAttribute<X, K, V> {
2726
private final SqmPathSource<K> keyPathSource;
2827

29-
public MapAttributeImpl(PluralAttributeBuilder<X, Map<K, V>, V, K> xceBuilder, MetadataContext metadataContext) {
30-
super( xceBuilder, metadataContext );
28+
public MapAttributeImpl(PluralAttributeBuilder<X, Map<K, V>, V, K> xceBuilder) {
29+
super( xceBuilder );
3130
keyPathSource = SqmMappingModelHelper.resolveSqmKeyPathSource(
3231
xceBuilder.getListIndexOrMapKeyType(),
3332
BindableType.PLURAL_ATTRIBUTE,

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public PluralAttributeBuilder(
6464
this.member = member;
6565
}
6666

67-
@SuppressWarnings({ "unchecked", "rawtypes" })
6867
public static <Y, X> PersistentAttribute<X, Y> build(
6968
PluralAttributeMetadata<?,Y,?> attributeMetadata,
7069
boolean isGeneric,
@@ -74,7 +73,7 @@ public static <Y, X> PersistentAttribute<X, Y> build(
7473
metadataContext.getTypeConfiguration().getJavaTypeRegistry()
7574
.getDescriptor( attributeMetadata.getJavaType() );
7675

77-
final PluralAttributeBuilder builder = new PluralAttributeBuilder<>(
76+
final var builder = new PluralAttributeBuilder<>(
7877
attributeJtd,
7978
isGeneric,
8079
attributeMetadata.getAttributeClassification(),
@@ -87,35 +86,36 @@ public static <Y, X> PersistentAttribute<X, Y> build(
8786
attributeMetadata.getMember()
8887
);
8988

90-
if ( Map.class.equals( attributeJtd.getJavaTypeClass() ) ) {
91-
return new MapAttributeImpl( builder, metadataContext );
89+
final Class<Y> javaClass = attributeJtd.getJavaTypeClass();
90+
if ( Map.class.equals( javaClass ) ) {
91+
return new MapAttributeImpl( builder );
9292
}
93-
else if ( Set.class.equals( attributeJtd.getJavaTypeClass() ) ) {
94-
return new SetAttributeImpl( builder, metadataContext );
93+
else if ( Set.class.equals( javaClass ) ) {
94+
return new SetAttributeImpl( builder );
9595
}
96-
else if ( List.class.equals( attributeJtd.getJavaTypeClass() ) ) {
97-
return new ListAttributeImpl( builder, metadataContext );
96+
else if ( List.class.equals( javaClass ) ) {
97+
return new ListAttributeImpl( builder );
9898
}
99-
else if ( Collection.class.equals( attributeJtd.getJavaTypeClass() ) ) {
100-
return new BagAttributeImpl( builder, metadataContext );
99+
else if ( Collection.class.equals( javaClass ) ) {
100+
return new BagAttributeImpl( builder );
101101
}
102102

103103
//apply loose rules
104-
if ( attributeJtd.getJavaTypeClass().isArray() ) {
105-
return new ListAttributeImpl( builder, metadataContext );
104+
if ( javaClass.isArray() ) {
105+
return new ListAttributeImpl( builder );
106106
}
107107

108-
if ( Map.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) {
109-
return new MapAttributeImpl( builder, metadataContext );
108+
if ( Map.class.isAssignableFrom( javaClass ) ) {
109+
return new MapAttributeImpl( builder );
110110
}
111-
else if ( Set.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) {
112-
return new SetAttributeImpl( builder, metadataContext );
111+
else if ( Set.class.isAssignableFrom( javaClass ) ) {
112+
return new SetAttributeImpl( builder );
113113
}
114-
else if ( List.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) {
115-
return new ListAttributeImpl( builder, metadataContext );
114+
else if ( List.class.isAssignableFrom( javaClass ) ) {
115+
return new ListAttributeImpl( builder );
116116
}
117-
else if ( Collection.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) ) {
118-
return new BagAttributeImpl( builder, metadataContext );
117+
else if ( Collection.class.isAssignableFrom( javaClass ) ) {
118+
return new BagAttributeImpl( builder );
119119
}
120120

121121
throw new UnsupportedMappingException( "Unknown collection: " + attributeJtd.getJavaType() );
@@ -124,13 +124,15 @@ else if ( Collection.class.isAssignableFrom( attributeJtd.getJavaTypeClass() ) )
124124
private static SimpleDomainType<?> determineListIndexOrMapKeyType(
125125
PluralAttributeMetadata<?,?,?> attributeMetadata,
126126
MetadataContext metadataContext) {
127-
if ( Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) {
128-
return (SimpleDomainType<?>) determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext );
127+
final Class<?> javaType = attributeMetadata.getJavaType();
128+
if ( Map.class.isAssignableFrom( javaType ) ) {
129+
return (SimpleDomainType<?>)
130+
determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext );
129131
}
130132

131-
if ( List.class.isAssignableFrom( attributeMetadata.getJavaType() )
132-
|| attributeMetadata.getJavaType().isArray() ) {
133-
return metadataContext.getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( Integer.class );
133+
if ( List.class.isAssignableFrom( javaType ) || javaType.isArray() ) {
134+
return metadataContext.getTypeConfiguration().getBasicTypeRegistry()
135+
.getRegisteredType( Integer.class );
134136
}
135137

136138
return null;

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.Set;
88

9-
import org.hibernate.metamodel.internal.MetadataContext;
109
import org.hibernate.query.hql.spi.SqmCreationState;
1110
import org.hibernate.query.sqm.tree.SqmJoinType;
1211
import org.hibernate.query.sqm.tree.domain.SqmSetJoin;
@@ -21,8 +20,8 @@ public class SetAttributeImpl<X, E>
2120
extends AbstractPluralAttribute<X, Set<E>, E>
2221
implements SqmSetPersistentAttribute<X, E> {
2322

24-
public SetAttributeImpl(PluralAttributeBuilder<X, Set<E>, E, ?> xceBuilder, MetadataContext metadataContext) {
25-
super( xceBuilder, metadataContext );
23+
public SetAttributeImpl(PluralAttributeBuilder<X, Set<E>, E, ?> xceBuilder) {
24+
super( xceBuilder );
2625
}
2726

2827
@Override

‎hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.lang.reflect.Member;
99

1010
import org.hibernate.metamodel.AttributeClassification;
11-
import org.hibernate.metamodel.internal.MetadataContext;
1211
import org.hibernate.metamodel.mapping.CollectionPart;
1312
import org.hibernate.metamodel.model.domain.AnyMappingDomainType;
1413
import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
@@ -63,8 +62,7 @@ public SingularAttributeImpl(
6362
boolean isIdentifier,
6463
boolean isVersion,
6564
boolean isOptional,
66-
boolean isGeneric,
67-
MetadataContext metadataContext) {
65+
boolean isGeneric) {
6866
super(
6967
declaringType,
7068
name,
@@ -210,8 +208,7 @@ public Identifier(
210208
SqmDomainType<J> attributeType,
211209
Member member,
212210
AttributeClassification attributeClassification,
213-
boolean isGeneric,
214-
MetadataContext metadataContext) {
211+
boolean isGeneric) {
215212
super(
216213
declaringType,
217214
name,
@@ -222,8 +219,7 @@ public Identifier(
222219
true,
223220
false,
224221
false,
225-
isGeneric,
226-
metadataContext
222+
isGeneric
227223
);
228224
}
229225

@@ -260,8 +256,7 @@ public Version(
260256
String name,
261257
AttributeClassification attributeClassification,
262258
SqmDomainType<Y> attributeType,
263-
Member member,
264-
MetadataContext metadataContext) {
259+
Member member) {
265260
super(
266261
declaringType,
267262
name,
@@ -272,8 +267,7 @@ public Version(
272267
false,
273268
true,
274269
false,
275-
false,
276-
metadataContext
270+
false
277271
);
278272
}
279273
}

0 commit comments

Comments
 (0)