From ce670a64977a513d8caa58c143471ddbbf641bd4 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Tue, 18 Jul 2017 16:01:29 -0500
Subject: [PATCH] refactor(json): make jsonite optional with build tags (#1026)

* refactor(json): Restore gin support for app engine

Create new folder to support multiple json package.
restore gin support for app engine (disable jsonite through tags)

use jsoniter

$ go build -tags=jsoniter .

use default json

$ go build .

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* rename json file.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* docs(json): add build tags document.

* fix(docs): markdown format.

* fix(json): missing space.
---
 README.md        |  9 ++++++++-
 binding/json.go  |  3 +--
 errors.go        |  4 +---
 errors_test.go   |  1 +
 json/json.go     | 17 +++++++++++++++++
 json/jsoniter.go | 18 ++++++++++++++++++
 render/json.go   |  4 +---
 7 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 json/json.go
 create mode 100644 json/jsoniter.go

diff --git a/README.md b/README.md
index 7e3df99f65..76ab3b0118 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,6 @@ BenchmarkZeus_GithubAll 		| 2000 		| 944234 	| 300688 	| 2648
 - [x] Battle tested
 - [x] API frozen, new releases will not break your code.
 
-
 ## Start using it
 
 1. Download and install it:
@@ -141,6 +140,14 @@ $ curl https://raw.githubusercontent.com/gin-gonic/gin/master/examples/basic/mai
 $ go run main.go
 ```
 
+## Build with [jsoniter](https://github.com/json-iterator/go)
+
+Gin use `encoding/json` as default json package but you can change to [jsoniter](https://github.com/json-iterator/go) by build from other tags.
+
+```sh
+$ go build -tags=jsoniter .
+```
+
 ## API Examples
 
 ### Using GET, POST, PUT, PATCH, DELETE and OPTIONS
diff --git a/binding/json.go b/binding/json.go
index 215fa9bfb4..f600a5f477 100644
--- a/binding/json.go
+++ b/binding/json.go
@@ -7,11 +7,10 @@ package binding
 import (
 	"net/http"
 
-	"github.com/json-iterator/go"
+	"github.com/gin-gonic/gin/json"
 )
 
 var (
-	json                   = jsoniter.ConfigCompatibleWithStandardLibrary
 	EnableDecoderUseNumber = false
 )
 
diff --git a/errors.go b/errors.go
index 26d4e474c2..1976110643 100644
--- a/errors.go
+++ b/errors.go
@@ -9,11 +9,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/json-iterator/go"
+	"github.com/gin-gonic/gin/json"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 type ErrorType uint64
 
 const (
diff --git a/errors_test.go b/errors_test.go
index a0d955049c..5e596aff9e 100644
--- a/errors_test.go
+++ b/errors_test.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/gin-gonic/gin/json"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/json/json.go b/json/json.go
new file mode 100644
index 0000000000..d2d0f8b37a
--- /dev/null
+++ b/json/json.go
@@ -0,0 +1,17 @@
+// Copyright 2017 Bo-Yi Wu.  All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+// +build !jsoniter
+
+package json
+
+import (
+	"encoding/json"
+)
+
+var (
+	Marshal       = json.Marshal
+	MarshalIndent = json.MarshalIndent
+	NewDecoder    = json.NewDecoder
+)
diff --git a/json/jsoniter.go b/json/jsoniter.go
new file mode 100644
index 0000000000..65deee5999
--- /dev/null
+++ b/json/jsoniter.go
@@ -0,0 +1,18 @@
+// Copyright 2017 Bo-Yi Wu.  All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+// +build jsoniter
+
+package json
+
+import (
+	"github.com/json-iterator/go"
+)
+
+var (
+	json          = jsoniter.ConfigCompatibleWithStandardLibrary
+	Marshal       = json.Marshal
+	MarshalIndent = json.MarshalIndent
+	NewDecoder    = json.NewDecoder
+)
diff --git a/render/json.go b/render/json.go
index 17e6ac8625..eb2548e2ad 100644
--- a/render/json.go
+++ b/render/json.go
@@ -8,11 +8,9 @@ import (
 	"bytes"
 	"net/http"
 
-	"github.com/json-iterator/go"
+	"github.com/gin-gonic/gin/json"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 type JSON struct {
 	Data interface{}
 }