From 3f97743e34a2599ce1112b2359e2cc04b19a1d96 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Fri, 21 Jun 2019 17:20:31 +0100 Subject: [PATCH] Move router and proxy into network package --- {proxy => network/proxy}/README.md | 0 {proxy => network/proxy}/grpc/grpc.go | 2 +- {proxy => network/proxy}/http/http.go | 2 +- {proxy => network/proxy}/http/http_test.go | 0 {proxy => network/proxy}/mucp/mucp.go | 2 +- {proxy => network/proxy}/proxy.go | 0 {router => network/router}/default_router.go | 0 {router => network/router}/default_table.go | 0 {router => network/router}/options.go | 0 {router => network/router}/query.go | 0 {router => network/router}/route.go | 0 {router => network/router}/router.go | 0 {router => network/router}/table.go | 0 {router => network/router}/table_watcher.go | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename {proxy => network/proxy}/README.md (100%) rename {proxy => network/proxy}/grpc/grpc.go (98%) rename {proxy => network/proxy}/http/http.go (98%) rename {proxy => network/proxy}/http/http_test.go (100%) rename {proxy => network/proxy}/mucp/mucp.go (98%) rename {proxy => network/proxy}/proxy.go (100%) rename {router => network/router}/default_router.go (100%) rename {router => network/router}/default_table.go (100%) rename {router => network/router}/options.go (100%) rename {router => network/router}/query.go (100%) rename {router => network/router}/route.go (100%) rename {router => network/router}/router.go (100%) rename {router => network/router}/table.go (100%) rename {router => network/router}/table_watcher.go (100%) diff --git a/proxy/README.md b/network/proxy/README.md similarity index 100% rename from proxy/README.md rename to network/proxy/README.md diff --git a/proxy/grpc/grpc.go b/network/proxy/grpc/grpc.go similarity index 98% rename from proxy/grpc/grpc.go rename to network/proxy/grpc/grpc.go index afb2453c..7aceb289 100644 --- a/proxy/grpc/grpc.go +++ b/network/proxy/grpc/grpc.go @@ -10,7 +10,7 @@ import ( "github.com/micro/go-micro/client/grpc" "github.com/micro/go-micro/codec" "github.com/micro/go-micro/config/options" - "github.com/micro/go-micro/proxy" + "github.com/micro/go-micro/network/proxy" "github.com/micro/go-micro/server" ) diff --git a/proxy/http/http.go b/network/proxy/http/http.go similarity index 98% rename from proxy/http/http.go rename to network/proxy/http/http.go index 61a6fc06..7c19b6e1 100644 --- a/proxy/http/http.go +++ b/network/proxy/http/http.go @@ -12,7 +12,7 @@ import ( "github.com/micro/go-micro/config/options" "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/proxy" + "github.com/micro/go-micro/network/proxy" "github.com/micro/go-micro/server" ) diff --git a/proxy/http/http_test.go b/network/proxy/http/http_test.go similarity index 100% rename from proxy/http/http_test.go rename to network/proxy/http/http_test.go diff --git a/proxy/mucp/mucp.go b/network/proxy/mucp/mucp.go similarity index 98% rename from proxy/mucp/mucp.go rename to network/proxy/mucp/mucp.go index cca97c90..9e8afd39 100644 --- a/proxy/mucp/mucp.go +++ b/network/proxy/mucp/mucp.go @@ -10,7 +10,7 @@ import ( "github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/config/options" - "github.com/micro/go-micro/proxy" + "github.com/micro/go-micro/network/proxy" "github.com/micro/go-micro/server" ) diff --git a/proxy/proxy.go b/network/proxy/proxy.go similarity index 100% rename from proxy/proxy.go rename to network/proxy/proxy.go diff --git a/router/default_router.go b/network/router/default_router.go similarity index 100% rename from router/default_router.go rename to network/router/default_router.go diff --git a/router/default_table.go b/network/router/default_table.go similarity index 100% rename from router/default_table.go rename to network/router/default_table.go diff --git a/router/options.go b/network/router/options.go similarity index 100% rename from router/options.go rename to network/router/options.go diff --git a/router/query.go b/network/router/query.go similarity index 100% rename from router/query.go rename to network/router/query.go diff --git a/router/route.go b/network/router/route.go similarity index 100% rename from router/route.go rename to network/router/route.go diff --git a/router/router.go b/network/router/router.go similarity index 100% rename from router/router.go rename to network/router/router.go diff --git a/router/table.go b/network/router/table.go similarity index 100% rename from router/table.go rename to network/router/table.go diff --git a/router/table_watcher.go b/network/router/table_watcher.go similarity index 100% rename from router/table_watcher.go rename to network/router/table_watcher.go