Skip to content

Commit 0d4328e

Browse files
gavinkinggavinking
committed
fix some more warnings and add static imports
1 parent e3b5258 commit 0d4328e

File tree

5 files changed

+48
-50
lines changed

5 files changed

+48
-50
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.net.URL;
1111
import java.util.ArrayList;
1212
import java.util.Collection;
13-
import java.util.Collections;
1413
import java.util.HashMap;
1514
import java.util.LinkedHashSet;
1615
import java.util.List;
@@ -37,6 +36,9 @@
3736
import org.hibernate.service.ServiceRegistry;
3837
import org.hibernate.type.SerializationException;
3938

39+
import static java.util.Collections.addAll;
40+
import static java.util.Collections.emptyList;
41+
import static java.util.Collections.emptySet;
4042
import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
4143

4244
/**
@@ -132,7 +134,7 @@ public XmlMappingBinderAccess getXmlMappingBinderAccess() {
132134
@Deprecated(since = "7.0")
133135
public List<Binding<JaxbBindableMappingDescriptor>> getXmlBindings() {
134136
if ( mappingXmlBindings == null && hbmXmlBindings == null ) {
135-
return Collections.emptyList();
137+
return emptyList();
136138
}
137139

138140
if ( hbmXmlBindings == null ) {
@@ -143,30 +145,31 @@ public List<Binding<JaxbBindableMappingDescriptor>> getXmlBindings() {
143145
return (List) hbmXmlBindings;
144146
}
145147

146-
final ArrayList<Binding<JaxbBindableMappingDescriptor>> combined = arrayList( mappingXmlBindings.size() + hbmXmlBindings.size() );
148+
final ArrayList<Binding<JaxbBindableMappingDescriptor>> combined =
149+
arrayList( mappingXmlBindings.size() + hbmXmlBindings.size() );
147150
combined.addAll( (List) mappingXmlBindings );
148151
combined.addAll( (List) hbmXmlBindings );
149152
return combined;
150153
}
151154

152155
public List<Binding<JaxbEntityMappingsImpl>> getMappingXmlBindings() {
153-
return mappingXmlBindings == null ? Collections.emptyList() : mappingXmlBindings;
156+
return mappingXmlBindings == null ? emptyList() : mappingXmlBindings;
154157
}
155158

156159
public List<Binding<JaxbHbmHibernateMapping>> getHbmXmlBindings() {
157-
return hbmXmlBindings == null ? Collections.emptyList() : hbmXmlBindings;
160+
return hbmXmlBindings == null ? emptyList() : hbmXmlBindings;
158161
}
159162

160163
public Collection<String> getAnnotatedPackages() {
161-
return annotatedPackages == null ? Collections.emptySet() : annotatedPackages;
164+
return annotatedPackages == null ? emptySet() : annotatedPackages;
162165
}
163166

164167
public Collection<Class<?>> getAnnotatedClasses() {
165-
return annotatedClasses == null ? Collections.emptySet() : annotatedClasses;
168+
return annotatedClasses == null ? emptySet() : annotatedClasses;
166169
}
167170

168171
public Collection<String> getAnnotatedClassNames() {
169-
return annotatedClassNames == null ? Collections.emptySet() : annotatedClassNames;
172+
return annotatedClassNames == null ? emptySet() : annotatedClassNames;
170173
}
171174

172175
public Map<String,Class<?>> getExtraQueryImports() {
@@ -269,7 +272,7 @@ public MetadataSources addAnnotatedClasses(Class<?>... annotatedClasses) {
269272
if ( this.annotatedClasses == null ) {
270273
this.annotatedClasses = new LinkedHashSet<>();
271274
}
272-
Collections.addAll( this.annotatedClasses, annotatedClasses );
275+
addAll( this.annotatedClasses, annotatedClasses );
273276
}
274277
return this;
275278
}
@@ -297,7 +300,7 @@ public MetadataSources addAnnotatedClassName(String annotatedClassName) {
297300
*/
298301
public MetadataSources addAnnotatedClassNames(String... annotatedClassNames) {
299302
if ( annotatedClassNames != null && annotatedClassNames.length > 0 ) {
300-
Collections.addAll( this.annotatedClassNames, annotatedClassNames );
303+
addAll( this.annotatedClassNames, annotatedClassNames );
301304
}
302305
return this;
303306
}

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
import java.util.Map;
99
import java.util.Set;
1010

11-
import org.hibernate.internal.util.ReflectHelper;
12-
import org.hibernate.internal.util.collections.CollectionHelper;
1311
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
1412
import org.hibernate.type.descriptor.java.EnumJavaType;
1513
import org.hibernate.type.descriptor.java.JavaType;
1614

