Merge pull request #233 from kzys/swag-file

Break dependency cycles

file.go

@@ -14,20 +14,6 @@
 
 package runtime
 
-import "mime/multipart"
+import "github.com/go-openapi/swag"
 
-// File represents an uploaded file.
-type File struct {
-	Data   multipart.File
-	Header *multipart.FileHeader
-}
-
-// Read bytes from the file
-func (f *File) Read(p []byte) (n int, err error) {
-	return f.Data.Read(p)
-}
-
-// Close the file
-func (f *File) Close() error {
-	return f.Data.Close()
-}
+type File = swag.File

file_test.go

@@ -1,20 +1,28 @@
 package runtime
 
 import (
-	"io"
 	"testing"
 
+	"github.com/go-openapi/spec"
+	"github.com/go-openapi/validate"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestFileImplementsIOReader(t *testing.T) {
-	var file interface{} = &File{}
-	expected := "that File implements io.Reader"
-	assert.Implements(t, new(io.Reader), file, expected)
-}
+func TestValidateFile(t *testing.T) {
+	fileParam := spec.FileParam("f")
+	validator := validate.NewParamValidator(fileParam, nil)
+
+	result := validator.Validate("str")
+	assert.Equal(t, 1, len(result.Errors))
+	assert.Equal(
+		t,
+		`f in formData must be of type file: "string"`,
+		result.Errors[0].Error(),
+	)
+
+	result = validator.Validate(&File{})
+	assert.True(t, result.IsValid())
 
-func TestFileImplementsIOReadCloser(t *testing.T) {
-	var file interface{} = &File{}
-	expected := "that File implements io.ReadCloser"
-	assert.Implements(t, new(io.ReadCloser), file, expected)
+	result = validator.Validate(File{})
+	assert.True(t, result.IsValid())
 }

go.mod

@@ -2,13 +2,13 @@ module github.com/go-openapi/runtime
 
 require (
 	github.com/docker/go-units v0.4.0
-	github.com/go-openapi/analysis v0.20.1
+	github.com/go-openapi/analysis v0.21.2
 	github.com/go-openapi/errors v0.20.1
-	github.com/go-openapi/loads v0.21.0
+	github.com/go-openapi/loads v0.21.1
 	github.com/go-openapi/spec v0.20.4
-	github.com/go-openapi/strfmt v0.21.0
-	github.com/go-openapi/swag v0.19.15
-	github.com/go-openapi/validate v0.20.3
+	github.com/go-openapi/strfmt v0.21.1
+	github.com/go-openapi/swag v0.21.1
+	github.com/go-openapi/validate v0.20.4-0.20220203034227-bad0d9503970
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/stretchr/testify v1.7.0
 	gopkg.in/yaml.v2 v2.4.0