Merge branch 'develop'

Author: rasmus

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+## How to contribute
+
+EventFlow still needs a lot of love and if you want to help out there are
+several areas that you could help out with.
+
+* **Features:** If you have a great idea for EventFlow, create a pull request.
+   It might be a finished idea or just some basic concepts showing the feature
+   outline
+* **Pull request feedback:** Typically there are several pull requests marked
+   with the `in progress` and feedback is always welcome. Please note that the
+   quality of the code here might not be "production ready", especially if
+   the pull request is marked with the `prof of concept` label
+* **Documentation:** Good documentation is very important for any library and
+   is also very hard to do properly, so if spot a spelling error, think up
+   a good idea for a guide or just have some comments, then please create
+   either a pull request or an issue
+* **Information sharing:** Working with CQRS+ES and DDD is hard, so if you come
+   across articles that might be relevant for EventFlow, or even better, can
+   point to specfic EventFlow functionality that might be done better, then
+   please create an issue or ask in the Gitter chat
+* **Expand the shipping example:** If you have ideas on how to expand the
+  shipping example found in the code base, the please create a pull request
+  or create an issue
+  * Give a good understanding of how to use EventFlow
+  * Give a better understanding of how API changes in EventFlow affect
+    existing applications
+  * Provide a platform for DDD discussions

Documentation/EventStore.rst

@@ -16,6 +16,11 @@ support for alternatives.
 In-memory
 ---------
 
+.. IMPORTANT::
+
+    In-memory event store shouldn't be used for production environments, only for tests.
+
+
 Using the in-memory event store is easy as its enabled by default, no need
 to do anything.
 
@@ -72,6 +77,11 @@ application install or update, e.g., when the web site is installed.
 Files
 -----
 
+.. IMPORTANT::
+
+    Files event shouldn't be used for production environments, only for tests.
+
+
 The file based event store is useful if you have a set of events that represents
 a certain scenario and would like to create a test that verifies that the domain
 handles it correctly.

README.md

