Update to the latest oatpp API

Author: lganzzzo

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.20)
 project(crud)
 
 set(CMAKE_CXX_STANDARD 17)

src/AppComponent.hpp

@@ -13,7 +13,7 @@
 
 #include "oatpp/network/tcp/server/ConnectionProvider.hpp"
 
-#include "oatpp/json/ObjectMapper.hpp""
+#include "oatpp/json/ObjectMapper.hpp"
 
 #include "oatpp/macro/component.hpp"
 
@@ -72,9 +72,7 @@ class AppComponent {
     OATPP_COMPONENT(std::shared_ptr<oatpp::web::mime::ContentMappers>, contentMappers); // get ContentMappers component
 
     auto connectionHandler = oatpp::web::server::HttpConnectionHandler::createShared(router);
-    connectionHandler->setErrorHandler(std::make_shared<ErrorHandler>(
-      contentMappers->getMapper("application/json"))
-    );
+    connectionHandler->setErrorHandler(std::make_shared<ErrorHandler>(contentMappers));
     return connectionHandler;
 
   }());

src/ErrorHandler.cpp

@@ -1,21 +1,42 @@
 
 #include "ErrorHandler.hpp"
+#include "oatpp/data/stream/BufferStream.hpp"
 
-ErrorHandler::ErrorHandler(const std::shared_ptr<oatpp::data::mapping::ObjectMapper>& objectMapper)
-  : m_objectMapper(objectMapper)
+ErrorHandler::ErrorHandler(const std::shared_ptr<oatpp::web::mime::ContentMappers>& mappers)
+  : m_mappers(mappers)
 {}
 
-std::shared_ptr<ErrorHandler::OutgoingResponse>
-ErrorHandler::handleError(const Status& status, const oatpp::String& message, const Headers& headers) {
+std::shared_ptr<ErrorHandler::OutgoingResponse> ErrorHandler::renderError(const HttpServerErrorStacktrace& stacktrace) {
+
+  Status status = stacktrace.status;
+  if(status.description == nullptr) {
+    status.description = "Unknown";
+  }
+
+  oatpp::data::stream::BufferOutputStream ss;
+
+  for(auto& s : stacktrace.stack) {
+    ss << s << "\n";
+  }
 
   auto error = StatusDto::createShared();
   error->status = "ERROR";
-  error->code = status.code;
-  error->message = message;
+  error->code = stacktrace.status.code;
+  error->message = ss.toString();
+
+  std::vector<oatpp::String> accept;
+  if(stacktrace.request) {
+    accept = stacktrace.request->getHeaderValues("Accept");
+  }
+
+  auto mapper = m_mappers->selectMapper(accept);
+  if(!mapper) {
+    mapper = m_mappers->getDefaultMapper();
+  }
 
-  auto response = ResponseFactory::createResponse(status, error, m_objectMapper);
+  auto response = ResponseFactory::createResponse(stacktrace.status,error,mapper);
 
-  for(const auto& pair : headers.getAll()) {
+  for(const auto& pair : stacktrace.headers.getAll()) {
     response->putHeader(pair.first.toString(), pair.second.toString());
   }
 

src/ErrorHandler.hpp

@@ -6,20 +6,20 @@
 
 #include "oatpp/web/server/handler/ErrorHandler.hpp"
 #include "oatpp/web/protocol/http/outgoing/ResponseFactory.hpp"
+#include "oatpp/web/mime/ContentMappers.hpp"
 
-class ErrorHandler : public oatpp::web::server::handler::ErrorHandler {
+class ErrorHandler : public oatpp::web::server::handler::DefaultErrorHandler {
 private:
   typedef oatpp::web::protocol::http::outgoing::Response OutgoingResponse;
   typedef oatpp::web::protocol::http::Status Status;
   typedef oatpp::web::protocol::http::outgoing::ResponseFactory ResponseFactory;
 private:
-  std::shared_ptr<oatpp::data::mapping::ObjectMapper> m_objectMapper;
+  std::shared_ptr<oatpp::web::mime::ContentMappers> m_mappers;
 public:
 
-  ErrorHandler(const std::shared_ptr<oatpp::data::mapping::ObjectMapper>& objectMapper);
+  ErrorHandler(const std::shared_ptr<oatpp::web::mime::ContentMappers>& mappers);
 
-  std::shared_ptr<OutgoingResponse>
-  handleError(const Status& status, const oatpp::String& message, const Headers& headers) override;
+  std::shared_ptr<OutgoingResponse> renderError(const HttpServerErrorStacktrace& stacktrace) override;
 
 };