Rename IEventStream back to IEventStore

tomasaschan · Nov 1, 2017 · 0845bc2 · 0845bc2
1 parent 8a8ce05
commit 0845bc2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 0.4.1
+next-version: 0.5.0
 branches:
   master:
     tag: beta

diff --git a/src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/ExtraMetaTests.cs b/src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/ExtraMetaTests.cs
@@ -43,7 +43,7 @@ public ExtraMetaTests(ExtraMetaEventFactoryFixture fixture, AssemblyInitializerF
         [InlineData("stream-2", 2)]
         public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, ExtraMetaStringEvent, IExtraMeta>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, ExtraMetaStringEvent, IExtraMeta>;
             var events = await store.Events(streamId);
             Assert.Equal(expectedCount, events.Count());
         }
@@ -53,7 +53,7 @@ public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expec
         [InlineData("stream-2", 1)]
         public async Task ReturnsEventsAccordingToQuery(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, ExtraMetaStringEvent, IExtraMeta>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, ExtraMetaStringEvent, IExtraMeta>;
             var events = await store.Events(streamId, es => es.Where(e => e.ExtraMeta.StartsWith("Foo")));
             Assert.Equal(expectedCount, events.Count());
         }
@@ -63,7 +63,7 @@ public async Task ReturnsEventsAccordingToQuery(string streamId, long expectedCo
         [InlineData("stream-2", 1)]
         public async Task ReturnsEventsWithMetadata(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, ExtraMetaStringEvent, IExtraMeta>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, ExtraMetaStringEvent, IExtraMeta>;
             var events = await store.Events(streamId, es => es.Where(e => e.ExtraMeta.StartsWith("Foo")));
             Assert.All(events, @event => Assert.StartsWith("Foo", @event.ExtraMeta));
         }
@@ -73,7 +73,7 @@ public async Task ReturnsEventsWithMetadata(string streamId, long expectedCount)
         [InlineData("stream-2", 1)]
         public async Task CanQueryByExtraMetadata(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, ExtraMetaStringEvent, IExtraMeta>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, ExtraMetaStringEvent, IExtraMeta>;
             var events = await store.Events(streamId, es => es.Where(e => e.ExtraMeta.StartsWith("Foo")));
             Assert.Equal(expectedCount, events.Count());
         }

diff --git a/src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/QueryEventsTests.cs b/src/RdbmsEventStore.EntityFramework.Tests/EventStoreTests/QueryEventsTests.cs
@@ -32,7 +32,7 @@ public QueryEventsTests(EventStoreFixture<long, string, StringEvent, IEventMetad
         [InlineData("stream-2", 2)]
         public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, StringEvent, IEventMetadata<string>>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
             var events = await store.Events(streamId);
             Assert.Equal(expectedCount, events.Count());
         }
@@ -42,23 +42,23 @@ public async Task ReturnsEventsFromCorrectStreamOnly(string streamId, long expec
         [InlineData("stream-2", 1)]
         public async Task ReturnsEventsAccordingToQuery(string streamId, long expectedCount)
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, StringEvent, IEventMetadata<string>>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
             var events = await store.Events(streamId, es => es.Where(e => e.Version > 1));
             Assert.Equal(expectedCount, events.Count());
         }
 
         [Fact]
         public async Task ReturnsAllEvents()
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, StringEvent, IEventMetadata<string>>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
             var events = await store.Events();
             Assert.Equal(5, events.Count());
         }
 
         [Fact]
         public async Task ReturnsAllEventsAccordingToQuery()
         {
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<string, StringEvent, IEventMetadata<string>>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<string, StringEvent, IEventMetadata<string>>;
             var events = await store.Events(es => es.Where(e => e.Version > 1));
             Assert.Equal(3, events.Count());
         }

diff --git a/...dbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs b/...dbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs
@@ -79,7 +79,7 @@ public async Task CanReadEventsFromStoreWithNonDefaultImplementations()
             });
             await _dbContext.SaveChangesAsync();
 
-            var store = _fixture.BuildEventStore(_dbContext) as IEventStream<long, NonDefaultEvent, IEventMetadata<long>>;
+            var store = _fixture.BuildEventStore(_dbContext) as IEventStore<long, NonDefaultEvent, IEventMetadata<long>>;
 
             var events = await store.Events(1);
 