@@ -315,33 +315,6 @@ share it by creating an issue with the link.
  - [The Unit of Work and Transactions In Domain Driven Design](http://blog.sapiensworks.com/post/2015/09/02/DDD-and-UoW/)
    by Mike Mogosanu
 
-## How to contribute
-
-EventFlow still needs a lot of love and if you want to help out there are
-several areas that you could help out with.
-
-* **Features:** If you have a great idea for EventFlow, create a pull request.
-   It might be a finished idea or just some basic concepts showing the feature
-   outline
-* **Pull request feedback:** Typically there are several pull requests marked
-   with the `in progress` and feedback is always welcome. Please note that the
-   quality of the code here might not be "production ready", especially if
-   the pull request is marked with the `prof of concept` label
-* **Documentation:** Good documentation is very important for any library and
-   is also very hard to do properly, so if spot a spelling error, think up
-   a good idea for a guide or just have some comments, then please create
-   either a pull request or an issue
-* **Information sharing:** Working with CQRS+ES and DDD is hard, so if you come
-   across articles that might be relevant for EventFlow, or even better, can
-   point to specfic EventFlow functionality that might be done better, then
-   please create an issue or ask in the Gitter chat
-* **Expand the shipping example:** If you have ideas on how to expand the
-  shipping example found in the code base, the please create a pull request
-  or create an issue
-  * Give a good understanding of how to use EventFlow
-  * Give a better understanding of how API changes in EventFlow affect
-    existing applications
-  * Provide a platform for DDD discussions
 
 ### Integration tests
 EventFlow has several tests that verify that its able to use the systems it
@@ -366,6 +339,14 @@ category.
 
 ## Thanks
 
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td width="25%">
+      <a href="https://www.jetbrains.com/"><img src="./Resources/jetbrains-128x128.png" /></a>
+    </td>
+  </tr>
+</table>
+
 * [Contributors](https://github.com/eventflow/EventFlow/graphs/contributors)
 * [JetBrains](https://www.jetbrains.com/resharper/): OSS licenses
 * [olholm](https://github.com/olholm): Current logo

RELEASE_NOTES.md

@@ -1,4 +1,18 @@
-### New in 0.48 (not released yet)
+### New in 0.49 (not released yet)
+
+* Breaking: Upgraded `EventStore.Client` dependency to version 4.0
+* Breaking: Changed target framework for `EventFlow.EventStores.EventStore` to
+  .NET 4.6.2 as required by `EventStore.Client` NuGet dependency
+* Fix: `EventFlow.Hangfire` now depends on `Hangfire.Core` instead of
+  `Hangfire`
+* New: Added an overload to `IDomainEventPublisher.PublishAsync` that isn't
+  generic and doesn't require an aggregate ID
+* New: Added `IReadModelPopulator.DeleteAsync` that allows deletion of single
+  read models
+* Obsolete: `IDomainEventPublisher.PublishAsync<,>` (generic) in favor of the
+  new less restrictive non-generic overload
+
+### New in 0.48.2937 (released 2017-07-11)
 
 * Breaking: Moved non-async methods on `IReadModelPopulator` to extension
   methods
@@ -11,7 +25,7 @@
 * New: Now possible to configure retry delay for MSSQL error `40501` (server
   too busy) using `IMsSqlConfiguration.SetServerBusyRetryDelay(RetryDelay)`
 * New: Now possible to configure the retry count of transient exceptions for
-  MSSQL and SQLite using the `ISqlConfiguration.SetTransientRetryCount(int)` 
+  MSSQL and SQLite using the `ISqlConfiguration.SetTransientRetryCount(int)`
 * Fixed: Added MSSQL error codes `10928`, `10929`, `18401` and `40540` as well
   as a few native `Win32Exception` exceptions to the list treated as transient
   errors, i.e., EventFlow will automatically retry if the server returns one

Resources/jetbrains-128x128.png

@@ -70,16 +70,24 @@ public ElasticsearchInstance(
 
             public async Task<string> GetStatusAsync()
             {
-                var clusterHealth = await HttpHelper.GetAsAsync<ClusterHealth>(new Uri(Uri, "_cluster/health"));
-                return clusterHealth.Status;
+                try
+                {
+                    var clusterHealth = await HttpHelper.GetAsAsync<ClusterHealth>(new Uri(Uri, "_cluster/health")).ConfigureAwait(false);
+                    return clusterHealth.Status;
+                }
+                catch (Exception e)
+                {
+                    LogHelper.Log.Warning(e, "Exception while checking Elasticsearch health");
+                    return string.Empty;
+                }
             }
 
             public Task WaitForGreenStateAsync()
             {
                 return WaitHelper.WaitAsync(TimeSpan.FromMinutes(1), async () =>
                 {
                     var status = await GetStatusAsync().ConfigureAwait(false);
-                    return status == "green";
+                    return string.Equals(status, "green", StringComparison.OrdinalIgnoreCase);
                 });
             }
 

Source/EventFlow.Elasticsearch.Tests/ElasticsearchRunner.cs

@@ -23,8 +23,6 @@
 
 using System;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using EventFlow.Configuration;
 using EventFlow.Elasticsearch.Extensions;
 using EventFlow.Elasticsearch.ReadStores;
@@ -45,6 +43,8 @@ namespace EventFlow.Elasticsearch.Tests.IntegrationTests
     [Category(Categories.Integration)]
     public class ElasticsearchReadModelStoreTests : TestSuiteForReadModelStore
     {
+        protected override Type ReadModelType { get; } = typeof(ElasticsearchThingyReadModel);
+
         private IElasticClient _elasticClient;
         private ElasticsearchRunner.ElasticsearchInstance _elasticsearchInstance;
         private string _indexName;
@@ -122,16 +122,6 @@ protected override IRootResolver CreateRootResolver(IEventFlowOptions eventFlowO
             }
         }
 
-        protected override Task PurgeTestAggregateReadModelAsync()
-        {
-            return ReadModelPopulator.PurgeAsync<ElasticsearchThingyReadModel>(CancellationToken.None);
-        }
-
-        protected override Task PopulateTestAggregateReadModelAsync()
-        {
-            return ReadModelPopulator.PopulateAsync<ElasticsearchThingyReadModel>(CancellationToken.None);
-        }
-
         [TearDown]
         public void TearDown()
         {

Source/EventFlow.Elasticsearch.Tests/IntegrationTests/ElasticsearchReadModelStoreTests.cs

@@ -25,6 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NEST" Version="5.3.1" />
+    <PackageReference Include="newtonsoft.json" Version="10.0.3" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EventFlow\EventFlow.csproj" />

Source/EventFlow.Elasticsearch/EventFlow.Elasticsearch.csproj

@@ -79,6 +79,22 @@ public async Task<ReadModelEnvelope<TReadModel>> GetAsync(
             return ReadModelEnvelope<TReadModel>.With(id, getResponse.Source, getResponse.Version);
         }
 
+        public async Task DeleteAsync(
+            string id,
+            CancellationToken cancellationToken)
+        {
+            var readModelDescription = _readModelDescriptionProvider.GetReadModelDescription<TReadModel>();
+
+            await _elasticClient.DeleteAsync(
+                new DocumentPath<TReadModel>(id),
+                d => d
+                    .Index(readModelDescription.IndexName.Value)
+                    .RequestConfiguration(c => c
+                        .AllowedStatusCodes((int) HttpStatusCode.NotFound)),
+                cancellationToken)
+                .ConfigureAwait(false);
+        }
+
         public async Task DeleteAllAsync(
             CancellationToken cancellationToken)
         {