renamed JsonValidator into JsonSchemaValidator

benchmark/benchmark.cpp

@@ -239,7 +239,7 @@ int main(int argc, char** argv) {
         configStr = config.dump();
 
         // validate the configuration file against the schema
-        mofka::JsonValidator validator{configSchema};
+        mofka::JsonSchemaValidator validator{configSchema};
         auto errors = validator.validate(config);
         if(!errors.empty()) {
             std::cerr << "Invalid configuration: ";

src/DefaultPartitionManager.cpp

@@ -120,7 +120,7 @@ std::unique_ptr<mofka::PartitionManager> DefaultPartitionManager::create(
     )"_json;
 
     /* Validate configuration against schema */
-    static JsonValidator schemaValidator{configSchema};
+    static JsonSchemaValidator schemaValidator{configSchema};
     auto validationErrors = schemaValidator.validate(config.json());
     if(!validationErrors.empty()) {
         spdlog::error("[mofka] Error(s) while validating JSON config for DefaultPartitionManager:");

src/DefaultValidator.hpp

@@ -21,9 +21,8 @@ class DefaultValidator : public ValidatorInterface {
     public:
 
     void validate(const Metadata& metadata, const Data& data) const override {
+        (void)metadata;
         (void)data;
-        if(!metadata.isValidJson())
-            throw InvalidMetadata("Metadata object does not contain valid JSON metadata");
     }
 
     Metadata metadata() const override {

src/JsonUtil.hpp

@@ -54,21 +54,21 @@ static inline bool ValidateIsJson(std::string_view json) {
     return brackets.empty();
 }
 
-struct JsonValidator {
+struct JsonSchemaValidator {
 
     using ErrorList = std::vector<std::string>;
 
     nlohmann::json_schema::json_validator m_validator;
 
-    JsonValidator(const nlohmann::json& schema) {
+    JsonSchemaValidator(const nlohmann::json& schema) {
         m_validator.set_root_schema(schema);
     }
 
-    JsonValidator(nlohmann::json&& schema) {
+    JsonSchemaValidator(nlohmann::json&& schema) {
         m_validator.set_root_schema(std::move(schema));
     }
 
-    JsonValidator(const char* schema) {
+    JsonSchemaValidator(const char* schema) {
         m_validator.set_root_schema(nlohmann::json::parse(schema));
     }
 

src/ProviderImpl.hpp

@@ -105,7 +105,7 @@ class ProviderImpl : public tl::provider<ProviderImpl> {
             "required": ["uuid", "type", "topic"]
         }
         )"_json;
-        static JsonValidator jsonValidator{configSchema};
+        static JsonSchemaValidator jsonValidator{configSchema};
 
         /* Validate configuration against schema */
         auto errors = jsonValidator.validate(config.json());

src/SchemaSerializer.hpp

@@ -56,7 +56,7 @@ class SchemaSerializer : public SerializerInterface {
         if(!metadata.json().contains("schema"))
             throw Exception{"SchemaSerializer is expecting a \"schema\" entry in its configuration"};
         // check that the schema field indeed is a schema
-        JsonValidator{metadata.json()["schema"]};
+        JsonSchemaValidator{metadata.json()["schema"]};
         // build the schema serializer and deserialize
         auto serializer   = makeSerializer(metadata.json()["schema"]);
         auto deserializer = makeDeserializer(metadata.json()["schema"]);

src/SchemaValidator.hpp

@@ -18,8 +18,8 @@ class SchemaValidator : public ValidatorInterface {
 
     using json = nlohmann::json;
 
-    json          m_json_schema;
-    JsonValidator m_json_validator;
+    json                m_json_schema;
+    JsonSchemaValidator m_json_validator;
 
     public: