Skip to content

Commit 5827a4f

Browse files
gavinkinggavinking
committed
replace log message with error
Signed-off-by: Gavin King <[email protected]>
1 parent cb38afc commit 5827a4f

File tree

3 files changed

+42
-83
lines changed

3 files changed

+42
-83
lines changed

‎hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,10 +720,6 @@ void cannotResolveNonNullableTransientDependencies(
720720
@Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 467)
721721
void creatingPooledLoOptimizer(int incrementSize, String name);
722722

723-
@LogMessage(level = WARN)
724-
@Message(value = "Unable to interpret type [%s] as an AttributeConverter due to an exception: %s", id = 468)
725-
void logBadHbmAttributeConverterType(String type, String exceptionMessage);
726-
727723
@LogMessage(level = WARN)
728724
@Message(value = "An unexpected session is defined for a collection, but the collection is not connected to that session. A persistent collection may only be associated with one session at a time. Overwriting session. %s", id = 470)
729725
void logUnexpectedSessionInCollectionNotConnected(String msg);

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

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.hibernate.boot.internal.ClassmateContext;
2121
import org.hibernate.boot.model.TypeDefinition;
2222
import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorBypassedImpl;
23-
import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor;
2423
import org.hibernate.boot.model.convert.internal.InstanceBasedConverterDescriptor;
2524
import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
2625
import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
@@ -39,8 +38,6 @@
3938
import org.hibernate.engine.jdbc.Size;
4039
import org.hibernate.internal.CoreLogging;
4140
import org.hibernate.internal.CoreMessageLogger;
42-
import org.hibernate.internal.util.StringHelper;
43-
import org.hibernate.internal.util.collections.CollectionHelper;
4441
import org.hibernate.metamodel.mapping.JdbcMapping;
4542
import org.hibernate.metamodel.mapping.SelectablePath;
4643
import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
@@ -80,7 +77,10 @@
8077
import jakarta.persistence.TemporalType;
8178

8279
import static java.lang.Boolean.parseBoolean;
80+
import static org.hibernate.boot.model.convert.spi.ConverterDescriptor.TYPE_NAME_PREFIX;
8381
import static org.hibernate.internal.util.ReflectHelper.reflectedPropertyType;
82+
import static org.hibernate.internal.util.StringHelper.isEmpty;
83+
import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
8484
import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
8585
import static org.hibernate.mapping.MappingHelper.injectParameters;
8686

@@ -217,10 +217,7 @@ public void setImplicitJavaTypeAccess(Function<TypeConfiguration, java.lang.refl
217217
}
218218

219219
public Selectable getColumn() {
220-
if ( getColumnSpan() == 0 ) {
221-
return null;
222-
}
223-
return getColumn( 0 );
220+
return getColumnSpan() == 0 ? null : getColumn( 0 );
224221
}
225222

