Upgrading to MediatR 4.0

jbogard · Dec 3, 2017 · 4c0183e · 4c0183e
1 parent 49bf2fe
commit 4c0183e
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 81 deletions.
diff --git a/src/ContosoUniversityCore/ContosoUniversityCore.csproj b/src/ContosoUniversityCore/ContosoUniversityCore.csproj
@@ -23,31 +23,31 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.1.1" />
-    <PackageReference Include="AutoMapper.EF6" Version="1.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="3.0.1" />
-    <PackageReference Include="BundlerMinifier.Core" Version="2.4.337" />
+    <PackageReference Include="AutoMapper" Version="6.2.1" />
+    <PackageReference Include="AutoMapper.EF6" Version="1.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="3.2.0" />
+    <PackageReference Include="BundlerMinifier.Core" Version="2.6.362" />
     <PackageReference Include="DelegateDecompiler.EntityFramework" Version="0.23.0" />
-    <PackageReference Include="EntityFramework" Version="6.1.3" />
+    <PackageReference Include="EntityFramework" Version="6.2.0" />
     <PackageReference Include="EntityFramework.Extended" Version="6.1.0.168" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="7.1.1" />
-    <PackageReference Include="HtmlTags.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="MediatR" Version="3.0.1" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="7.3.0-beta2" />
+    <PackageReference Include="HtmlTags.AspNetCore" Version="6.0.0" />
+    <PackageReference Include="MediatR" Version="4.0.0" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="4.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
-    <PackageReference Include="OdeToCode.AddFeatureFolders" Version="1.0.4" />
-    <PackageReference Include="X.PagedList" Version="7.1.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1" />
+    <PackageReference Include="OdeToCode.AddFeatureFolders" Version="1.0.8" />
+    <PackageReference Include="X.PagedList" Version="7.1.7" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/src/ContosoUniversityCore/Features/Course/Create.cs b/src/ContosoUniversityCore/Features/Course/Create.cs
@@ -17,7 +17,7 @@ public class Command : IRequest
             public Department Department { get; set; }
         }
 
-        public class Handler : IRequestHandler<Command>
+        public class Handler : RequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -26,7 +26,7 @@ public Handler(SchoolContext db)
                 _db = db;
             }
 
-            public void Handle(Command message)
+            protected override void HandleCore(Command message)
             {
                 var course = Mapper.Map<Command, Course>(message);
                 course.Id = message.Number;

diff --git a/src/ContosoUniversityCore/Features/Course/Delete.cs b/src/ContosoUniversityCore/Features/Course/Delete.cs
@@ -23,7 +23,7 @@ public QueryValidator()
             }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -32,7 +32,7 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public Task<Command> Handle(Query message)
+            protected override Task<Command> HandleCore(Query message)
             {
                 return _db.Courses.Where(c => c.Id == message.Id).ProjectToSingleOrDefaultAsync<Command>();
             }
@@ -47,7 +47,7 @@ public class Command : IRequest
             public string DepartmentName { get; set; }
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command>
+        public class CommandHandler : AsyncRequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -56,7 +56,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task Handle(Command message)
+            protected override async Task HandleCore(Command message)
             {
                 var course = await _db.Courses.FindAsync(message.Id);
 

diff --git a/src/ContosoUniversityCore/Features/Course/Details.cs b/src/ContosoUniversityCore/Features/Course/Details.cs
@@ -30,7 +30,7 @@ public class Model
             public string DepartmentName { get; set; }
         }
 
-        public class Handler : IAsyncRequestHandler<Query, Model>
+        public class Handler : AsyncRequestHandler<Query, Model>
         {
             private readonly SchoolContext _db;
 
@@ -39,7 +39,7 @@ public Handler(SchoolContext db)
                 _db = db;
             }
 
-            public Task<Model> Handle(Query message)
+            protected override Task<Model> HandleCore(Query message)
             {
                 return _db.Courses.Where(i => i.Id == message.Id).ProjectToSingleOrDefaultAsync<Model>();
             }

