Update to the latest oatpp API.

Author: lganzzzo

src/controller/UserController.hpp

@@ -67,27 +67,27 @@ class UserController : public oatpp::web::server::api::ApiController {
 
   ENDPOINT_INFO(createUser) {
     info->summary = "Create new User";
-    info->addConsumes<UserDto>("application/json");
-    info->addResponse<UserDto>(Status::CODE_200, "application/json");
+    info->addConsumes<Object<UserDto>>("application/json");
+    info->addResponse<Object<UserDto>>(Status::CODE_200, "application/json");
   }
   ENDPOINT("POST", "demo/api/users", createUser,
-           BODY_DTO(UserDto, userDto)) {
+           BODY_DTO(Object<UserDto>, userDto)) {
     return createDtoResponse(Status::CODE_200, m_database->createUser(userDto));
   }
 
 
   ENDPOINT_INFO(putUser) {
     // general
     info->summary = "Update User by userId";
-    info->addConsumes<UserDto>("application/json");
-    info->addResponse<UserDto>(Status::CODE_200, "application/json");
+    info->addConsumes<Object<UserDto>>("application/json");
+    info->addResponse<Object<UserDto>>(Status::CODE_200, "application/json");
     info->addResponse<String>(Status::CODE_404, "text/plain");
     // params specific
     info->pathParams["userId"].description = "User Identifier";
   }
   ENDPOINT("PUT", "demo/api/users/{userId}", putUser,
            PATH(Int32, userId),
-           BODY_DTO(UserDto, userDto)) {
+           BODY_DTO(Object<UserDto>, userDto)) {
     userDto->id = userId;
     return createDtoResponse(Status::CODE_200, m_database->updateUser(userDto));
   }
@@ -96,7 +96,7 @@ class UserController : public oatpp::web::server::api::ApiController {
   ENDPOINT_INFO(getUserById) {
     // general
     info->summary = "Get one User by userId";
-    info->addResponse<UserDto>(Status::CODE_200, "application/json");
+    info->addResponse<Object<UserDto>>(Status::CODE_200, "application/json");
     info->addResponse<String>(Status::CODE_404, "text/plain");
     // params specific
     info->pathParams["userId"].description = "User Identifier";
@@ -111,7 +111,7 @@ class UserController : public oatpp::web::server::api::ApiController {
 
   ENDPOINT_INFO(getUsers) {
     info->summary = "get all stored users";
-    info->addResponse<List<UserDto>>(Status::CODE_200, "application/json");
+    info->addResponse<List<Object<UserDto>>>(Status::CODE_200, "application/json");
   }
   ENDPOINT("GET", "demo/api/users", getUsers) {
     return createDtoResponse(Status::CODE_200, m_database->getUsers());

src/db/Database.cpp

@@ -1,7 +1,7 @@
 
 #include "Database.hpp"
 
-User Database::serializeFromDto(const UserDto::ObjectWrapper& userDto){
+User Database::serializeFromDto(const oatpp::Object<UserDto>& userDto){
   User user;
   if(userDto->id){
     user.id = *userDto->id;
@@ -15,7 +15,7 @@ User Database::serializeFromDto(const UserDto::ObjectWrapper& userDto){
   return user;
 }
 
-UserDto::ObjectWrapper Database::deserializeToDto(const User& user){
+oatpp::Object<UserDto> Database::deserializeToDto(const User& user){
   auto dto = UserDto::createShared();
   dto->id = user.id;
   dto->firstName = user.firstName;
@@ -27,15 +27,15 @@ UserDto::ObjectWrapper Database::deserializeToDto(const User& user){
   return dto;
 }
 
-UserDto::ObjectWrapper Database::createUser(const UserDto::ObjectWrapper& userDto){
+oatpp::Object<UserDto> Database::createUser(const oatpp::Object<UserDto>& userDto){
   std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
   auto user = serializeFromDto(userDto);
   user.id = m_idCounter++;
   m_usersById[user.id] = user;
   return deserializeToDto(user);
 }
 
-UserDto::ObjectWrapper Database::updateUser(const UserDto::ObjectWrapper& userDto){
+oatpp::Object<UserDto> Database::updateUser(const oatpp::Object<UserDto>& userDto){
   std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
   auto user = serializeFromDto(userDto);
   if(user.id < 0){
@@ -50,7 +50,7 @@ UserDto::ObjectWrapper Database::updateUser(const UserDto::ObjectWrapper& userDt
   return deserializeToDto(user);
 }
 
-UserDto::ObjectWrapper Database::getUserById(v_int32 id){
+oatpp::Object<UserDto> Database::getUserById(v_int32 id){
   std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
   auto it = m_usersById.find(id);
   if(it == m_usersById.end()){
@@ -59,9 +59,9 @@ UserDto::ObjectWrapper Database::getUserById(v_int32 id){
   return deserializeToDto(it->second);
 }
 
-oatpp::data::mapping::type::List<UserDto::ObjectWrapper>::ObjectWrapper Database::getUsers(){
+oatpp::List<oatpp::Object<UserDto>> Database::getUsers(){
   std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
-  auto result = oatpp::data::mapping::type::List<UserDto::ObjectWrapper>::createShared();
+  oatpp::List<oatpp::Object<UserDto>> result({});
   auto it = m_usersById.begin();
   while (it != m_usersById.end()) {
     result->push_back(deserializeToDto(it->second));

src/db/Database.hpp

@@ -18,18 +18,18 @@ class Database {
   v_int32 m_idCounter; ///< counter to generate userIds
   std::unordered_map<v_int32, User> m_usersById; ///< Map userId to User
 private:
-  User serializeFromDto(const UserDto::ObjectWrapper& userDto);
-  UserDto::ObjectWrapper deserializeToDto(const User& user);
+  User serializeFromDto(const oatpp::Object<UserDto>& userDto);
+  oatpp::Object<UserDto> deserializeToDto(const User& user);
 public:
 
   Database()
     : m_idCounter(0)
   {}
-  
-  UserDto::ObjectWrapper createUser(const UserDto::ObjectWrapper& userDto);
-  UserDto::ObjectWrapper updateUser(const UserDto::ObjectWrapper& userDto);
-  UserDto::ObjectWrapper getUserById(v_int32 id);
-  oatpp::data::mapping::type::List<UserDto::ObjectWrapper>::ObjectWrapper getUsers();
+
+  oatpp::Object<UserDto> createUser(const oatpp::Object<UserDto>& userDto);
+  oatpp::Object<UserDto> updateUser(const oatpp::Object<UserDto>& userDto);
+  oatpp::Object<UserDto> getUserById(v_int32 id);
+  oatpp::List<oatpp::Object<UserDto>> getUsers();
   bool deleteUser(v_int32 id);
 
 };

src/dto/UserDto.hpp

@@ -10,9 +10,9 @@
  *  Data Transfer Object. Object containing fields only.
  *  Used in API for serialization/deserialization and validation
  */
-class UserDto : public oatpp::Object {
+class UserDto : public oatpp::DTO {
 
-  DTO_INIT(UserDto, Object)
+  DTO_INIT(UserDto, DTO)
 
   DTO_FIELD(Int32, id);
   DTO_FIELD(String, firstName, "first-name");