unistack-org/micro
3
0
Fork 3
Code Issues 16 Pull Requests 2 Actions Packages Projects Releases 239 Wiki Activity

rename to protorpc and jsonrpc

Browse Source
This commit is contained in:
Asim 2015-11-28 18:54:38 +00:00
parent 80f53ab176
commit dddcdc34ed
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/rpc_codec.go
View File

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

2
codec/json/client.go → codec/jsonrpc/client.go
View File

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

4
codec/json/json.go → codec/jsonrpc/json.go
View File

@ -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 {

2
codec/json/server.go → codec/jsonrpc/server.go
View File

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

2
codec/proto/envelope.pb.go → codec/protorpc/envelope.pb.go
View File

@ -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"

2
codec/proto/envelope.proto → codec/protorpc/envelope.proto
View File

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

2
codec/proto/netstring.go → codec/protorpc/netstring.go
View File

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

4
codec/proto/proto.go → codec/protorpc/proto.go
View File

@ -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 {

14
server/rpc_codec.go
View File

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