Merge pull request #19 from maxzhang1985/dev

v1.3.0

Context/HttpContext.go

@@ -6,6 +6,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
+	"github.com/maxzhang1985/yoyogo/DependencyInjection"
 	"github.com/maxzhang1985/yoyogo/ResponseRender"
 	"github.com/maxzhang1985/yoyogo/Standard"
 	"github.com/maxzhang1985/yoyogo/Utils"
@@ -28,24 +29,26 @@ const (
 )
 
 type HttpContext struct {
-	Req        *http.Request
-	Resp       *responseWriter
-	RouterData url.Values
-	store      map[string]interface{}
-	storeMutex *sync.RWMutex
+	Req              *http.Request
+	Resp             *responseWriter
+	RouterData       url.Values
+	RequiredServices DependencyInjection.IServiceProvider
+	store            map[string]interface{}
+	storeMutex       *sync.RWMutex
 }
 
-func NewContext(w http.ResponseWriter, r *http.Request) *HttpContext {
+func NewContext(w http.ResponseWriter, r *http.Request, sp DependencyInjection.IServiceProvider) *HttpContext {
 	ctx := &HttpContext{}
-	ctx.init(w, r)
+	ctx.init(w, r, sp)
 	return ctx
 }
 
-func (ctx *HttpContext) init(w http.ResponseWriter, r *http.Request) {
+func (ctx *HttpContext) init(w http.ResponseWriter, r *http.Request, sp DependencyInjection.IServiceProvider) {
 	ctx.storeMutex = new(sync.RWMutex)
 	ctx.Resp = &responseWriter{w, 0, 0, nil}
 	ctx.Req = r
 	ctx.RouterData = url.Values{}
+	ctx.RequiredServices = sp
 	ctx.storeMutex.Lock()
 	ctx.store = nil
 	ctx.storeMutex.Unlock()

DependencyInjection/DefaultServiceProviderFactory.go

@@ -31,5 +31,5 @@ func (sc ServiceCollection) Build() IServiceProvider {
 		return nil
 	}
 
-	return DefaultServiceProvider{container}
+	return &DefaultServiceProvider{container}
 }

DependencyInjection/ServiceCollection.go

@@ -25,7 +25,7 @@ func (sc *ServiceCollection) AddSingletonByName(name string, provider interface{
 	sc.AddServiceDescriptor(sd)
 }
 
-func (sc *ServiceCollection) AddSingletonByImplements(provider interface{}, implements ...interface{}) {
+func (sc *ServiceCollection) AddSingletonByImplements(provider interface{}, implements interface{}) {
 	sd := NewServiceDescriptorByImplements(provider, implements, Singleton)
 	sc.AddServiceDescriptor(sd)
 }
@@ -40,7 +40,7 @@ func (sc *ServiceCollection) AddTransientByName(name string, provider interface{
 	sc.AddServiceDescriptor(sd)
 }
 
-func (sc *ServiceCollection) AddTransientByImplements(provider interface{}, implements ...interface{}) {
+func (sc *ServiceCollection) AddTransientByImplements(provider interface{}, implements interface{}) {
 	sd := NewServiceDescriptorByImplements(provider, implements, Transient)
 	sc.AddServiceDescriptor(sd)
 }

DependencyInjection/ServiceDescriptor.go

@@ -3,11 +3,11 @@ package DependencyInjection
 type ServiceDescriptor struct {
 	Name       string
 	Provider   interface{}
-	Implements []interface{}
+	Implements interface{}
 	Lifetime   ServiceLifetime
 }
 
-func NewServiceDescriptor(name string, provider interface{}, implements []interface{}, lifetime ServiceLifetime) ServiceDescriptor {
+func NewServiceDescriptor(name string, provider interface{}, implements interface{}, lifetime ServiceLifetime) ServiceDescriptor {
 	return ServiceDescriptor{Name: name, Provider: provider, Implements: implements, Lifetime: lifetime}
 }
 
@@ -19,6 +19,6 @@ func NewServiceDescriptorByName(name string, provider interface{}, lifetime Serv
 	return ServiceDescriptor{Name: name, Provider: provider, Lifetime: lifetime}
 }
 
-func NewServiceDescriptorByImplements(provider interface{}, implements []interface{}, lifetime ServiceLifetime) ServiceDescriptor {
+func NewServiceDescriptorByImplements(provider interface{}, implements interface{}, lifetime ServiceLifetime) ServiceDescriptor {
 	return ServiceDescriptor{Provider: provider, Implements: implements, Lifetime: lifetime}
 }

Examples/SimpleWeb/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"github.com/maxzhang1985/yoyogo/Context"
+	"github.com/maxzhang1985/yoyogo/DependencyInjection"
+	"github.com/maxzhang1985/yoyogo/Examples/SimpleWeb/models"
 	"github.com/maxzhang1985/yoyogo/Framework"
 	"github.com/maxzhang1985/yoyogo/Router"
 	"github.com/maxzhang1985/yoyogo/Standard"
@@ -23,7 +25,10 @@ func CreateCustomWebHostBuilder(args []string) *YoyoGo.HostBuilder {
 		Configure(func(app *YoyoGo.ApplicationBuilder) {
 			app.UseStatic("Static")
 		}).
-		UseRouter(RouterConfigFunc)
+		UseRouter(RouterConfigFunc).
+		ConfigureServices(func(serviceCollection *DependencyInjection.ServiceCollection) {
+			serviceCollection.AddTransientByImplements(models.NewUserAction, new(models.IUserAction))
+		})
 }
 
 //*/
@@ -41,6 +46,7 @@ func RouterConfigFunc(router Router.IRouterBuilder) {
 	})
 
 	router.GET("/info", GetInfo)
+	router.GET("/ioc", GetInfoByIOC)
 }
 
 //endregion
@@ -59,6 +65,12 @@ func GetInfo(ctx *Context.HttpContext) {
 	ctx.JSON(200, Std.M{"info": "ok"})
 }
 
+func GetInfoByIOC(ctx *Context.HttpContext) {
+	var userAction models.IUserAction
+	_ = ctx.RequiredServices.GetService(&userAction)
+	ctx.JSON(200, Std.M{"info": "ok " + userAction.Login("zhang")})
+}
+
 //HttpPost request: /info/:id ?q1=abc&username=123
 func PostInfo(ctx *Context.HttpContext) {
 	qs_q1 := ctx.Query("q1")

Examples/SimpleWeb/models/UserAction.go

@@ -0,0 +1,25 @@
+package models
+
+import (
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+type IUserAction interface {
+	Login(name string) string
+}
+
+type UserAction struct {
+	index int
+}
+
+func NewUserAction() *UserAction {
+	rand.Seed(time.Now().Unix())
+	rnd := rand.Intn(100)
+	return &UserAction{index: rnd}
+}
+
+func (u UserAction) Login(name string) string {
+	return "hello " + name + strconv.Itoa(u.index)
+}

Framework/ApplicationBuilder.go

@@ -67,19 +67,19 @@ func New(handlers ...Handler) *ApplicationBuilder {
 }
 
 // apply middleware in builder
-func (n *ApplicationBuilder) UseMiddleware(handler Handler) {
+func (app *ApplicationBuilder) UseMiddleware(handler Handler) {
 	if handler == nil {
 		panic("handler cannot be nil")
 	}
 
-	n.handlers = append(n.handlers, handler)
+	app.handlers = append(app.handlers, handler)
 	//n.middleware = build(n.handlers)
 }
 
 // build and combo all middleware to request delegate (ServeHTTP(w http.ResponseWriter, r *http.Request))
-func (n *ApplicationBuilder) Build() IRequestDelegate {
-	n.middleware = build(n.handlers)
-	return n
+func (app *ApplicationBuilder) Build() IRequestDelegate {
+	app.middleware = build(app.handlers)
+	return app
 }
 
 // apply static middleware in builder
@@ -88,23 +88,23 @@ func (app *ApplicationBuilder) UseStatic(path string) {
 }
 
 // apply handler middleware in builder
-func (n *ApplicationBuilder) UseHandler(handler http.Handler) {
-	n.UseMiddleware(wrap(handler))
+func (app *ApplicationBuilder) UseHandler(handler http.Handler) {
+	app.UseMiddleware(wrap(handler))
 }
 
 // apply handler func middleware in builder
-func (n *ApplicationBuilder) UseHandlerFunc(handlerFunc func(rw http.ResponseWriter, r *http.Request)) {
-	n.UseMiddleware(wrapFunc(handlerFunc))
+func (app *ApplicationBuilder) UseHandlerFunc(handlerFunc func(rw http.ResponseWriter, r *http.Request)) {
+	app.UseMiddleware(wrapFunc(handlerFunc))
 }
 
 // apply handler func middleware in builder
-func (n *ApplicationBuilder) UseFunc(handlerFunc HandlerFunc) {
-	n.UseMiddleware(handlerFunc)
+func (app *ApplicationBuilder) UseFunc(handlerFunc HandlerFunc) {
+	app.UseMiddleware(handlerFunc)
 }
 
 /*
 Middleware of Server Handler , request port.
 */
-func (yoyo *ApplicationBuilder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	yoyo.middleware.Invoke(Context.NewContext(w, r))
+func (app *ApplicationBuilder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	app.middleware.Invoke(Context.NewContext(w, r, app.hostContext.applicationServices))
 }

Framework/HostBuildContext.go

@@ -1,5 +1,8 @@
 package YoyoGo
 
+import "github.com/maxzhang1985/yoyogo/DependencyInjection"
+
 type HostBuildContext struct {
-	hostingEnvironment *HostEnv
+	hostingEnvironment  *HostEnv
+	applicationServices DependencyInjection.IServiceProvider
 }

Framework/HostBuilder.go

@@ -1,6 +1,9 @@
 package YoyoGo
 
-import "github.com/maxzhang1985/yoyogo/Router"
+import (
+	"github.com/maxzhang1985/yoyogo/DependencyInjection"
+	"github.com/maxzhang1985/yoyogo/Router"
+)
 
 type HostEnv struct {
 	ApplicationName string
@@ -14,10 +17,11 @@ type HostEnv struct {
 }
 
 type HostBuilder struct {
-	server          IServer
-	context         *HostBuildContext
-	configures      []func(*ApplicationBuilder)
-	routeconfigures []func(Router.IRouterBuilder)
+	server             IServer
+	context            *HostBuildContext
+	configures         []func(*ApplicationBuilder)
+	routeconfigures    []func(Router.IRouterBuilder)
+	servicesconfigures []func(*DependencyInjection.ServiceCollection)
 }
 
 func (self *HostBuilder) Configure(configure func(*ApplicationBuilder)) *HostBuilder {
@@ -30,6 +34,11 @@ func (self *HostBuilder) UseRouter(configure func(Router.IRouterBuilder)) *HostB
 	return self
 }
 
+func (self *HostBuilder) ConfigureServices(configure func(*DependencyInjection.ServiceCollection)) *HostBuilder {
+	self.servicesconfigures = append(self.servicesconfigures, configure)
+	return self
+}
+
 func (self *HostBuilder) UseServer(server IServer) *HostBuilder {
 	self.server = server
 	return self
@@ -49,6 +58,8 @@ func (self *HostBuilder) Build() WebHost {
 	self.context.hostingEnvironment.AppMode = "Dev"
 	self.context.hostingEnvironment.DefaultAddress = ":8080"
 
+	services := DependencyInjection.NewServiceCollection()
+
 	builder := NewApplicationBuilder(self.context)
 
 	for _, configure := range self.configures {
@@ -59,6 +70,13 @@ func (self *HostBuilder) Build() WebHost {
 		configure(builder)
 	}
 
+	for _, configure := range self.servicesconfigures {
+		configure(services)
+	}
+
+	serviceProvider := services.Build()
+	self.context.applicationServices = serviceProvider
+
 	return NewWebHost(self.server, builder.Build(), self.context)
 
 }