HHH-12653 - Throw MappingException if both @MappedSuperclass and @Inheritance are used

hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java

@@ -37,6 +37,7 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
@@ -532,6 +533,12 @@ public final class AnnotationBinder {
 					+ clazzToProcess.getName() );
 		}
 
+		if ( clazzToProcess.isAnnotationPresent( Inheritance.class )
+				&&  clazzToProcess.isAnnotationPresent( MappedSuperclass.class ) ) {
+			throw new AnnotationException( "An entity cannot be annotated with both @Inheritance and @MappedSuperclass: "
+												   + clazzToProcess.getName() );
+		}
+
 		//TODO: be more strict with secondarytable allowance (not for ids, not for secondary table join columns etc)
 		InheritanceState inheritanceState = inheritanceStatePerClass.get( clazzToProcess );
 		AnnotatedClassType classType = context.getMetadataCollector().getClassType( clazzToProcess );

hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java

@@ -0,0 +1,80 @@
+/*
+ * 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.inheritance;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.MappedSuperclass;
+
+import org.hibernate.AnnotationException;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+
+import org.hibernate.testing.TestForIssue;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ *
+ * @author Vlad Mihalcea
+ */
+@TestForIssue(jiraKey = "HHH-12653")
+public class MappedSuperclassInheritanceTest extends BaseEntityManagerFunctionalTestCase {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[] {
+				Employee.class,
+				Manager.class,
+				Developer.class
+		};
+	}
+
+	@Override
+	public void buildEntityManagerFactory() {
+		try {
+			super.buildEntityManagerFactory();
+
+			throw new IllegalStateException( "Should have thrown AnnotationException" );
+		}
+		catch (AnnotationException expected) {
+			assertTrue(expected.getMessage().startsWith( "An entity cannot be annotated with both @Inheritance and @MappedSuperclass" ));
+		}
+	}
+
+	@Test
+	public void test() {
+
+	}
+
+	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+	@MappedSuperclass
+	public static class Employee {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String jobType;
+
+		private String firstName;
+
+		private String lastName;
+	}
+
+	@Entity(name = "Manager")
+	public static class Manager extends Employee {
+	}
+
+	@Entity(name = "Developer")
+	public static class Developer extends Employee {
+	}
+}