Skip to content

Commit c18b7c9

Browse files
committed
eliminate dupe log message
1 parent c92c2f5 commit c18b7c9

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
import org.hibernate.boot.spi.MetadataBuildingContext;
1414
import org.hibernate.internal.CoreLogging;
1515
import org.hibernate.internal.CoreMessageLogger;
16-
import org.hibernate.internal.util.ReflectHelper;
1716

17+
import static org.hibernate.internal.util.ReflectHelper.overridesEquals;
18+
import static org.hibernate.internal.util.ReflectHelper.overridesHashCode;
1819
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
1920

2021
/**
@@ -325,17 +326,15 @@ private void checkTableDuplication() {
325326
* <em>correct</em>) we simply log a warning.
326327
*/
327328
private void checkCompositeIdentifier() {
328-
if ( getIdentifier() instanceof Component id ) {
329-
if ( !id.isDynamic() ) {
330-
final Class<?> idClass = id.getComponentClass();
331-
if ( idClass != null ) {
332-
final String idComponentClassName = idClass.getName();
333-
if ( !ReflectHelper.overridesEquals( idClass ) ) {
334-
LOG.compositeIdClassDoesNotOverrideEquals( idComponentClassName );
335-
}
336-
if ( !ReflectHelper.overridesHashCode( idClass ) ) {
337-
LOG.compositeIdClassDoesNotOverrideHashCode( idComponentClassName );
338-
}
329+
if ( getIdentifier() instanceof Component id
330+
&& !id.isDynamic() ) {
331+
final Class<?> idClass = id.getComponentClass();
332+
if ( idClass != null ) {
333+
if ( !overridesEquals( idClass ) ) {
334+
LOG.compositeIdClassDoesNotOverrideEquals( idClass.getName() );
335+
}
336+
else if ( !overridesHashCode( idClass ) ) {
337+
LOG.compositeIdClassDoesNotOverrideHashCode( idClass.getName() );
339338
}
340339
}
341340
}

0 commit comments

Comments
 (0)