address review

tokopedia · Sep 17, 2019 · 60b329d · 60b329d
1 parent 49d9cf0
commit 60b329d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 44 deletions.
diff --git a/example/simple/client/main.go b/example/simple/client/main.go
@@ -21,7 +21,7 @@ func main() {
 	}
 	defer conn.Close()
 
-	c := pb.NewSimpleClient(conn)
+	c := pb.NewGripmockClient(conn)
 
 	// Contact the server and print out its response.
 	name := "tokopedia"

diff --git a/example/simple/simple.pb.go b/example/simple/simple.pb.go
diff --git a/example/simple/simple.proto b/example/simple/simple.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package simple;
 
-// The greeting service definition.
-service Simple {
+// The Gripmock service definition.
+service Gripmock {
   // simple unary method
   rpc SayHello (Request) returns (Reply);
 }

diff --git a/example/simple/stub/simple.json b/example/simple/stub/simple.json
@@ -1,5 +1,5 @@
 {
- "service":"Simple",
+ "service":"Gripmock",
   "method":"SayHello",
   "input":{
     "equals":{

diff --git a/example/stream/stream.proto b/example/stream/stream.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package stream;
 
-// The greeting service definition.
+// The Gripmock service definition.
 service Gripmock {
   // server to client sreaming
   rpc serverStream (Request) returns (stream Reply);

diff --git a/example/well_known_types/well_known_types.proto b/example/well_known_types/well_known_types.proto
@@ -6,5 +6,8 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/api.proto";
 
 service Gripmock {
+  // this shows us example on using WKT as dependency
+  // api.proto in particular has go_package alias with semicolon
+  // "google.golang.org/genproto/protobuf/api;api"
   rpc ApiInfo(google.protobuf.Empty) returns (google.protobuf.Api);
 }
diff --git a/protoc-gen-gripmock/generator.go b/protoc-gen-gripmock/generator.go
@@ -161,7 +161,6 @@ func resolveDependencies(protos []*descriptor.FileDescriptorProto) map[string]st
 	aliasNum := 1
 	for _, dep := range depsFile {
 		for _, proto := range protos {
-			pkg := proto.GetOptions().GetGoPackage()
 			alias, pkg := getGoPackage(proto)
 
 			// skip whether its not intended deps