Merge pull request #2 from oatpp/v_1.1.0

V 1.1.0

Author: lganzzzo

CMakeLists.txt

@@ -20,8 +20,8 @@ target_include_directories(crud-lib PUBLIC src)
 
 ## link libs
 
-find_package(oatpp          1.0.0 REQUIRED)
-find_package(oatpp-swagger  1.0.0 REQUIRED)
+find_package(oatpp          1.1.0 REQUIRED)
+find_package(oatpp-swagger  1.1.0 REQUIRED)
 
 target_link_libraries(crud-lib
         PUBLIC oatpp::oatpp

README.md

@@ -63,11 +63,11 @@ $ docker run -p 8000:8000 -t example-crud
 ```c++
 ENDPOINT_INFO(createUser) {
   info->summary = "Create new User";
-  info->addConsumes<UserDto::ObjectWrapper>("application/json");
-  info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "application/json");
+  info->addConsumes<UserDto>("application/json");
+  info->addResponse<UserDto>(Status::CODE_200, "application/json");
 }
 ENDPOINT("POST", "demo/api/users", createUser,
-         BODY_DTO(UserDto::ObjectWrapper, userDto)) {
+         BODY_DTO(UserDto, userDto)) {
   return createDtoResponse(Status::CODE_200, m_database->createUser(userDto));
 }
 ```
@@ -77,13 +77,13 @@ ENDPOINT("POST", "demo/api/users", createUser,
 ```c++
 ENDPOINT_INFO(putUser) {
   info->summary = "Update User by userId";
-  info->addConsumes<UserDto::ObjectWrapper>("application/json");
-  info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "application/json");
+  info->addConsumes<UserDto>("application/json");
+  info->addResponse<UserDto>(Status::CODE_200, "application/json");
   info->addResponse<String>(Status::CODE_404, "text/plain");
 }
 ENDPOINT("PUT", "demo/api/users/{userId}", putUser,
          PATH(Int32, userId),
-         BODY_DTO(UserDto::ObjectWrapper, userDto)) {
+         BODY_DTO(UserDto, userDto)) {
   userDto->id = userId;
   return createDtoResponse(Status::CODE_200, m_database->updateUser(userDto));
 }
@@ -94,7 +94,7 @@ ENDPOINT("PUT", "demo/api/users/{userId}", putUser,
 ```c++
 ENDPOINT_INFO(getUserById) {
   info->summary = "Get one User by userId";
-  info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "application/json");
+  info->addResponse<UserDto>(Status::CODE_200, "application/json");
   info->addResponse<String>(Status::CODE_404, "text/plain");
 }
 ENDPOINT("GET", "demo/api/users/{userId}", getUserById,
@@ -110,7 +110,7 @@ ENDPOINT("GET", "demo/api/users/{userId}", getUserById,
 ```c++
 ENDPOINT_INFO(getUsers) {
   info->summary = "get all stored users";
-  info->addResponse<List<UserDto::ObjectWrapper>::ObjectWrapper>(Status::CODE_200, "application/json");
+  info->addResponse<List<UserDto>>(Status::CODE_200, "application/json");
 }
 ENDPOINT("GET", "demo/api/users", getUsers) {
   return createDtoResponse(Status::CODE_200, m_database->getUsers());

src/App.cpp

@@ -1,10 +1,3 @@
-//
-//  main.cpp
-//  web-starter-project
-//
-//  Created by Leonid on 2/12/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #include "./controller/UserController.hpp"
 #include "./AppComponent.hpp"

src/AppComponent.hpp

@@ -1,10 +1,3 @@
-//
-//  AppComponent.hpp
-//  oatpp-web-starter
-//
-//  Created by Leonid on 3/2/18.
-//  Copyright © 2018 lganzzzo. All rights reserved.
-//
 
 #ifndef AppComponent_hpp
 #define AppComponent_hpp
@@ -60,10 +53,8 @@ class AppComponent {
    *  Create ObjectMapper component to serialize/deserialize DTOs in Contoller's API
    */
   OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, apiObjectMapper)([] {
-    auto serializerConfig = oatpp::parser::json::mapping::Serializer::Config::createShared();
-    auto deserializerConfig = oatpp::parser::json::mapping::Deserializer::Config::createShared();
-    deserializerConfig->allowUnknownFields = false;
-    auto objectMapper = oatpp::parser::json::mapping::ObjectMapper::createShared(serializerConfig, deserializerConfig);
+    auto objectMapper = oatpp::parser::json::mapping::ObjectMapper::createShared();
+    objectMapper->getDeserializer()->getConfig()->allowUnknownFields = false;
     return objectMapper;
   }());
 

src/SwaggerComponent.hpp

@@ -1,10 +1,3 @@
-//
-//  SwaggerComponent.hpp
-//  crud
-//
-//  Created by Leonid on 7/31/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #ifndef SwaggerComponent_hpp
 #define SwaggerComponent_hpp

src/controller/UserController.hpp

@@ -1,10 +1,3 @@
-//
-//  UserController.hpp
-//  web-starter-project
-//
-//  Created by Leonid on 2/12/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #ifndef UserController_hpp
 #define UserController_hpp
@@ -54,7 +47,7 @@ class UserController : public oatpp::web::server::api::ApiController {
 
   ENDPOINT_INFO(root) {
     info->summary = "Index.html page";
-    info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "text/html");
+    info->addResponse<String>(Status::CODE_200, "text/html");
   }
   ENDPOINT("GET", "/", root) {
     const char* html =
@@ -74,27 +67,27 @@ class UserController : public oatpp::web::server::api::ApiController {
 
   ENDPOINT_INFO(createUser) {
     info->summary = "Create new User";
-    info->addConsumes<UserDto::ObjectWrapper>("application/json");
-    info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "application/json");
+    info->addConsumes<UserDto>("application/json");
+    info->addResponse<UserDto>(Status::CODE_200, "application/json");
   }
   ENDPOINT("POST", "demo/api/users", createUser,
-           BODY_DTO(UserDto::ObjectWrapper, userDto)) {
+           BODY_DTO(UserDto, userDto)) {
     return createDtoResponse(Status::CODE_200, m_database->createUser(userDto));
   }
 
 
   ENDPOINT_INFO(putUser) {
     // general
     info->summary = "Update User by userId";
-    info->addConsumes<UserDto::ObjectWrapper>("application/json");
-    info->addResponse<UserDto::ObjectWrapper>(Status::CODE_200, "application/json");
+    info->addConsumes<UserDto>("application/json");
+    info->addResponse<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::ObjectWrapper, userDto)) {
+           BODY_DTO(UserDto, userDto)) {
     userDto->id = userId;
     return createDtoResponse(Status::CODE_200, m_database->updateUser(userDto));
   }
@@ -103,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::ObjectWrapper>(Status::CODE_200, "application/json");
+    info->addResponse<UserDto>(Status::CODE_200, "application/json");
     info->addResponse<String>(Status::CODE_404, "text/plain");
     // params specific
     info->pathParams["userId"].description = "User Identifier";
@@ -118,7 +111,7 @@ class UserController : public oatpp::web::server::api::ApiController {
 
   ENDPOINT_INFO(getUsers) {
     info->summary = "get all stored users";
-    info->addResponse<List<UserDto::ObjectWrapper>::ObjectWrapper>(Status::CODE_200, "application/json");
+    info->addResponse<List<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,23 +1,17 @@
-//
-//  Database.cpp
-//  crud
-//
-//  Created by Leonid on 3/13/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #include "Database.hpp"
 
 User Database::serializeFromDto(const UserDto::ObjectWrapper& userDto){
   User user;
   if(userDto->id){
-    user.id = userDto->id->getValue();
+    user.id = *userDto->id;
   }
   user.firstName = userDto->firstName;
   user.lastName = userDto->lastName;
-  userDto->friends->forEach([&user](const oatpp::String& friendId){
-    user.friends.push_back(friendId);
-  });
+
+  for(auto& id : *userDto->friends) {
+    user.friends.push_back(id);
+  }
   return user;
 }
 
@@ -28,7 +22,7 @@ UserDto::ObjectWrapper Database::deserializeToDto(const User& user){
   dto->lastName = user.lastName;
   auto it = user.friends.begin();
   while (it != user.friends.end()) {
-    dto->friends->pushBack(*it++);
+    dto->friends->push_back(*it++);
   }
   return dto;
 }
@@ -70,7 +64,7 @@ oatpp::data::mapping::type::List<UserDto::ObjectWrapper>::ObjectWrapper Database
   auto result = oatpp::data::mapping::type::List<UserDto::ObjectWrapper>::createShared();
   auto it = m_usersById.begin();
   while (it != m_usersById.end()) {
-    result->pushBack(deserializeToDto(it->second));
+    result->push_back(deserializeToDto(it->second));
     it++;
   }
   return result;

src/db/Database.hpp

@@ -1,10 +1,3 @@
-//
-//  Database.hpp
-//  crud
-//
-//  Created by Leonid on 3/13/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #ifndef Database_hpp
 #define Database_hpp

src/db/model/User.hpp

@@ -1,10 +1,3 @@
-//
-//  User.hpp
-//  crud
-//
-//  Created by Leonid on 3/13/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #ifndef db_User_hpp
 #define db_User_hpp

src/dto/UserDto.hpp

@@ -1,31 +1,23 @@
-//
-//  UserDto.hpp
-//  crud
-//
-//  Created by Leonid on 3/13/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
-
 #ifndef UserDto_hpp
 #define UserDto_hpp
 
-#include "oatpp/core/data/mapping/type/Object.hpp"
 #include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/core/Types.hpp"
 
 #include OATPP_CODEGEN_BEGIN(DTO)
 
 /**
  *  Data Transfer Object. Object containing fields only.
  *  Used in API for serialization/deserialization and validation
  */
-class UserDto : public oatpp::data::mapping::type::Object {
+class UserDto : public oatpp::Object {
 
   DTO_INIT(UserDto, Object)
 
   DTO_FIELD(Int32, id);
   DTO_FIELD(String, firstName, "first-name");
   DTO_FIELD(String, lastName, "last-name");
-  DTO_FIELD(List<String>::ObjectWrapper, friends) = List<String>::createShared();
+  DTO_FIELD(Vector<String>, friends) = Vector<String>({});
 
 };