rename to protorpc and jsonrpc

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,
 	}
 )
 

codec/jsonrpc/client.go

@@ -1,4 +1,4 @@
-package json
+package jsonrpc
 
 import (
 	"encoding/json"

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 {

codec/jsonrpc/server.go

@@ -1,4 +1,4 @@
-package json
+package jsonrpc
 
 import (
 	"encoding/json"

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"

codec/protorpc/envelope.proto

@@ -1,4 +1,4 @@
-package proto;
+package protorpc;
 
 message Request {
 	optional string service_method = 1;

codec/protorpc/netstring.go

@@ -1,4 +1,4 @@
-package proto
+package protorpc
 
 import (
 	"encoding/binary"

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 {

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,
 	}
 )