unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

update example to use proto3

Browse Source
This commit is contained in:
Asim
2015-05-09 00:42:07 +01:00
parent 45a619c2c6
commit e7355eaeb5
4 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/service_client.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"github.com/golang/protobuf/proto"
"github.com/myodc/go-micro/client" "github.com/myodc/go-micro/client"
example "github.com/myodc/go-micro/template/proto/example" example "github.com/myodc/go-micro/template/proto/example"
) )
@@ -11,7 +10,7 @@ import (
func main() { func main() {
// Create new request to service go.micro.service.go-template, method Example.Call // Create new request to service go.micro.service.go-template, method Example.Call
req := client.NewRequest("go.micro.service.template", "Example.Call", &example.Request{ req := client.NewRequest("go.micro.service.template", "Example.Call", &example.Request{
Name: proto.String("John"), Name: "John",
}) })
// Set arbitrary headers // Set arbitrary headers
@@ -26,5 +25,5 @@ func main() {
return return
} }
fmt.Println(rsp.GetMsg()) fmt.Println(rsp.Msg)
} }

3
template/handler/example.go
View File

@@ -2,7 +2,6 @@ package handler
import ( import (
"code.google.com/p/go.net/context" "code.google.com/p/go.net/context"
"github.com/golang/protobuf/proto"
log "github.com/golang/glog" log "github.com/golang/glog"
"github.com/myodc/go-micro/server" "github.com/myodc/go-micro/server"
@@ -14,7 +13,7 @@ type Example struct{}
func (e *Example) Call(ctx context.Context, req *example.Request, rsp *example.Response) error { func (e *Example) Call(ctx context.Context, req *example.Request, rsp *example.Response) error {
log.Info("Received Example.Call request") log.Info("Received Example.Call request")
rsp.Msg = proto.String(server.Id + ": Hello " + req.GetName()) rsp.Msg = server.Id + ": Hello " + req.Name
return nil return nil
} }

26
template/proto/example/example.pb.go
View File

@@ -3,7 +3,7 @@
// DO NOT EDIT! // DO NOT EDIT!
/* /*
Package go_micro_service_template_example is a generated protocol buffer package. Package example is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
myodc/go-micro/template/proto/example/example.proto myodc/go-micro/template/proto/example/example.proto
@@ -12,46 +12,28 @@ It has these top-level messages:
Request Request
Response Response
*/ */
package go_micro_service_template_example package example
import proto "github.com/golang/protobuf/proto" import proto "github.com/golang/protobuf/proto"
import math "math"
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal var _ = proto.Marshal
var _ = math.Inf
type Request struct { type Request struct {
Name *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
XXX_unrecognized []byte `json:"-"`
} }
func (m *Request) Reset() { *m = Request{} } func (m *Request) Reset() { *m = Request{} }
func (m *Request) String() string { return proto.CompactTextString(m) } func (m *Request) String() string { return proto.CompactTextString(m) }
func (*Request) ProtoMessage() {} func (*Request) ProtoMessage() {}
func (m *Request) GetName() string {
if m != nil && m.Name != nil {
return *m.Name
}
return ""
}
type Response struct { type Response struct {
Msg *string `protobuf:"bytes,1,req,name=msg" json:"msg,omitempty"` Msg string `protobuf:"bytes,1,opt,name=msg" json:"msg,omitempty"`
XXX_unrecognized []byte `json:"-"`
} }
func (m *Response) Reset() { *m = Response{} } func (m *Response) Reset() { *m = Response{} }
func (m *Response) String() string { return proto.CompactTextString(m) } func (m *Response) String() string { return proto.CompactTextString(m) }
func (*Response) ProtoMessage() {} func (*Response) ProtoMessage() {}
func (m *Response) GetMsg() string {
if m != nil && m.Msg != nil {
return *m.Msg
}
return ""
}
func init() { func init() {
} }

6
template/proto/example/example.proto
View File

@@ -1,9 +1,9 @@
package go.micro.service.template.example; syntax = "proto3";
message Request { message Request {
required string name = 1; optional string name = 1;
} }
message Response { message Response {
required string msg = 1; optional string msg = 1;
} }