1715
import org.checkerframework.checker.nullness.qual.Nullable;
1816

17+
import static org.hibernate.internal.util.ReflectHelper.ensureAccessibility;
18+
import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
19+
1920
/**
2021
* @author Steve Ebersole
2122
*/
@@ -33,14 +34,13 @@ public EnumeratedValueConverter(
3334
this.enumJavaType = enumJavaType;
3435
this.relationalJavaType = relationalJavaType;
3536

36-
ReflectHelper.ensureAccessibility( valueField );
37+
ensureAccessibility( valueField );
3738

3839
final Class<E> enumJavaTypeClass = enumJavaType.getJavaTypeClass();
3940
final E[] enumConstants = enumJavaTypeClass.getEnumConstants();
40-
relationalToEnumMap = CollectionHelper.mapOfSize( enumConstants.length );
41-
enumToRelationalMap = CollectionHelper.mapOfSize( enumConstants.length );
42-
for ( int i = 0; i < enumConstants.length; i++ ) {
43-
final E enumConstant = enumConstants[i];
41+
relationalToEnumMap = mapOfSize( enumConstants.length );
42+
enumToRelationalMap = mapOfSize( enumConstants.length );
43+
for ( final E enumConstant : enumConstants ) {
4444
try {
4545
//noinspection unchecked
4646
final R relationalValue = (R) valueField.get( enumConstant );
@@ -60,18 +60,12 @@ public Set<R> getRelationalValueSet() {
6060

6161
@Override
6262
public @Nullable E toDomainValue(@Nullable R relationalForm) {
63-
if ( relationalForm == null ) {
64-
return null;
65-
}
66-
return relationalToEnumMap.get( relationalForm );
63+
return relationalForm == null ? null : relationalToEnumMap.get( relationalForm );
6764
}
6865

6966
@Override
7067
public @Nullable R toRelationalValue(@Nullable E domainForm) {
71-
if ( domainForm == null ) {
72-
return null;
73-
}
74-
return enumToRelationalMap.get( domainForm );
68+
return domainForm == null ? null : enumToRelationalMap.get( domainForm );
7569
}
7670

7771
@Override

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@
2525

2626
import jakarta.persistence.AttributeConverter;
2727

28+
import static java.util.Collections.unmodifiableCollection;
29+
import static java.util.Collections.unmodifiableSet;
30+
2831

2932
/**
3033
* @author Steve Ebersole
3134
*/
3235
public class ManagedResourcesImpl implements ManagedResources {
33-
private final Map<Class<? extends AttributeConverter>, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();
36+
private final Map<Class<? extends AttributeConverter<?,?>>, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();
3437
private final Set<Class<?>> annotatedClassReferences = new LinkedHashSet<>();
3538
private final Set<String> annotatedClassNames = new LinkedHashSet<>();
3639
private final Set<String> annotatedPackageNames = new LinkedHashSet<>();
@@ -68,22 +71,22 @@ public ManagedResourcesImpl() {
6871

6972
@Override
7073
public Collection<ConverterDescriptor> getAttributeConverterDescriptors() {
71-
return Collections.unmodifiableCollection( attributeConverterDescriptorMap.values() );
74+
return unmodifiableCollection( attributeConverterDescriptorMap.values() );
7275
}
7376

7477
@Override
7578
public Collection<Class<?>> getAnnotatedClassReferences() {
76-
return Collections.unmodifiableSet( annotatedClassReferences );
79+
return unmodifiableSet( annotatedClassReferences );
7780
}
7881

7982
@Override
8083
public Collection<String> getAnnotatedClassNames() {
81-
return Collections.unmodifiableSet( annotatedClassNames );
84+
return unmodifiableSet( annotatedClassNames );
8285
}
8386

8487
@Override
8588
public Collection<String> getAnnotatedPackageNames() {
86-
return Collections.unmodifiableSet( annotatedPackageNames );
89+
return unmodifiableSet( annotatedPackageNames );
8790
}
8891

8992
@Override

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.hibernate.dialect.Dialect;
1414
import org.hibernate.mapping.BasicValue;
1515
import org.hibernate.metamodel.mapping.JdbcMapping;
16+
import org.hibernate.type.BasicTypeRegistry;
1617
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
1718
import org.hibernate.type.BasicType;
1819
import org.hibernate.type.descriptor.java.BasicJavaType;
@@ -26,26 +27,24 @@
2627
/**
2728
* @author Steve Ebersole
2829
*/
29-
@SuppressWarnings("rawtypes")
3030
public class VersionResolution<E> implements BasicValue.Resolution<E> {
3131

3232
// todo (6.0) : support explicit JTD?
3333
// todo (6.0) : support explicit STD?
3434

35-
@SuppressWarnings({"rawtypes", "unchecked"})
3635
public static <E> VersionResolution<E> from(
3736
Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess,
3837
TimeZoneStorageType timeZoneStorageType,
39-
@SuppressWarnings("unused") MetadataBuildingContext context) {
38+
MetadataBuildingContext context) {
4039

4140
// todo (6.0) : add support for Dialect-specific interpretation?
4241

4342
final TypeConfiguration typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
4443
final java.lang.reflect.Type implicitJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
45-
final JavaType registered = typeConfiguration.getJavaTypeRegistry().resolveDescriptor( implicitJavaType );
46-
final BasicJavaType jtd = (BasicJavaType) registered;
44+
final JavaType<E> registered = typeConfiguration.getJavaTypeRegistry().resolveDescriptor( implicitJavaType );
45+
final BasicJavaType<E> basicJavaType = (BasicJavaType<E>) registered;
4746

48-
final JdbcType recommendedJdbcType = jtd.getRecommendedJdbcType(
47+
final JdbcType recommendedJdbcType = basicJavaType.getRecommendedJdbcType(
4948
new JdbcTypeIndicators() {
5049
@Override
5150
public TypeConfiguration getTypeConfiguration() {
@@ -105,25 +104,26 @@ public Dialect getDialect() {
105104
}
106105
);
107106

108-
final BasicType<?> basicType = typeConfiguration.getBasicTypeRegistry().resolve( jtd, recommendedJdbcType );
109-
final BasicType legacyType = typeConfiguration.getBasicTypeRegistry().getRegisteredType( jtd.getJavaType() );
107+
final BasicTypeRegistry basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
108+
final BasicType<?> basicType = basicTypeRegistry.resolve( basicJavaType, recommendedJdbcType );
109+
final BasicType<E> legacyType = basicTypeRegistry.getRegisteredType( basicJavaType.getJavaType() );
110110

111111
assert legacyType.getJdbcType().getDefaultSqlTypeCode() == recommendedJdbcType.getDefaultSqlTypeCode();
112112

113-
return new VersionResolution<>( jtd, recommendedJdbcType, basicType, legacyType );
113+
return new VersionResolution<>( basicJavaType, recommendedJdbcType, basicType, legacyType );
114114
}
115115

116-
private final JavaType javaType;
116+
private final JavaType<E> javaType;
117117
private final JdbcType jdbcType;
118118

119119
private final JdbcMapping jdbcMapping;
120-
private final BasicType legacyType;
120+
private final BasicType<E> legacyType;
121121

122122
public VersionResolution(
123-
JavaType javaType,
123+
JavaType<E> javaType,
124124
JdbcType jdbcType,
125125
JdbcMapping jdbcMapping,
126-
BasicType legacyType) {
126+
BasicType<E> legacyType) {
127127
this.javaType = javaType;
128128
this.jdbcType = jdbcType;
129129
this.jdbcMapping = jdbcMapping;
@@ -136,13 +136,11 @@ public JdbcMapping getJdbcMapping() {
136136
}
137137

138138
@Override
139-
@SuppressWarnings("unchecked")
140-
public BasicType getLegacyResolvedBasicType() {
139+
public BasicType<E> getLegacyResolvedBasicType() {
141140
return legacyType;
142141
}
143142

144143
@Override
145-
@SuppressWarnings("unchecked")
146144
public JavaType<E> getDomainJavaType() {
147145
return javaType;
148146
}
@@ -158,7 +156,7 @@ public JdbcType getJdbcType() {
158156
}
159157

160158
@Override
161-
public BasicValueConverter<E,E> getValueConverter() {
159+
public BasicValueConverter<E,?> getValueConverter() {
162160
return legacyType.getValueConverter();
163161
}
164162

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ public BasicValue(MetadataBuildingContext buildingContext, Table table) {
132132
public BasicValue(BasicValue original) {
133133
super( original );
134134
this.explicitTypeName = original.explicitTypeName;
135-
this.explicitLocalTypeParams = original.explicitLocalTypeParams == null
136-
? null
137-
: new HashMap<>(original.explicitLocalTypeParams);
135+
this.explicitLocalTypeParams =
136+
original.explicitLocalTypeParams == null ? null
137+
: new HashMap<>( original.explicitLocalTypeParams );
138138
this.explicitJavaTypeAccess = original.explicitJavaTypeAccess;
139139
this.explicitJdbcTypeAccess = original.explicitJdbcTypeAccess;
140140
this.explicitMutabilityPlanAccess = original.explicitMutabilityPlanAccess;

0 commit comments

Comments
 (0)