[PIPE-1397] Fix exclusiveMin/exclusiveMax for jsonschema draft-7 (#29)

* changing the type for exclusive min/max as per draft 7 * testcases update
discovery-digital · Sep 10, 2019 · 6e2eb55 · 6e2eb55
1 parent b85ba38
commit 6e2eb55
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/fixtures/allow_additional_props.json b/fixtures/allow_additional_props.json
@@ -22,10 +22,8 @@
           "type": "boolean"
         },
         "age": {
-          "exclusiveMaximum": true,
-          "exclusiveMinimum": true,
-          "maximum": 120,
-          "minimum": 18,
+          "exclusiveMaximum": 120,
+          "exclusiveMinimum": 18,
           "type": "integer"
         },
         "birth_date": {

diff --git a/fixtures/defaults.json b/fixtures/defaults.json
@@ -22,10 +22,8 @@
           "type": "boolean"
         },
         "age": {
-          "exclusiveMaximum": true,
-          "exclusiveMinimum": true,
-          "maximum": 120,
-          "minimum": 18,
+          "exclusiveMaximum": 120,
+          "exclusiveMinimum": 18,
           "type": "integer"
         },
         "birth_date": {

diff --git a/fixtures/defaults_expanded_toplevel.json b/fixtures/defaults_expanded_toplevel.json
@@ -22,10 +22,8 @@
           "type": "boolean"
         },
         "age": {
-          "exclusiveMaximum": true,
-          "exclusiveMinimum": true,
-          "maximum": 120,
-          "minimum": 18,
+          "exclusiveMaximum": 120,
+          "exclusiveMinimum": 18,
           "type": "integer"
         },
         "birth_date": {
@@ -120,10 +118,8 @@
       "type": "boolean"
     },
     "age": {
-      "exclusiveMaximum": true,
-      "exclusiveMinimum": true,
-      "maximum": 120,
-      "minimum": 18,
+      "exclusiveMaximum": 120,
+      "exclusiveMinimum": 18,
       "type": "integer"
     },
     "birth_date": {

diff --git a/fixtures/required_from_jsontags.json b/fixtures/required_from_jsontags.json
@@ -22,10 +22,8 @@
           "type": "boolean"
         },
         "age": {
-          "exclusiveMaximum": true,
-          "exclusiveMinimum": true,
-          "maximum": 120,
-          "minimum": 18,
+          "exclusiveMaximum": 120,
+          "exclusiveMinimum": 18,
           "type": "integer"
         },
         "birth_date": {

diff --git a/internal/testmodels/user.go b/internal/testmodels/user.go
@@ -62,7 +62,7 @@ type TestUser struct {
 
 	// Tests for jsonpb enum support
 	Feeling ProtoEnum `json:"feeling,omitempty"`
-	Age     int       `json:"age" jsonschema:"minimum=18,maximum=120,exclusiveMaximum=true,exclusiveMinimum=true"`
+	Age     int       `json:"age" jsonschema:"exclusiveMaximum=120,exclusiveMinimum=18"`
 	Email   string    `json:"email" jsonschema:"format=email"`
 
 	SecretNumber      int     `json:"secret_number,omitempty" jsonschema:"enum=9|30|28|52"`

diff --git a/reflect.go b/reflect.go
@@ -36,9 +36,9 @@ type Type struct {
 	// RFC draft-wright-json-schema-validation-00, section 5
 	MultipleOf           int              `json:"multipleOf,omitempty"`           // section 5.1
 	Maximum              int              `json:"maximum,omitempty"`              // section 5.2
-	ExclusiveMaximum     bool             `json:"exclusiveMaximum,omitempty"`     // section 5.3
+	ExclusiveMaximum     int              `json:"exclusiveMaximum,omitempty"`     // section 5.3
 	Minimum              int              `json:"minimum,omitempty"`              // section 5.4
-	ExclusiveMinimum     bool             `json:"exclusiveMinimum,omitempty"`     // section 5.5
+	ExclusiveMinimum     int              `json:"exclusiveMinimum,omitempty"`     // section 5.5
 	MaxLength            int              `json:"maxLength,omitempty"`            // section 5.6
 	MinLength            int              `json:"minLength,omitempty"`            // section 5.7
 	Pattern              string           `json:"pattern,omitempty"`              // section 5.8
@@ -317,8 +317,8 @@ func (r *Reflector) reflectStruct(definitions Definitions, t reflect.Type) *Type
 	definitions[definitionsKey] = st
 	r.reflectStructFields(st, definitions, t)
 	r.addSubschemasForConditionalCases(st, definitions, t)
-
 	return &Type{Ref: "#/definitions/" + definitionsKey}
+
 }
 
 func (r *Reflector) reflectStructFields(st *Type, definitions Definitions, t reflect.Type) {
@@ -453,10 +453,10 @@ func (t *Type) numbericKeywords(tags []string) {
 				i, _ := strconv.Atoi(val)
 				t.Maximum = i
 			case "exclusiveMaximum":
-				b, _ := strconv.ParseBool(val)
+				b, _ := strconv.Atoi(val)
 				t.ExclusiveMaximum = b
 			case "exclusiveMinimum":
-				b, _ := strconv.ParseBool(val)
+				b, _ := strconv.Atoi(val)
 				t.ExclusiveMinimum = b
 			case "enum":
 				enum := strings.Split(val, "|")