update to the latest oatpp API version.

Author: lganzzzo

azure-pipelines.yml

@@ -1,9 +1,9 @@
 jobs:
-  - job: ubuntu_16_04
-    displayName: 'Build - Ubuntu 16.04'
+  - job: ubuntu_20_04
+    displayName: 'Build - Ubuntu 20.04'
     continueOnError: false
     pool:
-      vmImage: 'Ubuntu 16.04'
+      vmImage: 'ubuntu-20.04'
     container:
       image: lganzzzo/ubuntu-cmake:latest
     workspace:

client/CMakeLists.txt

@@ -18,8 +18,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              1.2.5 REQUIRED)
-find_package(oatpp-websocket    1.2.5 REQUIRED)
+find_package(oatpp              1.3.0 REQUIRED)
+find_package(oatpp-websocket    1.3.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

client/src/ClientSocketListener.hpp

@@ -150,7 +150,7 @@ class ClientCoroutine : public oatpp::async::Coroutine<ClientCoroutine> {
   }
 
 
-  Action onConnected(const std::shared_ptr<oatpp::data::stream::IOStream>& connection) {
+  Action onConnected(const oatpp::provider::ResourceHandle<oatpp::data::stream::IOStream>& connection) {
     ++ SOCKETS;
     m_socket = oatpp::websocket::AsyncWebSocket::createShared(connection, true /* maskOutgoingMessages for clients always true */);
 

server/CMakeLists.txt

@@ -19,8 +19,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              1.2.5 REQUIRED)
-find_package(oatpp-websocket    1.2.5 REQUIRED)
+find_package(oatpp              1.3.0 REQUIRED)
+find_package(oatpp-websocket    1.3.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

server/src/App.cpp

@@ -52,14 +52,11 @@ void run(const oatpp::base::CommandLineArguments& args) {
   AppComponent components(args); // Create scope Environment components
 
   /* create ApiControllers and add endpoints to router */
-  
   auto router = components.httpRouter.getObject();
-  
-  auto myController = MyController::createShared();
-  myController->addEndpointsToRouter(router);
+
+  router->addController(MyController::createShared());
 
   /* create servers */
-
   OATPP_COMPONENT(std::shared_ptr<std::list<std::shared_ptr<oatpp::network::ServerConnectionProvider>>>, connectionProviders);
 
   std::list<std::thread> threads;

server/test/WebSocketTest.cpp

@@ -151,7 +151,7 @@ class ClientCoroutine : public oatpp::async::Coroutine<ClientCoroutine> {
     return connector->connectAsync("ws").callbackTo(&ClientCoroutine::onConnected);
   }
 
-  Action onConnected(const std::shared_ptr<oatpp::data::stream::IOStream>& connection) {
+  Action onConnected(const oatpp::provider::ResourceHandle<oatpp::data::stream::IOStream>& connection) {
     socket = oatpp::websocket::AsyncWebSocket::createShared(connection, true);
     socket->setListener(std::make_shared<ClientSocketListener>());
     executor->execute<ClientSenderCoroutine>(socket);