fix: 3.0 triple/grpc provider generated reference function by proto-g…

…en-dubbo (apache#128)

general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/conf/client.yml

@@ -16,7 +16,7 @@ registries:
 
 # reference config
 references:
-  "GreeterProvider":
+  "greeterImpl":
     registry: "demoZk"
     protocol: "tri"
     interface: "protobuf.Greeter"

general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go

@@ -76,8 +76,4 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *dubbo3.HelloRequest)
 	fmt.Println("get triple header tri-req-id = ", ctx.Value(tripleConstant.TripleCtxKey(tripleConstant.TripleRequestID)))
 	fmt.Println("get triple header tri-service-version = ", ctx.Value(tripleConstant.TripleCtxKey(tripleConstant.TripleServiceVersion)))
 	return &dubbo3.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
-}
-
-func (g *GreeterProvider) Reference() string {
-	return "greeterImpl"
-}
+}

general/dubbo3/pb/dubbogo-java/go-client/cmd/client.go

@@ -20,7 +20,6 @@ package main
 import (
 	"context"
 	"fmt"
-
 	"time"
 )
 
@@ -38,11 +37,10 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-go-samples/general/dubbo3/pb/dubbogo-java/go-client/pkg"
 	pb "github.com/apache/dubbo-go-samples/general/dubbo3/pb/dubbogo-java/protobuf"
 )
 
-var grpcGreeterImpl = new(pkg.GreeterProvider)
+var grpcGreeterImpl = new(pb.GreeterClientImpl)
 
 func init() {
 	config.SetConsumerService(grpcGreeterImpl)
@@ -58,10 +56,12 @@ func main() {
 		Name: "laurence",
 	}
 
+	reply := &pb.User{}
+
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "tri-req-id", "test_value_XXXXXXXX")
 
-	reply, err := grpcGreeterImpl.SayHello(ctx, req)
+	err := grpcGreeterImpl.SayHello(ctx, req, reply)
 	if err != nil {
 		panic(err)
 	}

general/dubbo3/pb/dubbogo-java/go-client/conf/client.yml

@@ -25,7 +25,7 @@ registries:
 
 # reference config
 references:
-  "GreeterProvider":
+  "greeterImpl":
     registry: "demoZk"
     protocol: "tri"
     interface: "com.apache.dubbo.sample.basic.IGreeter"

general/dubbo3/pb/dubbogo-java/go-server/conf/client.yml

@@ -25,7 +25,7 @@ registries:
 
 # reference config
 references:
-  "GreeterProvider":
+  "greeterImpl":
     registry: "demoZk"
     protocol: "tri"
     interface: "com.apache.dubbo.sample.basic.IGreeter"

general/dubbo3/pb/dubbogo-java/go-server/conf/server.yml

@@ -17,7 +17,7 @@ registries:
 
 # service config
 services:
-  "GreeterProvider":
+  "greeterImpl":
     registry: "demoZK"
     protocol: "tri"
     interface: "com.apache.dubbo.sample.basic.IGreeter"

general/dubbo3/pb/dubbogo-java/go-server/pkg/greeter.go

@@ -43,7 +43,3 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *pb.HelloRequest) (*p
 	logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name)
 	return &pb.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
 }
-
-func (g *GreeterProvider) Reference() string {
-	return "GreeterProvider"
-}

general/grpc/go-client/cmd/client.go

@@ -19,9 +19,6 @@ package main
 
 import (
 	"context"
-	"github.com/apache/dubbo-go-samples/general/grpc/go-client/pkg"
-	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
-	"github.com/dubbogo/gost/log"
 	"time"
 )
 
@@ -35,9 +32,14 @@ import (
 	_ "dubbo.apache.org/dubbo-go/v3/protocol/grpc"
 	_ "dubbo.apache.org/dubbo-go/v3/registry/protocol"
 	_ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper"
+	"github.com/dubbogo/gost/log"
+)
+
+import(
+	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
 )
 
-var grpcGreeterImpl = new(pkg.GrpcGreeterImpl)
+var grpcGreeterImpl = new(protobuf.GreeterClientImpl)
 
 func init() {
 	config.SetConsumerService(grpcGreeterImpl)

general/grpc/go-client/conf/client.yml

@@ -25,7 +25,7 @@ registries:
 
 # reference config
 references:
-  "GrpcGreeterImpl":
+  "greeterImpl":
     registry: "demoZk"
     protocol: "grpc"
     interface: "org.apache.dubbo.GreeterGrpc$IGreeter"

general/grpc/go-server/conf/client.yml

@@ -25,7 +25,7 @@ registries:
 
 # reference config
 references:
-  "GrpcGreeterImpl":
+  "greeterImpl":
     registry: "demoZk"
     protocol: "grpc"
     interface: "org.apache.dubbo.GreeterGrpc$IGreeter"

general/grpc/go-server/conf/server.yml

@@ -17,7 +17,7 @@ registries:
 
 # service config
 services:
-  "GrpcGreeterImpl":
+  "greeterImpl":
     registry: "zk"
     protocol: "grpc"
     interface: "org.apache.dubbo.GreeterGrpc$IGreeter"

general/grpc/go-server/pkg/greeter.go

@@ -38,6 +38,3 @@ func (g *GreeterProvider) SayHello(ctx context.Context, req *protobuf.HelloReque
 	return &protobuf.HelloReply{Message: "this is message from reply"}, nil
 }
 
-func (g *GreeterProvider) Reference() string {
-	return "GrpcGreeterImpl"
-}

general/grpc/go-server/tests/integration/main_test.go

@@ -20,10 +20,12 @@
 package integration
 
 import (
-	"context"
-	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
-	"google.golang.org/grpc"
+	"os"
+	"testing"
+	"time"
+)
 
+import (
 	_ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl"
 	_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
 	_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
@@ -35,30 +37,16 @@ import (
 	_ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper"
 )
 
-import (
-	"os"
-	"testing"
-	"time"
+import(
+	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
 )
 
-var grpcGreeterImpl = new(GrpcGreeterImpl)
+var grpcGreeterImpl = new(protobuf.GreeterClientImpl)
 
 func TestMain(m *testing.M) {
 	config.SetConsumerService(grpcGreeterImpl)
 	config.Load()
 	time.Sleep(3 * time.Second)
 
 	os.Exit(m.Run())
-}
-
-type GrpcGreeterImpl struct {
-	SayHello func(ctx context.Context, in *protobuf.HelloRequest, out *protobuf.HelloReply) error
-}
-
-func (u *GrpcGreeterImpl) Reference() string {
-	return "GrpcGreeterImpl"
-}
-
-func (u *GrpcGreeterImpl) GetDubboStub(cc *grpc.ClientConn) protobuf.GreeterClient {
-	return protobuf.NewGreeterClient(cc)
-}
+}