HHH-6330 - Remove entity mode switching capability

Author: sebersole

hibernate-core/src/main/java/org/hibernate/EntityMode.java

@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2008-2011, 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 Middleware LLC.
+ * 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
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate;
 
@@ -30,10 +29,11 @@
  * @author Steve Ebersole
  */
 public enum EntityMode {
-	POJO("pojo"),
-	DOM4J("dom4j"),
-	MAP("dynamic-map");
+	POJO( "pojo" ),
+	MAP( "dynamic-map" );
+
 	private final String name;
+
 	EntityMode(String name) {
 		this.name = name;
 	}
@@ -43,12 +43,22 @@ public String toString() {
 		return name;
 	}
 
+	private static final String DYNAMIC_MAP_NAME = MAP.name.toUpperCase();
+
+	/**
+	 * Legacy-style entity-mode name parsing.  <b>Case insensitive</b>
+	 *
+	 * @param entityMode The entity mode name to evaluate
+	 *
+	 * @return The appropriate entity mode; {@code null} for incoming {@code entityMode} param is treated by returning
+	 * {@link #POJO}.
+	 */
 	public static EntityMode parse(String entityMode) {
-		if(entityMode == null){
+		if ( entityMode == null ) {
 			return POJO;
 		}
 		entityMode = entityMode.toUpperCase();
-		if ( entityMode.equals( "DYNAMIC-MAP" ) ) {
+		if ( DYNAMIC_MAP_NAME.equals( entityMode ) ) {
 			return MAP;
 		}
 		return valueOf( entityMode );

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -97,26 +97,6 @@ public interface Session extends SharedSessionContract {
 	 */
 	public SharedSessionBuilder sessionWithOptions();
 
-	/**
-	 * Retrieve the entity mode in effect for this session.
-	 *
-	 * @return The entity mode for this session.
-	 */
-	public EntityMode getEntityMode();
-
-	/**
-	 * Starts a new Session with the given entity mode in effect. This secondary
-	 * Session inherits the connection, transaction, and other context
-	 * information from the primary Session. It doesn't need to be flushed
-	 * or closed by the developer.
-	 * 
-	 * @param entityMode The entity mode to use for the new session.
-	 * @return The new session
-	 * @deprecated
-	 */
-	@Deprecated
-	public Session getSession(EntityMode entityMode);
-
 	/**
 	 * Force this session to flush. Must be called at the end of a
 	 * unit of work, before committing the transaction and closing the

hibernate-core/src/main/java/org/hibernate/SessionBuilder.java

@@ -78,15 +78,6 @@ public interface SessionBuilder {
 	 */
 	public SessionBuilder connectionReleaseMode(ConnectionReleaseMode connectionReleaseMode);
 
-	/**
-	 * Use a specific entity mode for these session options
-	 *
-	 * @param entityMode The entity mode to use.
-	 *
-	 * @return {@code this}, for method chaining
-	 */
-	public SessionBuilder entityMode(EntityMode entityMode);
-
 	/**
 	 * Should the session built automatically join in any ongoing JTA transactions
 	 *

hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java

@@ -52,13 +52,6 @@ public interface SharedSessionBuilder extends SessionBuilder {
 	 */
 	public SharedSessionBuilder connectionReleaseMode();
 
-	/**
-	 * Signifies that the entity mode from the original session should be used to create the new session
-	 *
-	 * @return {@code this}, for method chaining
-	 */
-	public SharedSessionBuilder entityMode();
-
 	/**
 	 * Signifies that the autoJoinTransaction flag from the original session should be used to create the new session
 	 *
@@ -99,9 +92,6 @@ public interface SharedSessionBuilder extends SessionBuilder {
 	@Override
 	SharedSessionBuilder connectionReleaseMode(ConnectionReleaseMode connectionReleaseMode);
 
-	@Override
-	SharedSessionBuilder entityMode(EntityMode entityMode);
-
 	@Override
 	SharedSessionBuilder autoJoinTransactions(boolean autoJoinTransactions);
 

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java

@@ -170,7 +170,7 @@ public int compareTo(Object other) {
 		else {
 			//then by fk
 			return persister.getKeyType()
-					.compare( key, action.key, session.getEntityMode() );
+					.compare( key, action.key );
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java

@@ -168,7 +168,7 @@ public int compareTo(Object other) {
 		}
 		else {
 			//then by id
-			return persister.getIdentifierType().compare( id, action.id, session.getEntityMode() );
+			return persister.getIdentifierType().compare( id, action.id );
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java

@@ -75,7 +75,7 @@ public void execute() throws HibernateException {
 			// we need to grab the version value from the entity, otherwise
 			// we have issues with generated-version entities that may have
 			// multiple actions queued during the same flush
-			version = persister.getVersion( instance, session.getEntityMode() );
+			version = persister.getVersion( instance );
 		}
 
 		final CacheKey ck;

hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java

@@ -104,7 +104,7 @@ public void execute() throws HibernateException {
 			CacheEntry ce = new CacheEntry(
 					state,
 					persister, 
-					persister.hasUninitializedLazyProperties( instance, session.getEntityMode() ),
+					persister.hasUninitializedLazyProperties( instance ),
 					version,
 					session,
 					instance

hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java

@@ -93,7 +93,7 @@ public void execute() throws HibernateException {
 			// we need to grab the version value from the entity, otherwise
 			// we have issues with generated-version entities that may have
 			// multiple actions queued during the same flush
-			previousVersion = persister.getVersion( instance, session.getEntityMode() );
+			previousVersion = persister.getVersion( instance );
 		}
 
 		final CacheKey ck;
@@ -161,7 +161,7 @@ public void execute() throws HibernateException {
 				CacheEntry ce = new CacheEntry(
 						state, 
 						persister, 
-						persister.hasUninitializedLazyProperties( instance, session.getEntityMode() ), 
+						persister.hasUninitializedLazyProperties( instance ),
 						nextVersion,
 						getSession(),
 						instance

hibernate-core/src/main/java/org/hibernate/cache/spi/CacheKey.java

@@ -25,7 +25,6 @@
 
 import java.io.Serializable;
 
-import org.hibernate.EntityMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.compare.EqualsHelper;
 import org.hibernate.type.Type;
@@ -41,7 +40,6 @@ public class CacheKey implements Serializable {
 	private final Serializable key;
 	private final Type type;
 	private final String entityOrRoleName;
-	private final EntityMode entityMode;
 	private final String tenantId;
 	private final int hashCode;
 
@@ -53,23 +51,20 @@ public class CacheKey implements Serializable {
 	 * @param id The identifier associated with the cached data
 	 * @param type The Hibernate type mapping
 	 * @param entityOrRoleName The entity or collection-role name.
-	 * @param entityMode The entity mode of the originating session
 	 * @param tenantId The tenant identifier associated this data.
 	 * @param factory The session factory for which we are caching
 	 */
 	public CacheKey(
 			final Serializable id,
 			final Type type,
 			final String entityOrRoleName,
-			final EntityMode entityMode,
 			final String tenantId,
 			final SessionFactoryImplementor factory) {
 		this.key = id;
 		this.type = type;
 		this.entityOrRoleName = entityOrRoleName;
-		this.entityMode = entityMode;
 		this.tenantId = tenantId;
-		this.hashCode = type.getHashCode( key, entityMode, factory );
+		this.hashCode = type.getHashCode( key, factory );
 	}
 
 	@Override
@@ -85,7 +80,7 @@ public boolean equals(Object other) {
 		}
 		CacheKey that = (CacheKey) other;
 		return entityOrRoleName.equals( that.entityOrRoleName ) &&
-				type.isEqual( key, that.key, entityMode ) &&
+				type.isEqual( key, that.key ) &&
 				EqualsHelper.equals( tenantId, that.tenantId );
 	}
 

hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java

@@ -26,11 +26,10 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.EntityMode;
+import org.hibernate.Filter;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.internal.FilterImpl;
 import org.hibernate.type.Type;
@@ -42,15 +41,13 @@
  */
 public final class FilterKey implements Serializable {
 	private String filterName;
-	private Map filterParameters = new HashMap();
+	private Map<String,TypedValue> filterParameters = new HashMap<String,TypedValue>();
 
-	public FilterKey(String name, Map params, Map types, EntityMode entityMode) {
+	public FilterKey(String name, Map<String,?> params, Map<String,Type> types) {
 		filterName = name;
-		Iterator iter = params.entrySet().iterator();
-		while ( iter.hasNext() ) {
-			Map.Entry me = (Map.Entry) iter.next();
-			Type type = (Type) types.get( me.getKey() );
-			filterParameters.put( me.getKey(), new TypedValue( type, me.getValue(), entityMode ) );
+		for ( Map.Entry<String, ?> paramEntry : params.entrySet() ) {
+			Type type = types.get( paramEntry.getKey() );
+			filterParameters.put( paramEntry.getKey(), new TypedValue( type, paramEntry.getValue() ) );
 		}
 	}
 
@@ -73,19 +70,18 @@ public String toString() {
 		return "FilterKey[" + filterName + filterParameters + ']';
 	}
 
-	public static Set createFilterKeys(Map enabledFilters, EntityMode entityMode) {
-		if ( enabledFilters.size()==0 ) return null;
-		Set result = new HashSet();
-		Iterator iter = enabledFilters.values().iterator();
-		while ( iter.hasNext() ) {
-			FilterImpl filter = (FilterImpl) iter.next();
+	public static Set<FilterKey> createFilterKeys(Map<String,Filter> enabledFilters) {
+		if ( enabledFilters.size()==0 ) {
+			return null;
+		}
+		Set<FilterKey> result = new HashSet<FilterKey>();
+		for ( Filter filter : enabledFilters.values() ) {
 			FilterKey key = new FilterKey(
-					filter.getName(), 
-					filter.getParameters(), 
-					filter.getFilterDefinition().getParameterTypes(), 
-					entityMode
-				);
-			result.add(key);
+					filter.getName(),
+					( (FilterImpl) filter ).getParameters(),
+					filter.getFilterDefinition().getParameterTypes()
+			);
+			result.add( key );
 		}
 		return result;
 	}