Skip to content

Commit 04c4289

Browse files
lganzzzolganzzzo
committed
Update to the latest oatpp API
1 parent 8598a84 commit 04c4289

File tree

10 files changed

+28
-28
lines changed

10 files changed

+28
-28
lines changed

‎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.1.0 REQUIRED)
29-
find_package(oatpp-swagger 1.1.0 REQUIRED)
28+
find_package(oatpp 1.2.0 REQUIRED)
29+
find_package(oatpp-swagger 1.2.0 REQUIRED)
3030

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "oatpp/web/server/HttpRouter.hpp"
1212

1313
#include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
14-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
14+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
1515

1616
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
1717

@@ -52,7 +52,7 @@ class AppComponent {
5252
* Create "real-port" connection provider
5353
*/
5454
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)(Qualifiers::SERVICE_BOOK, [this] {
55-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(m_hostPort.port);
55+
return oatpp::network::tcp::server::ConnectionProvider::createShared({m_hostPort.host, m_hostPort.port});
5656
}());
5757

5858
/**

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

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

88
#include "oatpp-swagger/Controller.hpp"
9-
#include "oatpp/network/server/Server.hpp"
9+
#include "oatpp/network/Server.hpp"
1010

1111
namespace example { namespace book {
1212

@@ -42,7 +42,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
4242
acceptingThreads.push_back(std::thread([router, connectionHandler]{
4343

4444
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_BOOK);
45-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
45+
oatpp::network::Server server(connectionProvider, connectionHandler);
4646
OATPP_LOGI("book-service", "server is listening on port '%s'", connectionProvider->getProperty("port").getData());
4747
server.run();
4848

@@ -51,7 +51,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
5151
acceptingThreads.push_back(std::thread([router, connectionHandler]{
5252

5353
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_BOOK_VH);
54-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
54+
oatpp::network::Server server(connectionProvider, connectionHandler);
5555
OATPP_LOGI("book-service", "server is listening on virtual interface '%s'", connectionProvider->getProperty("host").getData());
5656
server.run();
5757

‎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.1.0 REQUIRED)
31-
find_package(oatpp-swagger 1.1.0 REQUIRED)
30+
find_package(oatpp 1.2.0 REQUIRED)
31+
find_package(oatpp-swagger 1.2.0 REQUIRED)
3232

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

‎facade/src/facade/AppComponent.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
1414
#include "oatpp/network/virtual_/client/ConnectionProvider.hpp"
15-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
16-
#include "oatpp/network/client/SimpleTCPConnectionProvider.hpp"
15+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
16+
#include "oatpp/network/tcp/client/ConnectionProvider.hpp"
1717
#include "oatpp/network/ConnectionPool.hpp"
1818

1919
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
@@ -56,7 +56,7 @@ class AppComponent {
5656
* Create "real-port" connection provider
5757
*/
5858
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)(Qualifiers::SERVICE_FACADE, [this] {
59-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(m_facade.port);
59+
return oatpp::network::tcp::server::ConnectionProvider::createShared({m_facade.host, m_facade.port});
6060
}());
6161

