Change type definition blocks to single declarations. This helps copy/pasting Echo code in examples. (#2606)

bind.go

@@ -14,23 +14,21 @@ import (
 	"strings"
 )
 
-type (
+// Binder is the interface that wraps the Bind method.
-	// Binder is the interface that wraps the Bind method.
+type Binder interface {
-	Binder interface {
 	Bind(i interface{}, c Context) error
-	}
+}
 
-	// DefaultBinder is the default implementation of the Binder interface.
+// DefaultBinder is the default implementation of the Binder interface.
-	DefaultBinder struct{}
+type DefaultBinder struct{}
 
-	// BindUnmarshaler is the interface used to wrap the UnmarshalParam method.
+// BindUnmarshaler is the interface used to wrap the UnmarshalParam method.
-	// Types that don't implement this, but do implement encoding.TextUnmarshaler
+// Types that don't implement this, but do implement encoding.TextUnmarshaler
-	// will use that interface instead.
+// will use that interface instead.
-	BindUnmarshaler interface {
+type BindUnmarshaler interface {
 	// UnmarshalParam decodes and assigns a value from an form or query param.
 	UnmarshalParam(param string) error
-	}
+}
-)
 
 // BindPathParams binds path params to bindable object
 func (b *DefaultBinder) BindPathParams(c Context, i interface{}) error {

bind_test.go

@@ -22,8 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type (
+type bindTestStruct struct {
-	bindTestStruct struct {
 	I           int
 	PtrI        *int
 	I8          int8
@@ -59,8 +58,9 @@ type (
 	T           Timestamp
 	Tptr        *Timestamp
 	SA          StringArray
-	}
+}
-	bindTestStructWithTags struct {
+
+type bindTestStructWithTags struct {
 	I           int      `json:"I" form:"I"`
 	PtrI        *int     `json:"PtrI" form:"PtrI"`
 	I8          int8     `json:"I8" form:"I8"`
@@ -96,17 +96,17 @@ type (
 	T           Timestamp   `json:"T" form:"T"`
 	Tptr        *Timestamp  `json:"Tptr" form:"Tptr"`
 	SA          StringArray `json:"SA" form:"SA"`
-	}
+}
-	Timestamp   time.Time
+
-	TA          []Timestamp
+type Timestamp time.Time
-	StringArray []string
+type TA []Timestamp
-	Struct      struct {
+type StringArray []string
+type Struct struct {
 	Foo string
-	}
+}
-	Bar struct {
+type Bar struct {
 	Baz int `json:"baz" query:"baz"`
-	}
+}
-)
 
 func (t *Timestamp) UnmarshalParam(src string) error {
 	ts, err := time.Parse(time.RFC3339, src)

context.go

@@ -16,10 +16,9 @@ import (
 	"sync"
 )
 
-type (
+// Context represents the context of the current HTTP request. It holds request and
-	// Context represents the context of the current HTTP request. It holds request and
+// response objects, path, path parameters, data and registered handler.
-	// response objects, path, path parameters, data and registered handler.
+type Context interface {
-	Context interface {
 	// Request returns `*http.Request`.
 	Request() *http.Request
 
@@ -198,9 +197,9 @@ type (
 	// with `Echo#AcquireContext()` and `Echo#ReleaseContext()`.
 	// See `Echo#ServeHTTP()`
 	Reset(r *http.Request, w http.ResponseWriter)
-	}
+}
 
-	context struct {
+type context struct {
 	request  *http.Request
 	response *Response
 	path     string
@@ -212,8 +211,7 @@ type (
 	echo     *Echo
 	logger   Logger
 	lock     sync.RWMutex
-	}
+}
-)
 
 const (
 	// ContextKeyHeaderAllow is set by Router for getting value for `Allow` header in later stages of handler call chain.

context_test.go

@@ -25,11 +25,9 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type (
+type Template struct {
-	Template struct {
 	templates *template.Template
-	}
+}
-)
 
 var testUser = user{1, "Jon Snow"}
 

echo.go

@@ -63,13 +63,12 @@ import (
 	"golang.org/x/net/http2/h2c"
 )
 
-type (
+// Echo is the top-level framework instance.
-	// Echo is the top-level framework instance.
+//
-	//
+// Goroutine safety: Do not mutate Echo instance fields after server has started. Accessing these
-	// Goroutine safety: Do not mutate Echo instance fields after server has started. Accessing these
+// fields from handlers/middlewares and changing field values at the same time leads to data-races.
-	// fields from handlers/middlewares and changing field values at the same time leads to data-races.
+// Adding new routes after the server has been started is also not safe!
-	// Adding new routes after the server has been started is also not safe!
+type Echo struct {
-	Echo struct {
 	filesystem
 	common
 	// startupMutex is mutex to lock Echo instance access during server configuration and startup. Useful for to get
@@ -107,53 +106,52 @@ type (
 
 	// OnAddRouteHandler is called when Echo adds new route to specific host router.
 	OnAddRouteHandler func(host string, route Route, handler HandlerFunc, middleware []MiddlewareFunc)
-	}
+}
 
-	// Route contains a handler and information for matching against requests.
+// Route contains a handler and information for matching against requests.
-	Route struct {
+type Route struct {
 	Method string `json:"method"`
 	Path   string `json:"path"`
 	Name   string `json:"name"`
-	}
+}
 
-	// HTTPError represents an error that occurred while handling a request.
+// HTTPError represents an error that occurred while handling a request.
-	HTTPError struct {
+type HTTPError struct {
 	Code     int         `json:"-"`
 	Message  interface{} `json:"message"`
 	Internal error       `json:"-"` // Stores the error returned by an external dependency
-	}
+}
 
-	// MiddlewareFunc defines a function to process middleware.
+// MiddlewareFunc defines a function to process middleware.
-	MiddlewareFunc func(next HandlerFunc) HandlerFunc
+type MiddlewareFunc func(next HandlerFunc) HandlerFunc
 
-	// HandlerFunc defines a function to serve HTTP requests.
+// HandlerFunc defines a function to serve HTTP requests.
-	HandlerFunc func(c Context) error
+type HandlerFunc func(c Context) error
 
-	// HTTPErrorHandler is a centralized HTTP error handler.
+// HTTPErrorHandler is a centralized HTTP error handler.
-	HTTPErrorHandler func(err error, c Context)
+type HTTPErrorHandler func(err error, c Context)
 
-	// Validator is the interface that wraps the Validate function.
+// Validator is the interface that wraps the Validate function.
-	Validator interface {
+type Validator interface {
 	Validate(i interface{}) error
-	}
+}
 
-	// JSONSerializer is the interface that encodes and decodes JSON to and from interfaces.
+// JSONSerializer is the interface that encodes and decodes JSON to and from interfaces.
-	JSONSerializer interface {
+type JSONSerializer interface {
 	Serialize(c Context, i interface{}, indent string) error
 	Deserialize(c Context, i interface{}) error
-	}
+}
 
-	// Renderer is the interface that wraps the Render function.
+// Renderer is the interface that wraps the Render function.
-	Renderer interface {
+type Renderer interface {
 	Render(io.Writer, string, interface{}, Context) error
-	}
+}
 
-	// Map defines a generic map of type `map[string]interface{}`.
+// Map defines a generic map of type `map[string]interface{}`.
-	Map map[string]interface{}
+type Map map[string]interface{}
 
-	// Common struct for Echo & Group.
+// Common struct for Echo & Group.
-	common struct{}
+type common struct{}
-)
 
 // HTTP methods
 // NOTE: Deprecated, please use the stdlib constants directly instead.
@@ -282,8 +280,7 @@ ____________________________________O/_______
 `
 )
 
-var (
+var methods = [...]string{
-	methods = [...]string{
 	http.MethodConnect,
 	http.MethodDelete,
 	http.MethodGet,
@@ -295,8 +292,7 @@ var (
 	http.MethodPut,
 	http.MethodTrace,
 	REPORT,
-	}
+}
-)
 
 // Errors
 var (
@@ -349,13 +345,15 @@ var (
 	ErrInvalidListenerNetwork = errors.New("invalid listener network")
 )
 
-// Error handlers
+// NotFoundHandler is the handler that router uses in case there was no matching route found. Returns an error that results
-var (
+// HTTP 404 status code.
-	NotFoundHandler = func(c Context) error {
+var NotFoundHandler = func(c Context) error {
 	return ErrNotFound
-	}
+}
 
-	MethodNotAllowedHandler = func(c Context) error {
+// MethodNotAllowedHandler is the handler thar router uses in case there was no matching route found but there was
+// another matching routes for that requested URL. Returns an error that results HTTP 405 Method Not Allowed status code.
+var MethodNotAllowedHandler = func(c Context) error {
 	// See RFC 7231 section 7.4.1: An origin server MUST generate an Allow field in a 405 (Method Not Allowed)
 	// response and MAY do so in any other response. For disabled resources an empty Allow header may be returned
 	routerAllowMethods, ok := c.Get(ContextKeyHeaderAllow).(string)
@@ -363,8 +361,7 @@ var (
 		c.Response().Header().Set(HeaderAllow, routerAllowMethods)
 	}
 	return ErrMethodNotAllowed
-	}
+}
-)
 
 // New creates an instance of Echo.
 func New() (e *Echo) {

echo_test.go

@@ -25,12 +25,10 @@ import (
 	"golang.org/x/net/http2"
 )
 
-type (
+type user struct {
-	user struct {
 	ID   int    `json:"id" xml:"id" form:"id" query:"id" param:"id" header:"id"`
 	Name string `json:"name" xml:"name" form:"name" query:"name" param:"name" header:"name"`
-	}
+}
-)
 
 const (
 	userJSON                    = `{"id":1,"name":"Jon Snow"}`

group.go

@@ -7,18 +7,16 @@ import (
 	"net/http"
 )
 
-type (
+// Group is a set of sub-routes for a specified route. It can be used for inner
-	// Group is a set of sub-routes for a specified route. It can be used for inner
+// routes that share a common middleware or functionality that should be separate
-	// routes that share a common middleware or functionality that should be separate
+// from the parent echo instance while still inheriting from it.
-	// from the parent echo instance while still inheriting from it.
+type Group struct {
-	Group struct {
 	common
 	host       string
 	prefix     string
 	middleware []MiddlewareFunc
 	echo       *Echo
-	}
+}
-)
 
 // Use implements `Echo#Use()` for sub-routes within the Group.
 func (g *Group) Use(middleware ...MiddlewareFunc) {

log.go

@@ -4,14 +4,12 @@
 package echo
 
 import (
-	"io"
-
 	"github.com/labstack/gommon/log"
+	"io"
 )
 
-type (
+// Logger defines the logging interface.
-	// Logger defines the logging interface.
+type Logger interface {
-	Logger interface {
 	Output() io.Writer
 	SetOutput(w io.Writer)
 	Prefix() string
@@ -40,5 +38,4 @@ type (
 	Panic(i ...interface{})
 	Panicj(j log.JSON)
 	Panicf(format string, args ...interface{})
-	}
+}
-)

middleware/basic_auth.go

@@ -12,9 +12,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// BasicAuthConfig defines the config for BasicAuth middleware.
-	// BasicAuthConfig defines the config for BasicAuth middleware.
+type BasicAuthConfig struct {
-	BasicAuthConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -25,26 +24,23 @@ type (
 	// Realm is a string to define realm attribute of BasicAuth.
 	// Default value "Restricted".
 	Realm string
-	}
+}
 
-	// BasicAuthValidator defines a function to validate BasicAuth credentials.
+// BasicAuthValidator defines a function to validate BasicAuth credentials.
-	// The function should return a boolean indicating whether the credentials are valid,
+// The function should return a boolean indicating whether the credentials are valid,
-	// and an error if any error occurs during the validation process.
+// and an error if any error occurs during the validation process.
-	BasicAuthValidator func(string, string, echo.Context) (bool, error)
+type BasicAuthValidator func(string, string, echo.Context) (bool, error)
-)
 
 const (
 	basic        = "basic"
 	defaultRealm = "Restricted"
 )
 
-var (
+// DefaultBasicAuthConfig is the default BasicAuth middleware config.
-	// DefaultBasicAuthConfig is the default BasicAuth middleware config.
+var DefaultBasicAuthConfig = BasicAuthConfig{
-	DefaultBasicAuthConfig = BasicAuthConfig{
 	Skipper: DefaultSkipper,
 	Realm:   defaultRealm,
-	}
+}
-)
 
 // BasicAuth returns an BasicAuth middleware.
 //

middleware/body_dump.go

@@ -14,32 +14,28 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// BodyDumpConfig defines the config for BodyDump middleware.
-	// BodyDumpConfig defines the config for BodyDump middleware.
+type BodyDumpConfig struct {
-	BodyDumpConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
 	// Handler receives request and response payload.
 	// Required.
 	Handler BodyDumpHandler
-	}
+}
 
-	// BodyDumpHandler receives the request and response payload.
+// BodyDumpHandler receives the request and response payload.
-	BodyDumpHandler func(echo.Context, []byte, []byte)
+type BodyDumpHandler func(echo.Context, []byte, []byte)
 
-	bodyDumpResponseWriter struct {
+type bodyDumpResponseWriter struct {
 	io.Writer
 	http.ResponseWriter
-	}
+}
-)
 
-var (
+// DefaultBodyDumpConfig is the default BodyDump middleware config.
-	// DefaultBodyDumpConfig is the default BodyDump middleware config.
+var DefaultBodyDumpConfig = BodyDumpConfig{
-	DefaultBodyDumpConfig = BodyDumpConfig{
 	Skipper: DefaultSkipper,
-	}
+}
-)
 
 // BodyDump returns a BodyDump middleware.
 //

middleware/body_limit.go

@@ -12,9 +12,8 @@ import (
 	"github.com/labstack/gommon/bytes"
 )
 
-type (
+// BodyLimitConfig defines the config for BodyLimit middleware.
-	// BodyLimitConfig defines the config for BodyLimit middleware.
+type BodyLimitConfig struct {
-	BodyLimitConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -22,21 +21,18 @@ type (
 	// as `4x` or `4xB`, where x is one of the multiple from K, M, G, T or P.
 	Limit string `yaml:"limit"`
 	limit int64
-	}
+}
 
-	limitedReader struct {
+type limitedReader struct {
 	BodyLimitConfig
 	reader io.ReadCloser
 	read   int64
-	}
+}
-)
 
-var (
+// DefaultBodyLimitConfig is the default BodyLimit middleware config.
-	// DefaultBodyLimitConfig is the default BodyLimit middleware config.
+var DefaultBodyLimitConfig = BodyLimitConfig{
-	DefaultBodyLimitConfig = BodyLimitConfig{
 	Skipper: DefaultSkipper,
-	}
+}
-)
 
 // BodyLimit returns a BodyLimit middleware.
 //

middleware/compress.go

@@ -16,9 +16,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// GzipConfig defines the config for Gzip middleware.
-	// GzipConfig defines the config for Gzip middleware.
+type GzipConfig struct {
-	GzipConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -38,9 +37,9 @@ type (
 	// See also:
 	// https://webmasters.stackexchange.com/questions/31750/what-is-recommended-minimum-object-size-for-gzip-performance-benefits
 	MinLength int
-	}
+}
 
-	gzipResponseWriter struct {
+type gzipResponseWriter struct {
 	io.Writer
 	http.ResponseWriter
 	wroteHeader       bool
@@ -49,21 +48,18 @@ type (
 	minLengthExceeded bool
 	buffer            *bytes.Buffer
 	code              int
-	}
+}
-)
 
 const (
 	gzipScheme = "gzip"
 )
 
-var (
+// DefaultGzipConfig is the default Gzip middleware config.
-	// DefaultGzipConfig is the default Gzip middleware config.
+var DefaultGzipConfig = GzipConfig{
-	DefaultGzipConfig = GzipConfig{
 	Skipper:   DefaultSkipper,
 	Level:     -1,
 	MinLength: 0,
-	}
+}
-)
 
 // Gzip returns a middleware which compresses HTTP response using gzip compression
 // scheme.

middleware/cors.go

@@ -12,9 +12,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// CORSConfig defines the config for CORS middleware.
-	// CORSConfig defines the config for CORS middleware.
+type CORSConfig struct {
-	CORSConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -108,17 +107,14 @@ type (
 	//
 	// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
 	MaxAge int `yaml:"max_age"`
-	}
+}
-)
 
-var (
+// DefaultCORSConfig is the default CORS middleware config.
-	// DefaultCORSConfig is the default CORS middleware config.
+var DefaultCORSConfig = CORSConfig{
-	DefaultCORSConfig = CORSConfig{
 	Skipper:      DefaultSkipper,
 	AllowOrigins: []string{"*"},
 	AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodPut, http.MethodPatch, http.MethodPost, http.MethodDelete},
-	}
+}
-)
 
 // CORS returns a Cross-Origin Resource Sharing (CORS) middleware.
 // See also [MDN: Cross-Origin Resource Sharing (CORS)].

middleware/csrf.go

@@ -11,9 +11,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// CSRFConfig defines the config for CSRF middleware.
-	// CSRFConfig defines the config for CSRF middleware.
+type CSRFConfig struct {
-	CSRFConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -66,18 +65,16 @@ type (
 
 	// ErrorHandler defines a function which is executed for returning custom errors.
 	ErrorHandler CSRFErrorHandler
-	}
+}
 
-	// CSRFErrorHandler is a function which is executed for creating custom errors.
+// CSRFErrorHandler is a function which is executed for creating custom errors.
-	CSRFErrorHandler func(err error, c echo.Context) error
+type CSRFErrorHandler func(err error, c echo.Context) error
-)
 
 // ErrCSRFInvalid is returned when CSRF check fails
 var ErrCSRFInvalid = echo.NewHTTPError(http.StatusForbidden, "invalid csrf token")
 
-var (
+// DefaultCSRFConfig is the default CSRF middleware config.
-	// DefaultCSRFConfig is the default CSRF middleware config.
+var DefaultCSRFConfig = CSRFConfig{
-	DefaultCSRFConfig = CSRFConfig{
 	Skipper:        DefaultSkipper,
 	TokenLength:    32,
 	TokenLookup:    "header:" + echo.HeaderXCSRFToken,
@@ -85,8 +82,7 @@ var (
 	CookieName:     "_csrf",
 	CookieMaxAge:   86400,
 	CookieSameSite: http.SameSiteDefaultMode,
-	}
+}
-)
 
 // CSRF returns a Cross-Site Request Forgery (CSRF) middleware.
 // See: https://en.wikipedia.org/wiki/Cross-site_request_forgery

middleware/decompress.go

@@ -12,16 +12,14 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// DecompressConfig defines the config for Decompress middleware.
-	// DecompressConfig defines the config for Decompress middleware.
+type DecompressConfig struct {
-	DecompressConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
 	// GzipDecompressPool defines an interface to provide the sync.Pool used to create/store Gzip readers
 	GzipDecompressPool Decompressor
-	}
+}
-)
 
 // GZIPEncoding content-encoding header if set to "gzip", decompress body contents.
 const GZIPEncoding string = "gzip"
@@ -31,13 +29,11 @@ type Decompressor interface {
 	gzipDecompressPool() sync.Pool
 }
 
-var (
+// DefaultDecompressConfig defines the config for decompress middleware
-	//DefaultDecompressConfig defines the config for decompress middleware
+var DefaultDecompressConfig = DecompressConfig{
-	DefaultDecompressConfig = DecompressConfig{
 	Skipper:            DefaultSkipper,
 	GzipDecompressPool: &DefaultGzipDecompressPool{},
-	}
+}
-)
 
 // DefaultGzipDecompressPool is the default implementation of Decompressor interface
 type DefaultGzipDecompressPool struct {

middleware/jwt.go

@@ -15,9 +15,8 @@ import (
 	"reflect"
 )
 
-type (
+// JWTConfig defines the config for JWT middleware.
-	// JWTConfig defines the config for JWT middleware.
+type JWTConfig struct {
-	JWTConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -112,32 +111,30 @@ type (
 	// parsing fails or parsed token is invalid.
 	// Defaults to implementation using `github.com/golang-jwt/jwt` as JWT implementation library
 	ParseTokenFunc func(auth string, c echo.Context) (interface{}, error)
-	}
+}
 
-	// JWTSuccessHandler defines a function which is executed for a valid token.
+// JWTSuccessHandler defines a function which is executed for a valid token.
-	JWTSuccessHandler func(c echo.Context)
+type JWTSuccessHandler func(c echo.Context)
 
-	// JWTErrorHandler defines a function which is executed for an invalid token.
+// JWTErrorHandler defines a function which is executed for an invalid token.
-	JWTErrorHandler func(err error) error
+type JWTErrorHandler func(err error) error
 
-	// JWTErrorHandlerWithContext is almost identical to JWTErrorHandler, but it's passed the current context.
+// JWTErrorHandlerWithContext is almost identical to JWTErrorHandler, but it's passed the current context.
-	JWTErrorHandlerWithContext func(err error, c echo.Context) error
+type JWTErrorHandlerWithContext func(err error, c echo.Context) error
-)
 
 // Algorithms
 const (
 	AlgorithmHS256 = "HS256"
 )
 
-// Errors
+// ErrJWTMissing is error that is returned when no JWToken was extracted from the request.
-var (
+var ErrJWTMissing = echo.NewHTTPError(http.StatusBadRequest, "missing or malformed jwt")
-	ErrJWTMissing = echo.NewHTTPError(http.StatusBadRequest, "missing or malformed jwt")
-	ErrJWTInvalid = echo.NewHTTPError(http.StatusUnauthorized, "invalid or expired jwt")
-)
 
-var (
+// ErrJWTInvalid is error that is returned when middleware could not parse JWT correctly.
-	// DefaultJWTConfig is the default JWT auth middleware config.
+var ErrJWTInvalid = echo.NewHTTPError(http.StatusUnauthorized, "invalid or expired jwt")
-	DefaultJWTConfig = JWTConfig{
+
+// DefaultJWTConfig is the default JWT auth middleware config.
+var DefaultJWTConfig = JWTConfig{
 	Skipper:          DefaultSkipper,
 	SigningMethod:    AlgorithmHS256,
 	ContextKey:       "user",
@@ -146,8 +143,7 @@ var (
 	AuthScheme:       "Bearer",
 	Claims:           jwt.MapClaims{},
 	KeyFunc:          nil,
-	}
+}
-)
 
 // JWT returns a JSON Web Token (JWT) auth middleware.
 //

middleware/key_auth.go

@@ -9,9 +9,8 @@ import (
 	"net/http"
 )
 
-type (
+// KeyAuthConfig defines the config for KeyAuth middleware.
-	// KeyAuthConfig defines the config for KeyAuth middleware.
+type KeyAuthConfig struct {
-	KeyAuthConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -49,29 +48,26 @@ type (
 	// In that case you can use ErrorHandler to set a default public key auth value in the request context
 	// and continue. Some logic down the remaining execution chain needs to check that (public) key auth value then.
 	ContinueOnIgnoredError bool
-	}
+}
 
-	// KeyAuthValidator defines a function to validate KeyAuth credentials.
+// KeyAuthValidator defines a function to validate KeyAuth credentials.
-	KeyAuthValidator func(auth string, c echo.Context) (bool, error)
+type KeyAuthValidator func(auth string, c echo.Context) (bool, error)
 
-	// KeyAuthErrorHandler defines a function which is executed for an invalid key.
+// KeyAuthErrorHandler defines a function which is executed for an invalid key.
-	KeyAuthErrorHandler func(err error, c echo.Context) error
+type KeyAuthErrorHandler func(err error, c echo.Context) error
-)
-
-var (
-	// DefaultKeyAuthConfig is the default KeyAuth middleware config.
-	DefaultKeyAuthConfig = KeyAuthConfig{
-		Skipper:    DefaultSkipper,
-		KeyLookup:  "header:" + echo.HeaderAuthorization,
-		AuthScheme: "Bearer",
-	}
-)
 
 // ErrKeyAuthMissing is error type when KeyAuth middleware is unable to extract value from lookups
 type ErrKeyAuthMissing struct {
 	Err error
 }
 
+// DefaultKeyAuthConfig is the default KeyAuth middleware config.
+var DefaultKeyAuthConfig = KeyAuthConfig{
+	Skipper:    DefaultSkipper,
+	KeyLookup:  "header:" + echo.HeaderAuthorization,
+	AuthScheme: "Bearer",
+}
+
 // Error returns errors text
 func (e *ErrKeyAuthMissing) Error() string {
 	return e.Err.Error()

middleware/logger.go

@@ -17,9 +17,8 @@ import (
 	"github.com/valyala/fasttemplate"
 )
 
-type (
+// LoggerConfig defines the config for Logger middleware.
-	// LoggerConfig defines the config for Logger middleware.
+type LoggerConfig struct {
-	LoggerConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -73,12 +72,10 @@ type (
 	template *fasttemplate.Template
 	colorer  *color.Color
 	pool     *sync.Pool
-	}
+}
-)
 
-var (
+// DefaultLoggerConfig is the default Logger middleware config.
-	// DefaultLoggerConfig is the default Logger middleware config.
+var DefaultLoggerConfig = LoggerConfig{
-	DefaultLoggerConfig = LoggerConfig{
 	Skipper: DefaultSkipper,
 	Format: `{"time":"${time_rfc3339_nano}","id":"${id}","remote_ip":"${remote_ip}",` +
 		`"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` +
@@ -86,8 +83,7 @@ var (
 		`,"bytes_in":${bytes_in},"bytes_out":${bytes_out}}` + "\n",
 	CustomTimeFormat: "2006-01-02 15:04:05.00000",
 	colorer:          color.New(),
-	}
+}
-)
 
 // Logger returns a middleware that logs HTTP requests.
 func Logger() echo.MiddlewareFunc {

middleware/method_override.go

@@ -9,28 +9,24 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// MethodOverrideConfig defines the config for MethodOverride middleware.
-	// MethodOverrideConfig defines the config for MethodOverride middleware.
+type MethodOverrideConfig struct {
-	MethodOverrideConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
 	// Getter is a function that gets overridden method from the request.
 	// Optional. Default values MethodFromHeader(echo.HeaderXHTTPMethodOverride).
 	Getter MethodOverrideGetter
-	}
+}
 
-	// MethodOverrideGetter is a function that gets overridden method from the request
+// MethodOverrideGetter is a function that gets overridden method from the request
-	MethodOverrideGetter func(echo.Context) string
+type MethodOverrideGetter func(echo.Context) string
-)
 
-var (
+// DefaultMethodOverrideConfig is the default MethodOverride middleware config.
-	// DefaultMethodOverrideConfig is the default MethodOverride middleware config.
+var DefaultMethodOverrideConfig = MethodOverrideConfig{
-	DefaultMethodOverrideConfig = MethodOverrideConfig{
 	Skipper: DefaultSkipper,
 	Getter:  MethodFromHeader(echo.HeaderXHTTPMethodOverride),
-	}
+}
-)
 
 // MethodOverride returns a MethodOverride middleware.
 // MethodOverride  middleware checks for the overridden method from the request and

middleware/middleware.go

@@ -12,14 +12,12 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// Skipper defines a function to skip middleware. Returning true skips processing
-	// Skipper defines a function to skip middleware. Returning true skips processing
+// the middleware.
-	// the middleware.
+type Skipper func(c echo.Context) bool
-	Skipper func(c echo.Context) bool
 
-	// BeforeFunc defines a function which is executed just before the middleware.
+// BeforeFunc defines a function which is executed just before the middleware.
-	BeforeFunc func(c echo.Context)
+type BeforeFunc func(c echo.Context)
-)
 
 func captureTokens(pattern *regexp.Regexp, input string) *strings.Replacer {
 	groups := pattern.FindAllStringSubmatch(input, -1)
@@ -56,7 +54,7 @@ func rewriteURL(rewriteRegex map[*regexp.Regexp]string, req *http.Request) error
 		return nil
 	}
 
-	// Depending how HTTP request is sent RequestURI could contain Scheme://Host/path or be just /path.
+	// Depending on how HTTP request is sent RequestURI could contain Scheme://Host/path or be just /path.
 	// We only want to use path part for rewriting and therefore trim prefix if it exists
 	rawURI := req.RequestURI
 	if rawURI != "" && rawURI[0] != '/' {

middleware/proxy.go

@@ -22,9 +22,8 @@ import (
 
 // TODO: Handle TLS proxy
 
-type (
+// ProxyConfig defines the config for Proxy middleware.
-	// ProxyConfig defines the config for Proxy middleware.
+type ProxyConfig struct {
-	ProxyConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -85,54 +84,51 @@ type (
 
 	// ModifyResponse defines function to modify response from ProxyTarget.
 	ModifyResponse func(*http.Response) error
-	}
+}
 
-	// ProxyTarget defines the upstream target.
+// ProxyTarget defines the upstream target.
-	ProxyTarget struct {
+type ProxyTarget struct {
 	Name string
 	URL  *url.URL
 	Meta echo.Map
-	}
+}
 
-	// ProxyBalancer defines an interface to implement a load balancing technique.
+// ProxyBalancer defines an interface to implement a load balancing technique.
-	ProxyBalancer interface {
+type ProxyBalancer interface {
 	AddTarget(*ProxyTarget) bool
 	RemoveTarget(string) bool
 	Next(echo.Context) *ProxyTarget
-	}
+}
 
-	// TargetProvider defines an interface that gives the opportunity for balancer
+// TargetProvider defines an interface that gives the opportunity for balancer
-	// to return custom errors when selecting target.
+// to return custom errors when selecting target.
-	TargetProvider interface {
+type TargetProvider interface {
 	NextTarget(echo.Context) (*ProxyTarget, error)
-	}
+}
 
-	commonBalancer struct {
+type commonBalancer struct {
 	targets []*ProxyTarget
 	mutex   sync.Mutex
-	}
+}
 
-	// RandomBalancer implements a random load balancing technique.
+// RandomBalancer implements a random load balancing technique.
-	randomBalancer struct {
+type randomBalancer struct {
 	commonBalancer
 	random *rand.Rand
-	}
+}
 
-	// RoundRobinBalancer implements a round-robin load balancing technique.
+// RoundRobinBalancer implements a round-robin load balancing technique.
-	roundRobinBalancer struct {
+type roundRobinBalancer struct {
 	commonBalancer
 	// tracking the index on `targets` slice for the next `*ProxyTarget` to be used
 	i int
-	}
+}
-)
 
-var (
+// DefaultProxyConfig is the default Proxy middleware config.
-	// DefaultProxyConfig is the default Proxy middleware config.
+var DefaultProxyConfig = ProxyConfig{
-	DefaultProxyConfig = ProxyConfig{
 	Skipper:    DefaultSkipper,
 	ContextKey: "target",
-	}
+}
-)
 
 func proxyRaw(t *ProxyTarget, c echo.Context) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

middleware/rate_limiter.go

@@ -12,17 +12,14 @@ import (
 	"golang.org/x/time/rate"
 )
 
-type (
+// RateLimiterStore is the interface to be implemented by custom stores.
-	// RateLimiterStore is the interface to be implemented by custom stores.
+type RateLimiterStore interface {
-	RateLimiterStore interface {
 	// Stores for the rate limiter have to implement the Allow method
 	Allow(identifier string) (bool, error)
-	}
+}
-)
 
-type (
+// RateLimiterConfig defines the configuration for the rate limiter
-	// RateLimiterConfig defines the configuration for the rate limiter
+type RateLimiterConfig struct {
-	RateLimiterConfig struct {
 	Skipper    Skipper
 	BeforeFunc BeforeFunc
 	// IdentifierExtractor uses echo.Context to extract the identifier for a visitor
@@ -33,18 +30,16 @@ type (
 	ErrorHandler func(context echo.Context, err error) error
 	// DenyHandler provides a handler to be called when RateLimiter denies access
 	DenyHandler func(context echo.Context, identifier string, err error) error
-	}
+}
-	// Extractor is used to extract data from echo.Context
-	Extractor func(context echo.Context) (string, error)
-)
 
-// errors
+// Extractor is used to extract data from echo.Context
-var (
+type Extractor func(context echo.Context) (string, error)
-	// ErrRateLimitExceeded denotes an error raised when rate limit is exceeded
+
-	ErrRateLimitExceeded = echo.NewHTTPError(http.StatusTooManyRequests, "rate limit exceeded")
+// ErrRateLimitExceeded denotes an error raised when rate limit is exceeded
-	// ErrExtractorError denotes an error raised when extractor function is unsuccessful
+var ErrRateLimitExceeded = echo.NewHTTPError(http.StatusTooManyRequests, "rate limit exceeded")
-	ErrExtractorError = echo.NewHTTPError(http.StatusForbidden, "error while extracting identifier")
+
-)
+// ErrExtractorError denotes an error raised when extractor function is unsuccessful
+var ErrExtractorError = echo.NewHTTPError(http.StatusForbidden, "error while extracting identifier")
 
 // DefaultRateLimiterConfig defines default values for RateLimiterConfig
 var DefaultRateLimiterConfig = RateLimiterConfig{
@@ -153,9 +148,8 @@ func RateLimiterWithConfig(config RateLimiterConfig) echo.MiddlewareFunc {
 	}
 }
 
-type (
+// RateLimiterMemoryStore is the built-in store implementation for RateLimiter
-	// RateLimiterMemoryStore is the built-in store implementation for RateLimiter
+type RateLimiterMemoryStore struct {
-	RateLimiterMemoryStore struct {
 	visitors map[string]*Visitor
 	mutex    sync.Mutex
 	rate     rate.Limit // for more info check out Limiter docs - https://pkg.go.dev/golang.org/x/time/rate#Limit.
@@ -165,13 +159,13 @@ type (
 	lastCleanup time.Time
 
 	timeNow func() time.Time
-	}
+}
-	// Visitor signifies a unique user's limiter details
+
-	Visitor struct {
+// Visitor signifies a unique user's limiter details
+type Visitor struct {
 	*rate.Limiter
 	lastSeen time.Time
-	}
+}
-)
 
 /*
 NewRateLimiterMemoryStore returns an instance of RateLimiterMemoryStore with

middleware/recover.go

@@ -12,12 +12,11 @@ import (
 	"github.com/labstack/gommon/log"
 )
 
-type (
+// LogErrorFunc defines a function for custom logging in the middleware.
-	// LogErrorFunc defines a function for custom logging in the middleware.
+type LogErrorFunc func(c echo.Context, err error, stack []byte) error
-	LogErrorFunc func(c echo.Context, err error, stack []byte) error
 
-	// RecoverConfig defines the config for Recover middleware.
+// RecoverConfig defines the config for Recover middleware.
-	RecoverConfig struct {
+type RecoverConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -47,12 +46,10 @@ type (
 	// The recovered error is then passed back to upstream middleware, instead of swallowing the error.
 	// Optional. Default value false.
 	DisableErrorHandler bool `yaml:"disable_error_handler"`
-	}
+}
-)
 
-var (
+// DefaultRecoverConfig is the default Recover middleware config.
-	// DefaultRecoverConfig is the default Recover middleware config.
+var DefaultRecoverConfig = RecoverConfig{
-	DefaultRecoverConfig = RecoverConfig{
 	Skipper:             DefaultSkipper,
 	StackSize:           4 << 10, // 4 KB
 	DisableStackAll:     false,
@@ -60,8 +57,7 @@ var (
 	LogLevel:            0,
 	LogErrorFunc:        nil,
 	DisableErrorHandler: false,
-	}
+}
-)
 
 // Recover returns a middleware which recovers from panics anywhere in the chain
 // and handles the control to the centralized HTTPErrorHandler.

middleware/request_id.go

@@ -7,9 +7,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// RequestIDConfig defines the config for RequestID middleware.
-	// RequestIDConfig defines the config for RequestID middleware.
+type RequestIDConfig struct {
-	RequestIDConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -22,17 +21,14 @@ type (
 
 	// TargetHeader defines what header to look for to populate the id
 	TargetHeader string
-	}
+}
-)
 
-var (
+// DefaultRequestIDConfig is the default RequestID middleware config.
-	// DefaultRequestIDConfig is the default RequestID middleware config.
+var DefaultRequestIDConfig = RequestIDConfig{
-	DefaultRequestIDConfig = RequestIDConfig{
 	Skipper:      DefaultSkipper,
 	Generator:    generator,
 	TargetHeader: echo.HeaderXRequestID,
-	}
+}
-)
 
 // RequestID returns a X-Request-ID middleware.
 func RequestID() echo.MiddlewareFunc {

middleware/rewrite.go

@@ -9,9 +9,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// RewriteConfig defines the config for Rewrite middleware.
-	// RewriteConfig defines the config for Rewrite middleware.
+type RewriteConfig struct {
-	RewriteConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -31,15 +30,12 @@ type (
 	// "^/old/[0.9]+/":     "/new",
 	// "^/api/.+?/(.*)":     "/v2/$1",
 	RegexRules map[*regexp.Regexp]string `yaml:"-"`
-	}
+}
-)
 
-var (
+// DefaultRewriteConfig is the default Rewrite middleware config.
-	// DefaultRewriteConfig is the default Rewrite middleware config.
+var DefaultRewriteConfig = RewriteConfig{
-	DefaultRewriteConfig = RewriteConfig{
 	Skipper: DefaultSkipper,
-	}
+}
-)
 
 // Rewrite returns a Rewrite middleware.
 //

middleware/secure.go

@@ -9,9 +9,8 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// SecureConfig defines the config for Secure middleware.
-	// SecureConfig defines the config for Secure middleware.
+type SecureConfig struct {
-	SecureConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -74,19 +73,16 @@ type (
 	// leaking potentially sensitive request paths to third parties.
 	// Optional. Default value "".
 	ReferrerPolicy string `yaml:"referrer_policy"`
-	}
+}
-)
 
-var (
+// DefaultSecureConfig is the default Secure middleware config.
-	// DefaultSecureConfig is the default Secure middleware config.
+var DefaultSecureConfig = SecureConfig{
-	DefaultSecureConfig = SecureConfig{
 	Skipper:            DefaultSkipper,
 	XSSProtection:      "1; mode=block",
 	ContentTypeNosniff: "nosniff",
 	XFrameOptions:      "SAMEORIGIN",
 	HSTSPreloadEnabled: false,
-	}
+}
-)
 
 // Secure returns a Secure middleware.
 // Secure middleware provides protection against cross-site scripting (XSS) attack,

middleware/slash.go

@@ -9,24 +9,20 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type (
+// TrailingSlashConfig defines the config for TrailingSlash middleware.
-	// TrailingSlashConfig defines the config for TrailingSlash middleware.
+type TrailingSlashConfig struct {
-	TrailingSlashConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
 	// Status code to be used when redirecting the request.
 	// Optional, but when provided the request is redirected using this code.
 	RedirectCode int `yaml:"redirect_code"`
-	}
+}
-)
 
-var (
+// DefaultTrailingSlashConfig is the default TrailingSlash middleware config.
-	// DefaultTrailingSlashConfig is the default TrailingSlash middleware config.
+var DefaultTrailingSlashConfig = TrailingSlashConfig{
-	DefaultTrailingSlashConfig = TrailingSlashConfig{
 	Skipper: DefaultSkipper,
-	}
+}
-)
 
 // AddTrailingSlash returns a root level (before router) middleware which adds a
 // trailing slash to the request `URL#Path`.

middleware/static.go

@@ -17,9 +17,8 @@ import (
 	"github.com/labstack/gommon/bytes"
 )
 
-type (
+// StaticConfig defines the config for Static middleware.
-	// StaticConfig defines the config for Static middleware.
+type StaticConfig struct {
-	StaticConfig struct {
 	// Skipper defines a function to skip middleware.
 	Skipper Skipper
 
@@ -49,8 +48,7 @@ type (
 	// Filesystem provides access to the static content.
 	// Optional. Defaults to http.Dir(config.Root)
 	Filesystem http.FileSystem `yaml:"-"`
-	}
+}
-)
 
 const html = `
 <!DOCTYPE html>
@@ -124,13 +122,11 @@ const html = `
 </html>
 `
 
-var (
+// DefaultStaticConfig is the default Static middleware config.
-	// DefaultStaticConfig is the default Static middleware config.
+var DefaultStaticConfig = StaticConfig{
-	DefaultStaticConfig = StaticConfig{
 	Skipper: DefaultSkipper,
 	Index:   "index.html",
-	}
+}
-)
 
 // Static returns a Static middleware to serves static content from the provided
 // root directory.

middleware/timeout.go

@@ -80,14 +80,12 @@ type TimeoutConfig struct {
 	Timeout time.Duration
 }
 
-var (
+// DefaultTimeoutConfig is the default Timeout middleware config.
-	// DefaultTimeoutConfig is the default Timeout middleware config.
+var DefaultTimeoutConfig = TimeoutConfig{
-	DefaultTimeoutConfig = TimeoutConfig{
 	Skipper:      DefaultSkipper,
 	Timeout:      0,
 	ErrorMessage: "",
-	}
+}
-)
 
 // Timeout returns a middleware which returns error (503 Service Unavailable error) to client immediately when handler
 // call runs for longer than its time limit. NB: timeout does not stop handler execution.

response.go

@@ -10,11 +10,10 @@ import (
 	"net/http"
 )
 
-type (
+// Response wraps an http.ResponseWriter and implements its interface to be used
-	// Response wraps an http.ResponseWriter and implements its interface to be used
+// by an HTTP handler to construct an HTTP response.
-	// by an HTTP handler to construct an HTTP response.
+// See: https://golang.org/pkg/net/http/#ResponseWriter
-	// See: https://golang.org/pkg/net/http/#ResponseWriter
+type Response struct {
-	Response struct {
 	echo        *Echo
 	beforeFuncs []func()
 	afterFuncs  []func()
@@ -22,8 +21,7 @@ type (
 	Status      int
 	Size        int64
 	Committed   bool
-	}
+}
-)
 
 // NewResponse creates a new instance of Response.
 func NewResponse(w http.ResponseWriter, e *Echo) (r *Response) {

router.go

@@ -9,15 +9,15 @@ import (
 	"net/http"
 )
 
-type (
+// Router is the registry of all registered routes for an `Echo` instance for
-	// Router is the registry of all registered routes for an `Echo` instance for
+// request matching and URL path parameter parsing.
-	// request matching and URL path parameter parsing.
+type Router struct {
-	Router struct {
 	tree   *node
 	routes map[string]*Route
 	echo   *Echo
-	}
+}
-	node struct {
+
+type node struct {
 	kind           kind
 	label          byte
 	prefix         string
@@ -35,15 +35,18 @@ type (
 
 	// notFoundHandler is handler registered with RouteNotFound method and is executed for 404 cases
 	notFoundHandler *routeMethod
-	}
+}
-	kind        uint8
+
-	children    []*node
+type kind uint8
-	routeMethod struct {
+type children []*node
+
+type routeMethod struct {
 	ppath   string
 	pnames  []string
 	handler HandlerFunc
-	}
+}
-	routeMethods struct {
+
+type routeMethods struct {
 	connect     *routeMethod
 	delete      *routeMethod
 	get         *routeMethod
@@ -57,8 +60,7 @@ type (
 	report      *routeMethod
 	anyOther    map[string]*routeMethod
 	allowHeader string
-	}
+}
-)
 
 const (
 	staticKind kind = iota