rebased

Signed-off-by: Pierre Fenoll <[email protected]>

Author: fenollp

go.sum

@@ -21,6 +21,12 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

openapi3/schema_issue289_test.go

@@ -1,13 +1,13 @@
 package openapi3
 
 import (
-  "testing"
+	"testing"
 
-  "github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIssue289(t *testing.T) {
-  spec := []byte(`components:
+	spec := []byte(`components:
   schemas:
     Server:
       properties:
@@ -29,15 +29,15 @@ func TestIssue289(t *testing.T) {
 openapi: "3.0.1"
 `)
 
-  s, err := NewSwaggerLoader().LoadSwaggerFromData(spec)
-  require.NoError(t, err)
+	s, err := NewSwaggerLoader().LoadSwaggerFromData(spec)
+	require.NoError(t, err)
 
-  err = s.CompileSchemas()
-  require.NoError(t, err)
+	err = s.CompileSchemas()
+	require.NoError(t, err)
 
-  err = s.Components.Schemas["Server"].Value.VisitData(s, map[string]interface{}{
-    "name":    "kin-openapi",
-    "address": "127.0.0.1",
-  })
-  require.EqualError(t, err, ErrOneOfConflict.Error())
+	err = s.Components.Schemas["Server"].Value.VisitData(s, map[string]interface{}{
+		"name":    "kin-openapi",
+		"address": "127.0.0.1",
+	})
+	require.EqualError(t, err, ErrOneOfConflict.Error())
 }

openapi3filter/validate_readonly_test.go

@@ -1,17 +1,17 @@
 package openapi3filter
 
 import (
-  "bytes"
-  "encoding/json"
-  "net/http"
-  "testing"
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"testing"
 
-  "github.com/getkin/kin-openapi/openapi3"
-  "github.com/stretchr/testify/require"
+	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/stretchr/testify/require"
 )
 
 func TestValidatingRequestBodyWithReadOnlyProperty(t *testing.T) {
-  const spec = `{
+	const spec = `{
   "openapi": "3.0.3",
   "info": {
     "version": "1.0.0",
@@ -60,32 +60,32 @@ func TestValidatingRequestBodyWithReadOnlyProperty(t *testing.T) {
 }
 `
 
-  type Request struct {
-    ID string `json:"_id"`
-  }
+	type Request struct {
+		ID string `json:"_id"`
+	}
 
-  sl := openapi3.NewSwaggerLoader()
-  l, err := sl.LoadSwaggerFromData([]byte(spec))
-  require.NoError(t, err)
-  router := NewRouter().WithSwagger(l)
+	sl := openapi3.NewSwaggerLoader()
+	l, err := sl.LoadSwaggerFromData([]byte(spec))
+	require.NoError(t, err)
+	router := NewRouter().WithSwagger(l)
 
-  err = l.CompileSchemas()
-  require.NoError(t, err)
+	err = l.CompileSchemas()
+	require.NoError(t, err)
 
-  b, err := json.Marshal(Request{ID: "bt6kdc3d0cvp6u8u3ft0"})
-  require.NoError(t, err)
+	b, err := json.Marshal(Request{ID: "bt6kdc3d0cvp6u8u3ft0"})
+	require.NoError(t, err)
 
-  httpReq, err := http.NewRequest(http.MethodPost, "/accounts", bytes.NewReader(b))
-  require.NoError(t, err)
-  httpReq.Header.Add("Content-Type", "application/json")
+	httpReq, err := http.NewRequest(http.MethodPost, "/accounts", bytes.NewReader(b))
+	require.NoError(t, err)
+	httpReq.Header.Add("Content-Type", "application/json")
 
-  route, pathParams, err := router.FindRoute(httpReq.Method, httpReq.URL)
-  require.NoError(t, err)
+	route, pathParams, err := router.FindRoute(httpReq.Method, httpReq.URL)
+	require.NoError(t, err)
 
-  err = ValidateRequest(sl.Context, &RequestValidationInput{
-    Request:    httpReq,
-    PathParams: pathParams,
-    Route:      route,
-  })
-  require.NoError(t, err)
+	err = ValidateRequest(sl.Context, &RequestValidationInput{
+		Request:    httpReq,
+		PathParams: pathParams,
+		Route:      route,
+	})
+	require.NoError(t, err)
 }