From 4ca18cbd63873ad6f89225b50f24f6580af29786 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <p@yai.se>
Date: Fri, 29 Mar 2019 10:57:01 +0100
Subject: [PATCH] fix #54: use signed-integer-validator even for
 number_unsigned

---
 src/json-validator.cpp       | 15 ++++++++-------
 test/issue-54/CMakeLists.txt |  3 +++
 test/issue-54/instance.json  |  1 +
 test/issue-54/schema.json    |  4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 test/issue-54/CMakeLists.txt
 create mode 100644 test/issue-54/instance.json
 create mode 100644 test/issue-54/schema.json

diff --git a/src/json-validator.cpp b/src/json-validator.cpp
index 3b60bfc..3fbc2db 100644
--- a/src/json-validator.cpp
+++ b/src/json-validator.cpp
@@ -398,7 +398,6 @@ public:
 		    {"string", json::value_t::string},
 		    {"boolean", json::value_t::boolean},
 		    {"integer", json::value_t::number_integer},
-		    {"integer", json::value_t::number_unsigned},
 		    {"number", json::value_t::number_float},
 		};
 
@@ -435,12 +434,14 @@ public:
 		for (auto &key : known_keywords)
 			sch.erase(key);
 
-		// with nlohmann::json floats can be seen as unsigned or integer - reuse the number-validator for
-		// integer values as well, if they have not been specified
+		// with nlohmann::json float instance (but number in schema-definition) can be seen as unsigned or integer -
+		// reuse the number-validator for integer values as well, if they have not been specified explicitly
 		if (type_[(uint8_t) json::value_t::number_float] && !type_[(uint8_t) json::value_t::number_integer])
-			type_[(uint8_t) json::value_t::number_integer] =
-			    type_[(uint8_t) json::value_t::number_unsigned] =
-			        type_[(uint8_t) json::value_t::number_float];
+			type_[(uint8_t) json::value_t::number_integer] = type_[(uint8_t) json::value_t::number_float];
+
+		// #54: JSON-schema does not differentiate between unsigned and signed integer - nlohmann::json does
+		// we stick with JSON-schema: use the integer-validator if instance-value is unsigned
+		type_[(uint8_t) json::value_t::number_unsigned] = type_[(uint8_t) json::value_t::number_integer];
 
 		attr = sch.find("enum");
 		if (attr != sch.end()) {
@@ -995,8 +996,8 @@ std::shared_ptr<schema> type_schema::make(json &schema,
 	switch (type) {
 	case json::value_t::null:
 		return std::make_shared<null>(schema, root);
+
 	case json::value_t::number_unsigned:
-		return std::make_shared<numeric<json::number_unsigned_t>>(schema, root, kw);
 	case json::value_t::number_integer:
 		return std::make_shared<numeric<json::number_integer_t>>(schema, root, kw);
 	case json::value_t::number_float:
diff --git a/test/issue-54/CMakeLists.txt b/test/issue-54/CMakeLists.txt
new file mode 100644
index 0000000..016e594
--- /dev/null
+++ b/test/issue-54/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_test_simple_schema(Issue::54
+                       ${CMAKE_CURRENT_SOURCE_DIR}/schema.json
+                       ${CMAKE_CURRENT_SOURCE_DIR}/instance.json)
diff --git a/test/issue-54/instance.json b/test/issue-54/instance.json
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/issue-54/instance.json
@@ -0,0 +1 @@
+0
diff --git a/test/issue-54/schema.json b/test/issue-54/schema.json
new file mode 100644
index 0000000..c097e9d
--- /dev/null
+++ b/test/issue-54/schema.json
@@ -0,0 +1,4 @@
+{
+    "type": "integer",
+    "minimum": -2
+}