Skip to content

Commit 99e09f1

Browse files
lganzzzolganzzzo
committed
Update to the latest oatpp API
1 parent d144568 commit 99e09f1

File tree

18 files changed

+58
-46
lines changed

18 files changed

+58
-46
lines changed

‎async-server-rooms/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ add_library(${project_name}-lib
2121

2222
## link libs
2323

24-
find_package(oatpp 1.1.0 REQUIRED)
25-
find_package(oatpp-websocket 1.1.0 REQUIRED)
24+
find_package(oatpp 1.2.0 REQUIRED)
25+
find_package(oatpp-websocket 1.2.0 REQUIRED)
2626

2727
target_link_libraries(${project_name}-lib
2828
PUBLIC oatpp::oatpp

‎async-server-rooms/src/App.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "controller/RoomsController.hpp"
22
#include "./AppComponent.hpp"
33

4-
#include "oatpp/network/server/Server.hpp"
4+
#include "oatpp/network/Server.hpp"
55

66
#include <iostream>
77

@@ -18,13 +18,13 @@ void run() {
1818
myController->addEndpointsToRouter(router);
1919

2020
/* Get connection handler component */
21-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, connectionHandler, "http");
21+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");
2222

2323
/* Get connection provider component */
2424
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider);
2525

2626
/* Create server which takes provided TCP connections and passes them to HTTP connection handler */
27-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
27+
oatpp::network::Server server(connectionProvider, connectionHandler);
2828

2929
/* Priny info about server port */
3030
OATPP_LOGI("MyApp", "Server running on port %s", connectionProvider->getProperty("port").getData());

‎async-server-rooms/src/AppComponent.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "oatpp/web/server/AsyncHttpConnectionHandler.hpp"
77
#include "oatpp/web/server/HttpRouter.hpp"
8-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
8+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
99

1010
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
1111

@@ -33,7 +33,7 @@ class AppComponent {
3333
* Create ConnectionProvider component which listens on the port
3434
*/
3535
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
36-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(8000);
36+
return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", 8000});
3737
}());
3838

