From 4fb46bf1f357c79438961f7461f117746c9d7e23 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Mon, 18 Dec 2017 02:24:53 +0200 Subject: [PATCH] fix mvc/ideas/1/main.go->AfterActivation Former-commit-id: bf3d8227793fba76f0f7349d82d1200275ac9147 --- _examples/mvc/hello-world/main.go | 4 +++- mvc/ideas/1/main.go | 4 ++-- mvc/mvc.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/_examples/mvc/hello-world/main.go b/_examples/mvc/hello-world/main.go index fdac99cb..e7400367 100644 --- a/_examples/mvc/hello-world/main.go +++ b/_examples/mvc/hello-world/main.go @@ -147,6 +147,8 @@ func (c *ExampleController) BeforeActivation(b mvc.BeforeActivation) { b.Handle("GET", "/mypath/{param}", "DoIt", optionalMiddlewareHere...) } -func (c *ExampleController) AfterActivation(a mvc.AfterActivation) +// After activation, all dependencies are set-ed - so read only access on them +// but still possible to add custom controller or simple standard handlers. +func (c *ExampleController) AfterActivation(a mvc.AfterActivation) {} */ diff --git a/mvc/ideas/1/main.go b/mvc/ideas/1/main.go index 93e31a1e..329f5c66 100644 --- a/mvc/ideas/1/main.go +++ b/mvc/ideas/1/main.go @@ -73,8 +73,8 @@ func (c *TodoController) BeforeActivation(b mvc.BeforeActivation) { b.Handle("GET", "/custom", "Custom") } -func (c *TodoController) AfterActivation(b mvc.BeforeActivation) { - if !b.IsRequestScoped() { +func (c *TodoController) AfterActivation(a mvc.AfterActivation) { + if !a.IsRequestScoped() { panic("TodoController should be request scoped, we have a 'Session' which depends on the context.") } } diff --git a/mvc/mvc.go b/mvc/mvc.go index 08744f15..44abd864 100644 --- a/mvc/mvc.go +++ b/mvc/mvc.go @@ -53,7 +53,7 @@ func (app *Application) Configure(configurators ...func(*Application)) *Applicat // controller's methods, if matching. // // The dependencies can be changed per-controller as well via a `beforeActivate` -// on the `Register` method or when the controller has the `BeforeActivation(c *ControllerActivator)` +// on the `Register` method or when the controller has the `BeforeActivation(b BeforeActivation)` // method defined. // // It returns this Application.