refactor: code cleanup

include/jvalidate/constraint.h

@@ -33,7 +33,7 @@ private:
   using Self = ConstraintFactory<A>;
 
 private:
-  Keywords<MakeConstraint> constraints_{
+  std::unordered_map<std::string_view, MakeConstraint> constraints_{
       {"additionalProperties", &Self::additionalProperties},
       {"enum", &Self::isInEnumuration},
       {"maxItems", &Self::maxItems},
@@ -49,7 +49,7 @@ private:
       {"uniqueItems", &Self::uniqueItems},
   };
 
-  Keywords<Versioned<MakeConstraint>> versioned_constraints_{
+  std::unordered_map<std::string_view, Versioned<MakeConstraint>> versioned_constraints_{
       {"additionalItems",
        {{schema::Version::Draft04, &Self::additionalItems},
         {schema::Version::Draft2020_12, nullptr}}},

tests/selfvalidate_test.cxx

@@ -25,9 +25,7 @@
 
 using jvalidate::schema::Version;
 
-using testing::Combine;
 using testing::TestWithParam;
-using testing::Values;
 
 struct RecursiveTestFilter {
   std::unordered_set<std::string> whitelist;