3939
/**
@@ -46,7 +46,7 @@ class AppComponent {
4646
/**
4747
* Create ConnectionHandler component which uses Router component to route requests
4848
*/
49-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, serverConnectionHandler)("http", [] {
49+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)("http", [] {
5050
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
5151
OATPP_COMPONENT(std::shared_ptr<oatpp::async::Executor>, executor); // get Async executor component
5252
return oatpp::web::server::AsyncHttpConnectionHandler::createShared(router, executor);
@@ -62,7 +62,7 @@ class AppComponent {
6262
/**
6363
* Create websocket connection handler
6464
*/
65-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler)("websocket", [] {
65+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler)("websocket", [] {
6666
OATPP_COMPONENT(std::shared_ptr<oatpp::async::Executor>, executor);
6767
auto connectionHandler = oatpp::websocket::AsyncConnectionHandler::createShared(executor);
6868
connectionHandler->setSocketInstanceListener(std::make_shared<Lobby>());

‎async-server-rooms/src/controller/RoomsController.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "oatpp/web/server/api/ApiController.hpp"
88

9-
#include "oatpp/network/server/ConnectionHandler.hpp"
9+
#include "oatpp/network/ConnectionHandler.hpp"
1010

1111
#include "oatpp/core/macro/codegen.hpp"
1212
#include "oatpp/core/macro/component.hpp"
@@ -21,7 +21,7 @@ class RoomsController : public oatpp::web::server::api::ApiController {
2121
private:
2222
typedef RoomsController __ControllerType;
2323
private:
24-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler, "websocket");
24+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler, "websocket");
2525
public:
2626
RoomsController(OATPP_COMPONENT(std::shared_ptr<ObjectMapper>, objectMapper))
2727
: oatpp::web::server::api::ApiController(objectMapper)
@@ -64,7 +64,7 @@ class RoomsController : public oatpp::web::server::api::ApiController {
6464
/* Websocket handshake */
6565
auto response = oatpp::websocket::Handshaker::serversideHandshake(request->getHeaders(), controller->websocketConnectionHandler);
6666

67-
auto parameters = std::make_shared<oatpp::network::server::ConnectionHandler::ParameterMap>();
67+
auto parameters = std::make_shared<oatpp::network::ConnectionHandler::ParameterMap>();
6868

6969
(*parameters)["roomName"] = roomName;
7070
(*parameters)["nickname"] = nickname;

‎async-server/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
1717

1818
## link libs
1919

20-
find_package(oatpp 1.1.0 REQUIRED)
21-
find_package(oatpp-websocket 1.1.0 REQUIRED)
20+
find_package(oatpp 1.2.0 REQUIRED)
21+
find_package(oatpp-websocket 1.2.0 REQUIRED)
2222

2323
target_link_libraries(${project_name}-lib
2424
PUBLIC oatpp::oatpp

‎async-server/src/App.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "./controller/MyController.hpp"
22
#include "./AppComponent.hpp"
33

4-
#include "oatpp/network/server/Server.hpp"
4+
#include "oatpp/network/Server.hpp"
55

66
#include <iostream>
77

@@ -18,13 +18,13 @@ void run() {
1818
myController->addEndpointsToRouter(router);
1919

2020
/* Get connection handler component */
21-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, connectionHandler, "http");
21+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");
2222

2323
/* Get connection provider component */
2424
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider);
2525

2626
/* Create server which takes provided TCP connections and passes them to HTTP connection handler */
27-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
27+
oatpp::network::Server server(connectionProvider, connectionHandler);
2828

2929
/* Priny info about server port */
3030
OATPP_LOGI("MyApp", "Server running on port %s", connectionProvider->getProperty("port").getData());

‎async-server/src/AppComponent.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "oatpp/web/server/AsyncHttpConnectionHandler.hpp"
77
#include "oatpp/web/server/HttpRouter.hpp"
8-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
8+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
99

1010
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
1111

@@ -33,7 +33,7 @@ class AppComponent {
3333
* Create ConnectionProvider component which listens on the port
3434
*/
3535
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
36-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(8000);
36+
return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", 8000});
3737
}());
3838

3939
/**
@@ -46,7 +46,7 @@ class AppComponent {
4646
/**
4747
* Create ConnectionHandler component which uses Router component to route requests
4848
*/
49-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, serverConnectionHandler)("http", [] {
49+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)("http", [] {
5050
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
5151
OATPP_COMPONENT(std::shared_ptr<oatpp::async::Executor>, executor); // get Async executor component
5252
return oatpp::web::server::AsyncHttpConnectionHandler::createShared(router, executor);
@@ -62,7 +62,7 @@ class AppComponent {
6262
/**
6363
* Create websocket connection handler
6464
*/
65-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler)("websocket", [] {
65+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler)("websocket", [] {
6666
OATPP_COMPONENT(std::shared_ptr<oatpp::async::Executor>, executor);
6767
auto connectionHandler = oatpp::websocket::AsyncConnectionHandler::createShared(executor);
6868
connectionHandler->setSocketInstanceListener(std::make_shared<WSInstanceListener>());

‎async-server/src/controller/MyController.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "oatpp/web/server/api/ApiController.hpp"
88

9-
#include "oatpp/network/server/ConnectionHandler.hpp"
9+
#include "oatpp/network/ConnectionHandler.hpp"
1010

1111
#include "oatpp/core/macro/codegen.hpp"
1212
#include "oatpp/core/macro/component.hpp"
@@ -20,7 +20,7 @@ class MyController : public oatpp::web::server::api::ApiController {
2020
private:
2121
typedef MyController __ControllerType;
2222
private:
23-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler, "websocket");
23+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler, "websocket");
2424
public:
2525
MyController(OATPP_COMPONENT(std::shared_ptr<ObjectMapper>, objectMapper))
2626
: oatpp::web::server::api::ApiController(objectMapper)

‎client-binance.com/CMakeLists.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,21 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/module") # <--
2525

2626
find_package(mbedtls 2.16.0 REQUIRED)
2727

28-
find_package(oatpp 1.1.0 REQUIRED)
29-
find_package(oatpp-websocket 1.1.0 REQUIRED)
30-
find_package(oatpp-mbedtls 1.1.0 REQUIRED)
28+
find_package(oatpp 1.2.0 REQUIRED)
29+
find_package(oatpp-websocket 1.2.0 REQUIRED)
30+
find_package(oatpp-mbedtls 1.2.0 REQUIRED)
3131

3232
target_link_libraries(${project_name}-lib
33+
## oatpp
3334
PUBLIC oatpp::oatpp
3435
PUBLIC oatpp::oatpp-test
3536
PUBLIC oatpp::oatpp-websocket
3637
PUBLIC oatpp::oatpp-mbedtls
38+
39+
## mbedtls
40+
PUBLIC mbedtls::TLS
41+
PUBLIC mbedtls::X509
42+
PUBLIC mbedtls::Crypto
3743
)
3844

3945
#################################################################

‎client-binance.com/src/App.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void run() {
7979
auto config = oatpp::mbedtls::Config::createDefaultClientConfigShared();
8080

8181
/* secure connection provider for stream.binance.com */
82-
auto connectionProvider = oatpp::mbedtls::client::ConnectionProvider::createShared(config, "stream.binance.com", 9443 /* port */);
82+
auto connectionProvider = oatpp::mbedtls::client::ConnectionProvider::createShared(config, {"stream.binance.com", 9443 /* port */});
8383

8484
/* websocket connector */
8585
auto connector = oatpp::websocket::Connector::createShared(connectionProvider);

‎client-mbedtls/CMakeLists.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,21 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/module") # <--
2020

2121
find_package(mbedtls 2.16.0 REQUIRED)
2222

23-
find_package(oatpp 1.1.0 REQUIRED)
24-
find_package(oatpp-websocket 1.1.0 REQUIRED)
25-
find_package(oatpp-mbedtls 1.1.0 REQUIRED)
23+
find_package(oatpp 1.2.0 REQUIRED)
24+
find_package(oatpp-websocket 1.2.0 REQUIRED)
25+
find_package(oatpp-mbedtls 1.2.0 REQUIRED)
2626

2727
target_link_libraries(${project_name}-lib
28+
## oatpp
2829
PUBLIC oatpp::oatpp
2930
PUBLIC oatpp::oatpp-test
3031
PUBLIC oatpp::oatpp-websocket
3132
PUBLIC oatpp::oatpp-mbedtls
33+
34+
## mbedtls
35+
PUBLIC mbedtls::TLS
36+
PUBLIC mbedtls::X509
37+
PUBLIC mbedtls::Crypto
3238
)
3339

3440
#################################################################

‎client-mbedtls/src/App.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void run() {
2929

3030
auto config = oatpp::mbedtls::Config::createDefaultClientConfigShared();
3131

32-
auto connectionProvider = oatpp::mbedtls::client::ConnectionProvider::createShared(config, "echo.websocket.org", 443);
32+
auto connectionProvider = oatpp::mbedtls::client::ConnectionProvider::createShared(config, {"echo.websocket.org", 443});
3333

3434
auto connector = oatpp::websocket::Connector::createShared(connectionProvider);
3535

‎client/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ add_library(${project_name}-lib
1515

1616
## link libs
1717

18-
find_package(oatpp 1.1.0 REQUIRED)
19-
find_package(oatpp-websocket 1.1.0 REQUIRED)
18+
find_package(oatpp 1.2.0 REQUIRED)
19+
find_package(oatpp-websocket 1.2.0 REQUIRED)
2020

2121
target_link_libraries(${project_name}-lib
2222
PUBLIC oatpp::oatpp

‎client/src/App.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "oatpp-websocket/WebSocket.hpp"
55
#include "oatpp-websocket/Connector.hpp"
66

7-
#include "oatpp/network/client/SimpleTCPConnectionProvider.hpp"
7+
#include "oatpp/network/tcp/client/ConnectionProvider.hpp"
88

99
#include <thread>
1010

@@ -26,7 +26,7 @@ void run() {
2626

2727
OATPP_LOGI(TAG, "Application Started");
2828

29-
auto connectionProvider = oatpp::network::client::SimpleTCPConnectionProvider::createShared("echo.websocket.org", 80);
29+
auto connectionProvider = oatpp::network::tcp::client::ConnectionProvider::createShared({"echo.websocket.org", 80});
3030

3131
auto connector = oatpp::websocket::Connector::createShared(connectionProvider);
3232

‎server/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
1717

1818
## link libs
1919

20-
find_package(oatpp 1.1.0 REQUIRED)
21-
find_package(oatpp-websocket 1.1.0 REQUIRED)
20+
find_package(oatpp 1.2.0 REQUIRED)
21+
find_package(oatpp-websocket 1.2.0 REQUIRED)
2222

2323
target_link_libraries(${project_name}-lib
2424
PUBLIC oatpp::oatpp

‎server/src/App.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "./controller/MyController.hpp"
22
#include "./AppComponent.hpp"
33

4-
#include "oatpp/network/server/Server.hpp"
4+
#include "oatpp/network/Server.hpp"
55

66
#include <iostream>
77

@@ -18,13 +18,13 @@ void run() {
1818
myController->addEndpointsToRouter(router);
1919

2020
/* Get connection handler component */
21-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, connectionHandler, "http");
21+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");
2222

2323
/* Get connection provider component */
2424
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, connectionProvider);
2525

2626
/* Create server which takes provided TCP connections and passes them to HTTP connection handler */
27-
oatpp::network::server::Server server(connectionProvider, connectionHandler);
27+
oatpp::network::Server server(connectionProvider, connectionHandler);
2828

2929
/* Priny info about server port */
3030
OATPP_LOGI("MyApp", "Server running on port %s", connectionProvider->getProperty("port").getData());

‎server/src/AppComponent.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "oatpp/web/server/HttpConnectionHandler.hpp"
99
#include "oatpp/web/server/HttpRouter.hpp"
10-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
10+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
1111

1212
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
1313

@@ -24,7 +24,7 @@ class AppComponent {
2424
* Create ConnectionProvider component which listens on the port
2525
*/
2626
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
27-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(8000);
27+
return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", 8000});
2828
}());
2929

3030
/**
@@ -37,7 +37,7 @@ class AppComponent {
3737
/**
3838
* Create http ConnectionHandler
3939
*/
40-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, httpConnectionHandler)("http" /* qualifier */, [] {
40+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, httpConnectionHandler)("http" /* qualifier */, [] {
4141
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
4242
return oatpp::web::server::HttpConnectionHandler::createShared(router);
4343
}());
@@ -52,7 +52,7 @@ class AppComponent {
5252
/**
5353
* Create websocket connection handler
5454
*/
55-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler)("websocket" /* qualifier */, [] {
55+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler)("websocket" /* qualifier */, [] {
5656
auto connectionHandler = oatpp::websocket::ConnectionHandler::createShared();
5757
connectionHandler->setSocketInstanceListener(std::make_shared<WSInstanceListener>());
5858
return connectionHandler;

‎server/src/controller/MyController.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "oatpp/web/server/api/ApiController.hpp"
88

9-
#include "oatpp/network/server/ConnectionHandler.hpp"
9+
#include "oatpp/network/ConnectionHandler.hpp"
1010

1111
#include "oatpp/core/macro/codegen.hpp"
1212
#include "oatpp/core/macro/component.hpp"
@@ -19,7 +19,7 @@
1919
*/
2020
class MyController : public oatpp::web::server::api::ApiController {
2121
private:
22-
OATPP_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, websocketConnectionHandler, "websocket");
22+
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, websocketConnectionHandler, "websocket");
2323
public:
2424
MyController(OATPP_COMPONENT(std::shared_ptr<ObjectMapper>, objectMapper))
2525
: oatpp::web::server::api::ApiController(objectMapper)

0 commit comments

Comments
 (0)