BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-01 19:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Go related style fixes.

Browse Source 
Change-Id: Ie854ace69a21ef685e1ade5584f9d9ce4e8b41f1
This commit is contained in:
wvo
2016-12-21 21:57:10 +00:00
committed by Wouter van Oortmerssen
parent 03ee3db240
commit 9ec9303abb
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/grpc.go
View File

@@ -1,7 +1,7 @@
package flatbuffers package flatbuffers
// FlatbuffersCodec implements gRPC-go Codec which is used to encode and decode messages. // Codec implements gRPC-go Codec which is used to encode and decode messages.
var Codec string = "flatbuffers" var Codec = "flatbuffers"
type FlatbuffersCodec struct{} type FlatbuffersCodec struct{}

6
grpc/src/compiler/go_generator.cc
View File

@@ -48,7 +48,7 @@ namespace grpc_go_generator {
// Returns string with first letter to lowerCase // Returns string with first letter to lowerCase
grpc::string unexportName(grpc::string s) { grpc::string unexportName(grpc::string s) {
if (s.size() <= 0) if (s.empty())
return s; return s;
s[0] = std::tolower(s[0]); s[0] = std::tolower(s[0]);
return s; return s;
@@ -56,7 +56,7 @@ grpc::string unexportName(grpc::string s) {
// Returns string with first letter to uppercase // Returns string with first letter to uppercase
grpc::string exportName(grpc::string s) { grpc::string exportName(grpc::string s) {
if (s.size() <= 0) if (s.empty())
return s; return s;
s[0] = std::toupper(s[0]); s[0] = std::toupper(s[0]);
return s; return s;
@@ -434,4 +434,4 @@ grpc::string GenerateServiceSource(grpc_generator::File *file,
GenerateService(service, printer, vars); GenerateService(service, printer, vars);
return out; return out;
} }
}// Namespace grpc_go_generator }// Namespace grpc_go_generator

11
grpc/tests/go_test.go
View File

@@ -6,7 +6,6 @@ import (
"net" "net"
"testing" "testing"
"github.com/google/flatbuffers/go"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@@ -14,8 +13,8 @@ import (
type server struct{} type server struct{}
// test used to send and receive in grpc methods // test used to send and receive in grpc methods
var test string = "Flatbuffers" var test = "Flatbuffers"
var addr string = "0.0.0.0:50051" var addr = "0.0.0.0:50051"
// gRPC server store method // gRPC server store method
func (s *server) Store(context context.Context, in *Example.Monster) (*flatbuffers.Builder, error) { func (s *server) Store(context context.Context, in *Example.Monster) (*flatbuffers.Builder, error) {
@@ -46,7 +45,7 @@ func StoreClient(c Example.MonsterStorageClient, t *testing.T) {
b.Finish(Example.MonsterEnd(b)) b.Finish(Example.MonsterEnd(b))
out, err := c.Store(context.Background(), b) out, err := c.Store(context.Background(), b)
if err != nil { if err != nil {
t.Fatal("Store client failed: %v", err) t.Fatalf("Store client failed: %v", err)
} }
if string(out.Id()) != test { if string(out.Id()) != test {
t.Errorf("StoreClient failed: expected=%s, got=%s\n", test, out.Id()) t.Errorf("StoreClient failed: expected=%s, got=%s\n", test, out.Id())
@@ -62,7 +61,7 @@ func RetrieveClient(c Example.MonsterStorageClient, t *testing.T) {
b.Finish(Example.StatEnd(b)) b.Finish(Example.StatEnd(b))
out, err := c.Retrieve(context.Background(), b) out, err := c.Retrieve(context.Background(), b)
if err != nil { if err != nil {
t.Fatal("Retrieve client failed: %v", err) t.Fatalf("Retrieve client failed: %v", err)
} }
if string(out.Name()) != test { if string(out.Name()) != test {
t.Errorf("RetrieveClient failed: expected=%s, got=%s\n", test, out.Name()) t.Errorf("RetrieveClient failed: expected=%s, got=%s\n", test, out.Name())
@@ -85,7 +84,7 @@ func TestGRPC(t *testing.T) {
}() }()
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithCodec(flatbuffers.FlatbuffersCodec{})) conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithCodec(flatbuffers.FlatbuffersCodec{}))
if err != nil { if err != nil {
t.Fatal("Failed to connect: %v", err) t.Fatalf("Failed to connect: %v", err)
} }
defer conn.Close() defer conn.Close()
client := Example.NewMonsterStorageClient(conn) client := Example.NewMonsterStorageClient(conn)