Skip to content

Commit f8272f8

Browse files
lganzzzolganzzzo
committed
update to the latest oatpp API version
1 parent bcc1e57 commit f8272f8

File tree

12 files changed

+24
-27
lines changed

12 files changed

+24
-27
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.2.5 REQUIRED)
25-
find_package(oatpp-websocket 1.2.5 REQUIRED)
24+
find_package(oatpp 1.3.0 REQUIRED)
25+
find_package(oatpp-websocket 1.3.0 REQUIRED)
2626

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

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ void run() {
1414
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router);
1515

1616
/* Create RoomsController and add all of its endpoints to router */
17-
auto myController = std::make_shared<RoomsController>();
18-
myController->addEndpointsToRouter(router);
17+
router->addController(std::make_shared<RoomsController>());
1918

2019
/* Get connection handler component */
2120
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");

‎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.2.5 REQUIRED)
21-
find_package(oatpp-websocket 1.2.5 REQUIRED)
20+
find_package(oatpp 1.3.0 REQUIRED)
21+
find_package(oatpp-websocket 1.3.0 REQUIRED)
2222

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

‎async-server/src/App.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ void run() {
1414
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router);
1515

1616
/* Create MyController and add all of its endpoints to router */
17-
auto myController = std::make_shared<MyController>();
18-
myController->addEndpointsToRouter(router);
17+
router->addController(std::make_shared<MyController>());
1918

2019
/* Get connection handler component */
2120
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");

‎azure-pipelines.yml

+3-3
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:

‎client-binance.com/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ 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.2.5 REQUIRED)
29-
find_package(oatpp-websocket 1.2.5 REQUIRED)
30-
find_package(oatpp-mbedtls 1.2.5 REQUIRED)
28+
find_package(oatpp 1.3.0 REQUIRED)
29+
find_package(oatpp-websocket 1.3.0 REQUIRED)
30+
find_package(oatpp-mbedtls 1.3.0 REQUIRED)
3131

3232
target_link_libraries(${project_name}-lib
3333
## oatpp

‎client-mbedtls/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ 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.2.5 REQUIRED)
24-
find_package(oatpp-websocket 1.2.5 REQUIRED)
25-
find_package(oatpp-mbedtls 1.2.5 REQUIRED)
23+
find_package(oatpp 1.3.0 REQUIRED)
24+
find_package(oatpp-websocket 1.3.0 REQUIRED)
25+
find_package(oatpp-mbedtls 1.3.0 REQUIRED)
2626

2727
target_link_libraries(${project_name}-lib
2828
## oatpp

‎client-mbedtls/src/App.cpp

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

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

32-
oatpp::network::Address address("echo.websocket.org", 443);
32+
oatpp::network::Address address("demo.piesocket.com", 443);
3333
auto connectionProvider = oatpp::mbedtls::client::ConnectionProvider::createShared(config, address);
3434

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

37-
auto connection = connector->connect("/");
37+
auto connection = connector->connect("v3/channel_1?api_key=oCdCMcMPQpbvNjUIzqtvF1d2X2okWpDQj4AwARJuAgtjhzKxVEjQU6IdCjwm&notify_self");
3838

3939
OATPP_LOGI(TAG, "Connected");
4040

‎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.2.5 REQUIRED)
19-
find_package(oatpp-websocket 1.2.5 REQUIRED)
18+
find_package(oatpp 1.3.0 REQUIRED)
19+
find_package(oatpp-websocket 1.3.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
@@ -26,11 +26,11 @@ void run() {
2626

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

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

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

33-
auto connection = connector->connect("/");
33+
auto connection = connector->connect("v3/channel_1?api_key=oCdCMcMPQpbvNjUIzqtvF1d2X2okWpDQj4AwARJuAgtjhzKxVEjQU6IdCjwm&notify_self");
3434

3535
OATPP_LOGI(TAG, "Connected");
3636

‎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.2.5 REQUIRED)
21-
find_package(oatpp-websocket 1.2.5 REQUIRED)
20+
find_package(oatpp 1.3.0 REQUIRED)
21+
find_package(oatpp-websocket 1.3.0 REQUIRED)
2222

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

‎server/src/App.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ void run() {
1414
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router);
1515

1616
/* Create MyController and add all of its endpoints to router */
17-
auto myController = std::make_shared<MyController>();
18-
myController->addEndpointsToRouter(router);
17+
router->addController(std::make_shared<MyController>());
1918

2019
/* Get connection handler component */
2120
OATPP_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, connectionHandler, "http");

0 commit comments

Comments
 (0)