6262
/**
@@ -94,10 +94,10 @@ class AppComponent {
9494
auto interface = oatpp::network::virtual_::Interface::obtainShared(m_userService.host);
9595
connectionProvider = oatpp::network::virtual_::client::ConnectionProvider::createShared(interface);
9696
} else {
97-
connectionProvider = oatpp::network::client::SimpleTCPConnectionProvider::createShared(m_userService.host, m_userService.port);
97+
connectionProvider = oatpp::network::tcp::client::ConnectionProvider::createShared({m_userService.host, m_userService.port});
9898
}
9999

100-
auto connectionPool = std::make_shared<oatpp::network::ClientConnectionPool>(connectionProvider, 10, std::chrono::seconds(5));
100+
auto connectionPool = oatpp::network::ClientConnectionPool::createShared(connectionProvider, 10, std::chrono::seconds(5));
101101

102102
auto requestExecutor = oatpp::web::client::HttpRequestExecutor::createShared(connectionPool);
103103
return service::UserService::createShared(requestExecutor, objectMapper);
@@ -117,10 +117,10 @@ class AppComponent {
117117
auto interface = oatpp::network::virtual_::Interface::obtainShared(m_bookService.host);
118118
connectionProvider = oatpp::network::virtual_::client::ConnectionProvider::createShared(interface);
119119
} else {
120-
connectionProvider= oatpp::network::client::SimpleTCPConnectionProvider::createShared(m_bookService.host, m_bookService.port);
120+
connectionProvider = oatpp::network::tcp::client::ConnectionProvider::createShared({m_bookService.host, m_bookService.port});
121121
}
122122

123-
auto connectionPool = std::make_shared<oatpp::network::ClientConnectionPool>(connectionProvider, 10, std::chrono::seconds(5));
123+
auto connectionPool = oatpp::network::ClientConnectionPool::createShared(connectionProvider, 10, std::chrono::seconds(5));
124124

125125
auto requestExecutor = oatpp::web::client::HttpRequestExecutor::createShared(connectionPool);
126126
return service::BookService::createShared(requestExecutor, objectMapper);

‎facade/src/facade/Runner.cpp

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

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

11-
#include "oatpp/network/server/Server.hpp"
11+
#include "oatpp/network/Server.hpp"
1212

1313
namespace example { namespace facade {
1414

@@ -48,7 +48,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
4848
acceptingThreads.push_back(std::thread([router, connectionHandler]{
4949

5050
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_FACADE);
51-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
51+
oatpp::network::Server server(connectionProvider, connectionHandler);
5252
OATPP_LOGI("facade", "server is listening on port '%s'", connectionProvider->getProperty("port").getData());
5353
server.run();
5454

@@ -58,7 +58,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
5858
acceptingThreads.push_back(std::thread([router, connectionHandler]{
5959

6060
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_FACADE_VH);
61-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
61+
oatpp::network::Server server(connectionProvider, connectionHandler);
6262
OATPP_LOGI("facade", "server is listening on virtual interface '%s'", connectionProvider->getProperty("host").getData());
6363
server.run();
6464

‎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.1.0 REQUIRED)
45-
find_package(oatpp-swagger 1.1.0 REQUIRED)
44+
find_package(oatpp 1.2.0 REQUIRED)
45+
find_package(oatpp-swagger 1.2.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.1.0 REQUIRED)
29-
find_package(oatpp-swagger 1.1.0 REQUIRED)
28+
find_package(oatpp 1.2.0 REQUIRED)
29+
find_package(oatpp-swagger 1.2.0 REQUIRED)
3030

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

‎user-service/src/user-service/AppComponent.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "oatpp/web/server/HttpRouter.hpp"
1212

1313
#include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
14-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
14+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
1515

1616
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
1717

@@ -52,7 +52,7 @@ class AppComponent {
5252
* Create "real-port" connection provider
5353
*/
5454
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)(Qualifiers::SERVICE_USER, [this] {
55-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(m_hostPort.port);
55+
return oatpp::network::tcp::server::ConnectionProvider::createShared({m_hostPort.host, m_hostPort.port});
5656
}());
5757

5858
/**

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

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

88
#include "oatpp-swagger/Controller.hpp"
9-
#include "oatpp/network/server/Server.hpp"
9+
#include "oatpp/network/Server.hpp"
1010

1111
namespace example { namespace user {
1212

@@ -42,7 +42,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
4242
acceptingThreads.push_back(std::thread([router, connectionHandler]{
4343

4444
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_USER);
45-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
45+
oatpp::network::Server server(connectionProvider, connectionHandler);
4646
OATPP_LOGI("user-service", "server is listening on port '%s'", connectionProvider->getProperty("port").getData());
4747
server.run();
4848

@@ -52,7 +52,7 @@ void Runner::run(std::list<std::thread>& acceptingThreads) {
5252
acceptingThreads.push_back(std::thread([router, connectionHandler]{
5353

5454
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider, Qualifiers::SERVICE_USER_VH);
55-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
55+
oatpp::network::Server server(connectionProvider, connectionHandler);
5656
OATPP_LOGI("user-service", "server is listening on virtual interface '%s'", connectionProvider->getProperty("host").getData());
5757
server.run();
5858

0 commit comments

Comments
 (0)