Browse Source

godoc: minor

pull/1766/head
Gerasimos (Makis) Maropoulos 3 months ago
parent
commit
43079f75d2
No known key found for this signature in database GPG Key ID: ACAB76DFB0DD3F3B
5 changed files with 19 additions and 15 deletions
  1. +0
    -1
      core/host/proxy.go
  2. +1
    -1
      core/host/proxy_test.go
  3. +1
    -1
      mvc/controller.go
  4. +15
    -12
      mvc/controller_method_parser.go
  5. +2
    -0
      mvc/mvc.go

+ 0
- 1
core/host/proxy.go View File

@@ -43,7 +43,6 @@ func ProxyHandler(target *url.URL, config *tls.Config) *httputil.ReverseProxy {
return p
}


// mergeQuery return a query string that combines targetQuery and reqQuery
// and remove the duplicated query parameters of them.
func mergeQuery(targetQuery, reqQuery string) string {


+ 1
- 1
core/host/proxy_test.go View File

@@ -27,7 +27,7 @@ func TestProxy(t *testing.T) {

config := &tls.Config{
InsecureSkipVerify: true,
MaxVersion: tls.VersionTLS12,
MaxVersion: tls.VersionTLS12,
}
proxy := host.NewProxy("", u, config)



+ 1
- 1
mvc/controller.go View File

@@ -318,7 +318,7 @@ func (c *ControllerActivator) parseMethods() {
}

func (c *ControllerActivator) parseMethod(m reflect.Method) {
httpMethod, httpPath, err := parseMethod(c.app.Router.Macros(), m, c.isReservedMethod,c.app.customPathWordFunc)
httpMethod, httpPath, err := parseMethod(c.app.Router.Macros(), m, c.isReservedMethod, c.app.customPathWordFunc)
if err != nil {
if err != errSkip {
c.logErrorf("MVC: fail to parse the route path and HTTP method for '%s.%s': %v", c.fullName, m.Name, err)


+ 15
- 12
mvc/controller_method_parser.go View File

@@ -92,21 +92,21 @@ func genParamKey(argIdx int) string {
}

type methodParser struct {
lexer *methodLexer
fn reflect.Method
macros *macro.Macros
lexer *methodLexer
fn reflect.Method
macros *macro.Macros
customPathWordFunc CustomPathWordFunc
}

func parseMethod(macros *macro.Macros, fn reflect.Method, skipper func(string) bool,wordFunc CustomPathWordFunc) (method, path string, err error) {
func parseMethod(macros *macro.Macros, fn reflect.Method, skipper func(string) bool, wordFunc CustomPathWordFunc) (method, path string, err error) {
if skipper(fn.Name) {
return "", "", errSkip
}

p := &methodParser{
fn: fn,
lexer: newMethodLexer(fn.Name),
macros: macros,
fn: fn,
lexer: newMethodLexer(fn.Name),
macros: macros,
customPathWordFunc: wordFunc,
}
return p.parse()
@@ -121,7 +121,10 @@ var errSkip = errors.New("skip")

var allMethods = append(router.AllMethods[0:], []string{"ALL", "ANY"}...)

type CustomPathWordFunc func(path, w string,wordIndex int) string
// CustomPathWordFunc describes the function which can be passed
// through `Application.SetCustomPathWordFunc` to customize
// the controllers method parsing.
type CustomPathWordFunc func(path, w string, wordIndex int) string

func addPathWord(path, w string) string {
if path[len(path)-1] != '/' {
@@ -151,7 +154,7 @@ func (p *methodParser) parse() (method, path string, err error) {
return "", "", errSkip
}

wordIndex:=0
wordIndex := 0
for {
w := p.lexer.next()
if w == "" {
@@ -178,9 +181,9 @@ func (p *methodParser) parse() (method, path string, err error) {
}

// custom static path.
if p.customPathWordFunc!=nil {
path = p.customPathWordFunc(path, w,wordIndex)
}else{
if p.customPathWordFunc != nil {
path = p.customPathWordFunc(path, w, wordIndex)
} else {
// default static path.
path = addPathWord(path, w)
}


+ 2
- 0
mvc/mvc.go View File

@@ -122,6 +122,8 @@ func (app *Application) SetName(appName string) *Application {
return app
}

// SetCustomPathWordFunc sets a custom function
// which is responsible to override the existing controllers method parsing.
func (app *Application) SetCustomPathWordFunc(wordFunc CustomPathWordFunc) *Application {
app.customPathWordFunc = wordFunc
return app


Loading…
Cancel
Save