|
13 | 13 | import org.hibernate.boot.spi.MetadataBuildingContext; |
14 | 14 | import org.hibernate.internal.CoreLogging; |
15 | 15 | import org.hibernate.internal.CoreMessageLogger; |
16 | | -import org.hibernate.internal.util.ReflectHelper; |
17 | 16 |
|
| 17 | +import static org.hibernate.internal.util.ReflectHelper.overridesEquals; |
| 18 | +import static org.hibernate.internal.util.ReflectHelper.overridesHashCode; |
18 | 19 | import static org.hibernate.internal.util.StringHelper.nullIfEmpty; |
19 | 20 |
|
20 | 21 | /** |
@@ -325,17 +326,15 @@ private void checkTableDuplication() { |
325 | 326 | * <em>correct</em>) we simply log a warning. |
326 | 327 | */ |
327 | 328 | 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() ); |
339 | 338 | } |
340 | 339 | } |
341 | 340 | } |
|
0 commit comments