Move api/router/util to util/router (#1909)

go-micro · Aug 7, 2020 · a6d7b1d · a6d7b1d
1 parent 8ee31b9
commit a6d7b1d
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/api/router/registry/registry.go b/api/router/registry/registry.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/micro/go-micro/v3/api"
 	"github.com/micro/go-micro/v3/api/router"
-	"github.com/micro/go-micro/v3/api/router/util"
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/metadata"
 	"github.com/micro/go-micro/v3/registry"
 	"github.com/micro/go-micro/v3/registry/cache"
+	util "github.com/micro/go-micro/v3/util/router"
 )
 
 // endpoint struct, that holds compiled pcre

diff --git a/api/router/static/static.go b/api/router/static/static.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/micro/go-micro/v3/api"
 	"github.com/micro/go-micro/v3/api/router"
-	"github.com/micro/go-micro/v3/api/router/util"
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/metadata"
 	"github.com/micro/go-micro/v3/registry"
 	rutil "github.com/micro/go-micro/v3/util/registry"
+	util "github.com/micro/go-micro/v3/util/router"
 )
 
 type endpoint struct {

diff --git a/api/router/util/LICENSE.txt → util/router/LICENSE.txt b/api/router/util/LICENSE.txt → util/router/LICENSE.txt
diff --git a/api/router/util/compile.go → util/router/compile.go b/api/router/util/compile.go → util/router/compile.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/compile.go
 

diff --git a/api/router/util/compile_test.go → util/router/compile_test.go b/api/router/util/compile_test.go → util/router/compile_test.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/compile_test.go
 

diff --git a/api/router/util/parse.go → util/router/parse.go b/api/router/util/parse.go → util/router/parse.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/parse.go
 

diff --git a/api/router/util/parse_test.go → util/router/parse_test.go b/api/router/util/parse_test.go → util/router/parse_test.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/parse_test.go
 

diff --git a/api/router/util/pattern.go → util/router/pattern.go b/api/router/util/pattern.go → util/router/pattern.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/utilities/pattern.go
 

diff --git a/api/router/util/runtime.go → util/router/runtime.go b/api/router/util/runtime.go → util/router/runtime.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/runtime/pattern.go
 

diff --git a/api/router/util/types.go → util/router/types.go b/api/router/util/types.go → util/router/types.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/types.go
 

diff --git a/api/router/util/types_test.go → util/router/types_test.go b/api/router/util/types_test.go → util/router/types_test.go
@@ -1,4 +1,4 @@
-package util
+package router
 
 // download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/types_test.go