refactor package structure to flat

Author: casualjim

.drone.yml

@@ -20,7 +20,8 @@ build:
       - go get -u github.com/go-openapi/loads
       - go get -u github.com/go-openapi/strfmt
       - go get -u github.com/go-openapi/runtime
-      - ./hack/build-drone.sh
+      - go test -race
+      - go test -v -cover -coverprofile=coverage.out -covermode=count
 
 notify:
   slack:

validation/formats.go renamed to formats.go

@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"reflect"
 
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/strfmt"
-	validate "github.com/go-openapi/validate/validator"
 )
 
 type formatValidator struct {
@@ -59,7 +58,7 @@ func (f *formatValidator) Applies(source interface{}, kind reflect.Kind) bool {
 func (f *formatValidator) Validate(val interface{}) *Result {
 	result := new(Result)
 
-	if err := validate.FormatOf(f.Path, f.In, f.Format, val.(string), f.KnownFormats); err != nil {
+	if err := FormatOf(f.Path, f.In, f.Format, val.(string), f.KnownFormats); err != nil {
 		result.AddErrors(err)
 	}
 

hack/build-drone.sh

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"encoding/json"

validation/items_validator_test.go renamed to items_validator_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"reflect"

validation/object_validator.go renamed to object_validator.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"reflect"

validation/parameter_validator_test.go renamed to parameter_validator_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import "github.com/go-openapi/errors"
 
@@ -52,6 +52,7 @@ func (r *Result) Inc() {
 	r.MatchCount++
 }
 
+// AsError renders this result as an error interface
 func (r *Result) AsError() error {
 	if r.IsValid() {
 		return nil

validation/result.go renamed to result.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"reflect"

validation/schema.go renamed to schema.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"reflect"

validation/schema_props.go renamed to schema_props.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package validation
+package validate
 
 import (
 	"fmt"
@@ -21,7 +21,6 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/strfmt"
-	validate "github.com/go-openapi/validate/validator"
 )
 
 type schemaSliceValidator struct {
@@ -85,17 +84,17 @@ func (s *schemaSliceValidator) Validate(data interface{}) *Result {
 	}
 
 	if s.MinItems != nil {
-		if err := validate.MinItems(s.Path, s.In, int64(size), *s.MinItems); err != nil {
+		if err := MinItems(s.Path, s.In, int64(size), *s.MinItems); err != nil {
 			result.AddErrors(err)
 		}
 	}
 	if s.MaxItems != nil {
-		if err := validate.MaxItems(s.Path, s.In, int64(size), *s.MaxItems); err != nil {
+		if err := MaxItems(s.Path, s.In, int64(size), *s.MaxItems); err != nil {
 			result.AddErrors(err)
 		}
 	}
 	if s.UniqueItems {
-		if err := validate.UniqueItems(s.Path, s.In, val.Interface()); err != nil {
+		if err := UniqueItems(s.Path, s.In, val.Interface()); err != nil {
 			result.AddErrors(err)
 		}
 	}