diff --git a/src/ContosoUniversityCore/Features/Course/Edit.cs b/src/ContosoUniversityCore/Features/Course/Edit.cs
@@ -24,7 +24,7 @@ public QueryValidator()
             }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -33,7 +33,7 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public Task<Command> Handle(Query message)
+            protected override Task<Command> HandleCore(Query message)
             {
                 return _db.Courses.Where(c => c.Id == message.Id).ProjectToSingleOrDefaultAsync<Command>();
             }
@@ -57,7 +57,7 @@ public CommandValidator()
             }
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command>
+        public class CommandHandler : AsyncRequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -66,7 +66,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task Handle(Command message)
+            protected override async Task HandleCore(Command message)
             {
                 var course = await _db.Courses.FindAsync(message.Id);
 

diff --git a/src/ContosoUniversityCore/Features/Course/Index.cs b/src/ContosoUniversityCore/Features/Course/Index.cs
@@ -29,7 +29,7 @@ public class Course
             }
         }
 
-        public class Handler : IAsyncRequestHandler<Query, Result>
+        public class Handler : AsyncRequestHandler<Query, Result>
         {
             private readonly SchoolContext _db;
 
@@ -38,7 +38,7 @@ public Handler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task<Result> Handle(Query message)
+            protected override async Task<Result> HandleCore(Query message)
             {
                 int? departmentID = message.SelectedDepartment?.Id;
 

diff --git a/src/ContosoUniversityCore/Features/Department/Create.cs b/src/ContosoUniversityCore/Features/Department/Create.cs
@@ -38,7 +38,7 @@ public class Command : IRequest
             public Instructor Administrator { get; set; }
         }
 
-        public class CommandHandler : IRequestHandler<Command>
+        public class CommandHandler : RequestHandler<Command>
         {
             private readonly SchoolContext _context;
 
@@ -47,7 +47,7 @@ public CommandHandler(SchoolContext context)
                 _context = context;
             }
 
-            public void Handle(Command message)
+            protected override void HandleCore(Command message)
             {
                 var department = Mapper.Map<Command, Department>(message);
 

diff --git a/src/ContosoUniversityCore/Features/Department/Delete.cs b/src/ContosoUniversityCore/Features/Department/Delete.cs
@@ -31,7 +31,7 @@ public class Command : IRequest
             public byte[] RowVersion { get; set; }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -40,7 +40,7 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task<Command> Handle(Query message)
+            protected override async Task<Command> HandleCore(Query message)
             {
                 var department = await _db.Departments
                     .Where(d => d.Id == message.Id)
@@ -50,7 +50,7 @@ public async Task<Command> Handle(Query message)
             }
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command>
+        public class CommandHandler : AsyncRequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -59,7 +59,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task Handle(Command message)
+            protected override async Task HandleCore(Command message)
             {
                 var department = await _db.Departments.FindAsync(message.Id);
 

diff --git a/src/ContosoUniversityCore/Features/Department/Details.cs b/src/ContosoUniversityCore/Features/Department/Details.cs
@@ -28,7 +28,7 @@ public class Model
 
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Model>
+        public class QueryHandler : AsyncRequestHandler<Query, Model>
         {
             private readonly SchoolContext _context;
 
@@ -37,7 +37,7 @@ public QueryHandler(SchoolContext context)
                 _context = context;
             }
 
-            public async Task<Model> Handle(Query message)
+            protected override async Task<Model> HandleCore(Query message)
             {
                 string query = @"
 SELECT d.*, p.LastName + ', ' + p.FirstName AS [AdministratorFullName]

diff --git a/src/ContosoUniversityCore/Features/Department/Edit.cs b/src/ContosoUniversityCore/Features/Department/Edit.cs
@@ -40,7 +40,7 @@ public Validator()
             }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -49,7 +49,7 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task<Command> Handle(Query message)
+            protected override async Task<Command> HandleCore(Query message)
             {
                 var department = await _db.Departments
                     .Where(d => d.Id == message.Id)
@@ -59,7 +59,7 @@ public async Task<Command> Handle(Query message)
             }
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command>
+        public class CommandHandler : AsyncRequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -68,7 +68,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task Handle(Command message)
+            protected override async Task HandleCore(Command message)
             {
                 var dept = await _db.Departments.FindAsync(message.Id);
                 message.Administrator = await _db.Instructors.FindAsync(message.Administrator.Id);

diff --git a/src/ContosoUniversityCore/Features/Department/Index.cs b/src/ContosoUniversityCore/Features/Department/Index.cs
@@ -28,7 +28,7 @@ public class Model
             public string AdministratorFullName { get; set; }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, List<Model>>
+        public class QueryHandler : AsyncRequestHandler<Query, List<Model>>
         {
             private readonly SchoolContext _context;
 
@@ -37,7 +37,7 @@ public QueryHandler(SchoolContext context)
                 _context = context;
             }
 
-            public async Task<List<Model>> Handle(Query message)
+            protected override async Task<List<Model>> HandleCore(Query message)
             {
                 return await _context.Departments
                   .ProjectToListAsync<Model>();

diff --git a/src/ContosoUniversityCore/Features/Instructor/CreateEdit.cs b/src/ContosoUniversityCore/Features/Instructor/CreateEdit.cs
@@ -79,7 +79,7 @@ public CommandValidator()
             }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -88,7 +88,7 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task<Command> Handle(Query message)
+            protected override async Task<Command> HandleCore(Query message)
             {
                 Command model;
                 if (message.Id == null)
@@ -122,7 +122,7 @@ private void PopulateAssignedCourseData(Command model)
 
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command, int>
+        public class CommandHandler : AsyncRequestHandler<Command, int>
         {
             private readonly SchoolContext _db;
 
@@ -131,7 +131,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task<int> Handle(Command message)
+            protected override async Task<int> HandleCore(Command message)
             {
                 Instructor instructor;
                 if (message.Id == null)

diff --git a/src/ContosoUniversityCore/Features/Instructor/Delete.cs b/src/ContosoUniversityCore/Features/Instructor/Delete.cs
@@ -41,7 +41,7 @@ public class Command : IRequest
             public string OfficeAssignmentLocation { get; set; }
         }
 
-        public class QueryHandler : IAsyncRequestHandler<Query, Command>
+        public class QueryHandler : AsyncRequestHandler<Query, Command>
         {
             private readonly SchoolContext _db;
 
@@ -50,13 +50,13 @@ public QueryHandler(SchoolContext db)
                 _db = db;
             }
 
-            public Task<Command> Handle(Query message)
+            protected override Task<Command> HandleCore(Query message)
             {
                 return _db.Instructors.Where(i => i.Id == message.Id).ProjectToSingleOrDefaultAsync<Command>();
             }
         }
 
-        public class CommandHandler : IAsyncRequestHandler<Command>
+        public class CommandHandler : AsyncRequestHandler<Command>
         {
             private readonly SchoolContext _db;
 
@@ -65,7 +65,7 @@ public CommandHandler(SchoolContext db)
                 _db = db;
             }
 
-            public async Task Handle(Command message)
+            protected override async Task HandleCore(Command message)
             {
                 Instructor instructor = await _db.Instructors
                     .Include(i => i.OfficeAssignment)

diff --git a/src/ContosoUniversityCore/Features/Instructor/Details.cs b/src/ContosoUniversityCore/Features/Instructor/Details.cs
@@ -39,7 +39,7 @@ public class Model
             public string OfficeAssignmentLocation { get; set; }
         }
 
-        public class Handler : IAsyncRequestHandler<Query, Model>
+        public class Handler : AsyncRequestHandler<Query, Model>
         {
             private readonly SchoolContext _db;
 
@@ -48,7 +48,7 @@ public Handler(SchoolContext db)
                 _db = db;
             }
 
-            public Task<Model> Handle(Query message)
+            protected override Task<Model> HandleCore(Query message)
             {
                 return _db.Instructors.Where(i => i.Id == message.Id).ProjectToSingleOrDefaultAsync<Model>();
             }