[query] Query handlers refactoring

src/query/api/v1/handler/database/common.go

@@ -38,11 +38,11 @@ type Handler struct {
 	instrumentOpts instrument.Options
 }
 
-type AddRouteFn func(path string, handler http.Handler, methods ...string)
+type addRouteFn func(path string, handler http.Handler, methods ...string)
 
 // RegisterRoutes registers the namespace routes
 func RegisterRoutes(
-	addRoute AddRouteFn,
+	addRoute addRouteFn,
 	client clusterclient.Client,
 	cfg config.Configuration,
 	embeddedDbCfg *dbconfig.DBConfiguration,

src/query/api/v1/handler/namespace/common.go

@@ -72,7 +72,7 @@ type Handler struct {
 	instrumentOpts instrument.Options
 }
 
-type AddRouteFn func(path string, handler http.Handler, methods ...string)
+type addRouteFn func(path string, handler http.Handler, methods ...string)
 
 // Metadata returns the current metadata in the given store and its version
 func Metadata(store kv.Store) ([]namespace.Metadata, int, error) {
@@ -103,7 +103,7 @@ func Metadata(store kv.Store) ([]namespace.Metadata, int, error) {
 
 // RegisterRoutes registers the namespace routes.
 func RegisterRoutes(
-	addRouteFn AddRouteFn,
+	addRouteFn addRouteFn,
 	client clusterclient.Client,
 	clusters m3.Clusters,
 	defaults []handleroptions.ServiceOptionsDefault,

src/query/api/v1/handler/topic/common.go

@@ -56,7 +56,7 @@ type Handler struct {
 	instrumentOpts instrument.Options
 }
 
-type AddRouteFn func(path string, handler http.Handler, methods ...string)
+type addRouteFn func(path string, handler http.Handler, methods ...string)
 
 // Service gets a topic service from m3cluster client
 func Service(clusterClient clusterclient.Client, opts handleroptions.ServiceOptions) (topic.Service, error) {
@@ -71,7 +71,7 @@ func Service(clusterClient clusterclient.Client, opts handleroptions.ServiceOpti
 
 // RegisterRoutes registers the topic routes
 func RegisterRoutes(
-	addRoute AddRouteFn,
+	addRoute addRouteFn,
 	client clusterclient.Client,
 	cfg config.Configuration,
 	instrumentOpts instrument.Options,

src/query/api/v1/httpd/handler.go

@@ -345,7 +345,12 @@ func (h *Handler) RegisterRoutes() error {
 	return nil
 }
 
-func (h *Handler) addRoute(router *mux.Router, path string, handler http.Handler, methods []string) {
+func (h *Handler) addRoute(
+	router *mux.Router,
+	path string,
+	handler http.Handler,
+	methods []string,
+) {
 	h.addRouteHandlerFn(router, path, handler.ServeHTTP, methods...)
 }