From a6d7b1d710d4c8b2b547482c2a1aa20cfb41c0c4 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Fri, 7 Aug 2020 13:30:29 +0100 Subject: [PATCH] Move api/router/util to util/router (#1909) --- api/router/registry/registry.go | 2 +- api/router/static/static.go | 2 +- {api/router/util => util/router}/LICENSE.txt | 0 {api/router/util => util/router}/compile.go | 2 +- {api/router/util => util/router}/compile_test.go | 2 +- {api/router/util => util/router}/parse.go | 2 +- {api/router/util => util/router}/parse_test.go | 2 +- {api/router/util => util/router}/pattern.go | 2 +- {api/router/util => util/router}/runtime.go | 2 +- {api/router/util => util/router}/types.go | 2 +- {api/router/util => util/router}/types_test.go | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename {api/router/util => util/router}/LICENSE.txt (100%) rename {api/router/util => util/router}/compile.go (99%) rename {api/router/util => util/router}/compile_test.go (99%) rename {api/router/util => util/router}/parse.go (99%) rename {api/router/util => util/router}/parse_test.go (99%) rename {api/router/util => util/router}/pattern.go (97%) rename {api/router/util => util/router}/runtime.go (99%) rename {api/router/util => util/router}/types.go (98%) rename {api/router/util => util/router}/types_test.go (99%) diff --git a/api/router/registry/registry.go b/api/router/registry/registry.go index b4f467f7..63885e1e 100644 --- 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 index d530f4d4..1425dd1c 100644 --- 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 b/util/router/LICENSE.txt similarity index 100% rename from api/router/util/LICENSE.txt rename to util/router/LICENSE.txt diff --git a/api/router/util/compile.go b/util/router/compile.go similarity index 99% rename from api/router/util/compile.go rename to util/router/compile.go index ca52c061..606334a2 100644 --- a/api/router/util/compile.go +++ b/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 b/util/router/compile_test.go similarity index 99% rename from api/router/util/compile_test.go rename to util/router/compile_test.go index 3ed6f43c..0d655b90 100644 --- a/api/router/util/compile_test.go +++ b/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 b/util/router/parse.go similarity index 99% rename from api/router/util/parse.go rename to util/router/parse.go index 155684df..1e3b844d 100644 --- a/api/router/util/parse.go +++ b/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 b/util/router/parse_test.go similarity index 99% rename from api/router/util/parse_test.go rename to util/router/parse_test.go index 43fb5cbe..9f102ff9 100644 --- a/api/router/util/parse_test.go +++ b/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 b/util/router/pattern.go similarity index 97% rename from api/router/util/pattern.go rename to util/router/pattern.go index 5cc9af13..394b4b45 100644 --- a/api/router/util/pattern.go +++ b/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 b/util/router/runtime.go similarity index 99% rename from api/router/util/runtime.go rename to util/router/runtime.go index a2ba7804..24cc5d59 100644 --- a/api/router/util/runtime.go +++ b/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 b/util/router/types.go similarity index 98% rename from api/router/util/types.go rename to util/router/types.go index e9ff047a..9cacddaa 100644 --- a/api/router/util/types.go +++ b/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 b/util/router/types_test.go similarity index 99% rename from api/router/util/types_test.go rename to util/router/types_test.go index 7f58e74c..cb9eb8e7 100644 --- a/api/router/util/types_test.go +++ b/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