Skip to content

Commit 1c67d0f

Browse files
lganzzzolganzzzo
committed
update to the latest oatpp API version.
1 parent 4f09eaa commit 1c67d0f

File tree

13 files changed

+33
-50
lines changed

13 files changed

+33
-50
lines changed

‎azure-pipelines.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
jobs:
2-
- job: ubuntu_16_04
3-
displayName: 'Build - Ubuntu 16.04'
2+
- job: ubuntu_20_04
3+
displayName: 'Build - Ubuntu 20.04'
44
continueOnError: false
55
pool:
6-
vmImage: 'Ubuntu 16.04'
6+
vmImage: 'ubuntu-20.04'
77
workspace:
88
clean: all
99
steps:

‎book-service/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ target_include_directories(${project_name}-lib PUBLIC src)
2525

2626
## link libs
2727

28-
find_package(oatpp 1.2.5 REQUIRED)
29-
find_package(oatpp-swagger 1.2.5 REQUIRED)
28+
find_package(oatpp 1.3.0 REQUIRED)
29+
find_package(oatpp-swagger 1.3.0 REQUIRED)
3030

3131
target_link_libraries(${project_name}-lib
3232
PUBLIC oatpp::oatpp

‎book-service/src/book-service/Runner.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "controller/BookController.hpp"
77

88
#include "oatpp-swagger/Controller.hpp"
9+
#include "oatpp/web/server/HttpConnectionHandler.hpp"
910
#include "oatpp/network/Server.hpp"
1011

1112
namespace example { namespace book {
@@ -14,20 +15,15 @@ Runner::Runner() {
1415

1516
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router, Qualifiers::SERVICE_BOOK);
1617

17-
auto docEndpoints = oatpp::swagger::Controller::Endpoints::createShared();
18+
oatpp::web::server::api::Endpoints docEndpoints;
1819

1920
/* Add BookController */
20-
auto bookController = std::make_shared<controller::BookController>();
21-
bookController->addEndpointsToRouter(router);
22-
m_controllers.push_back(bookController);
23-
24-
docEndpoints->pushBackAll(bookController->getEndpoints());
21+
docEndpoints.append(router->addController(std::make_shared<controller::BookController>())->getEndpoints());
2522

2623
OATPP_COMPONENT(std::shared_ptr<oatpp::swagger::DocumentInfo>, documentInfo, Qualifiers::SERVICE_BOOK);
2724
OATPP_COMPONENT(std::shared_ptr<oatpp::swagger::Resources>, resources, Qualifiers::SERVICE_BOOK);
28-
auto swaggerController = oatpp::swagger::Controller::createShared(docEndpoints, documentInfo, resources);
29-
swaggerController->addEndpointsToRouter(router);
30-
m_controllers.push_back(swaggerController);
25+
26+
router->addController(oatpp::swagger::Controller::createShared(docEndpoints, documentInfo, resources));
3127

3228
}
3329

‎book-service/src/book-service/Runner.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
namespace example { namespace book {
1111

1212
class Runner {
13-
private:
14-
std::list<std::shared_ptr<oatpp::web::server::api::ApiController>> m_controllers;
1513
public:
1614

1715
Runner();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ class BookDto : public oatpp::DTO {
1919

2020
public:
2121

22+
BookDto() = default;
23+
2224
BookDto(v_int64 pId, v_int64 pAuthorId, const String& pTitle)
2325
: id(pId)
2426
, authorId(pAuthorId)

‎facade/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ target_include_directories(${project_name}-lib PUBLIC src)
2727

2828
## link libs
2929

30-
find_package(oatpp 1.2.5 REQUIRED)
31-
find_package(oatpp-swagger 1.2.5 REQUIRED)
30+
find_package(oatpp 1.3.0 REQUIRED)
31+
find_package(oatpp-swagger 1.3.0 REQUIRED)
3232

3333
target_link_libraries(${project_name}-lib
3434
PUBLIC oatpp::oatpp

‎facade/src/facade/Runner.cpp‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "oatpp-swagger/Controller.hpp"
1010

11+
#include "oatpp/web/server/HttpConnectionHandler.hpp"
1112
#include "oatpp/network/Server.hpp"
1213

1314
namespace example { namespace facade {
@@ -16,24 +17,15 @@ Runner::Runner() {
1617

1718
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router, Qualifiers::SERVICE_FACADE);
1819

19-
auto docEndpoints = oatpp::swagger::Controller::Endpoints::createShared();
20+
oatpp::web::server::api::Endpoints docEndpoints;
2021

21-
auto userController = std::make_shared<controller::UserController>();
22-
userController->addEndpointsToRouter(router);
23-
m_controllers.push_back(userController);
24-
25-
auto bookController = std::make_shared<controller::BookController>();
26-
bookController->addEndpointsToRouter(router);
27-
m_controllers.push_back(bookController);
28-
29-
docEndpoints->pushBackAll(userController->getEndpoints());
30-
docEndpoints->pushBackAll(bookController->getEndpoints());
22+
docEndpoints.append(router->addController(std::make_shared<controller::UserController>())->getEndpoints());
23+
docEndpoints.append(router->addController(std::make_shared<controller::BookController>())->getEndpoints());
3124

3225
OATPP_COMPONENT(std::shared_ptr<oatpp::swagger::DocumentInfo>, documentInfo, Qualifiers::SERVICE_FACADE);
3326
OATPP_COMPONENT(std::shared_ptr<oatpp::swagger::Resources>, resources, Qualifiers::SERVICE_FACADE);
34-
auto swaggerController = oatpp::swagger::Controller::createShared(docEndpoints, documentInfo, resources);
35-
swaggerController->addEndpointsToRouter(router);
36-
m_controllers.push_back(swaggerController);
27+
28+
router->addController(oatpp::swagger::Controller::createShared(docEndpoints, documentInfo, resources));
3729

3830
}
3931

‎facade/src/facade/Runner.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
namespace example { namespace facade {
1111

1212
class Runner {
13-
private:
14-
std::list<std::shared_ptr<oatpp::web::server::api::ApiController>> m_controllers;
1513
public:
1614

1715
Runner();

‎monolith/all-services/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ target_link_libraries(${project_name}-exe
4141
PUBLIC ${FACADE_LIBRARY}
4242
)
4343

44-
find_package(oatpp 1.2.5 REQUIRED)
45-
find_package(oatpp-swagger 1.2.5 REQUIRED)
44+
find_package(oatpp 1.3.0 REQUIRED)
45+
find_package(oatpp-swagger 1.3.0 REQUIRED)
4646

4747
## define path to swagger-ui res folder
4848
add_definitions(-DOATPP_SWAGGER_RES_PATH="${OATPP_BASE_DIR}/bin/oatpp-swagger/res")

‎user-service/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ target_include_directories(${project_name}-lib PUBLIC src)
2525

2626
## link libs
2727

28-
find_package(oatpp 1.2.5 REQUIRED)
29-
find_package(oatpp-swagger 1.2.5 REQUIRED)
28+
find_package(oatpp 1.3.0 REQUIRED)
29+
find_package(oatpp-swagger 1.3.0 REQUIRED)
3030

3131
target_link_libraries(${project_name}-lib
3232
PUBLIC oatpp::oatpp

0 commit comments

Comments
 (0)