HHH-18868 Cleanup tests and mapper-supers identifier mapper check

Author: mbellade

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java

@@ -357,7 +357,7 @@ else if ( MappedSuperclass.class.isAssignableFrom( mapping.getClass() ) ) {
 							// #buildIdClassAttributes
 							continue;
 						}
-						if ( safeMapping.isVersioned() && property == safeMapping.getVersion() ) {
+						else if ( safeMapping.isVersioned() && property == safeMapping.getVersion() ) {
 							// skip the version property, it was already handled previously.
 							continue;
 						}
@@ -415,8 +415,10 @@ else if ( MappedSuperclass.class.isAssignableFrom( mapping.getClass() ) ) {
 
 	private static boolean isIdentifierProperty(Property property, MappedSuperclass mappedSuperclass) {
 		final Component identifierMapper = mappedSuperclass.getIdentifierMapper();
-		return identifierMapper != null ?
-				ArrayHelper.contains( identifierMapper.getPropertyNames(), property.getName() ) : false;
+		return identifierMapper != null && ArrayHelper.contains(
+				identifierMapper.getPropertyNames(),
+				property.getName()
+		);
 	}
 
 	private <T> void addAttribute(EmbeddableDomainType<T> embeddable, Property property, Component component) {

hibernate-core/src/test/java/org/hibernate/orm/test/idclass/BaseSummary.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/idclass/mappedsuperclass/BaseSummary.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.idclass;
+package org.hibernate.orm.test.idclass.mappedsuperclass;
 
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;

hibernate-core/src/test/java/org/hibernate/orm/test/idclass/MappedSuperclassIdClassAttributesTest.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/idclass/mappedsuperclass/MappedSuperclassIdClassAttributesTest.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.idclass;
+package org.hibernate.orm.test.idclass.mappedsuperclass;
 
 import jakarta.persistence.metamodel.SingularAttribute;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -11,14 +11,12 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DomainModel(annotatedClasses = {Summary.class, BaseSummary.class})
 @SessionFactory
-@JiraKey( "HHH-18858" )
+@JiraKey("HHH-18858")
 public class MappedSuperclassIdClassAttributesTest {
-
 	@Test
 	public void test(SessionFactoryScope scope) {
 		scope.inSession( entityManager -> {

hibernate-core/src/test/java/org/hibernate/orm/test/idclass/PKey.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/idclass/mappedsuperclass/PKey.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.idclass;
+package org.hibernate.orm.test.idclass.mappedsuperclass;
 
 import java.io.Serializable;
 import java.util.Objects;

hibernate-core/src/test/java/org/hibernate/orm/test/idclass/Summary.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/idclass/mappedsuperclass/Summary.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.idclass;
+package org.hibernate.orm.test.idclass.mappedsuperclass;
 
 import jakarta.persistence.Entity;