Skip to content

Commit

Permalink
MediatR 3.0 alpha and AutoMapper DI alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbogard
jbogard committed Jan 3, 2017
1 parent 9e47c56 commit 612f0e3
Show file tree
Hide file tree
Showing 26 changed files with 91 additions and 91 deletions.
16 changes: 8 additions & 8 deletions src/ContosoUniversityCore/Features/Course/CourseController.cs
View file
Expand Up @@ -15,7 +15,7 @@ public CourseController(IMediator mediator)

public async Task<IActionResult> Index(Index.Query query)
{
var model = await _mediator.SendAsync(query);
var model = await _mediator.Send(query);

return View(model);
}
Expand All @@ -27,23 +27,23 @@ public ActionResult Create()

[HttpPost]
[ValidateAntiForgeryToken]
public IActionResult Create(Create.Command command)
public async Task<IActionResult> Create(Create.Command command)
{
_mediator.Send(command);
await _mediator.Send(command);

return this.RedirectToActionJson(nameof(Index));
}

public async Task<IActionResult> Details(Details.Query query)
{
var model = await _mediator.SendAsync(query);
var model = await _mediator.Send(query);

return View(model);
}

public async Task<IActionResult> Edit(Edit.Query query)
{
var model = await _mediator.SendAsync(query);
var model = await _mediator.Send(query);

return View(model);
}
Expand All @@ -52,14 +52,14 @@ public async Task<IActionResult> Edit(Edit.Query query)
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(Edit.Command command)
{
await _mediator.SendAsync(command);
await _mediator.Send(command);

return this.RedirectToActionJson(nameof(Index));
}

public async Task<IActionResult> Delete(Delete.Query query)
{
var model = await _mediator.SendAsync(query);
var model = await _mediator.Send(query);

return View(model);
}
Expand All @@ -68,7 +68,7 @@ public async Task<IActionResult> Delete(Delete.Query query)
[ValidateAntiForgeryToken]
public async Task<IActionResult> Delete(Delete.Command command)
{
await _mediator.SendAsync(command);
await _mediator.Send(command);

return this.RedirectToActionJson(nameof(Index));
}
Expand Down
4 changes: 2 additions & 2 deletions src/ContosoUniversityCore/Features/Course/Create.cs
View file
Expand Up @@ -17,7 +17,7 @@ public class Command : IRequest
public Department Department { get; set; }
}

public class Handler : RequestHandler<Command>
public class Handler : IRequestHandler<Command>
{
private readonly SchoolContext _db;

Expand All @@ -26,7 +26,7 @@ public Handler(SchoolContext db)
_db = db;
}

protected override void HandleCore(Command message)
public void Handle(Command message)
{
var course = Mapper.Map<Command, Course>(message);
course.Id = message.Number;
Expand Down
12 changes: 6 additions & 6 deletions src/ContosoUniversityCore/Features/Course/Delete.cs
View file
Expand Up @@ -10,7 +10,7 @@

public class Delete
{
public class Query : IAsyncRequest<Command>
public class Query : IRequest<Command>
{
public int? Id { get; set; }
}
Expand All @@ -32,13 +32,13 @@ public QueryHandler(SchoolContext db)
_db = db;
}

public async Task<Command> Handle(Query message)
public Task<Command> Handle(Query message)
{
return await _db.Courses.Where(c => c.Id == message.Id).ProjectToSingleOrDefaultAsync<Command>();
return _db.Courses.Where(c => c.Id == message.Id).ProjectToSingleOrDefaultAsync<Command>();
}
}

public class Command : IAsyncRequest
public class Command : IRequest
{
[Display(Name = "Number")]
public int Id { get; set; }
Expand All @@ -47,7 +47,7 @@ public class Command : IAsyncRequest
public string DepartmentName { get; set; }
}

public class CommandHandler : AsyncRequestHandler<Command>
public class CommandHandler : IAsyncRequestHandler<Command>
{
private readonly SchoolContext _db;

Expand All @@ -56,7 +56,7 @@ public CommandHandler(SchoolContext db)
_db = db;
}

