[hibernate-commits] [hibernate/hibernate-orm] fa526f: HHH-9475 Cannot mix @MapKey with @Convert - Moved ...

Branch: refs/heads/5.0 Home: https://github.com/hibernate/hibernate-orm Commit: fa526f601173aa6de6dc1b65d3c069001a581467 https://github.com/hibernate/hibernate-orm/commit/fa526f601173aa6de6dc1b6... Author: Janario Oliveira <janarioliver(a)gmail.com&gt; Date: 2015-11-09 (Mon, 09 Nov 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java M hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java A hibernate-core/src/test/java/org/hibernate/test/converter/map/ColorType.java A hibernate-core/src/test/java/org/hibernate/test/converter/map/ColorTypeConverter.java A hibernate-core/src/test/java/org/hibernate/test/converter/map/MapKeyAttributeConverterTest.java M hibernate-core/src/test/java/org/hibernate/test/converter/map/MapKeyConversionTest.java Log Message: ----------- HHH-9475 Cannot mix @MapKey with @Convert - Moved classes to reuse in test case; Added copy of type from referenced MapKey (cherry picked from commit 80e851e7d0a13f7aab3f683d2b46fbb985fdbe46)