From 6073a79ee08657ea9784c26b8521a8f8ef9e1644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=AC=A7?= <thinkerou@gmail.com>
Date: Sun, 19 Aug 2018 17:39:58 +0800
Subject: [PATCH] not use protobuf on context but use it on render (#1496)

---
 context.go            | 11 +++++------
 render/json.go        |  0
 render/protobuf.go    |  4 ++--
 render/render.go      |  0
 render/render_test.go |  3 ++-
 5 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 render/json.go
 mode change 100755 => 100644 render/render.go
 mode change 100755 => 100644 render/render_test.go

diff --git a/context.go b/context.go
index 5cd52837..6d80284e 100644
--- a/context.go
+++ b/context.go
@@ -20,7 +20,6 @@ import (
 	"github.com/gin-contrib/sse"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/gin-gonic/gin/render"
-	"github.com/golang/protobuf/proto"
 )
 
 // Content-Type MIME of the most common data formats.
@@ -784,6 +783,11 @@ func (c *Context) YAML(code int, obj interface{}) {
 	c.Render(code, render.YAML{Data: obj})
 }
 
+// ProtoBuf serializes the given struct as ProtoBuf into the response body.
+func (c *Context) ProtoBuf(code int, obj interface{}) {
+	c.Render(code, render.ProtoBuf{Data: obj})
+}
+
 // String writes the given string into the response body.
 func (c *Context) String(code int, format string, values ...interface{}) {
 	c.Render(code, render.String{Format: format, Data: values})
@@ -846,11 +850,6 @@ func (c *Context) Stream(step func(w io.Writer) bool) {
 	}
 }
 
-// ProtoBuf serializes the given struct as ProtoBuf into the response body.
-func (c *Context) ProtoBuf(code int, obj proto.Message) {
-	c.Render(code, render.ProtoBuf{Data: obj})
-}
-
 /************************************/
 /******** CONTENT NEGOTIATION *******/
 /************************************/
diff --git a/render/json.go b/render/json.go
old mode 100755
new mode 100644
diff --git a/render/protobuf.go b/render/protobuf.go
index fe826884..34f1e9b5 100644
--- a/render/protobuf.go
+++ b/render/protobuf.go
@@ -11,7 +11,7 @@ import (
 )
 
 type ProtoBuf struct {
-	Data proto.Message
+	Data interface{}
 }
 
 var protobufContentType = []string{"application/x-protobuf"}
@@ -19,7 +19,7 @@ var protobufContentType = []string{"application/x-protobuf"}
 func (r ProtoBuf) Render(w http.ResponseWriter) error {
 	r.WriteContentType(w)
 
-	bytes, err := proto.Marshal(r.Data)
+	bytes, err := proto.Marshal(r.Data.(proto.Message))
 	if err != nil {
 		return err
 	}
diff --git a/render/render.go b/render/render.go
old mode 100755
new mode 100644
diff --git a/render/render_test.go b/render/render_test.go
old mode 100755
new mode 100644
index 905b76a1..cd20d01d
--- a/render/render_test.go
+++ b/render/render_test.go
@@ -15,10 +15,11 @@ import (
 	"strings"
 	"testing"
 
-	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/ugorji/go/codec"
+
+	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 )
 
 // TODO unit tests