diff --git a/src/RdbmsEventStore.EntityFramework/EntityFrameworkEventStore.cs b/src/RdbmsEventStore.EntityFramework/EntityFrameworkEventStore.cs
@@ -7,7 +7,7 @@
 
 namespace RdbmsEventStore.EntityFramework
 {
-    public class EntityFrameworkEventStore<TId, TStreamId, TContext, TEvent, TEventMetadata, TPersistedEvent> : IEventStream<TStreamId, TEvent, TEventMetadata>
+    public class EntityFrameworkEventStore<TId, TStreamId, TContext, TEvent, TEventMetadata, TPersistedEvent> : IEventStore<TStreamId, TEvent, TEventMetadata>
         where TId : IEquatable<TId>
         where TStreamId : IEquatable<TStreamId>
         where TContext : DbContext, IEventDbContext<TPersistedEvent>

diff --git a/src/RdbmsEventStore/EventStreamExtensions.cs b/src/RdbmsEventStore/EventStreamExtensions.cs
@@ -7,28 +7,28 @@ namespace RdbmsEventStore
 {
     public static class EventStreamExtensions
     {
-        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStream<TStreamId, TEvent, TEventMetadata> stream)
+        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStore<TStreamId, TEvent, TEventMetadata> store)
             where TStreamId : IEquatable<TStreamId>
             where TEvent : class, TEventMetadata, IEvent<TStreamId>
             where TEventMetadata : class, IEventMetadata<TStreamId>
-            => stream.Events(events => events);
+            => store.Events(events => events);
 
-        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStream<TStreamId, TEvent, TEventMetadata> stream, TStreamId streamId)
+        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStore<TStreamId, TEvent, TEventMetadata> store, TStreamId streamId)
             where TStreamId : IEquatable<TStreamId>
             where TEvent : class, TEventMetadata, IEvent<TStreamId>
             where TEventMetadata : class, IEventMetadata<TStreamId>
-            => stream.Events(streamId, events => events);
+            => store.Events(streamId, events => events);
 
-        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStream<TStreamId, TEvent, TEventMetadata> stream, TStreamId streamId, Func<IQueryable<TEventMetadata>, IQueryable<TEventMetadata>> query)
+        public static Task<IEnumerable<TEvent>> Events<TStreamId, TEvent, TEventMetadata>(this IEventStore<TStreamId, TEvent, TEventMetadata> store, TStreamId streamId, Func<IQueryable<TEventMetadata>, IQueryable<TEventMetadata>> query)
             where TStreamId : IEquatable<TStreamId>
             where TEvent : class, TEventMetadata, IEvent<TStreamId>
             where TEventMetadata : class, IEventMetadata<TStreamId>
-            => stream.Events(events => events.Where(e => e.StreamId.Equals(streamId)).Apply(query));
+            => store.Events(events => events.Where(e => e.StreamId.Equals(streamId)).Apply(query));
 
-        public static Task Append<TStreamId, TEvent, TEventMetadata>(this IEventStream<TStreamId, TEvent, TEventMetadata> stream, TStreamId streamId, long versionBefore, object payload)
+        public static Task Append<TStreamId, TEvent, TEventMetadata>(this IEventStore<TStreamId, TEvent, TEventMetadata> store, TStreamId streamId, long versionBefore, object payload)
             where TStreamId : IEquatable<TStreamId>
             where TEvent : class, TEventMetadata, IEvent<TStreamId>
             where TEventMetadata : class, IEventMetadata<TStreamId>
-            => stream.Append(streamId, versionBefore, new[] { payload });
+            => store.Append(streamId, versionBefore, new[] { payload });
     }
 }
diff --git a/src/RdbmsEventStore/IEventStream.cs → src/RdbmsEventStore/IEventStore.cs b/src/RdbmsEventStore/IEventStream.cs → src/RdbmsEventStore/IEventStore.cs
@@ -5,7 +5,7 @@
 
 namespace RdbmsEventStore
 {
-    public interface IEventStream<in TStreamId, TEvent, TEventMetadata>
+    public interface IEventStore<in TStreamId, TEvent, TEventMetadata>
         where TStreamId : IEquatable<TStreamId>
         where TEvent : IEvent<TStreamId>, TEventMetadata
         where TEventMetadata : IEventMetadata<TStreamId>