HHH-9913 - NPE in org.hibernate.cache.internal.CacheDataDescriptionImpl.decode()

Author: sebersole

hibernate-core/src/main/java/org/hibernate/cache/internal/CacheDataDescriptionImpl.java

@@ -74,7 +74,8 @@ public static CacheDataDescriptionImpl decode(PersistentClass model) {
 				model.isVersioned()
 						? ( (VersionType) model.getVersion().getType() ).getComparator()
 						: null,
-				model.getIdentifierProperty().getType());
+				model.getIdentifier().getType()
+		);
 	}
 
 	/**
@@ -91,7 +92,8 @@ public static CacheDataDescriptionImpl decode(Collection model) {
 				model.getOwner().isVersioned()
 						? ( (VersionType) model.getOwner().getVersion().getType() ).getComparator()
 						: null,
-				model.getKey().getType());
+				model.getKey().getType()
+		);
 	}
 
 }

hibernate-core/src/test/java/org/hibernate/test/cache/cid/It.java

@@ -0,0 +1,25 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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.test.cache.cid;
+
+import java.io.Serializable;
+import javax.persistence.Cacheable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Steve Ebersole
+ */
+@Entity
+@Cacheable(true)
+public class It implements Serializable {
+	@Id
+	public Integer key1;
+	@Id
+	public Integer key2;
+	public String name;
+}

hibernate-core/src/test/java/org/hibernate/test/cache/cid/ItWithPkClass.java

@@ -0,0 +1,32 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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.test.cache.cid;
+
+import java.io.Serializable;
+import javax.persistence.Cacheable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+/**
+ * @author Steve Ebersole
+ */
+@Entity
+@Cacheable(true)
+@IdClass( ItWithPkClass.Pk.class )
+public class ItWithPkClass {
+	@Id
+	public Integer key1;
+	@Id
+	public Integer key2;
+	public String name;
+
+	public static class Pk implements Serializable {
+		public Integer key1;
+		public Integer key2;
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/cache/cid/NonAggregatedCompositeIdCachingTest.java

@@ -0,0 +1,67 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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.test.cache.cid;
+
+import javax.persistence.SharedCacheMode;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
+
+/**
+ * @author Steve Ebersole
+ */
+public class NonAggregatedCompositeIdCachingTest extends BaseUnitTestCase {
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-9913" )
+	public void testNonAggregatedCompositeId() {
+		// HHH-9913 reports a NPE when bootstrapping a SF with non-aggregated composite identifiers
+		// in org.hibernate.cache.internal.CacheDataDescriptionImpl#decode
+		StandardServiceRegistry ssr = new StandardServiceRegistryBuilder()
+				.applySetting( AvailableSettings.USE_SECOND_LEVEL_CACHE, true )
+				.build();
+
+		try {
+			new MetadataSources( ssr )
+					.addAnnotatedClass( It.class )
+					.getMetadataBuilder()
+					.applySharedCacheMode( SharedCacheMode.ENABLE_SELECTIVE )
+					.build()
+					.buildSessionFactory();
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-9913" )
+	public void testNonAggregatedCompositeIdWithPkClass() {
+		// HHH-9913 reports a NPE when bootstrapping a SF with non-aggregated composite identifiers
+		// in org.hibernate.cache.internal.CacheDataDescriptionImpl#decode
+		StandardServiceRegistry ssr = new StandardServiceRegistryBuilder().build();
+
+		try {
+			new MetadataSources( ssr )
+					.addAnnotatedClass( ItWithPkClass.class )
+					.getMetadataBuilder()
+					.applySharedCacheMode( SharedCacheMode.ENABLE_SELECTIVE )
+					.build()
+					.buildSessionFactory();
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+}