HHH-5709: New property of PersistentClass finally renamed to jpaEntityName

hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java

@@ -195,7 +195,7 @@ public class EntityBinder {
 		persistentClass.setAbstract( annotatedClass.isAbstract() );
 		persistentClass.setClassName( annotatedClass.getName() );
 		persistentClass.setNodeName( name );
-		persistentClass.setAnnotatedEntityName(name);
+		persistentClass.setJpaEntityName(name);
 		//persistentClass.setDynamic(false); //no longer needed with the Entity name refactoring?
 		persistentClass.setEntityName( annotatedClass.getName() );
 		bindDiscriminatorValue();

hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java

@@ -57,7 +57,7 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
 	private String proxyInterfaceName;
 	
 	private String nodeName;
-	private String annotatedEntityName;
+	private String jpaEntityName;
 
 	private String discriminatorValue;
 	private boolean lazy;
@@ -737,12 +737,12 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
 		this.nodeName = nodeName;
 	}
 
-	public String getAnnotatedEntityName() {
-		return annotatedEntityName;
+	public String getJpaEntityName() {
+		return jpaEntityName;
 	}
 	
-	public void setAnnotatedEntityName(String annotatedEntityName) {
-		this.annotatedEntityName = annotatedEntityName;
+	public void setJpaEntityName(String jpaEntityName) {
+		this.jpaEntityName = jpaEntityName;
 	}
 	
 	public boolean hasPojoRepresentation() {

hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java

@@ -33,20 +33,20 @@ import javax.persistence.metamodel.EntityType;
 public class EntityTypeImpl<X> 
 		extends AbstractIdentifiableType<X>
 		implements EntityType<X>, Serializable {
-	private final String nodeName;
+	private final String jpaEntityName;
 
 	public EntityTypeImpl(
 			Class<X> javaType,
 			AbstractIdentifiableType<? super X> superType, 
-			String nodeName,
+			String jpaEntityName,
 			boolean hasIdentifierProperty,
 			boolean isVersioned) {
 		super( javaType, superType, hasIdentifierProperty, isVersioned );
-		this.nodeName = nodeName;
+		this.jpaEntityName = jpaEntityName;
 	}
 
 	public String getName() {
-		return nodeName;
+		return jpaEntityName;
 	}
 
 	public BindableType getBindableType() {

hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java

@@ -94,7 +94,7 @@ public class MetamodelImpl implements Metamodel, Serializable {
 		EntityTypeImpl entityType = new EntityTypeImpl(
 				javaType,
 				superType,
-				persistentClass.getAnnotatedEntityName(),
+				persistentClass.getJpaEntityName(),
 				persistentClass.hasIdentifierProperty(),
 				persistentClass.isVersioned()
 		);