Adding an additional, simplified Entity Collection interface

(without as much of the ICollection baggage)

src/MongoFramework/Infrastructure/EntityBucketStagingCollection.cs

@@ -7,18 +7,14 @@
 
 namespace MongoFramework.Infrastructure
 {
-	public class EntityBucketStagingCollection<TGroup, TSubEntity> : IEntityCollection<EntityBucket<TGroup, TSubEntity>> where TGroup : class
+	public class EntityBucketStagingCollection<TGroup, TSubEntity> : IEntityCollectionBase<EntityBucket<TGroup, TSubEntity>> where TGroup : class
 	{
 		private Dictionary<TGroup, List<TSubEntity>> SubEntityStaging { get; }
 		private IEntityCollection<EntityBucket<TGroup, TSubEntity>> ChangeTracker { get; }
 		private IEntityReader<EntityBucket<TGroup, TSubEntity>> EntityReader { get; }
 
 		public int BucketSize { get; }
 
-		public int Count => throw new NotImplementedException();
-
-		public bool IsReadOnly => false;
-
 		public EntityBucketStagingCollection(IEntityReader<EntityBucket<TGroup, TSubEntity>> entityReader, int bucketSize)
 		{
 			SubEntityStaging = new Dictionary<TGroup, List<TSubEntity>>(new ShallowPropertyEqualityComparer<TGroup>());
@@ -115,42 +111,9 @@ public void Update(EntityBucket<TGroup, TSubEntity> entity, EntityEntryState sta
 		{
 			throw new NotImplementedException();
 		}
-
-		public void Add(EntityBucket<TGroup, TSubEntity> item)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool Contains(EntityBucket<TGroup, TSubEntity> item)
+		public bool Remove(EntityBucket<TGroup, TSubEntity> entity)
 		{
 			throw new NotImplementedException();
 		}
-
-		public void CopyTo(EntityBucket<TGroup, TSubEntity>[] array, int arrayIndex)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool Remove(EntityBucket<TGroup, TSubEntity> item)
-		{
-			throw new NotImplementedException();
-		}
-
-		public IEnumerator<EntityBucket<TGroup, TSubEntity>> GetEnumerator()
-		{
-			var result = GetEntries().Select(e => e.Entity);
-			using (var enumerator = result.GetEnumerator())
-			{
-				while (enumerator.MoveNext())
-				{
-					yield return enumerator.Current;
-				}
-			}
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
 	}
 }

src/MongoFramework/Infrastructure/EntityWriterPipeline.cs

@@ -14,7 +14,7 @@ public class EntityWriterPipeline<TEntity> : IEntityWriterPipeline<TEntity> wher
 	{
 		public IMongoDbConnection Connection { get; }
 		private ICommandWriter<TEntity> CommandWriter { get; }
-		private List<IEntityCollection<TEntity>> ManagedCollections { get; } = new List<IEntityCollection<TEntity>>();
+		private List<IEntityCollectionBase<TEntity>> ManagedCollections { get; } = new List<IEntityCollectionBase<TEntity>>();
 		private List<IWriteCommand<TEntity>> StagedCommands { get; } = new List<IWriteCommand<TEntity>>();
 
 		public EntityWriterPipeline(IMongoDbConnection connection)
@@ -23,7 +23,7 @@ public EntityWriterPipeline(IMongoDbConnection connection)
 			CommandWriter = new CommandWriter<TEntity>(connection);
 		}
 
-		public void AddCollection(IEntityCollection<TEntity> collection)
+		public void AddCollection(IEntityCollectionBase<TEntity> collection)
 		{
 			if (collection == null)
 			{
@@ -35,7 +35,7 @@ public void AddCollection(IEntityCollection<TEntity> collection)
 				ManagedCollections.Add(collection);
 			}
 		}
-		public void RemoveCollection(IEntityCollection<TEntity> collection)
+		public void RemoveCollection(IEntityCollectionBase<TEntity> collection)
 		{
 			if (collection == null)
 			{

src/MongoFramework/Infrastructure/IEntityCollection.cs

@@ -2,10 +2,16 @@
 
 namespace MongoFramework.Infrastructure
 {
-	public interface IEntityCollection<TEntity> : ICollection<TEntity> where TEntity : class
+	public interface IEntityCollectionBase<TEntity> where TEntity : class
 	{
 		EntityEntry<TEntity> GetEntry(TEntity entity);
 		IEnumerable<EntityEntry<TEntity>> GetEntries();
 		void Update(TEntity entity, EntityEntryState state);
+		bool Remove(TEntity entity);
+	}
+
+	public interface IEntityCollection<TEntity> : IEntityCollectionBase<TEntity>, ICollection<TEntity> where TEntity : class
+	{
+
 	}
 }

src/MongoFramework/Infrastructure/IEntityNavigationCollection.cs

@@ -2,15 +2,15 @@
 
 namespace MongoFramework.Infrastructure
 {
-	public interface IEntityNavigationCollection
+	public interface IEntityNavigationCollectionBase
 	{
 		void SetConnection(IMongoDbConnection connection);
 		void AddForeignId(object foreignId);
 		void AddForeignIds(IEnumerable<object> foreignIds);
 		void LoadEntities();
 	}
 
-	public interface IEntityNavigationCollection<TEntity> : IEntityNavigationCollection, IEntityCollection<TEntity> where TEntity : class
+	public interface IEntityNavigationCollection<TEntity> : IEntityNavigationCollectionBase, IEntityCollection<TEntity> where TEntity : class
 	{
 
 	}

src/MongoFramework/Infrastructure/IEntityWriterPipeline.cs

@@ -10,8 +10,8 @@ namespace MongoFramework.Infrastructure
 	public interface IEntityWriterPipeline<TEntity> where TEntity : class
 	{
 		IMongoDbConnection Connection { get; }
-		void AddCollection(IEntityCollection<TEntity> collection);
-		void RemoveCollection(IEntityCollection<TEntity> collection);
+		void AddCollection(IEntityCollectionBase<TEntity> collection);
+		void RemoveCollection(IEntityCollectionBase<TEntity> collection);
 		void StageCommand(IWriteCommand<TEntity> command);
 		void ClearStaging();
 		void Write();

src/MongoFramework/Infrastructure/Mutation/Mutators/NavigationPropertyMutator.cs

@@ -21,13 +21,13 @@ public void MutateEntity(TEntity entity, MutatorType mutationType, IMongoDbConne
 				else if (mutationType == MutatorType.Create && relationship.IsCollection)
 				{
 					var navigationCollectionType = typeof(EntityNavigationCollection<>).MakeGenericType(relationship.EntityType);
-					var navigationCollection = Activator.CreateInstance(navigationCollectionType, relationship.IdProperty) as IEntityNavigationCollection;
+					var navigationCollection = Activator.CreateInstance(navigationCollectionType, relationship.IdProperty) as IEntityNavigationCollectionBase;
 					navigationCollection.SetConnection(connection);
 					relationship.NavigationProperty.SetValue(entity, navigationCollection);
 				}
 				else if (mutationType == MutatorType.Select && relationship.IsCollection)
 				{
-					if (relationship.NavigationProperty.GetValue(entity) is IEntityNavigationCollection navigationCollection)
+					if (relationship.NavigationProperty.GetValue(entity) is IEntityNavigationCollectionBase navigationCollection)
 					{
 						navigationCollection.SetConnection(connection);
 					}