changing exception type in MappingHandler

Author: jholloc

libtokamap/TODO.md

@@ -16,3 +16,5 @@
 - [x] ~~Replace gsl::span with std::span~~
 - [ ] Handle mismatch of request data type and returned data type, i.e. type conversions?
 - [ ] Check returned data against expected rank
+- [ ] Add JSON schema files into repo (from IMAS MASTU mapping)
+- [ ] Validate JSON mappings on read

libtokamap/examples/simple_mapper/src/json_data_source.cpp

@@ -8,15 +8,10 @@
 #include <filesystem>
 #include <fstream>
 #include <libtokamap.hpp>
-#include "exceptions/exceptions.hpp"
 #include <nlohmann/json.hpp>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
-#include "map_types/map_arguments.hpp"
-#include "utils/algorithm.hpp"
-
 using namespace std::string_literals;
 
 namespace

libtokamap/examples/simple_mapper/src/json_data_source.hpp

@@ -1,16 +1,15 @@
+#include <filesystem>
 #include <libtokamap.hpp>
 #include <nlohmann/json.hpp>
-#include <stdexcept>
-#include "exceptions/exceptions.hpp"
 #include <string>
 #include <unordered_map>
 #include <utility>
-#include <filesystem>
 
 class JSONDataSource : public libtokamap::DataSource
 {
   public:
-    explicit JSONDataSource(std::filesystem::path data_root) : m_data_root{std::move(data_root)} {
+    explicit JSONDataSource(std::filesystem::path data_root) : m_data_root{std::move(data_root)}
+    {
         if (!std::filesystem::exists(m_data_root)) {
             throw libtokamap::FileError{"data root does not exist"};
         }

libtokamap/examples/simple_mapper/src/simple_mapper.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <bit>
 #include <cstddef>
 #include <cstdint>
@@ -10,7 +11,6 @@
 #include <string>
 #include <typeindex>
 #include <utility>
-#include <algorithm>
 
 #include "json_data_source.hpp"
 

libtokamap/include/libtokamap.hpp

@@ -7,6 +7,7 @@
 #include <map_types/expr_mapping.hpp>        // IWYU pragma: export.
 #include <map_types/map_arguments.hpp>       // IWYU pragma: export.
 #include <map_types/value_mapping.hpp>       // IWYU pragma: export.
+#include <utils/algorithm.hpp>               // IWYU pragma: export.
 #include <utils/indices.hpp>                 // IWYU pragma: export.
 #include <utils/ram_cache.hpp>               // IWYU pragma: export.
 #include <utils/scale_offset.hpp>            // IWYU pragma: export.

libtokamap/src/handlers/mapping_handler.cpp

@@ -200,8 +200,8 @@ libtokamap::TypedDataArray libtokamap::MappingHandler::map(const std::string& ma
     const auto maybe_mappings = read_mappings(machine_string, ids_name, extra_attributes);
 
     if (!maybe_mappings) {
-        throw libtokamap::MappingError{"no mappings found for machine '" + machine_string + "' and IDS '" + ids_name +
-                                       "'"};
+        auto msg = "no mappings found for machine '" + machine_string + "' and IDS '" + ids_name + "'";
+        throw libtokamap::ParameterError{msg};
     }
 
     const auto& [attributes, mappings] = maybe_mappings.value();