Fix MetadataTest failures, the behaviour introduced by HHH-4702 has been reverted, SingularAttribute#getBindableJavaType() and SingularAttribute#getType().getJavaType() return Integer.class also for int attributes

Author: dreab8

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

@@ -385,17 +385,20 @@ private void applyIdMetadata(PersistentClass persistentClass, IdentifiableDomain
 			// Handle the actual id-attributes
 			final Component cidValue = (Component) persistentClass.getIdentifier();
 			final Iterator<Property> cidPropertyItr = cidValue.getPropertyIterator();
-			final Set<SingularPersistentAttribute<?,?>> idAttributes = new HashSet<>( cidValue.getPropertySpan() );
 
-			while ( cidPropertyItr.hasNext() ) {
-				final Property cidSubProperty = cidPropertyItr.next();
-
-				final SingularPersistentAttribute<?, Object> cidSubAttr = attributeFactory.buildIdAttribute(
-						identifiableType,
-						cidSubProperty
-				);
-
-				idAttributes.add( cidSubAttr );
+			AbstractIdentifiableType idType = (AbstractIdentifiableType) entityTypes.get( cidValue.getOwner().getMappedClass() );
+			Set idAttributes = idType.getIdClassAttributesSafely();
+			if ( idAttributes == null ) {
+				idAttributes = new HashSet<>( cidValue.getPropertySpan() );
+				while ( cidPropertyItr.hasNext() ) {
+					final Property cidSubProperty = cidPropertyItr.next();
+					final SingularPersistentAttribute<?, Object> cidSubAttr = attributeFactory.buildIdAttribute(
+							idType,
+							cidSubProperty
+					);
+
+					idAttributes.add( cidSubAttr );
+				}
 			}
 
 			( ( AttributeContainer) identifiableType ).getInFlightAccess().applyNonAggregatedIdAttributes( idAttributes );

hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/selectcase/GroupBySelectCaseTest.java

@@ -20,7 +20,7 @@
 import org.hibernate.dialect.DerbyDialect;
 import org.hibernate.dialect.PostgreSQL95Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.jpa.test.metadata.Person_;
+import org.hibernate.orm.test.jpa.metadata.Person_;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.SkipForDialect;

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/MetadataTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.Basic;
 import javax.persistence.Embeddable;
 

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Address.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Animal.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.MappedSuperclass;
 
 /**

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Being.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.Entity;
 
 /**

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Cat.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.MappedSuperclass;
 
 /**

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Cattish.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/jpa/test/metadata/Child.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.test.metadata;
+package org.hibernate.orm.test.jpa.metadata;
 import java.util.Collection;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;