From b44001c644963bc911d85851acda7c780ff2411b Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Fri, 27 Apr 2018 16:07:45 -0400
Subject: [PATCH] HHH-12199 - Added test case.

---
 .../org/hibernate/test/cfg/FooEntity.hbm.xml  | 19 +++++++
 .../cfg/PropertyAccessTypeDetectionType.java  | 53 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml
 create mode 100644 hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java

diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml
new file mode 100644
index 0000000000..98339c9767
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/FooEntity.hbm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+  ~ 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>.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+    <class name="org.hibernate.test.cfg.PropertyAccessTypeDetectionType$FooEntity" table="foo_entity">
+        <id name="id" type="long">
+            <generator class="native" />
+        </id>
+        <property name="intValue" />
+    </class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java
new file mode 100644
index 0000000000..939931a499
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/PropertyAccessTypeDetectionType.java
@@ -0,0 +1,53 @@
+/*
+ * 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.cfg;
+
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Chris Cranford
+ */
+@TestForIssue(jiraKey ="HHH-12199")
+public class PropertyAccessTypeDetectionType extends BaseCoreFunctionalTestCase {
+	@Override
+	protected String[] getMappings() {
+		return new String[] { "cfg/FooEntity.hbm.xml" };
+	}
+
+	public static class FooEntity {
+		public static final String intValue = "intValue";
+
+		private Long id;
+		private Integer _intValue;
+
+		public Long getId() { return id; }
+		public void setId(Long id) { this.id = id; }
+
+		public Integer getIntValue() { return _intValue; }
+		public void setIntValue(Integer intValue) { this._intValue = intValue; }
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testPropertyAccessIgnoresStaticFields() {
+		// verify that the entity persister is configured with property intValue as an Integer rather than
+		// using the static field reference and determining the type to be String.
+		assertTrue(
+				sessionFactory()
+						.getMetamodel()
+						.entityPersister( FooEntity.class )
+						.getPropertyType( "intValue" )
+						.getReturnedClass()
+						.isAssignableFrom( Integer.class )
+		);
+	}
+}