Skip to content

Commit a155876

Browse files
lganzzzolganzzzo
committed
Update to the latest oatpp API.
1 parent 2300856 commit a155876

File tree

11 files changed

+54
-54
lines changed

11 files changed

+54
-54
lines changed

‎book-service/src/book-service/controller/BookController.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ class BookController : public oatpp::web::server::api::ApiController {
3030

3131
ENDPOINT_INFO(createBook) {
3232
info->summary = "Create new Book";
33-
info->addConsumes<dto::BookDto>("application/json");
34-
info->addResponse<dto::BookDto>(Status::CODE_200, "application/json");
33+
info->addConsumes<Object<dto::BookDto>>("application/json");
34+
info->addResponse<Object<dto::BookDto>>(Status::CODE_200, "application/json");
3535
}
3636
ENDPOINT("POST", "/books", createBook,
37-
BODY_DTO(dto::BookDto, bookDto)) {
37+
BODY_DTO(Object<dto::BookDto>, bookDto)) {
3838
OATPP_ASSERT_HTTP(bookDto->authorId, Status::CODE_400, "'authorId' is require!");
3939
return createDtoResponse(Status::CODE_200, m_database->createBook(bookDto));
4040
}
@@ -43,15 +43,15 @@ class BookController : public oatpp::web::server::api::ApiController {
4343
ENDPOINT_INFO(putBook) {
4444
// general
4545
info->summary = "Update Book by bookId";
46-
info->addConsumes<dto::BookDto>("application/json");
47-
info->addResponse<dto::BookDto>(Status::CODE_200, "application/json");
46+
info->addConsumes<Object<dto::BookDto>>("application/json");
47+
info->addResponse<Object<dto::BookDto>>(Status::CODE_200, "application/json");
4848
info->addResponse<String>(Status::CODE_404, "text/plain");
4949
// params specific
5050
info->pathParams["bookId"].description = "Book Identifier";
5151
}
5252
ENDPOINT("PUT", "/books/{bookId}", putBook,
5353
PATH(Int64, bookId),
54-
BODY_DTO(dto::BookDto, bookDto)) {
54+
BODY_DTO(Object<dto::BookDto>, bookDto)) {
5555
bookDto->id = bookId;
5656
return createDtoResponse(Status::CODE_200, m_database->updateBook(bookDto));
5757
}
@@ -60,7 +60,7 @@ class BookController : public oatpp::web::server::api::ApiController {
6060
ENDPOINT_INFO(getBookById) {
6161
// general
6262
info->summary = "Get one Book by bookId";
63-
info->addResponse<dto::BookDto>(Status::CODE_200, "application/json");
63+
info->addResponse<Object<dto::BookDto>>(Status::CODE_200, "application/json");
6464
info->addResponse<String>(Status::CODE_404, "text/plain");
6565
// params specific
6666
info->pathParams["bookId"].description = "Book Identifier";
@@ -75,7 +75,7 @@ class BookController : public oatpp::web::server::api::ApiController {
7575

7676
ENDPOINT_INFO(getBooks) {
7777
info->summary = "get all stored books";
78-
info->addResponse<List<dto::BookDto>>(Status::CODE_200, "application/json");
78+
info->addResponse<List<Object<dto::BookDto>>>(Status::CODE_200, "application/json");
7979
}
8080
ENDPOINT("GET", "/books", getBooks) {
8181
return createDtoResponse(Status::CODE_200, m_database->getBooks());

‎book-service/src/book-service/db/Database.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace example { namespace book { namespace db {
55

6-
model::Book Database::serializeFromDto(const dto::BookDto::ObjectWrapper &bookDto) {
6+
model::Book Database::serializeFromDto(const oatpp::Object<dto::BookDto> &bookDto) {
77
model::Book book;
88
if (bookDto->id) {
99
book.id = bookDto->id;
@@ -13,23 +13,23 @@ model::Book Database::serializeFromDto(const dto::BookDto::ObjectWrapper &bookDt
1313
return book;
1414
}
1515

16-
dto::BookDto::ObjectWrapper Database::deserializeToDto(const model::Book &book) {
16+
oatpp::Object<dto::BookDto> Database::deserializeToDto(const model::Book &book) {
1717
auto dto = dto::BookDto::createShared();
1818
dto->id = book.id;
1919
dto->title = book.title;
2020
dto->authorId = book.authorId;
2121
return dto;
2222
}
2323

24-
dto::BookDto::ObjectWrapper Database::createBook(const dto::BookDto::ObjectWrapper &bookDto) {
24+
oatpp::Object<dto::BookDto> Database::createBook(const oatpp::Object<dto::BookDto> &bookDto) {
2525
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
2626
auto book = serializeFromDto(bookDto);
2727
book.id = m_idCounter++;
2828
m_booksById[book.id] = book;
2929
return deserializeToDto(book);
3030
}
3131

32-
dto::BookDto::ObjectWrapper Database::updateBook(const dto::BookDto::ObjectWrapper &bookDto) {
32+
oatpp::Object<dto::BookDto> Database::updateBook(const oatpp::Object<dto::BookDto> &bookDto) {
3333
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
3434
auto book = serializeFromDto(bookDto);
3535
if (book.id < 0) {
@@ -44,7 +44,7 @@ dto::BookDto::ObjectWrapper Database::updateBook(const dto::BookDto::ObjectWrapp
4444
return deserializeToDto(book);
4545
}
4646

47-
dto::BookDto::ObjectWrapper Database::getBookById(v_int64 id) {
47+
oatpp::Object<dto::BookDto> Database::getBookById(v_int64 id) {
4848
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
4949
auto it = m_booksById.find(id);
5050
if (it == m_booksById.end()) {
@@ -53,9 +53,9 @@ dto::BookDto::ObjectWrapper Database::getBookById(v_int64 id) {
5353
return deserializeToDto(it->second);
5454
}
5555

56-
oatpp::data::mapping::type::List<dto::BookDto::ObjectWrapper>::ObjectWrapper Database::getBooks() {
56+
oatpp::List<oatpp::Object<dto::BookDto>> Database::getBooks() {
5757
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
58-
auto result = oatpp::data::mapping::type::List<dto::BookDto::ObjectWrapper>::createShared();
58+
auto result = oatpp::List<oatpp::Object<dto::BookDto>>::createShared();
5959
auto it = m_booksById.begin();
6060
while (it != m_booksById.end()) {
6161
result->push_back(deserializeToDto(it->second));

‎book-service/src/book-service/db/Database.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class Database {
2020
v_int64 m_idCounter; ///< counter to generate bookIds
2121
std::unordered_map<v_int64, model::Book> m_booksById; ///< Map bookId to Book
2222
private:
23-
model::Book serializeFromDto(const dto::BookDto::ObjectWrapper& bookDto);
24-
dto::BookDto::ObjectWrapper deserializeToDto(const model::Book& book);
23+
model::Book serializeFromDto(const oatpp::Object<dto::BookDto>& bookDto);
24+
oatpp::Object<dto::BookDto> deserializeToDto(const model::Book& book);
2525
public:
2626

2727
Database()
@@ -37,11 +37,11 @@ class Database {
3737
createBook(dto::BookDto::createShared(0, 5, "The Catcher in the Rye"));
3838

3939
}
40-
41-
dto::BookDto::ObjectWrapper createBook(const dto::BookDto::ObjectWrapper& bookDto);
42-
dto::BookDto::ObjectWrapper updateBook(const dto::BookDto::ObjectWrapper& bookDto);
43-
dto::BookDto::ObjectWrapper getBookById(v_int64 id);
44-
oatpp::data::mapping::type::List<dto::BookDto::ObjectWrapper>::ObjectWrapper getBooks();
40+
41+
oatpp::Object<dto::BookDto> createBook(const oatpp::Object<dto::BookDto>& bookDto);
42+
oatpp::Object<dto::BookDto> updateBook(const oatpp::Object<dto::BookDto>& bookDto);
43+
oatpp::Object<dto::BookDto> getBookById(v_int64 id);
44+
oatpp::List<oatpp::Object<dto::BookDto>> getBooks();
4545
bool deleteBook(v_int64 id);
4646

4747
};

‎book-service/src/book-service/dto/BookDto.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ namespace example { namespace book { namespace dto {
99

1010
#include OATPP_CODEGEN_BEGIN(DTO)
1111

12-
class BookDto : public oatpp::Object {
12+
class BookDto : public oatpp::DTO {
1313

14-
DTO_INIT(BookDto, Object)
14+
DTO_INIT(BookDto, DTO)
1515

1616
DTO_FIELD(Int64, id);
1717
DTO_FIELD(Int64, authorId, "authorId");

‎facade/src/facade/dto/BookDto.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ namespace example { namespace facade { namespace dto {
99

1010
#include OATPP_CODEGEN_BEGIN(DTO)
1111

12-
class BookDto : public oatpp::Object {
12+
class BookDto : public oatpp::DTO {
1313

14-
DTO_INIT(BookDto, Object)
14+
DTO_INIT(BookDto, DTO)
1515

1616
DTO_FIELD(Int64, id);
1717
DTO_FIELD(Int64, authorId, "authorId");

‎facade/src/facade/dto/BookInfoDto.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace example { namespace facade { namespace dto {
1111

1212
#include OATPP_CODEGEN_BEGIN(DTO)
1313

14-
class BookInfoDto : public oatpp::Object {
14+
class BookInfoDto : public oatpp::DTO {
1515

16-
DTO_INIT(BookInfoDto, Object)
16+
DTO_INIT(BookInfoDto, DTO)
1717

1818
DTO_FIELD(Int64, id);
1919
DTO_FIELD(String, title, "title");

‎facade/src/facade/dto/UserDto.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ namespace example { namespace facade { namespace dto {
99

1010
#include OATPP_CODEGEN_BEGIN(DTO)
1111

12-
class UserDto : public oatpp::Object {
12+
class UserDto : public oatpp::DTO {
1313

14-
DTO_INIT(UserDto, Object)
14+
DTO_INIT(UserDto, DTO)
1515

1616
DTO_FIELD(Int64, id);
1717
DTO_FIELD(String, name, "name");

‎user-service/src/user-service/controller/UserController.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ class UserController : public oatpp::web::server::api::ApiController {
3030

3131
ENDPOINT_INFO(createUser) {
3232
info->summary = "Create new User";
33-
info->addConsumes<dto::UserDto>("application/json");
34-
info->addResponse<dto::UserDto>(Status::CODE_200, "application/json");
33+
info->addConsumes<Object<dto::UserDto>>("application/json");
34+
info->addResponse<Object<dto::UserDto>>(Status::CODE_200, "application/json");
3535
}
3636
ENDPOINT("POST", "/users", createUser,
37-
BODY_DTO(dto::UserDto, userDto)) {
37+
BODY_DTO(Object<dto::UserDto>, userDto)) {
3838
return createDtoResponse(Status::CODE_200, m_database->createUser(userDto));
3939
}
4040

4141

4242
ENDPOINT_INFO(putUser) {
4343
// general
4444
info->summary = "Update User by userId";
45-
info->addConsumes<dto::UserDto>("application/json");
46-
info->addResponse<dto::UserDto>(Status::CODE_200, "application/json");
45+
info->addConsumes<Object<dto::UserDto>>("application/json");
46+
info->addResponse<Object<dto::UserDto>>(Status::CODE_200, "application/json");
4747
info->addResponse<String>(Status::CODE_404, "text/plain");
4848
// params specific
4949
info->pathParams["userId"].description = "User Identifier";
5050
}
5151
ENDPOINT("PUT", "/users/{userId}", putUser,
5252
PATH(Int64, userId),
53-
BODY_DTO(dto::UserDto, userDto)) {
53+
BODY_DTO(Object<dto::UserDto>, userDto)) {
5454
userDto->id = userId;
5555
return createDtoResponse(Status::CODE_200, m_database->updateUser(userDto));
5656
}
@@ -59,7 +59,7 @@ class UserController : public oatpp::web::server::api::ApiController {
5959
ENDPOINT_INFO(getUserById) {
6060
// general
6161
info->summary = "Get one User by userId";
62-
info->addResponse<dto::UserDto>(Status::CODE_200, "application/json");
62+
info->addResponse<Object<dto::UserDto>>(Status::CODE_200, "application/json");
6363
info->addResponse<String>(Status::CODE_404, "text/plain");
6464
// params specific
6565
info->pathParams["userId"].description = "User Identifier";
@@ -74,7 +74,7 @@ class UserController : public oatpp::web::server::api::ApiController {
7474

7575
ENDPOINT_INFO(getUsers) {
7676
info->summary = "get all stored users";
77-
info->addResponse<List<dto::UserDto>>(Status::CODE_200, "application/json");
77+
info->addResponse<List<Object<dto::UserDto>>>(Status::CODE_200, "application/json");
7878
}
7979
ENDPOINT("GET", "/users", getUsers) {
8080
return createDtoResponse(Status::CODE_200, m_database->getUsers());

‎user-service/src/user-service/db/Database.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace example { namespace user { namespace db {
55

6-
model::User Database::serializeFromDto(const dto::UserDto::ObjectWrapper &userDto) {
6+
model::User Database::serializeFromDto(const oatpp::Object<dto::UserDto> &userDto) {
77
model::User user;
88
if (userDto->id) {
99
user.id = userDto->id;
@@ -12,22 +12,22 @@ model::User Database::serializeFromDto(const dto::UserDto::ObjectWrapper &userDt
1212
return user;
1313
}
1414

15-
dto::UserDto::ObjectWrapper Database::deserializeToDto(const model::User &user) {
15+
oatpp::Object<dto::UserDto> Database::deserializeToDto(const model::User &user) {
1616
auto dto = dto::UserDto::createShared();
1717
dto->id = user.id;
1818
dto->name = user.name;
1919
return dto;
2020
}
2121

22-
dto::UserDto::ObjectWrapper Database::createUser(const dto::UserDto::ObjectWrapper &userDto) {
22+
oatpp::Object<dto::UserDto> Database::createUser(const oatpp::Object<dto::UserDto> &userDto) {
2323
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
2424
auto user = serializeFromDto(userDto);
2525
user.id = m_idCounter++;
2626
m_usersById[user.id] = user;
2727
return deserializeToDto(user);
2828
}
2929

30-
dto::UserDto::ObjectWrapper Database::updateUser(const dto::UserDto::ObjectWrapper &userDto) {
30+
oatpp::Object<dto::UserDto> Database::updateUser(const oatpp::Object<dto::UserDto> &userDto) {
3131
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
3232
auto user = serializeFromDto(userDto);
3333
if (user.id < 0) {
@@ -42,7 +42,7 @@ dto::UserDto::ObjectWrapper Database::updateUser(const dto::UserDto::ObjectWrapp
4242
return deserializeToDto(user);
4343
}
4444

45-
dto::UserDto::ObjectWrapper Database::getUserById(v_int64 id) {
45+
oatpp::Object<dto::UserDto> Database::getUserById(v_int64 id) {
4646
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
4747
auto it = m_usersById.find(id);
4848
if (it == m_usersById.end()) {
@@ -51,9 +51,9 @@ dto::UserDto::ObjectWrapper Database::getUserById(v_int64 id) {
5151
return deserializeToDto(it->second);
5252
}
5353

54-
oatpp::List<dto::UserDto> Database::getUsers() {
54+
oatpp::List<oatpp::Object<dto::UserDto>> Database::getUsers() {
5555
std::lock_guard<oatpp::concurrency::SpinLock> lock(m_lock);
56-
auto result = oatpp::List<dto::UserDto::ObjectWrapper>::createShared();
56+
auto result = oatpp::List<oatpp::Object<dto::UserDto>>::createShared();
5757
auto it = m_usersById.begin();
5858
while (it != m_usersById.end()) {
5959
result->push_back(deserializeToDto(it->second));

‎user-service/src/user-service/db/Database.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class Database {
2020
v_int64 m_idCounter; ///< counter to generate userIds
2121
std::unordered_map<v_int64, model::User> m_usersById; ///< Map userId to User
2222
private:
23-
model::User serializeFromDto(const dto::UserDto::ObjectWrapper& userDto);
24-
dto::UserDto::ObjectWrapper deserializeToDto(const model::User& user);
23+
model::User serializeFromDto(const oatpp::Object<dto::UserDto>& userDto);
24+
oatpp::Object<dto::UserDto> deserializeToDto(const model::User& user);
2525
public:
2626

2727
Database()
@@ -37,11 +37,11 @@ class Database {
3737
createUser(dto::UserDto::createShared(0, "J.D. Salinger"));
3838

3939
}
40-
41-
dto::UserDto::ObjectWrapper createUser(const dto::UserDto::ObjectWrapper& userDto);
42-
dto::UserDto::ObjectWrapper updateUser(const dto::UserDto::ObjectWrapper& userDto);
43-
dto::UserDto::ObjectWrapper getUserById(v_int64 id);
44-
oatpp::List<dto::UserDto> getUsers();
40+
41+
oatpp::Object<dto::UserDto> createUser(const oatpp::Object<dto::UserDto>& userDto);
42+
oatpp::Object<dto::UserDto> updateUser(const oatpp::Object<dto::UserDto>& userDto);
43+
oatpp::Object<dto::UserDto> getUserById(v_int64 id);
44+
oatpp::List<oatpp::Object<dto::UserDto>> getUsers();
4545
bool deleteUser(v_int64 id);
4646

4747
};

0 commit comments

Comments
 (0)