From dddcdc34edcba50827240b8e0db8a906a8b75541 Mon Sep 17 00:00:00 2001 From: Asim Date: Sat, 28 Nov 2015 18:54:38 +0000 Subject: [PATCH] rename to protorpc and jsonrpc --- client/rpc_codec.go | 14 +++++++------- codec/{json => jsonrpc}/client.go | 2 +- codec/{json => jsonrpc}/json.go | 4 ++-- codec/{json => jsonrpc}/server.go | 2 +- codec/{proto => protorpc}/envelope.pb.go | 2 +- codec/{proto => protorpc}/envelope.proto | 2 +- codec/{proto => protorpc}/netstring.go | 2 +- codec/{proto => protorpc}/proto.go | 4 ++-- server/rpc_codec.go | 14 +++++++------- 9 files changed, 23 insertions(+), 23 deletions(-) rename codec/{json => jsonrpc}/client.go (99%) rename codec/{json => jsonrpc}/json.go (97%) rename codec/{json => jsonrpc}/server.go (99%) rename codec/{proto => protorpc}/envelope.pb.go (99%) rename codec/{proto => protorpc}/envelope.proto (91%) rename codec/{proto => protorpc}/netstring.go (97%) rename codec/{proto => protorpc}/proto.go (98%) diff --git a/client/rpc_codec.go b/client/rpc_codec.go index c75f0029..867ba100 100644 --- a/client/rpc_codec.go +++ b/client/rpc_codec.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/codec/proto" + "github.com/micro/go-micro/codec/jsonrpc" + "github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/transport" rpc "github.com/youtube/vitess/go/rpcplus" ) @@ -27,11 +27,11 @@ var ( defaultContentType = "application/octet-stream" defaultCodecs = map[string]codec.NewCodec{ - "application/json": json.NewCodec, - "application/json-rpc": json.NewCodec, - "application/protobuf": proto.NewCodec, - "application/proto-rpc": proto.NewCodec, - "application/octet-stream": proto.NewCodec, + "application/json": jsonrpc.NewCodec, + "application/json-rpc": jsonrpc.NewCodec, + "application/protobuf": protorpc.NewCodec, + "application/proto-rpc": protorpc.NewCodec, + "application/octet-stream": protorpc.NewCodec, } ) diff --git a/codec/json/client.go b/codec/jsonrpc/client.go similarity index 99% rename from codec/json/client.go rename to codec/jsonrpc/client.go index 7a26bd9f..7b079e05 100644 --- a/codec/json/client.go +++ b/codec/jsonrpc/client.go @@ -1,4 +1,4 @@ -package json +package jsonrpc import ( "encoding/json" diff --git a/codec/json/json.go b/codec/jsonrpc/json.go similarity index 97% rename from codec/json/json.go rename to codec/jsonrpc/json.go index d2909b04..b843dfd4 100644 --- a/codec/json/json.go +++ b/codec/jsonrpc/json.go @@ -1,4 +1,4 @@ -package json +package jsonrpc import ( "bytes" @@ -23,7 +23,7 @@ func (j *jsonCodec) Close() error { } func (j *jsonCodec) String() string { - return "json" + return "json-rpc" } func (j *jsonCodec) Write(m *codec.Message, b interface{}) error { diff --git a/codec/json/server.go b/codec/jsonrpc/server.go similarity index 99% rename from codec/json/server.go rename to codec/jsonrpc/server.go index ee035fcb..bf78ca43 100644 --- a/codec/json/server.go +++ b/codec/jsonrpc/server.go @@ -1,4 +1,4 @@ -package json +package jsonrpc import ( "encoding/json" diff --git a/codec/proto/envelope.pb.go b/codec/protorpc/envelope.pb.go similarity index 99% rename from codec/proto/envelope.pb.go rename to codec/protorpc/envelope.pb.go index 426ed6a1..9af273e0 100644 --- a/codec/proto/envelope.pb.go +++ b/codec/protorpc/envelope.pb.go @@ -12,7 +12,7 @@ It has these top-level messages: Request Response */ -package proto +package protorpc import proto "github.com/golang/protobuf/proto" import json "encoding/json" diff --git a/codec/proto/envelope.proto b/codec/protorpc/envelope.proto similarity index 91% rename from codec/proto/envelope.proto rename to codec/protorpc/envelope.proto index 630714ca..9c4fd19d 100644 --- a/codec/proto/envelope.proto +++ b/codec/protorpc/envelope.proto @@ -1,4 +1,4 @@ -package proto; +package protorpc; message Request { optional string service_method = 1; diff --git a/codec/proto/netstring.go b/codec/protorpc/netstring.go similarity index 97% rename from codec/proto/netstring.go rename to codec/protorpc/netstring.go index 83540328..8204a0e2 100644 --- a/codec/proto/netstring.go +++ b/codec/protorpc/netstring.go @@ -1,4 +1,4 @@ -package proto +package protorpc import ( "encoding/binary" diff --git a/codec/proto/proto.go b/codec/protorpc/proto.go similarity index 98% rename from codec/proto/proto.go rename to codec/protorpc/proto.go index 4cd933c2..51f9e06c 100644 --- a/codec/proto/proto.go +++ b/codec/protorpc/proto.go @@ -1,4 +1,4 @@ -package proto +package protorpc import ( "bytes" @@ -27,7 +27,7 @@ func (c *protoCodec) Close() error { } func (c *protoCodec) String() string { - return "proto" + return "proto-rpc" } func (c *protoCodec) Write(m *codec.Message, b interface{}) error { diff --git a/server/rpc_codec.go b/server/rpc_codec.go index 9d567210..44cd45b5 100644 --- a/server/rpc_codec.go +++ b/server/rpc_codec.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/json" - "github.com/micro/go-micro/codec/proto" + "github.com/micro/go-micro/codec/jsonrpc" + "github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/transport" rpc "github.com/youtube/vitess/go/rpcplus" ) @@ -25,11 +25,11 @@ type readWriteCloser struct { var ( defaultCodecs = map[string]codec.NewCodec{ - "application/json": json.NewCodec, - "application/json-rpc": json.NewCodec, - "application/protobuf": proto.NewCodec, - "application/proto-rpc": proto.NewCodec, - "application/octet-stream": proto.NewCodec, + "application/json": jsonrpc.NewCodec, + "application/json-rpc": jsonrpc.NewCodec, + "application/protobuf": protorpc.NewCodec, + "application/proto-rpc": protorpc.NewCodec, + "application/octet-stream": protorpc.NewCodec, } )