HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (continued fixing of hibernate-core test failures)

sebersole · sebersole · commit af3ae957a7c3 · 2016-04-26T10:57:29.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
@@ -163,7 +163,13 @@ public interface SessionFactoryImplementor extends Mapping, SessionFactory, Quer
 	 */
 	CurrentTenantIdentifierResolver getCurrentTenantIdentifierResolver();
 
-	Iterable<EntityNameResolver> iterateEntityNameResolvers();
+	/**
+	 * @deprecated (since 5.2) use {@link #getMetamodel()} -> {@link MetamodelImplementor#getEntityNameResolvers()}
+	 */
+	@Deprecated
+	default Iterable<EntityNameResolver> iterateEntityNameResolvers() {
+		return getMetamodel().getEntityNameResolvers();
+	}
 
 	/**
 	 * Contract for resolving this SessionFactory on deserialization
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java
@@ -29,7 +29,7 @@ public String resolveEntityName(Object entity) {
 			return entityName;
 		}
 
-		for ( EntityNameResolver resolver : sessionFactory.iterateEntityNameResolvers() ) {
+		for ( EntityNameResolver resolver : sessionFactory.getMetamodel().getEntityNameResolvers() ) {
 			entityName = resolver.resolveEntityName( entity );
 			if ( entityName != null ) {
 				break;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -18,8 +18,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.persistence.EntityGraph;
@@ -35,7 +33,6 @@
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.EmptyInterceptor;
-import org.hibernate.EntityNameResolver;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -118,7 +115,6 @@
 import org.hibernate.stat.spi.StatisticsImplementor;
 import org.hibernate.tool.schema.spi.DelayedDropAction;
 import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
-import org.hibernate.tuple.entity.EntityTuplizer;
 import org.hibernate.type.SerializableType;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeResolver;
@@ -184,7 +180,6 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 	private final transient Map<String,IdentifierGenerator> identifierGenerators;
 	private final transient Map<String, FilterDefinition> filters;
 	private final transient Map<String, FetchProfile> fetchProfiles;
-	private final transient ConcurrentMap<EntityNameResolver,Object> entityNameResolvers = new ConcurrentHashMap<>();
 
 	private final transient TypeResolver typeResolver;
 	private final transient TypeHelper typeHelper;
@@ -498,35 +493,6 @@ public TypeResolver getTypeResolver() {
 		return typeResolver;
 	}
 
-	private void registerEntityNameResolvers(EntityPersister persister) {
-		if ( persister.getEntityMetamodel() == null || persister.getEntityMetamodel().getTuplizer() == null ) {
-			return;
-		}
-		registerEntityNameResolvers( persister.getEntityMetamodel().getTuplizer() );
-	}
-
-	private void registerEntityNameResolvers(EntityTuplizer tuplizer) {
-		EntityNameResolver[] resolvers = tuplizer.getEntityNameResolvers();
-		if ( resolvers == null ) {
-			return;
-		}
-
-		for ( EntityNameResolver resolver : resolvers ) {
-			registerEntityNameResolver( resolver );
-		}
-	}
-
-	private static final Object ENTITY_NAME_RESOLVER_MAP_VALUE = new Object();
-
-	public void registerEntityNameResolver(EntityNameResolver resolver) {
-		entityNameResolvers.put( resolver, ENTITY_NAME_RESOLVER_MAP_VALUE );
-	}
-
-	@Override
-	public Iterable<EntityNameResolver> iterateEntityNameResolvers() {
-		return entityNameResolvers.keySet();
-	}
-
 	public QueryPlanCache getQueryPlanCache() {
 		return queryPlanCache;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java
@@ -209,6 +209,7 @@ public MetadataImplementor getMetadata() {
 		this.jpaEntityTypesByEntityName.putAll( context.getEntityTypesByEntityName() );
 	}
 
+	@Override
 	public java.util.Collection<EntityNameResolver> getEntityNameResolvers() {
 		return entityNameResolvers.keySet();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java
@@ -6,9 +6,11 @@
  */
 package org.hibernate.metamodel.spi;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.EntityNameResolver;
 import org.hibernate.MappingException;
 import org.hibernate.Metamodel;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -22,6 +24,8 @@ public interface MetamodelImplementor extends Metamodel {
 	@Override
 	SessionFactoryImplementor getSessionFactory();
 
+	Collection<EntityNameResolver> getEntityNameResolvers();
+
 	/**
 	 * Locate an EntityPersister by the entity class.  The passed Class might refer to either
 	 * the entity name directly, or it might name a proxy interface for the entity.  This
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -18,6 +18,8 @@
 public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T> {
 	private final QueryParameterBindingTypeResolver typeResolver;
 
+	private boolean isBound;
+
 	private Type bindType;
 	private T bindValue;
 
@@ -26,6 +28,11 @@ public QueryParameterBindingImpl(Type type, QueryParameterBindingTypeResolver ty
 		this.typeResolver = typeResolver;
 	}
 
+	@Override
+	public boolean isBound() {
+		return isBound;
+	}
+
 	@Override
 	public T getBindValue() {
 		return bindValue;
@@ -38,6 +45,7 @@ public Type getBindType() {
 
 	@Override
 	public void setBindValue(T value) {
+		this.isBound = true;
 		this.bindValue = value;
 
 		if ( bindType == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
@@ -194,8 +194,8 @@ public QueryParameterBinding getBinding(int position) {
 
 	public void verifyParametersBound(boolean reserveFirstParameter) {
 		for ( Map.Entry<QueryParameter, QueryParameterBinding> bindEntry : parameterBindingMap.entrySet() ) {
-			if ( bindEntry.getValue().getBindValue() == null ) {
-				if ( bindEntry.getKey().getName() == null ) {
+			if ( !bindEntry.getValue().isBound() ) {
+				if ( bindEntry.getKey().getName() != null ) {
 					throw new QueryException( "Named parameter [" + bindEntry.getKey().getName() + "] not set" );
 				}
 				else if ( bindEntry.getKey().getPosition() != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/internal/ProcedureParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/internal/ProcedureParameterBindingImpl.java
@@ -22,6 +22,11 @@ public ProcedureParameterBindingImpl(ProcedureParameterImplementor<T> parameter)
 		this.parameter = parameter;
 	}
 
+	@Override
+	public boolean isBound() {
+		return parameter.getNativeParameterRegistration().getBind() != null;
+	}
+
 	@Override
 	public void setBindValue(T value) {
 		parameter.getNativeParameterRegistration().bindValue( value );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
@@ -18,6 +18,8 @@
  */
 @Incubating
 public interface QueryParameterBinding<T> {
+	boolean isBound();
+
 	/**
 	 * Sets the parameter binding value.  The inherent parameter type (if known) is assumed
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
@@ -178,7 +178,7 @@ private EntityPersister guessEntityPersister(Object object) {
 		}
 
 		if ( entityName == null ) {
-			for ( EntityNameResolver resolver : scope.resolveFactory().iterateEntityNameResolvers() ) {
+			for ( EntityNameResolver resolver : scope.resolveFactory().getMetamodel().getEntityNameResolvers() ) {
 				entityName = resolver.resolveEntityName( entity );
 				if ( entityName != null ) {
 					break;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public String resolveEntityName(Object entity) {`
`29`	`29`	`return entityName;`
`30`	`30`	`}`
`31`	`31`
`32`		`- for ( EntityNameResolver resolver : sessionFactory.iterateEntityNameResolvers() ) {`
	`32`	`+ for ( EntityNameResolver resolver : sessionFactory.getMetamodel().getEntityNameResolvers() ) {`
`33`	`33`	`entityName = resolver.resolveEntityName( entity );`
`34`	`34`	`if ( entityName != null ) {`
`35`	`35`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ public MetadataImplementor getMetadata() {`
`209`	`209`	`this.jpaEntityTypesByEntityName.putAll( context.getEntityTypesByEntityName() );`
`210`	`210`	`}`
`211`	`211`
	`212`	`+ @Override`
`212`	`213`	`public java.util.Collection<EntityNameResolver> getEntityNameResolvers() {`
`213`	`214`	`return entityNameResolvers.keySet();`
`214`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`*/`
`19`	`19`	`@Incubating`
`20`	`20`	`public interface QueryParameterBinding<T> {`
	`21`	`+ boolean isBound();`
	`22`	`+`
`21`	`23`	`/**`
`22`	`24`	`* Sets the parameter binding value. The inherent parameter type (if known) is assumed`
`23`	`25`	`*`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private EntityPersister guessEntityPersister(Object object) {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`if ( entityName == null ) {`
`181`		`- for ( EntityNameResolver resolver : scope.resolveFactory().iterateEntityNameResolvers() ) {`
	`181`	`+ for ( EntityNameResolver resolver : scope.resolveFactory().getMetamodel().getEntityNameResolvers() ) {`
`182`	`182`	`entityName = resolver.resolveEntityName( entity );`
`183`	`183`	`if ( entityName != null ) {`
`184`	`184`	`break;`