Skip to content

Commit 8e0a13f

Browse files
committed
Update to the latest oatpp API.
1 parent 28d420e commit 8e0a13f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

CMakeLists.txt

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

2525
## link libs
2626

27-
find_package(oatpp 1.1.0 REQUIRED)
28-
find_package(oatpp-swagger 1.1.0 REQUIRED)
27+
find_package(oatpp 1.2.0 REQUIRED)
28+
find_package(oatpp-swagger 1.2.0 REQUIRED)
2929

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

src/App.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "./ServiceComponent.hpp"
55
#include "./SwaggerComponent.hpp"
66

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

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

@@ -38,8 +38,8 @@ void run(const oatpp::base::CommandLineArguments& args) {
3838

3939
/* create server */
4040

41-
oatpp::network::server::Server server(serviceComponent.serverConnectionProvider.getObject(),
42-
serviceComponent.serverConnectionHandler.getObject());
41+
oatpp::network::Server server(serviceComponent.serverConnectionProvider.getObject(),
42+
serviceComponent.serverConnectionHandler.getObject());
4343

4444
OATPP_LOGD("Server", "Running on port %s...", serviceComponent.serverConnectionProvider.getObject()->getProperty("port").toString()->c_str());
4545

src/ServiceComponent.hpp

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

99
#include "oatpp/web/server/HttpConnectionHandler.hpp"
1010
#include "oatpp/web/server/HttpRouter.hpp"
11-
#include "oatpp/network/server/SimpleTCPConnectionProvider.hpp"
11+
#include "oatpp/network/tcp/server/ConnectionProvider.hpp"
1212

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

@@ -43,7 +43,7 @@ class ServiceComponent {
4343
auto response = ResponseFactory::createResponse(Status::CODE_500, error, m_objectMapper);
4444

4545
for(const auto& pair : headers.getAll()) {
46-
response->putHeader(pair.first, pair.second);
46+
response->putHeader(pair.first.toString(), pair.second.toString());
4747
}
4848

4949
return response;
@@ -66,7 +66,7 @@ class ServiceComponent {
6666
*/
6767
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
6868
OATPP_COMPONENT(oatpp::Object<ConfigDto>, config); // Get config component
69-
return oatpp::network::server::SimpleTCPConnectionProvider::createShared(config->port);
69+
return oatpp::network::tcp::server::ConnectionProvider::createShared({"localhost", config->port});
7070
}());
7171

7272
/**
@@ -79,7 +79,7 @@ class ServiceComponent {
7979
/**
8080
* Create ConnectionHandler component which uses Router component to route requests
8181
*/
82-
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::server::ConnectionHandler>, serverConnectionHandler)([] {
82+
OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
8383
OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
8484
OATPP_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, objectMapper); // get ObjectMapper component
8585
auto connectionHandler = oatpp::web::server::HttpConnectionHandler::createShared(router);

src/dto/ConfigDto.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ConfigDto : public oatpp::DTO {
1111

1212
DTO_INIT(ConfigDto, DTO)
1313

14-
DTO_FIELD(Int32, port);
14+
DTO_FIELD(UInt16, port);
1515
DTO_FIELD(String, swaggerHost);
1616
DTO_FIELD(String, dbHost);
1717
DTO_FIELD(String, dbUser);

0 commit comments

Comments
 (0)