Skip to content

Commit 4e23031

Browse files
bavulapatibavulapati
committed
style(clang-tidy): Clean include headers of src/core/jsonschema
Reported by clang-tidy check misc-include-cleaner Refs: sourcemeta/blaze#429 Signed-off-by: Balakrishna Avulapati <[email protected]>
1 parent 3e37df3 commit 4e23031

File tree

61 files changed

+156
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+156
-45
lines changed

‎src/core/jsonschema/bundle.cc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
2-
3-
#include <cassert> // assert
4-
#include <sstream> // std::ostringstream
5-
#include <utility> // std::move
4+
#include <sourcemeta/core/jsonschema_error.h>
5+
#include <sourcemeta/core/jsonschema_frame.h>
6+
#include <sourcemeta/core/jsonschema_types.h>
7+
8+
#include <cassert> // assert
9+
#include <cstddef> // std::size_t
10+
#include <optional> //std::nullopt
11+
#include <sstream> // std::ostringstream
12+
#include <string> // std::string
13+
#include <utility> // std::move
614

715
namespace {
816

‎src/core/jsonschema/frame.cc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
4+
#include <sourcemeta/core/jsonschema_error.h>
5+
#include <sourcemeta/core/jsonschema_frame.h>
6+
#include <sourcemeta/core/jsonschema_types.h>
7+
#include <sourcemeta/core/jsonschema_walker.h>
8+
#include <sourcemeta/core/uri.h>
29

310
#include <algorithm> // std::sort, std::all_of, std::any_of
411
#include <cassert> // assert
12+
#include <cstddef> // std::size_t
13+
#include <cstdint> // std::uint8_t
514
#include <functional> // std::less
615
#include <map> // std::map
716
#include <optional> // std::optional
17+
#include <ostream> // std::ostream
818
#include <set> // std::set
919
#include <sstream> // std::ostringstream
1020
#include <utility> // std::pair, std::move

‎src/core/jsonschema/include/sourcemeta/core/jsonschema.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@
55
#include <sourcemeta/core/jsonschema_export.h>
66
#endif
77

8-
#include <sourcemeta/core/json.h>
8+
#include <sourcemeta/core/json_value.h>
99
#include <sourcemeta/core/jsonpointer.h>
10-
11-
#include <sourcemeta/core/jsonschema_error.h>
1210
#include <sourcemeta/core/jsonschema_frame.h>
13-
#include <sourcemeta/core/jsonschema_resolver.h>
14-
#include <sourcemeta/core/jsonschema_transform.h>
1511
#include <sourcemeta/core/jsonschema_types.h>
16-
#include <sourcemeta/core/jsonschema_walker.h>
12+
#include <sourcemeta/core/uri.h>
1713

1814
#include <cstdint> // std::uint8_t
19-
#include <functional> // std::function
2015
#include <optional> // std::optional, std::nullopt
21-
#include <set> // std::set
2216
#include <string> // std::string
2317
#include <string_view> // std::string_view
2418

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#endif
77

88
#include <sourcemeta/core/jsonpointer.h>
9-
#include <sourcemeta/core/uri.h>
109

11-
#include <exception> // std::exception
12-
#include <string> // std::string
13-
#include <utility> // std::move
10+
#include <exception> // std::exception
11+
#include <string> // std::string
12+
#include <string_view> // std::string_view
13+
#include <utility> // std::move
1414

1515
namespace sourcemeta::core {
1616

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@
55
#include <sourcemeta/core/jsonschema_export.h>
66
#endif
77

8-
#include <sourcemeta/core/json.h>
8+
#include <sourcemeta/core/json_value.h>
99
#include <sourcemeta/core/jsonpointer.h>
10-
11-
#include <sourcemeta/core/jsonschema_resolver.h>
1210
#include <sourcemeta/core/jsonschema_types.h>
13-
#include <sourcemeta/core/jsonschema_walker.h>
1411

15-
#include <cstdint> // std::uint8_t
16-
#include <functional> // std::reference_wrapper
17-
#include <map> // std::map
18-
#include <optional> // std::optional
19-
#include <ostream> // std::ostream
20-
#include <set> // std::set
21-
#include <tuple> // std::tuple
22-
#include <unordered_set> // std::unordered_set
23-
#include <utility> // std::pair
24-
#include <vector> // std::vector
12+
#include <cstdint> // std::uint8_t
13+
#include <functional> // std::reference_wrapper
14+
#include <map> // std::map
15+
#include <optional> // std::optional
16+
#include <ostream> // std::ostream
17+
#include <set> // std::set
18+
#include <utility> // std::pair
19+
#include <vector> // std::vector
2520

2621
namespace sourcemeta::core {
2722

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
#endif
77

88
#include <sourcemeta/core/json.h>
9+
#include <sourcemeta/core/json_value.h>
910
#include <sourcemeta/core/jsonschema_types.h>
1011

1112
#include <filesystem> // std::filesystem
1213
#include <functional> // std::function
1314
#include <map> // std::map
1415
#include <optional> // std::optional
16+
#include <string> // std::string
1517
#include <string_view> // std::string_view
1618

1719
namespace sourcemeta::core {

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
#include <sourcemeta/core/jsonschema_export.h>
66
#endif
77

8-
#include <sourcemeta/core/json.h>
8+
#include <sourcemeta/core/json_value.h>
99
#include <sourcemeta/core/jsonpointer.h>
1010
#include <sourcemeta/core/uri.h>
1111

1212
#include <sourcemeta/core/jsonschema_resolver.h>
13+
#include <sourcemeta/core/jsonschema_types.h>
1314

1415
#include <cassert> // assert
1516
#include <concepts> // std::derived_from
1617
#include <functional> // std::function
1718
#include <map> // std::map
1819
#include <memory> // std::make_unique, std::unique_ptr
1920
#include <optional> // std::optional, std::nullopt
20-
#include <set> // std::set
2121
#include <string> // std::string
2222
#include <string_view> // std::string_view
2323
#include <utility> // std::move, std::forward, std::pair
2424
#include <variant> // std::variant
25-
#include <vector> // std::vector
2625

2726
namespace sourcemeta::core {
2827

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_
33

44
#include <sourcemeta/core/json.h>
5+
#include <sourcemeta/core/json_value.h>
56
#include <sourcemeta/core/jsonpointer.h>
67
#include <sourcemeta/core/uri.h>
78

‎src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
#include <sourcemeta/core/jsonschema_export.h>
66
#endif
77

8-
#include <sourcemeta/core/json.h>
9-
8+
#include <sourcemeta/core/json_value.h>
109
#include <sourcemeta/core/jsonschema_types.h>
1110

12-
#include <cstdint> // std::uint64_t
13-
#include <optional> // std::optional
14-
#include <string> // std::string
15-
#include <string_view> // std::string_view
16-
#include <vector> // std::vector
11+
#include <optional> // std::optional
12+
#include <string> // std::string
13+
#include <vector> // std::vector
1714

1815
namespace sourcemeta::core {
1916

‎src/core/jsonschema/jsonschema.cc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
4+
#include <sourcemeta/core/jsonschema_error.h>
5+
#include <sourcemeta/core/jsonschema_frame.h>
6+
#include <sourcemeta/core/jsonschema_types.h>
7+
#include <sourcemeta/core/jsonschema_walker.h>
8+
#include <sourcemeta/core/uri.h>
29

310
#include <cassert> // assert
411
#include <cstdint> // std::uint64_t
512
#include <functional> // std::less
613
#include <limits> // std::numeric_limits
14+
#include <map> // std::map
715
#include <numeric> // std::accumulate
16+
#include <optional> // std::optional
817
#include <sstream> // std::ostringstream
18+
#include <string> // std::string
19+
#include <string_view> // std::string_view
920
#include <type_traits> // std::remove_reference_t
1021
#include <utility> // std::move
1122

‎src/core/jsonschema/official_resolver.in.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#include <optional> // std::optional
2+
#include <sourcemeta/core/json.h>
3+
#include <sourcemeta/core/json_value.h>
14
#include <sourcemeta/core/jsonschema.h>
5+
#include <string_view> // std::string_view
26

37
auto sourcemeta::core::schema_official_resolver(std::string_view identifier)
48
-> std::optional<sourcemeta::core::JSON> {

‎src/core/jsonschema/official_walker.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <sourcemeta/core/jsonschema.h>
22

3+
#include <string_view> // std::string_view
4+
35
auto sourcemeta::core::schema_official_walker(
46
std::string_view keyword,
57
const sourcemeta::core::Vocabularies &vocabularies)

‎src/core/jsonschema/resolver.cc

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
2-
3-
#include <algorithm> // std::transform
4-
#include <cassert> // assert
5-
#include <cctype> // std::tolower
6-
#include <sstream> // std::ostringstream
4+
#include <sourcemeta/core/jsonschema_error.h>
5+
#include <sourcemeta/core/jsonschema_frame.h>
6+
#include <sourcemeta/core/jsonschema_resolver.h>
7+
#include <sourcemeta/core/jsonschema_types.h>
8+
9+
#include <algorithm> // std::transform
10+
#include <cassert> // assert
11+
#include <cctype> // std::tolower
12+
#include <filesystem> // std::filesystem
13+
#include <functional> // std::function
14+
#include <optional> // std::optional
15+
#include <sstream> // std::ostringstream
16+
#include <string> // std::string
17+
#include <string_view> // std::string_view
18+
#include <utility> // std::move
719

820
namespace sourcemeta::core {
921

‎src/core/jsonschema/transformer.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
4+
#include <sourcemeta/core/jsonschema_error.h>
5+
#include <sourcemeta/core/jsonschema_frame.h>
6+
#include <sourcemeta/core/jsonschema_transform.h>
7+
#include <sourcemeta/core/jsonschema_types.h>
28

39
#include <cassert> // assert
10+
#include <optional> // std::optional
411
#include <set> // std::set
512
#include <sstream> // std::ostringstream
613
#include <stdexcept> // std::runtime_error
14+
#include <string> // std::string
715
#include <utility> // std::move, std::pair
816

917
namespace {

‎src/core/jsonschema/walker.cc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
#include <sourcemeta/core/json_value.h>
2+
#include <sourcemeta/core/jsonpointer.h>
13
#include <sourcemeta/core/jsonschema.h>
4+
#include <sourcemeta/core/jsonschema_types.h>
5+
#include <sourcemeta/core/jsonschema_walker.h>
26

37
#include <algorithm> // std::max, std::sort
48
#include <cassert> // assert
9+
#include <cstddef> // std::size_t
10+
#include <cstdint> // std::uint8_t
11+
#include <optional> // std::optional
12+
#include <string> // std::string
13+
#include <utility> // std::move
14+
#include <vector> // std::vector
515

616
namespace {
717
enum class SchemaWalkerType_t : std::uint8_t { Deep, Flat };

‎src/extension/alterschema/alterschema.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <sourcemeta/core/alterschema.h>
2+
#include <sourcemeta/core/jsonschema_transform.h>
23

34
#include <cassert> // assert
45

‎src/extension/alterschema/include/sourcemeta/core/alterschema.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#endif
1616

1717
#include <sourcemeta/core/jsonschema.h>
18+
#include <sourcemeta/core/jsonschema_transform.h>
1819

1920
namespace sourcemeta::core {
2021

‎test/jsonschema/jsonschema_base_dialect_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78

‎test/jsonschema/jsonschema_bundle_2019_09_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_2020_12_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft0_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft1_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft2_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft3_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft4_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft6_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_draft7_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_bundle_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <sourcemeta/core/json.h>
44
#include <sourcemeta/core/jsonschema.h>
5+
#include <sourcemeta/core/jsonschema_error.h>
56

67
#include <string> // std::string
78
#include <string_view> // std::string_view

‎test/jsonschema/jsonschema_error_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <gtest/gtest.h>
22

33
#include <sourcemeta/core/jsonschema.h>
4+
#include <sourcemeta/core/jsonschema_error.h>
45

56
#include <exception> // std::exception
67
#include <string> // std::string

0 commit comments

Comments
 (0)