protected override async Task HandleCore(Command message)
public async Task Handle(Command message)
{
var course = await _db.Courses.FindAsync(message.Id);

Expand Down
6 changes: 3 additions & 3 deletions src/ContosoUniversityCore/Features/Course/Details.cs
View file
Expand Up @@ -9,7 +9,7 @@

public class Details
{
public class Query : IAsyncRequest<Model>
public class Query : IRequest<Model>
{
public int? Id { get; set; }
}
Expand Down Expand Up @@ -39,9 +39,9 @@ public Handler(SchoolContext db)
_db = db;
}

public async Task<Model> Handle(Query message)
public Task<Model> Handle(Query message)
{
return await _db.Courses.Where(i => i.Id == message.Id).ProjectToSingleOrDefaultAsync<Model>();
return _db.Courses.Where(i => i.Id == message.Id).ProjectToSingleOrDefaultAsync<Model>();
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/ContosoUniversityCore/Features/Course/Edit.cs
View file
Expand Up @@ -11,7 +11,7 @@

public class Edit
{
public class Query : IAsyncRequest<Command>
public class Query : IRequest<Command>
{
public int? Id { get; set; }
}
Expand Down Expand Up @@ -39,7 +39,7 @@ public Task<Command> Handle(Query message)
}
}

public class Command : IAsyncRequest
public class Command : IRequest
{
[Display(Name = "Number")]
public int Id { get; set; }
Expand All @@ -57,7 +57,7 @@ public CommandValidator()
}
}

public class CommandHandler : AsyncRequestHandler<Command>
public class CommandHandler : IAsyncRequestHandler<Command>
{
private readonly SchoolContext _db;

Expand All @@ -66,7 +66,7 @@ public CommandHandler(SchoolContext db)
_db = db;
}

