Skip to content

Commit

Permalink
schema_factory
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielaparker
danielaparker committed Dec 13, 2023
1 parent 2f588fb commit 6d872df
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 112 deletions.
75 changes: 12 additions & 63 deletions ...s_ext/jsonschema/draft7/schema_parser.hpp → .../jsonschema/draft7/schema_parser_impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

// See https://github.com/danielaparker/jsoncons for latest version

#ifndef JSONCONS_JSONSCHEMA_DRAFT7_KEYWORD_FACTORY_HPP
#define JSONCONS_JSONSCHEMA_DRAFT7_KEYWORD_FACTORY_HPP
#ifndef JSONCONS_JSONSCHEMA_DRAFT7_SCHEMA_PARSER_IMPL_HPP
#define JSONCONS_JSONSCHEMA_DRAFT7_SCHEMA_PARSER_IMPL_HPP

#include <jsoncons/config/jsoncons_config.hpp>
#include <jsoncons/uri.hpp>
Expand All @@ -16,6 +16,7 @@
#include <jsoncons_ext/jsonschema/keywords.hpp>
#include <jsoncons_ext/jsonschema/draft7/schema_draft7.hpp>
#include <jsoncons_ext/jsonschema/schema_version.hpp>
#include <jsoncons_ext/jsonschema/schema_parser.hpp>
#include <cassert>
#include <set>
#include <sstream>
Expand Down Expand Up @@ -44,7 +45,7 @@ namespace draft7 {
};

template <class Json>
class schema_parser
class schema_parser_impl : public schema_parser<Json>
{
public:
using reference_validator_type = reference_validator<Json>;
Expand All @@ -68,16 +69,16 @@ namespace draft7 {
std::map<std::string, subschema_registry> subschema_registries_;

public:
schema_parser(uri_resolver<Json>&& resolver) noexcept
schema_parser_impl(uri_resolver<Json>&& resolver) noexcept

: resolver_(std::move(resolver))
{
}

schema_parser(const schema_parser&) = delete;
schema_parser& operator=(const schema_parser&) = delete;
schema_parser(schema_parser&&) = default;
schema_parser& operator=(schema_parser&&) = default;
schema_parser_impl(const schema_parser_impl&) = delete;
schema_parser_impl& operator=(const schema_parser_impl&) = delete;
schema_parser_impl(schema_parser_impl&&) = default;
schema_parser_impl& operator=(schema_parser_impl&&) = default;

std::shared_ptr<json_schema<Json>> get_schema()
{
Expand Down Expand Up @@ -1041,26 +1042,12 @@ namespace draft7 {
);
}

void parse(const Json& sch)
void parse(const Json& sch) override
{
if (sch.is_object())
{
auto it = sch.find("$schema");
if (it != sch.object_range().end())
{
auto sv = it->value().as_string_view();
if (!schema_version::contains(sv))
{
std::string message("Unsupported schema version ");
message.append(sv.data(), sv.size());
JSONCONS_THROW(schema_error(message));
}
}
}
load(sch, compilation_context(schema_location("#")));
parse(sch, "#");
}

void parse(const Json& sch, const std::string& retrieval_uri)
void parse(const Json& sch, const std::string& retrieval_uri) override
{
if (sch.is_object())
{
Expand Down Expand Up @@ -1235,44 +1222,6 @@ namespace draft7 {

};

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema);

return parser.get_schema();
}

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema, const std::string& retrieval_uri)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema, retrieval_uri);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser(resolver);
parser.parse(schema);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const std::string& retrieval_uri, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser(resolver, retrieval_uri);
parser.parse(schema);

return parser.get_schema();
}

} // namespace draft7
} // namespace jsonschema
} // namespace jsoncons
Expand Down
50 changes: 1 addition & 49 deletions include/jsoncons_ext/jsonschema/jsonschema.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,6 @@

#include <jsoncons_ext/jsonschema/keywords.hpp>
#include <jsoncons_ext/jsonschema/json_validator.hpp>
#include <jsoncons_ext/jsonschema/draft7/schema_parser.hpp>


namespace jsoncons {
namespace jsonschema {

template <class Json>
using schema_draft7 = jsoncons::jsonschema::draft7::schema_draft7<Json>;

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema);

return parser.get_schema();
}

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema, const std::string& retrieval_uri)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema, retrieval_uri);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser(resolver);
parser.parse(schema);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const std::string& retrieval_uri, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser<Json> parser(resolver, retrieval_uri);
parser.parse(schema);

return parser.get_schema();
}

} // namespace jsonschema
} // namespace jsoncons
#include <jsoncons_ext/jsonschema/schema_factory.hpp>

#endif // JSONCONS_JSONSCHEMA_JSONSCHEMA_HPP
59 changes: 59 additions & 0 deletions include/jsoncons_ext/jsonschema/schema_factory.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Copyright 2013-2023 Daniel Parker
// Distributed under the Boost license, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

// See https://github.com/danielaparker/jsoncons for latest version

#ifndef JSONCONS_JSONSCHEMA_SCHEMA_FACTORY_HPP
#define JSONCONS_JSONSCHEMA_SCHEMA_FACTORY_HPP

#include <jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp>

namespace jsoncons {
namespace jsonschema {

template <class Json>
using schema_draft7 = jsoncons::jsonschema::draft7::schema_draft7<Json>;

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema)
{
jsoncons::jsonschema::draft7::schema_parser_impl<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema);

return parser.get_schema();
}

template <class Json>
std::shared_ptr<json_schema<Json>> make_schema(const Json& schema, const std::string& retrieval_uri)
{
jsoncons::jsonschema::draft7::schema_parser_impl<Json> parser{ jsoncons::jsonschema::draft7::default_uri_resolver<Json>()};
parser.parse(schema, retrieval_uri);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser_impl<Json> parser(resolver);
parser.parse(schema);

return parser.get_schema();
}

template <class Json,class URIResolver>
typename std::enable_if<extension_traits::is_unary_function_object_exact<URIResolver,Json,std::string>::value,std::shared_ptr<json_schema<Json>>>::type
make_schema(const Json& schema, const std::string& retrieval_uri, const URIResolver& resolver)
{
jsoncons::jsonschema::draft7::schema_parser_impl<Json> parser(resolver, retrieval_uri);
parser.parse(schema);

return parser.get_schema();
}

} // namespace jsonschema
} // namespace jsoncons

#endif // JSONCONS_JSONSCHEMA_SCHEMA_HPP
34 changes: 34 additions & 0 deletions include/jsoncons_ext/jsonschema/schema_parser.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2013-2023 Daniel Parker
// Distributed under the Boost license, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

// See https://github.com/danielaparker/jsoncons for latest version

#ifndef JSONCONS_JSONSCHEMA_SCHEMA_PARSER_HPP
#define JSONCONS_JSONSCHEMA_SCHEMA_PARSER_HPP

#include <jsoncons/config/jsoncons_config.hpp>
#include <jsoncons/uri.hpp>
#include <jsoncons/json.hpp>
#include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
#include <jsoncons_ext/jsonschema/schema_location.hpp>
#include <jsoncons_ext/jsonschema/keyword_validator.hpp>

namespace jsoncons {
namespace jsonschema {

template <class Json>
class schema_parser
{
public:

virtual void parse(const Json& sch) = 0;

virtual void parse(const Json& sch, const std::string& retrieval_uri) = 0;
};

} // namespace jsonschema
} // namespace jsoncons

#endif // JSONCONS_JSONSCHEMA_SCHEMA_HPP

0 comments on commit 6d872df

Please sign in to comment.