int fixed

Author: Frol Kruchkov

utils.go

@@ -106,20 +106,13 @@ func isJsonNumber(what interface{}) bool {
 	return false
 }
 
-func checkJsonNumber(what interface{}) (isValidInt64 bool, isValidInt32 bool) {
+func checkJsonInteger(what interface{}) (isInt bool) {
 
 	jsonNumber := what.(json.Number)
 
 	bigFloat, isValidNumber := new(big.Float).SetString(string(jsonNumber))
-	if !isValidNumber || !bigFloat.IsInt() {
-		return false, false
-	}
-
-	int64Value, acc := bigFloat.Int64()
-	isValidInt64 = acc == big.Exact
-	isValidInt32 = isValidInt64 && int64Value <= math.MaxInt32 && int64Value >= math.MinInt32
 
-	return
+	return isValidNumber && bigFloat.IsInt()
 
 }
 
@@ -144,9 +137,9 @@ func mustBeInteger(what interface{}) *int {
 
 		number := what.(json.Number)
 
-		_, isValidInt32 := checkJsonNumber(number)
+		isInt := checkJsonInteger(number)
 
-		if isValidInt32 {
+		if isInt {
 
 			int64Value, err := number.Int64()
 			if err != nil {

utils_test.go

@@ -66,26 +66,26 @@ func TestResultErrorFormatNumber(t *testing.T) {
 
 func TestCheckJsonNumber(t *testing.T) {
 	var testCases = []struct {
-		isInt64 bool
-		isInt32 bool
-		value   json.Number
+		isInt bool
+		value json.Number
 	}{
-		{true, true, "0"},
-		{true, true, "2147483647"},
-		{true, true, "-2147483648"},
-		{true, false, "9223372036854775807"},
-		{true, false, "-9223372036854775808"},
-		{true, true, "1.0e+2"},
-		{true, false, "1.0e+10"},
-		{true, true, "-1.0e+2"},
-		{true, false, "-1.0e+10"},
-		{false, false, "1.0e-2"},
+		{true, "0"},
+		{true, "2147483647"},
+		{true, "-2147483648"},
+		{true, "9223372036854775807"},
+		{true, "-9223372036854775808"},
+		{true, "1.0e+2"},
+		{true, "1.0e+10"},
+		{true, "-1.0e+2"},
+		{true, "-1.0e+10"},
+		{false, "1.0e-2"},
+		{false, "number"},
+		{false, "123number"},
 	}
 
 	for _, testCase := range testCases {
-		isInt64, isInt32 := checkJsonNumber(testCase.value)
-		assert.Equal(t, testCase.isInt32, isInt32)
-		assert.Equal(t, testCase.isInt64, isInt64)
+		assert.Equal(t, testCase.isInt, checkJsonInteger(testCase.value))
+		assert.Equal(t, testCase.isInt, checkJsonInteger(testCase.value))
 	}
 
 }

validation.go

@@ -118,14 +118,14 @@ func (v *subSchema) validateRecursive(currentSubSchema *subSchema, currentNode i
 
 			value := currentNode.(json.Number)
 
-			isValidInt64, _ := checkJsonNumber(value)
+			isInt := checkJsonInteger(value)
 
-			validType := currentSubSchema.types.Contains(TYPE_NUMBER) || (isValidInt64 && currentSubSchema.types.Contains(TYPE_INTEGER))
+			validType := currentSubSchema.types.Contains(TYPE_NUMBER) || (isInt && currentSubSchema.types.Contains(TYPE_INTEGER))
 
 			if currentSubSchema.types.IsTyped() && !validType {
 
 				givenType := TYPE_INTEGER
-				if !isValidInt64 {
+				if !isInt {
 					givenType = TYPE_NUMBER
 				}