feat: drop context uri params, use BindURI direct

things-go · Apr 25, 2024 · 0cff626 · 0cff626
1 parent 27e9be6
commit 0cff626
Show file tree

Hide file tree

Showing 10 changed files with 278 additions and 41 deletions.
diff --git a/cmd/protoc-gen-dyn-gin/main.go b/cmd/protoc-gen-dyn-gin/main.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-const version = "v0.1.0"
+const version = "v0.2.0"
 
 var args = struct {
 	ShowVersion         bool

diff --git a/cmd/protoc-gen-dyn-gin/service.go b/cmd/protoc-gen-dyn-gin/service.go
@@ -78,9 +78,6 @@ func executeServiceDesc(g *protogen.GeneratedFile, s *serviceDesc) error {
 		{ // gin.HandleFunc closure
 			g.P("return func(c *", g.QualifiedGoIdent(ginPackage.Ident("Context")), ") {")
 			g.P("carrier := ", g.QualifiedGoIdent(transportHttpPackage.Ident("FromCarrier")), "(c.Request.Context())")
-			if s.UseEncoding && m.HasVars {
-				g.P("c.Request = carrier.WithValueUri(c.Request, c.Params)")
-			}
 			{ // binding
 				g.P("shouldBind := func(req *", m.Request, ") error {")
 				if s.UseEncoding {
@@ -101,7 +98,7 @@ func executeServiceDesc(g *protogen.GeneratedFile, s *serviceDesc) error {
 						}
 					}
 					if m.HasVars {
-						g.P("if err := carrier.BindUri(c, req); err != nil {")
+						g.P("if err := carrier.BindURI(c, " + g.QualifiedGoIdent(transportHttpPackage.Ident("UrlValues")) + "(c.Params), req); err != nil {")
 						g.P("return err")
 						g.P("}")
 					}

diff --git a/example/hello/gen.sh b/example/hello/gen.sh
@@ -18,6 +18,7 @@ protoc \
   --go-grpc_opt paths=source_relative \
   --dyn-gin_out ${out_dir} \
   --dyn-gin_opt paths=source_relative \
+  --dyn-gin_opt use_encoding=true \
   --dyn-resty_out ${out_dir} \
   --dyn-resty_opt paths=source_relative \
   hello.proto
diff --git a/example/hello/hello.gin.pb.go b/example/hello/hello.gin.pb.go
diff --git a/example/hello/hello.pb.go b/example/hello/hello.pb.go
diff --git a/example/hello/hello.proto b/example/hello/hello.proto
@@ -12,20 +12,28 @@ import "google/api/annotations.proto";
 // The greeting service definition.
 service Greeter {
   // Sends a hello
-  rpc SayHello (HelloRequest) returns (HelloReply) {// I am a trailing comment
+  rpc SayHello(HelloRequest) returns (HelloReply) { // I am a trailing comment
     option (google.api.http) = {
-      post: "/v1/hello",
-      body: "*"
+      post : "/v1/hello",
+      body : "*"
+    };
+  }
+  // Sends a hello
+  rpc GetHello(GetHelloRequest) returns (GetHelloReply) {
+    option (google.api.http) = {
+      get : "/v1/hello/{id}",
     };
   }
 }
 
 // The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
-}
+message HelloRequest { string name = 1; }
+
+// The response message containing the greetings
+message HelloReply { string message = 1; }
+
+// The request message containing the user's name.
+message GetHelloRequest { int64 id = 1; }
 
 // The response message containing the greetings
-message HelloReply {
-  string message = 1;
-}
+message GetHelloReply { string message = 1; }