Update to the latest oatpp API

Author: lganzzzo

CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 ## use these variables to configure module installation
 
 set(OATPP_THIS_MODULE_NAME oatpp-mbedtls) ## name of the module (also name of folders in installation dirs)
-set(OATPP_THIS_MODULE_VERSION "1.0.0") ## version of the module (also sufix of folders in installation dirs)
+set(OATPP_THIS_MODULE_VERSION "1.1.0") ## version of the module (also sufix of folders in installation dirs)
 set(OATPP_THIS_MODULE_LIBRARIES oatpp-mbedtls) ## list of libraries to find when find_package is called
 set(OATPP_THIS_MODULE_TARGETS oatpp-mbedtls) ## list of targets to install
 set(OATPP_THIS_MODULE_DIRECTORIES oatpp-mbedtls) ## list of directories to install

test/oatpp-mbedtls/FullTest.cpp

@@ -172,10 +172,10 @@ void FullTest::onRun() {
         auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
         OATPP_ASSERT(dto);
         OATPP_ASSERT(dto->testMap);
-        OATPP_ASSERT(dto->testMap->count() == 3);
-        OATPP_ASSERT(dto->testMap->get("key1", "") == "value1");
-        OATPP_ASSERT(dto->testMap->get("key2", "") == "32");
-        OATPP_ASSERT(dto->testMap->get("key3", "") == oatpp::utils::conversion::float32ToStr(0.32));
+        OATPP_ASSERT(dto->testMap->size() == 3);
+        OATPP_ASSERT(dto->testMap["key1"] == "value1");
+        OATPP_ASSERT(dto->testMap["key2"] == "32");
+        OATPP_ASSERT(dto->testMap["key3"] == oatpp::utils::conversion::float32ToStr(0.32));
       }
 
       { // test GET with header parameter

test/oatpp-mbedtls/app/Controller.hpp

@@ -67,16 +67,16 @@ class Controller : public oatpp::web::server::api::ApiController {
   ENDPOINT("GET", "queries", getWithQueries,
            QUERY(String, name), QUERY(Int32, age)) {
     auto dto = TestDto::createShared();
-    dto->testValue = "name=" + name + "&age=" + oatpp::utils::conversion::int32ToStr(age->getValue());
+    dto->testValue = "name=" + name + "&age=" + oatpp::utils::conversion::int32ToStr(age);
     return createDtoResponse(Status::CODE_200, dto);
   }
 
   ENDPOINT("GET", "queries/map", getWithQueriesMap,
-           QUERIES(const QueryParams&, queries)) {
+           QUERIES(QueryParams, queries)) {
     auto dto = TestDto::createShared();
-    dto->testMap = dto->testMap->createShared();
+    dto->testMap = Fields<String>::createShared();
     for(auto& it : queries.getAll_Unsafe()) {
-      dto->testMap->put(it.first.toString(), it.second.toString());
+      dto->testMap->push_back({it.first.toString(), it.second.toString()});
     }
     return createDtoResponse(Status::CODE_200, dto);
   }

test/oatpp-mbedtls/app/DTOs.hpp

@@ -25,19 +25,19 @@
 #ifndef oatpp_test_web_app_DTOs_hpp
 #define oatpp_test_web_app_DTOs_hpp
 
-#include "oatpp/core/data/mapping/type/Object.hpp"
 #include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace test { namespace mbedtls { namespace app {
 
 #include OATPP_CODEGEN_BEGIN(DTO)
 
-class TestDto : public oatpp::data::mapping::type::Object {
+class TestDto : public oatpp::Object {
 
   DTO_INIT(TestDto, Object)
 
   DTO_FIELD(String, testValue);
-  DTO_FIELD(Fields<String>::ObjectWrapper, testMap);
+  DTO_FIELD(Fields<String>, testMap);
 
 };