HHH-8812 - JPAOverriddenAnnotationReader and @convert annotations

(cherry picked from commit 56e6db3)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java

@@ -0,0 +1,47 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.cfg.annotations.reflection;
+
+import org.hibernate.annotations.common.reflection.Filter;
+
+/**
+ * @author Emmanuel Bernard
+ * @author Steve Ebersole
+ */
+public class PersistentAttributeFilter implements Filter {
+	/**
+	 * Singleton access
+	 */
+	public static final PersistentAttributeFilter INSTANCE = new PersistentAttributeFilter();
+
+	@Override
+	public boolean returnStatic() {
+		return false;
+	}
+
+	@Override
+	public boolean returnTransient() {
+		return false;
+	}
+}

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/PersistentAttributeFilter.java

@@ -21,9 +21,6 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-
-// $Id$
-
 package org.hibernate.cfg.annotations.reflection;
 
 import java.io.Serializable;
@@ -37,21 +34,23 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.cfg.AttributeConverterDefinition;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.StringHelper;
 
-import org.jboss.logging.Logger;
-
 import org.dom4j.Document;
 import org.dom4j.Element;
 
 /**
+ * A helper for consuming orm.xml mappings.
+ *
  * @author Emmanuel Bernard
  * @author Brett Meyer
  */
 public class XMLContext implements Serializable {
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, XMLContext.class.getName());
+    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( XMLContext.class );
+
 	private Default globalDefaults;
 	private Map<String, Element> classOverriding = new HashMap<String, Element>();
 	private Map<String, Default> defaultsOverriding = new HashMap<String, Default>();

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java

@@ -0,0 +1,29 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+
+/**
+ * Defines the capability to merge mapping information from both annotations and orm.xml sources into a unified set of
+ * metadata in the Hibernate commons-annotations model.
+ */
+package org.hibernate.cfg.annotations.reflection;

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/package-info.java

