HHH-14487 Fix usage of wrong Map in PropertyAccessStrategyMapImpl

Author: beikov

hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyMapImpl.java

@@ -6,7 +6,8 @@
  */
 package org.hibernate.property.access.internal;
 
-import org.hibernate.mapping.Map;
+import java.util.Map;
+
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.property.access.spi.PropertyAccessStrategy;
 
@@ -24,7 +25,7 @@ public class PropertyAccessStrategyMapImpl implements PropertyAccessStrategy {
 	public PropertyAccess buildPropertyAccess(Class containerJavaType, String propertyName) {
 
 		// Sometimes containerJavaType is null, but if it isn't, make sure it's a Map.
-		if (containerJavaType != null && !Map.class.isAssignableFrom(containerJavaType)) {
+		if (containerJavaType != null && !Map.class.isAssignableFrom( containerJavaType)) {
 			throw new IllegalArgumentException(
 				String.format(
 					"Expecting class: [%1$s], but containerJavaType is of type: [%2$s] for propertyName: [%3$s]",

hibernate-core/src/test/java/org/hibernate/property/PropertyAccessStrategyMapTest.java

@@ -8,8 +8,8 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
-import org.hibernate.mapping.Map;
 import org.hibernate.property.access.internal.PropertyAccessStrategyMapImpl;
 import org.hibernate.property.access.spi.PropertyAccess;
 
@@ -42,7 +42,7 @@ public void testNonMap() {
 		}
 		catch (IllegalArgumentException e) {
 			assertEquals(
-				"Expecting class: [org.hibernate.mapping.Map], but containerJavaType is of type: [java.util.Date] for propertyName: [time]",
+				"Expecting class: [java.util.Map], but containerJavaType is of type: [java.util.Date] for propertyName: [time]",
 				e.getMessage()
 			);
 		}

hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java

@@ -42,6 +42,7 @@
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.SkipForDialect;
+import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.test.sql.hand.Dimension;
 import org.hibernate.test.sql.hand.Employment;
@@ -885,6 +886,28 @@ public void testEscapeColonInSQL() throws QueryException {
 		s.close();
 	}
 
+	@Test
+	@TestForIssue( jiraKey = "HHH-14487")
+	public void testAliasToBeanMap() {
+		Person gavin = new Person( "Gavin" );
+
+		Session s = openSession();
+		Transaction t = s.beginTransaction();
+		s.persist( gavin );
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
+		HashMap result = (HashMap) session.createNativeQuery( "select * from PERSON" )
+				.setResultTransformer( Transformers.aliasToBean( HashMap.class ) )
+				.uniqueResult();
+		assertEquals( "Gavin", result.get( "NAME" ) == null ? result.get( "name" ) : result.get( "NAME" ) );
+		session.delete( gavin );
+		t.commit();
+		s.close();
+	}
+
 	private String buildLongString(int size, char baseChar) {
 		StringBuilder buff = new StringBuilder();
 		for( int i = 0; i < size; i++ ) {