Refactor traits validation to reduce code bloat (#261)

Co-authored-by: Dominik Thalhammer <dominik@thalhammer.it>

Author: prince-chrismc

docs/traits.md

@@ -1,18 +1,18 @@
 # JSON Traits
 
-Traits define the compatability mapping for JWT-CPP required functionality to the JSON implementation of choice.
+Traits define the compatibility mapping for JWT-CPP required functionality to the JSON implementation of choice.
 
 ## Providing your own JSON Traits
 
-There are several key items that need to be provided to a `jwt::basic_claim` in order for it to be interoptable with you JSON library of choice.
+There are several key items that need to be provided to a `jwt::basic_claim` in order for it to be interoperable with you JSON library of choice.
 
 * type specifications
 * conversion from generic "value type" to a specific type
 * serialization and parsing
 
 If ever you are not sure, the traits are heavily checked against static asserts to make sure you provide everything that's required.
 
-> :warning: Not all JSON libraries are a like, you may need to extend certain types such that it can be used. See this [provided implemtation](https://github.com/Thalhammer/jwt-cpp/blob/e6b92cca0b7088027269c481fa244e5c39df88ff/include/jwt-cpp/traits/danielaparker-jsoncons/traits.h#L18).
+> :warning: Not all JSON libraries are a like, you may need to extend certain types such that it can be used. See this [provided implementation](https://github.com/Thalhammer/jwt-cpp/blob/e6b92cca0b7088027269c481fa244e5c39df88ff/include/jwt-cpp/traits/danielaparker-jsoncons/traits.h#L18).
 
 ```cpp
 struct my_favorite_json_library_traits {
@@ -21,7 +21,7 @@ struct my_favorite_json_library_traits {
     using object_type = json::object_t; // The "map type" string to value
     using array_type = json::array_t; // The "list type" array of values
     using string_type = std::string; // The "list of chars", must be a narrow char
-    using number_type = double; // The "percision type"
+    using number_type = double; // The "precision type"
     using integer_type = int64_t; // The "integral type"
     using boolean_type = bool; // The "boolean type"
 
@@ -50,10 +50,10 @@ struct my_favorite_json_library_traits {
     static array_type as_array(const value_type &val);
     static string_type as_string(const value_type &val);
     static number_type as_number(const value_type &val);
-    static integer_type as_int(const value_type &val);
-    static boolean_type as_bool(const value_type &val);
+    static integer_type as_integer(const value_type &val);
+    static boolean_type as_boolean(const value_type &val);
 
-    // serilization and parsing
+    // serialization and parsing
     static bool parse(value_type &val, string_type str);
     static string_type serialize(const value_type &val); // with no extra whitespace, padding or indentation
 };

include/jwt-cpp/jwt.h

@@ -49,15 +49,15 @@ namespace jwt {
 				return string_type{val.get_string()};
 			}
 
-			static integer_type as_int(const value_type& val) {
+			static integer_type as_integer(const value_type& val) {
 				switch (val.kind()) {
 				case json::kind::int64: return val.get_int64();
 				case json::kind::uint64: return static_cast<int64_t>(val.get_uint64());
 				default: throw std::bad_cast();
 				}
 			}
 
-			static boolean_type as_bool(const value_type& val) {
+			static boolean_type as_boolean(const value_type& val) {
 				if (val.kind() != json::kind::bool_) throw std::bad_cast();
 				return val.get_bool();
 			}

include/jwt-cpp/traits/boost-json/traits.h

@@ -98,12 +98,12 @@ namespace jwt {
 				return val.as_double();
 			}
 
-			static integer_type as_int(const json& val) {
+			static integer_type as_integer(const json& val) {
 				if (get_type(val) != jwt::json::type::integer) throw std::bad_cast();
 				return val.as<integer_type>();
 			}
 
-			static boolean_type as_bool(const json& val) {
+			static boolean_type as_boolean(const json& val) {
 				if (val.type() != jsoncons::json_type::bool_value) throw std::bad_cast();
 				return val.as_bool();
 			}

include/jwt-cpp/traits/danielaparker-jsoncons/traits.h

@@ -49,12 +49,12 @@ namespace jwt {
 				return val.get<picojson::array>();
 			}
 
-			static int64_t as_int(const picojson::value& val) {
+			static int64_t as_integer(const picojson::value& val) {
 				if (!val.is<int64_t>()) throw std::bad_cast();
 				return val.get<int64_t>();
 			}
 
-			static bool as_bool(const picojson::value& val) {
+			static bool as_boolean(const picojson::value& val) {
 				if (!val.is<bool>()) throw std::bad_cast();
 				return val.get<bool>();
 			}

include/jwt-cpp/traits/kazuho-picojson/traits.h

@@ -46,15 +46,15 @@ namespace jwt {
 				return val.get<json::array_t>();
 			}
 
-			static int64_t as_int(const json& val) {
+			static int64_t as_integer(const json& val) {
 				switch (val.type()) {
 				case json::value_t::number_integer:
 				case json::value_t::number_unsigned: return val.get<int64_t>();
 				default: throw std::bad_cast();
 				}
 			}
 
-			static bool as_bool(const json& val) {
+			static bool as_boolean(const json& val) {
 				if (val.type() != json::value_t::boolean) throw std::bad_cast();
 				return val.get<bool>();
 			}

include/jwt-cpp/traits/nlohmann-json/traits.h

@@ -90,7 +90,7 @@ TEST(ClaimTest, SetAlgorithm) {
 
 TEST(ClaimTest, AsInt) {
 	jwt::claim c(picojson::value(static_cast<int64_t>(10)));
-	ASSERT_EQ(c.as_int(), 10);
+	ASSERT_EQ(c.as_integer(), 10);
 }
 
 TEST(ClaimTest, AsDate) {
@@ -101,8 +101,8 @@ TEST(ClaimTest, AsDate) {
 TEST(ClaimTest, PicoJSONTraitsAccessorsThrow) {
 	jwt::traits::kazuho_picojson::value_type val;
 	ASSERT_THROW(jwt::traits::kazuho_picojson::as_array(val), std::bad_cast);
-	ASSERT_THROW(jwt::traits::kazuho_picojson::as_bool(val), std::bad_cast);
-	ASSERT_THROW(jwt::traits::kazuho_picojson::as_int(val), std::bad_cast);
+	ASSERT_THROW(jwt::traits::kazuho_picojson::as_boolean(val), std::bad_cast);
+	ASSERT_THROW(jwt::traits::kazuho_picojson::as_integer(val), std::bad_cast);
 	ASSERT_THROW(jwt::traits::kazuho_picojson::as_number(val), std::bad_cast);
 	ASSERT_THROW(jwt::traits::kazuho_picojson::as_object(val), std::bad_cast);
 	ASSERT_THROW(jwt::traits::kazuho_picojson::as_string(val), std::bad_cast);
@@ -111,7 +111,7 @@ TEST(ClaimTest, PicoJSONTraitsAccessorsThrow) {
 
 TEST(ClaimTest, PicoJSONTraitsAsBool) {
 	jwt::traits::kazuho_picojson::value_type val(true);
-	ASSERT_EQ(jwt::traits::kazuho_picojson::as_bool(val), true);
+	ASSERT_EQ(jwt::traits::kazuho_picojson::as_boolean(val), true);
 	ASSERT_EQ(jwt::traits::kazuho_picojson::get_type(val), jwt::json::type::boolean);
 }
 
@@ -133,9 +133,9 @@ TEST(ClaimTest, MapOfClaim) {
 	ASSERT_TRUE(claims.has_claim("bool"));
 	ASSERT_FALSE(claims.has_claim("__missing__"));
 
-	ASSERT_EQ(map::basic_claim_t{claims.get_claim("array").as_array().at(0)}.as_int(), (int)1);
+	ASSERT_EQ(map::basic_claim_t{claims.get_claim("array").as_array().at(0)}.as_integer(), (int)1);
 	ASSERT_EQ(claims.get_claim("string").as_string(), "hello world");
 	ASSERT_EQ(claims.get_claim("number").as_number(), 9.9);
-	ASSERT_EQ(claims.get_claim("bool").as_bool(), true);
+	ASSERT_EQ(claims.get_claim("bool").as_boolean(), true);
 	ASSERT_THROW(claims.get_claim("__missing__"), jwt::error::claim_not_present_exception);
 }