protected override async Task HandleCore(Command message)
public async Task Handle(Command message)
{
var course = await _db.Courses.FindAsync(message.Id);

Expand Down
2 changes: 1 addition & 1 deletion src/ContosoUniversityCore/Features/Course/Index.cs
View file
Expand Up @@ -10,7 +10,7 @@

public class Index
{
public class Query : IAsyncRequest<Result>
public class Query : IRequest<Result>
{
public Department SelectedDepartment { get; set; }
}
Expand Down
4 changes: 2 additions & 2 deletions src/ContosoUniversityCore/Features/Department/Create.cs
View file
Expand Up @@ -38,7 +38,7 @@ public class Command : IRequest
public Instructor Administrator { get; set; }
}

public class CommandHandler : RequestHandler<Command>
public class CommandHandler : IRequestHandler<Command>
{
private readonly SchoolContext _context;

Expand All @@ -47,7 +47,7 @@ public CommandHandler(SchoolContext context)
_context = context;
}

protected override void HandleCore(Command message)
public void Handle(Command message)
{
var department = Mapper.Map<Command, Department>(message);

Expand Down
8 changes: 4 additions & 4 deletions src/ContosoUniversityCore/Features/Department/Delete.cs
View file
Expand Up @@ -10,12 +10,12 @@

public class Delete
{
public class Query : IAsyncRequest<Command>
public class Query : IRequest<Command>
{
public int Id { get; set; }
}

public class Command : IAsyncRequest
public class Command : IRequest
{
public string Name { get; set; }

Expand Down Expand Up @@ -50,7 +50,7 @@ public async Task<Command> Handle(Query message)
}
}

public class CommandHandler : AsyncRequestHandler<Command>
public class CommandHandler : IAsyncRequestHandler<Command>
{
private readonly SchoolContext _db;

Expand All @@ -59,7 +59,7 @@ public CommandHandler(SchoolContext db)
_db = db;
}

protected override async Task HandleCore(Command message)
public async Task Handle(Command message)
{
var department = await _db.Departments.FindAsync(message.Id);

Expand Down
16 changes: 8 additions & 8 deletions src/ContosoUniversityCore/Features/Department/DepartmentController.cs
View file
Expand Up @@ -16,14 +16,14 @@ public DepartmentController(IMediator mediator)

public async Task<ActionResult> Index()
{
var model = await _mediator.SendAsync(new Index.Query());
var model = await _mediator.Send(new Index.Query());

return View(model);
}

public async Task<ActionResult> Details(Details.Query query)
{
var department = await _mediator.SendAsync(query);
var department = await _mediator.Send(query);

return View(department);
}
Expand All @@ -35,16 +35,16 @@ public ActionResult Create()

[HttpPost]
[ValidateAntiForgeryToken]
public ActionResult Create(Create.Command model)
public async Task<ActionResult> Create(Create.Command model)
{
_mediator.Send(model);
await _mediator.Send(model);

return this.RedirectToActionJson(nameof(Index));
}

public async Task<ActionResult> Edit(Edit.Query query)
{
var department = await _mediator.SendAsync(query);
var department = await _mediator.Send(query);

return View(department);
}
Expand All @@ -53,14 +53,14 @@ public async Task<ActionResult> Edit(Edit.Query query)
[ValidateAntiForgeryToken]
public async Task<ActionResult> Edit(Edit.Command model)
{
await _mediator.SendAsync(model);
await _mediator.Send(model);

return this.RedirectToActionJson(nameof(Index));
}

public async Task<ActionResult> Delete(Delete.Query query)
{
var model = await _mediator.SendAsync(query);
var model = await _mediator.Send(query);

return View(model);
}
Expand All @@ -69,7 +69,7 @@ public async Task<ActionResult> Delete(Delete.Query query)
[ValidateAntiForgeryToken]
public async Task<ActionResult> Delete(Delete.Command command)
{
await _mediator.SendAsync(command);
await _mediator.Send(command);

return this.RedirectToActionJson(nameof(Index));
}
Expand Down
2 changes: 1 addition & 1 deletion src/ContosoUniversityCore/Features/Department/Details.cs
View file
Expand Up @@ -8,7 +8,7 @@

public class Details
{
public class Query : IAsyncRequest<Model>
public class Query : IRequest<Model>
{
public int Id { get; set; }
}
Expand Down
8 changes: 4 additions & 4 deletions src/ContosoUniversityCore/Features/Department/Edit.cs
View file
Expand Up @@ -11,12 +11,12 @@

public class Edit
{
public class Query : IAsyncRequest<Command>
public class Query : IRequest<Command>
{
public int Id { get; set; }
}

public class Command : IAsyncRequest
public class Command : IRequest
{
public string Name { get; set; }

Expand Down Expand Up @@ -59,7 +59,7 @@ public async Task<Command> Handle(Query message)
}
}

public class CommandHandler : AsyncRequestHandler<Command>
public class CommandHandler : IAsyncRequestHandler<Command>
{
private readonly SchoolContext _db;

Expand All @@ -68,7 +68,7 @@ public CommandHandler(SchoolContext db)
_db = db;
}

protected override async Task HandleCore(Command message)
public async Task Handle(Command message)
{
var dept = await _db.Departments.FindAsync(message.Id);
message.Administrator = await _db.Instructors.FindAsync(message.Administrator.Id);
Expand Down
2 changes: 1 addition & 1 deletion src/ContosoUniversityCore/Features/Department/Index.cs
View file
Expand Up @@ -10,7 +10,7 @@

public class Index
{
public class Query : IAsyncRequest<List<Model>>
public class Query : IRequest<List<Model>>
{
}

Expand Down
4 changes: 2 additions & 2 deletions src/ContosoUniversityCore/Features/Instructor/CreateEdit.cs
View file
Expand Up @@ -14,7 +14,7 @@

public class CreateEdit
{
public class Query : IAsyncRequest<Command>
public class Query : IRequest<Command>
{
public int? Id { get; set; }
}
Expand All @@ -28,7 +28,7 @@ public QueryValidator()
}


public class Command : IAsyncRequest<int>
public class Command : IRequest<int>
{
public Command()
{
Expand Down

0 comments on commit 612f0e3

Please sign in to comment.