Skip to content

Commit b51f424

Browse files
committed
Update to the latest oatpp API.
1 parent 016ab6e commit b51f424

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

CMakeLists.txt

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

1919
## link libs
2020

21-
find_package(oatpp 1.1.0 REQUIRED)
22-
find_package(oatpp-libressl 1.1.0 REQUIRED)
21+
find_package(oatpp 1.2.0 REQUIRED)
22+
find_package(oatpp-libressl 1.2.0 REQUIRED)
2323

2424
include(FindPkgConfig) # <-- include pkg-config needed by FindLibreSSL.cmake script
2525
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") # <-- use FindLibreSSL.cmake in /cmake folder

src/App.cpp

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

55
#include "oatpp-libressl/Callbacks.hpp"
66

7-
#include "oatpp/network/server/Server.hpp"
7+
#include "oatpp/network/Server.hpp"
88

99
#include <iostream>
1010
#include <csignal>
@@ -34,8 +34,8 @@ void run() {
3434

3535
/* create server */
3636

37-
oatpp::network::server::Server server(components.serverConnectionProvider.getObject(),
38-
components.serverConnectionHandler.getObject());
37+
oatpp::network::Server server(components.serverConnectionProvider.getObject(),
38+
components.serverConnectionHandler.getObject());
3939

4040
OATPP_LOGD("Server", "Running on port %s...", components.serverConnectionProvider.getObject()->getProperty("port").toString()->c_str());
4141

src/AppComponent.hpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include "oatpp/web/server/AsyncHttpConnectionHandler.hpp"
1414
#include "oatpp/web/server/HttpRouter.hpp"
1515

16-
#include "oatpp/network/client/SimpleTCPConnectionProvider.hpp"
17-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
16+
#include "oatpp/network/tcp/client/ConnectionProvider.hpp"
17+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
1818

1919
#include "oatpp/parser/json/mapping/ObjectMapper.hpp"
2020

@@ -43,7 +43,7 @@ class AppComponent {
4343
* Try to make sure you are using libtls, libssl, and libcrypto from the same package
4444
*/
4545

46-
return oatpp::libressl::server::ConnectionProvider::createShared(config, 8443);
46+
return oatpp::libressl::server::ConnectionProvider::createShared(config, {"localhost", 8443});
4747
}());
4848

4949
/**
@@ -56,7 +56,7 @@ class AppComponent {
5656
/**
5757
* Create ConnectionHandler component which uses Router component to route requests
5858
*/
59-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, serverConnectionHandler)([] {
59+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
6060
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
6161
/* Async ConnectionHandler for Async IO and Coroutine based endpoints */
6262
return oatpp::web::server::AsyncHttpConnectionHandler::createShared(router);
@@ -77,8 +77,7 @@ class AppComponent {
7777
auto config = oatpp::libressl::Config::createShared();
7878
tls_config_insecure_noverifycert(config->getTLSConfig());
7979
tls_config_insecure_noverifyname(config->getTLSConfig());
80-
return oatpp::libressl::client::ConnectionProvider::createShared(config, "httpbin.org", 443);
81-
//return oatpp::network::client::SimpleTCPConnectionProvider::createShared("httpbin.org", 80);
80+
return oatpp::libressl::client::ConnectionProvider::createShared(config, {"httpbin.org", 443});
8281
}());
8382

8483
OATPP_CREATE_COMPONENT(std::shared_ptr<MyApiClient>, myApiClient)([] {

0 commit comments

Comments
 (0)