do not use data with content-type (#17)

Author: youngbupark

dapr/proto/common/v1/common.pb.go

@@ -7,7 +7,6 @@ import (
 
 	commonv1pb "github.com/dapr/go-sdk/dapr/proto/common/v1"
 	pb "github.com/dapr/go-sdk/dapr/proto/dapr/v1"
-	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"google.golang.org/grpc"
 )
@@ -26,32 +25,24 @@ func main() {
 	// Create the client
 	client := pb.NewDaprClient(conn)
 
-	d, err := ptypes.MarshalAny(&commonv1pb.DataWithContentType{
-		ContentType: "text/plain; charset=UTF-8",
-		Body:        []byte("Hello"),
-	})
-	if err != nil {
-		panic(err)
-	}
-
 	// Invoke a method called MyMethod on another Dapr enabled service with id client
 	resp, err := client.InvokeService(context.Background(), &pb.InvokeServiceRequest{
 		Id: "client",
 		Message: &commonv1pb.InvokeRequest{
-			Method: "MyMethod",
-			Data:   d,
+			Method:      "MyMethod",
+			ContentType: "text/plain; charset=UTF-8",
+			Data:        &any.Any{Value: []byte("Hello")},
 		},
 	})
 	if err != nil {
 		panic(err)
 	}
-	var value = &commonv1pb.DataWithContentType{}
-	ptypes.UnmarshalAny(resp.Data, value)
-	if value.GetContentType() != "text/plain; charset=UTF-8" {
-		fmt.Printf("wrong content type: %s", value.GetContentType())
+
+	if resp.GetContentType() != "text/plain; charset=UTF-8" {
+		fmt.Printf("wrong content type: %s", resp.GetContentType())
 	}
 
-	fmt.Println(string(value.Body))
+	fmt.Println(string(resp.GetData().GetValue()))
 
 	// Publish a message to the topic TopicA
 	_, err = client.PublishEvent(context.Background(), &pb.PublishEventEnvelope{
@@ -71,7 +62,7 @@ func main() {
 		// statestore is the name of the default redis state store , set up by Dapr CLI
 		StoreName: "statestore",
 		Requests: []*pb.StateRequest{
-			&pb.StateRequest{
+			{
 				Key: "myKey",
 				Value: &any.Any{
 					Value: []byte("My State"),

example/caller/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 
-	"github.com/golang/protobuf/ptypes"
+	"github.com/golang/protobuf/ptypes/any"
 	"github.com/golang/protobuf/ptypes/empty"
 
 	commonv1pb "github.com/dapr/go-sdk/dapr/proto/common/v1"
@@ -54,12 +54,10 @@ func (s *server) OnInvoke(ctx context.Context, in *commonv1pb.InvokeRequest) (*c
 		response = s.MyMethod()
 	}
 
-	d := &commonv1pb.DataWithContentType{
+	return &commonv1pb.InvokeResponse{
 		ContentType: "text/plain; charset=UTF-8",
-		Body:        []byte(response),
-	}
-	resp, err := ptypes.MarshalAny(d)
-	return &commonv1pb.InvokeResponse{Data: resp}, err
+		Data:        &any.Any{Value: []byte(response)},
+	}, nil
 }
 
 // Dapr will call this method to get the list of topics the app wants to subscribe to. In this example, we are telling Dapr