OGM-207 Removing AssociationKind enum as it is not required

hibernate · Jan 24, 2014 · 89030a2 · 89030a2
1 parent 6a5014e
commit 89030a2
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 53 deletions.
diff --git a/core/src/main/java/org/hibernate/ogm/grid/AssociationKey.java b/core/src/main/java/org/hibernate/ogm/grid/AssociationKey.java
@@ -43,7 +43,6 @@ public final class AssociationKey implements Serializable {
 	//role and entity key are not part of the object identity
 	private transient String collectionRole;
 	private transient EntityKey entityKey;
-	private transient AssociationKind associationKind;
 
 	public AssociationKey(AssociationKeyMetadata metadata, Object[] columnValues) {
 		this.metadata = metadata;
@@ -80,13 +79,6 @@ public EntityKey getEntityKey() {
 		return entityKey;
 	}
 
-	/**
-	 * Describe the type of association. May be null but is typically filled for collection of embeddable.
-	 */
-	public AssociationKind getAssociationKind() {
-		return associationKind;
-	}
-
 	public String[] getRowKeyColumnNames() {
 		return metadata.getRowKeyColumnNames();
 	}
@@ -143,10 +135,6 @@ public void setOwnerEntityKey(EntityKey entityKey) {
 		this.entityKey = entityKey;
 	}
 
-	public void setAssociationKind(AssociationKind kind) {
-		this.associationKind = kind;
-	}
-
 	/**
 	 * Whether the given column is part of this key or not.
 	 *

diff --git a/core/src/main/java/org/hibernate/ogm/grid/AssociationKind.java b/core/src/main/java/org/hibernate/ogm/grid/AssociationKind.java
diff --git a/core/src/main/java/org/hibernate/ogm/util/impl/PropertyMetadataProvider.java b/core/src/main/java/org/hibernate/ogm/util/impl/PropertyMetadataProvider.java
@@ -33,7 +33,6 @@
 import org.hibernate.ogm.dialect.GridDialect;
 import org.hibernate.ogm.grid.AssociationKey;
 import org.hibernate.ogm.grid.AssociationKeyMetadata;
-import org.hibernate.ogm.grid.AssociationKind;
 import org.hibernate.ogm.grid.EntityKey;
 import org.hibernate.ogm.grid.RowKey;
 import org.hibernate.ogm.options.spi.OptionsService;
@@ -170,13 +169,9 @@ private AssociationKey getCollectionMetadataKey() {
 				}
 				collectionMetadataKey.setOwnerEntityKey( entityKey );
 				//TODO add information on the collection type, set, map, bag, list etc
-
-				AssociationKind type = collectionPersister.getElementType().isEntityType() ? AssociationKind.ASSOCIATION : AssociationKind.EMBEDDED;
-				collectionMetadataKey.setAssociationKind( type );
 			}
 			// We have a to-one on the main side
 			else if ( propertyType != null ) {
-				collectionMetadataKey.setAssociationKind( propertyType.isEntityType() ? AssociationKind.ASSOCIATION : AssociationKind.EMBEDDED );
 				if ( propertyType instanceof EntityType ) {
 					EntityType entityType = (EntityType) propertyType;
 					OgmEntityPersister associatedPersister = (OgmEntityPersister) entityType.getAssociatedJoinable( session.getFactory() );

diff --git a/mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoHelpers.java b/mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoHelpers.java
@@ -26,7 +26,6 @@
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.ogm.datastore.mongodb.impl.AssociationStorageStrategy;
 import org.hibernate.ogm.grid.AssociationKey;
-import org.hibernate.ogm.grid.AssociationKind;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -60,8 +59,7 @@ public static DBObject associationKeyToObject(AssociationStorageStrategy storage
 	}
 
 	public static boolean isEmbeddedInEntity(AssociationKey key, AssociationStorageStrategy storageStrategy) {
-		return ( key != null && key.getAssociationKind() == AssociationKind.EMBEDDED )
-				|| storageStrategy.isEmbeddedInEntity();
+		return storageStrategy.isEmbeddedInEntity();
 	}
 
 	//only for embedded

diff --git a/...c/test/java/org/hibernate/ogm/test/mongodb/loading/LoadSelectedColumnsCollectionTest.java b/...c/test/java/org/hibernate/ogm/test/mongodb/loading/LoadSelectedColumnsCollectionTest.java
@@ -48,7 +48,6 @@
 import org.hibernate.ogm.dialect.mongodb.MongoDBDialect;
 import org.hibernate.ogm.grid.AssociationKey;
 import org.hibernate.ogm.grid.AssociationKeyMetadata;
-import org.hibernate.ogm.grid.AssociationKind;
 import org.hibernate.ogm.grid.EntityKey;
 import org.hibernate.ogm.grid.EntityKeyMetadata;
 import org.hibernate.ogm.options.generic.document.AssociationStorageType;
@@ -130,7 +129,6 @@ public void testLoadSelectedAssociationColumns() {
 		AssociationKeyMetadata metadata = new AssociationKeyMetadata( "Project_Module", new String[] { "Project_id" } );
 		metadata.setRowKeyColumnNames( new String[] { "Project_id", "module_id" } );
 		AssociationKey associationKey = new AssociationKey( metadata, new Object[] { "projectID" } );
-		associationKey.setAssociationKind( AssociationKind.ASSOCIATION );
 		associationKey.setCollectionRole( "modules" );
 		associationKey.setOwnerEntityKey( new EntityKey( new EntityKeyMetadata( "Project", new String[] { "id" } ), new String[] { "projectID" } ) );
 		AssociationContext associationContext = new AssociationContext( new PropertyOptionsContext( new WritableOptionsServiceContext(), Project.class, "modules" ) );