226223
public java.lang.reflect.Type getResolvedJavaType() {
@@ -748,8 +745,7 @@ else if ( implicitJavaTypeAccess != null ) {
748745
return implicitJavaTypeAccess.apply(typeConfiguration);
749746
}
750747
else if ( ownerName != null && propertyName != null ) {
751-
return reflectedPropertyType( ownerName, propertyName,
752-
getServiceRegistry().requireService( ClassLoaderService.class ) );
748+
return reflectedPropertyType( ownerName, propertyName, classLoaderService() );
753749
}
754750
else {
755751
return null;
@@ -835,7 +831,7 @@ public TypeConfiguration getTypeConfiguration() {
835831
// 3) basic type "resolution key"
836832
// 4) UserType or BasicType class name - directly, or through a TypeDefinition
837833

838-
if ( name.startsWith( ConverterDescriptor.TYPE_NAME_PREFIX ) ) {
834+
if ( name.startsWith( TYPE_NAME_PREFIX ) ) {
839835
return NamedConverterResolution.from(
840836
name,
841837
explicitJtdAccess,
@@ -902,13 +898,12 @@ public TypeConfiguration getTypeConfiguration() {
902898

903899

904900
// see if the name is a UserType or BasicType implementor class name
905-
final ClassLoaderService cls = serviceRegistry.requireService( ClassLoaderService.class );
901+
final ClassLoaderService classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
906902
try {
907-
final Class<?> typeNamedClass = cls.classForName( name );
908-
903+
final Class<?> typeNamedClass = classLoaderService.classForName( name );
909904
// if there are no local config params, register an implicit TypeDefinition for this custom type .
910905
// later uses may find it and re-use its cacheable reference...
911-
if ( CollectionHelper.isEmpty( localTypeParams ) ) {
906+
if ( isEmpty( localTypeParams ) ) {
912907
final TypeDefinition implicitDefinition = new TypeDefinition(
913908
name,
914909
typeNamedClass,
@@ -1012,29 +1007,16 @@ public void setExplicitTypeName(String typeName) {
10121007
}
10131008

10141009
public void setTypeName(String typeName) {
1015-
if ( StringHelper.isNotEmpty( typeName ) ) {
1016-
if ( typeName.startsWith( ConverterDescriptor.TYPE_NAME_PREFIX ) ) {
1017-
final String converterClassName = typeName.substring( ConverterDescriptor.TYPE_NAME_PREFIX.length() );
1018-
final ClassLoaderService cls = getServiceRegistry().requireService( ClassLoaderService.class );
1019-
try {
1020-
final Class<AttributeConverter<?,?>> converterClass = cls.classForName( converterClassName );
1021-
setAttributeConverterDescriptor( new ClassBasedConverterDescriptor(
1022-
converterClass,
1023-
false,
1024-
getBuildingContext().getBootstrapContext().getClassmateContext()
1025-
) );
1026-
return;
1027-
}
1028-
catch (Exception e) {
1029-
log.logBadHbmAttributeConverterType( typeName, e.getMessage() );
1030-
}
1031-
}
1032-
else {
1033-
setExplicitTypeName( typeName );
1034-
}
1010+
if ( isEmpty( typeName ) ) {
1011+
super.setTypeName( typeName );
1012+
}
1013+
else if ( typeName.startsWith( TYPE_NAME_PREFIX ) ) {
1014+
setAttributeConverterDescriptor( typeName );
1015+
}
1016+
else {
1017+
setExplicitTypeName( typeName );
1018+
super.setTypeName( typeName );
10351019
}
1036-
1037-
super.setTypeName( typeName );
10381020
}
10391021

10401022
private static int COUNTER;

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

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.hibernate.generator.GeneratorCreationContext;
3838
import org.hibernate.internal.CoreLogging;
3939
import org.hibernate.internal.CoreMessageLogger;
40-
import org.hibernate.internal.util.ReflectHelper;
4140
import org.hibernate.models.spi.MemberDetails;
4241
import org.hibernate.models.spi.TypeDetails;
4342
import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
@@ -63,6 +62,7 @@
6362
import static org.hibernate.boot.model.internal.GeneratorBinder.ASSIGNED_GENERATOR_NAME;
6463
import static org.hibernate.boot.model.internal.GeneratorBinder.ASSIGNED_IDENTIFIER_GENERATOR_CREATOR;
6564
import static org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl.fromExplicit;
65+
import static org.hibernate.internal.util.ReflectHelper.reflectedPropertyClass;
6666
import static org.hibernate.internal.util.collections.ArrayHelper.toBooleanArray;
6767

6868
/**
@@ -208,7 +208,7 @@ protected void justAddColumn(Column column) {
208208
}
209209

210210
protected void justAddColumn(Column column, boolean insertable, boolean updatable) {
211-
int index = columns.indexOf( column );
211+
final int index = columns.indexOf( column );
212212
if ( index == -1 ) {
213213
columns.add( column );
214214
insertability.add( insertable );
@@ -289,26 +289,23 @@ public String getTypeName() {
289289

290290
public void setTypeName(String typeName) {
291291
if ( typeName != null && typeName.startsWith( TYPE_NAME_PREFIX ) ) {
292-
final String converterClassName = typeName.substring( TYPE_NAME_PREFIX.length() );
293-
final ClassLoaderService cls = getMetadata()
294-
.getMetadataBuildingOptions()
295-
.getServiceRegistry()
296-
.requireService( ClassLoaderService.class );
297-
try {
298-
final Class<? extends AttributeConverter<?,?>> converterClass = cls.classForName( converterClassName );
299-
this.attributeConverterDescriptor = new ClassBasedConverterDescriptor(
300-
converterClass,
301-
false,
302-
( (InFlightMetadataCollector) getMetadata() ).getBootstrapContext().getClassmateContext()
303-
);
304-
return;
305-
}
306-
catch (Exception e) {
307-
log.logBadHbmAttributeConverterType( typeName, e.getMessage() );
308-
}
292+
setAttributeConverterDescriptor( typeName );
293+
}
294+
else {
295+
this.typeName = typeName;
309296
}
297+
}
310298

311-
this.typeName = typeName;
299+
void setAttributeConverterDescriptor(String typeName) {
300+
final String converterClassName = typeName.substring( TYPE_NAME_PREFIX.length() );
301+
this.attributeConverterDescriptor =
302+
new ClassBasedConverterDescriptor( classLoaderService().classForName( converterClassName ),
303+
false, getBuildingContext().getBootstrapContext().getClassmateContext() );
304+
}
305+
306+
ClassLoaderService classLoaderService() {
307+
return getMetadata().getMetadataBuildingOptions().getServiceRegistry()
308+
.requireService( ClassLoaderService.class );
312309
}
313310

314311
public void makeVersion() {
@@ -675,14 +672,7 @@ public void setTypeUsingReflection(String className, String propertyName) throws
675672
}
676673

677674
private Class<?> getClass(String className, String propertyName) {
678-
return ReflectHelper.reflectedPropertyClass(
679-
className,
680-
propertyName,
681-
getMetadata()
682-
.getMetadataBuildingOptions()
683-
.getServiceRegistry()
684-
.requireService( ClassLoaderService.class )
685-
);
675+
return reflectedPropertyClass( className, propertyName, classLoaderService() );
686676
}
687677

688678
/**
@@ -738,8 +728,8 @@ public TypeConfiguration getTypeConfiguration() {
738728

739729
private <T> Type buildAttributeConverterTypeAdapter(
740730
JpaAttributeConverter<T, ?> jpaAttributeConverter) {
741-
JavaType<T> domainJavaType = jpaAttributeConverter.getDomainJavaType();
742-
JavaType<?> relationalJavaType = jpaAttributeConverter.getRelationalJavaType();
731+
final JavaType<T> domainJavaType = jpaAttributeConverter.getDomainJavaType();
732+
final JavaType<?> relationalJavaType = jpaAttributeConverter.getRelationalJavaType();
743733

744734
// build the SqlTypeDescriptor adapter ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
745735
// Going back to the illustration, this should be a SqlTypeDescriptor that handles the Integer <-> String
@@ -951,16 +941,11 @@ protected void createParameterImpl() {
951941
final MemberDetails attributeMember = (MemberDetails) typeParameters.get( DynamicParameterizedType.XPROPERTY );
952942
// todo : not sure this works for handling @MapKeyEnumerated
953943
final Annotation[] annotations = getAnnotations( attributeMember );
954-
955-
final ClassLoaderService classLoaderService =
956-
getMetadata().getMetadataBuildingOptions().getServiceRegistry()
957-
.requireService( ClassLoaderService.class );
958944
typeParameters.put(
959945
DynamicParameterizedType.PARAMETER_TYPE,
960946
new ParameterTypeImpl(
961-
classLoaderService.classForTypeName(
962-
typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS)
963-
),
947+
classLoaderService()
948+
.classForTypeName( typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS) ),
964949
attributeMember != null ? attributeMember.getType() : null,
965950
annotations,
966951
table.getCatalog(),
@@ -1003,13 +988,9 @@ public DynamicParameterizedType.ParameterType makeParameterImpl() {
1003988
final MemberDetails attributeMember = (MemberDetails) typeParameters.get( DynamicParameterizedType.XPROPERTY );
1004989
// todo : not sure this works for handling @MapKeyEnumerated
1005990
final Annotation[] annotations = getAnnotations( attributeMember );
1006-
1007-
final ClassLoaderService classLoaderService =
1008-
getMetadata().getMetadataBuildingOptions().getServiceRegistry()
1009-
.requireService( ClassLoaderService.class );
1010-
1011991
return new ParameterTypeImpl(
1012-
classLoaderService.classForTypeName( typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS) ),
992+
classLoaderService()
993+
.classForTypeName( typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS) ),
1013994
attributeMember != null ? attributeMember.getType() : null,
1014995
annotations,
1015996
table.getCatalog(),

0 commit comments

Comments
 (0)