@@ -58,6 +58,8 @@ public class ExplicitDateConvertersTest {
 
 	// NOTE : initially unable to reproduce the reported problem
 
+	static int callsToConverter = 0;
+
 	public static class LongToDateConverter implements AttributeConverter<Date,Long> {
 		@Override
 		public Long convertToDatabaseColumn(Date attribute) {
@@ -72,8 +74,6 @@ public Date convertToEntityAttribute(Long dbData) {
 		}
 	}
 
-	static int callsToConverter = 0;
-
 	@Entity( name = "Entity1" )
 	public static class Entity1 {
 		@Id

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/convert/ExplicitDateConvertersTest.java

@@ -23,46 +23,44 @@
  */
 package org.hibernate.jpa.test.convert;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Id;
 
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.StringType;
 import org.hibernate.type.Type;
+import org.hibernate.type.descriptor.converter.AttributeConverterTypeAdapter;
 
-import org.junit.Test;
-
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.Test;
 
 import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
-import static org.junit.Assert.fail;
 
 /**
  * Test simple application of Convert annotation via XML.
  *
  * @author Steve Ebersole
  */
 public class SimpleXmlOverriddenTest extends BaseUnitTestCase {
+	/**
+	 * A baseline test, with an explicit @Convert annotation that should be in effect
+	 */
 	@Test
 	public void baseline() {
 		final PersistenceUnitDescriptorAdapter pu = new PersistenceUnitDescriptorAdapter() {
 			@Override
 			public List<String> getManagedClassNames() {
-				return Arrays.asList( Super.class.getName(), Sub.class.getName() );
+				return Arrays.asList( TheEntity.class.getName() );
 			}
 
 			// No mapping file should mean that the converter is applied
@@ -74,30 +72,26 @@ public List<String> getManagedClassNames() {
 
 		final SessionFactoryImplementor sfi = emf.unwrap( SessionFactoryImplementor.class );
 		try {
-			final EntityPersister ep = sfi.getEntityPersister( Sub.class.getName() );
+			final EntityPersister ep = sfi.getEntityPersister( TheEntity.class.getName() );
 
 			Type type = ep.getPropertyType( "it" );
-			try {
-				assertTyping( StringType.class, type );
-				fail( "Expected AttributeConverter to be applied" );
-			}
-			catch (AssertionError expected) {
-			}
+			AttributeConverterTypeAdapter adapter = assertTyping( AttributeConverterTypeAdapter.class, type );
+			assertTyping( SillyStringConverter.class, adapter.getAttributeConverter() );
 		}
 		finally {
 			emf.close();
 		}
 	}
 
 	/**
-	 * Test outcome of applying overrides via orm.xml, specifically at the entity level
+	 * Test outcome of applying overrides via orm.xml, specifically at the attribute level
 	 */
 	@Test
-	public void testDefinitionAtEntityLevel() {
+	public void testDefinitionAtAttributeLevel() {
 		final PersistenceUnitDescriptorAdapter pu = new PersistenceUnitDescriptorAdapter() {
 			@Override
 			public List<String> getManagedClassNames() {
-				return Arrays.asList( Super.class.getName(), Sub.class.getName() );
+				return Arrays.asList( TheEntity.class.getName() );
 			}
 
 			@Override
@@ -107,13 +101,11 @@ public List<String> getMappingFileNames() {
 		};
 
 		final Map settings = new HashMap();
-//		settings.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
-
 		EntityManagerFactory emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build();
 
 		final SessionFactoryImplementor sfi = emf.unwrap( SessionFactoryImplementor.class );
 		try {
-			final EntityPersister ep = sfi.getEntityPersister( Sub.class.getName() );
+			final EntityPersister ep = sfi.getEntityPersister( TheEntity.class.getName() );
 
 			Type type = ep.getPropertyType( "it" );
 			assertTyping( StringType.class, type );
@@ -127,11 +119,11 @@ public List<String> getMappingFileNames() {
 	 * Test outcome of applying overrides via orm.xml, specifically at the entity level
 	 */
 	@Test
-	public void testDefinitionAtAttributeLevel() {
+	public void testDefinitionAtEntityLevel() {
 		final PersistenceUnitDescriptorAdapter pu = new PersistenceUnitDescriptorAdapter() {
 			@Override
 			public List<String> getManagedClassNames() {
-				return Arrays.asList( Super.class.getName(), Sub.class.getName() );
+				return Arrays.asList( TheEntity2.class.getName() );
 			}
 
 			@Override
@@ -141,13 +133,11 @@ public List<String> getMappingFileNames() {
 		};
 
 		final Map settings = new HashMap();
-//		settings.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
-
 		EntityManagerFactory emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build();
 
 		final SessionFactoryImplementor sfi = emf.unwrap( SessionFactoryImplementor.class );
 		try {
-			final EntityPersister ep = sfi.getEntityPersister( Sub.class.getName() );
+			final EntityPersister ep = sfi.getEntityPersister( TheEntity2.class.getName() );
 
 			Type type = ep.getPropertyType( "it" );
 			assertTyping( StringType.class, type );
@@ -157,18 +147,19 @@ public List<String> getMappingFileNames() {
 		}
 	}
 
-	@MappedSuperclass
-	public static class Super {
+	@Entity(name="TheEntity")
+	public static class TheEntity {
 		@Id
 		public Integer id;
 		@Convert(converter = SillyStringConverter.class)
 		public String it;
 	}
 
-	@Entity(name = "Sub")
-	// the xml disabled conversion on the Sub#it attribute
-	// Essentially the same test as org.hibernate.jpa.test.convert.SimpleOverriddenConverterTest, but through XML
-	//@Convert( attributeName = "it", disableConversion = true )
-	public static class Sub extends Super {
+	@Entity(name="TheEntity2")
+	@Convert( attributeName = "it", converter = SillyStringConverter.class )
+	public static class TheEntity2 {
+		@Id
+		public Integer id;
+		public String it;
 	}
 }