jsonschema common

danielaparker · Dec 13, 2023 · 80ec495 · 80ec495
1 parent 382fa65
commit 80ec495
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/doc/ref/jsonschema/schema_error.md b/doc/ref/jsonschema/schema_error.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::schema_error
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>

diff --git a/doc/ref/jsonschema/validation_error.md b/doc/ref/jsonschema/validation_error.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::validation_error
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>

diff --git a/doc/ref/jsonschema/validation_output.md b/doc/ref/jsonschema/validation_output.md
@@ -1,7 +1,7 @@
 ### jsoncons::jsonschema::validation_output
 
 ```cpp
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 ```
 
 <br>

diff --git a/include/jsoncons_ext/jsonschema/common/compilation_context.hpp b/include/jsoncons_ext/jsonschema/common/compilation_context.hpp
@@ -4,14 +4,14 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_JSONSCHEMA_COMPILATION_CONTEXT_HPP
-#define JSONCONS_JSONSCHEMA_COMPILATION_CONTEXT_HPP
+#ifndef JSONCONS_JSONSCHEMA_COMMON_COMPILATION_CONTEXT_HPP
+#define JSONCONS_JSONSCHEMA_COMMON_COMPILATION_CONTEXT_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/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 #include <jsoncons_ext/jsonschema/common/schema_location.hpp>
 
 namespace jsoncons {

diff --git a/...ncons_ext/jsonschema/format_validator.hpp → ...xt/jsonschema/common/format_validator.hpp b/...ncons_ext/jsonschema/format_validator.hpp → ...xt/jsonschema/common/format_validator.hpp
@@ -4,14 +4,14 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_JSONSCHEMA_FORMAT_VALIDATOR_HPP
-#define JSONCONS_JSONSCHEMA_FORMAT_VALIDATOR_HPP
+#ifndef JSONCONS_JSONSCHEMA_COMMON_FORMAT_VALIDATOR_HPP
+#define JSONCONS_JSONSCHEMA_COMMON_FORMAT_VALIDATOR_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/common/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
 #include <cassert>
 #include <set>
 #include <sstream>

diff --git a/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp b/include/jsoncons_ext/jsonschema/common/keyword_validator.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 
 namespace jsoncons {
 namespace jsonschema {

diff --git a/include/jsoncons_ext/jsonschema/keywords.hpp → ...oncons_ext/jsonschema/common/keywords.hpp b/include/jsoncons_ext/jsonschema/keywords.hpp → ...oncons_ext/jsonschema/common/keywords.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/format_validator.hpp>
+#include <jsoncons_ext/jsonschema/common/format_validator.hpp>
 #include <jsoncons_ext/jsonschema/common/keyword_validator.hpp>
 #include <cassert>
 #include <set>

diff --git a/include/jsoncons_ext/jsonschema/common/schema_location.hpp b/include/jsoncons_ext/jsonschema/common/schema_location.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 
 namespace jsoncons {
 namespace jsonschema {

diff --git a/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp b/include/jsoncons_ext/jsonschema/draft7/schema_parser_impl.hpp
@@ -11,8 +11,8 @@
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
 #include <jsoncons_ext/jsonschema/common/compilation_context.hpp>
-#include <jsoncons_ext/jsonschema/common/json_schema.hpp>
-#include <jsoncons_ext/jsonschema/keywords.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/common/keywords.hpp>
 #include <jsoncons_ext/jsonschema/schema_version.hpp>
 #include <jsoncons_ext/jsonschema/common/schema_parser.hpp>
 #include <jsoncons_ext/jsonschema/draft7/schema_draft7.hpp>

diff --git a/...ons_ext/jsonschema/common/json_schema.hpp → ...e/jsoncons_ext/jsonschema/json_schema.hpp b/...ons_ext/jsonschema/common/json_schema.hpp → ...e/jsoncons_ext/jsonschema/json_schema.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/jsonschema_error.hpp>
+#include <jsoncons_ext/jsonschema/jsonschema_error.hpp>
 #include <jsoncons_ext/jsonschema/common/keyword_validator.hpp>
 
 namespace jsoncons {

diff --git a/include/jsoncons_ext/jsonschema/json_validator.hpp b/include/jsoncons_ext/jsonschema/json_validator.hpp
@@ -11,7 +11,7 @@
 #include <jsoncons/uri.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons_ext/jsonpointer/jsonpointer.hpp>
-#include <jsoncons_ext/jsonschema/common/json_schema.hpp>
+#include <jsoncons_ext/jsonschema/json_schema.hpp>
 #include <cassert>
 #include <set>
 #include <sstream>

diff --git a/include/jsoncons_ext/jsonschema/jsonschema.hpp b/include/jsoncons_ext/jsonschema/jsonschema.hpp
@@ -7,7 +7,7 @@
 #ifndef JSONCONS_JSONSCHEMA_JSONSCHEMA_HPP
 #define JSONCONS_JSONSCHEMA_JSONSCHEMA_HPP
 
-#include <jsoncons_ext/jsonschema/keywords.hpp>
+#include <jsoncons_ext/jsonschema/common/keywords.hpp>
 #include <jsoncons_ext/jsonschema/json_validator.hpp>
 #include <jsoncons_ext/jsonschema/schema_factory.hpp>
 

diff --git a/...xt/jsonschema/common/jsonschema_error.hpp → ...ncons_ext/jsonschema/jsonschema_error.hpp b/...xt/jsonschema/common/jsonschema_error.hpp → ...ncons_ext/jsonschema/jsonschema_error.hpp
diff --git a/test/jsonschema/src/format_validator_tests.cpp b/test/jsonschema/src/format_validator_tests.cpp
@@ -11,7 +11,7 @@
 #include <fstream>
 #include <iostream>
 #include <regex>
-#include <jsoncons_ext/jsonschema/format_validator.hpp>
+#include <jsoncons_ext/jsonschema/common/format_validator.hpp>
 
 namespace jsonschema = jsoncons::jsonschema;