update to the latest oatpp API version

Author: lganzzzo

CMakeLists.txt

@@ -27,9 +27,9 @@ target_include_directories(example-yuv-websocket-stream-lib PUBLIC src)
 
 ## link libs
 
-find_package(oatpp            1.2.5 REQUIRED)
-find_package(oatpp-swagger    1.2.5 REQUIRED)
-find_package(oatpp-websocket  1.2.5 REQUIRED)
+find_package(oatpp            1.3.0 REQUIRED)
+find_package(oatpp-swagger    1.3.0 REQUIRED)
+find_package(oatpp-websocket  1.3.0 REQUIRED)
 
 target_link_libraries(example-yuv-websocket-stream-lib
         PUBLIC oatpp::oatpp

azure-pipelines.yml

@@ -4,11 +4,11 @@
 # https://aka.ms/yaml
 
 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:

src/App.cpp

@@ -18,20 +18,15 @@ void run() {
   AppComponent components; // Create scope Environment components
 
   /* create ApiControllers and add endpoints to router */
-  
   auto router = components.httpRouter.getObject();
-  auto docEndpoints = oatpp::swagger::Controller::Endpoints::createShared();
-  
-  auto camController = apiv0::CamAPIController::createShared();
-  camController->addEndpointsToRouter(router);
-  
-  docEndpoints->pushBackAll(camController->getEndpoints());
-  
-  auto swaggerController = oatpp::swagger::Controller::createShared(docEndpoints);
-  swaggerController->addEndpointsToRouter(router);
-  
+
+  oatpp::web::server::api::Endpoints docEndpoints;
+
+  docEndpoints.append(router->addController(apiv0::CamAPIController::createShared())->getEndpoints());
+
+  router->addController(oatpp::swagger::Controller::createShared(docEndpoints));
+
   /* create server */
-  
   oatpp::network::Server server(components.serverConnectionProvider.getObject(),
                                 components.serverConnectionHandler.getObject());
 

src/backend/ImageWSListener.cpp

@@ -32,7 +32,7 @@ int ImageWSRegistry::rm(const oatpp::websocket::WebSocket *recv) {
 
 int ImageWSRegistry::distributeImage(const void *p, int size) {
   OATPP_LOGD("ImageWSRegistry", "Distributing image");
-  oatpp::String image((const char*)p, size, true);
+  oatpp::String image((const char*)p, size);
   for(auto & it : m_registry) {
     OATPP_LOGD("ImageWSRegistry", "Sending image to %p", it);
     it->sendOneFrameBinary(image);

src/backend/Utils.cpp

@@ -2,14 +2,14 @@
 #include "Utils.hpp"
 oatpp::String Utils::getExtension(const oatpp::String &filename) {
   v_int32 dotPos = 0;
-  for(v_int32 i = filename->getSize() - 1; i > 0; i--) {
-    if(filename->getData()[i] == '.') {
+  for(v_int32 i = filename->size() - 1; i > 0; i--) {
+    if(filename->data()[i] == '.') {
       dotPos = i;
       break;
     }
   }
-  if(dotPos != 0 && dotPos < filename->getSize() - 1) {
-    return oatpp::String((const char*)&filename->getData()[dotPos + 1], filename->getSize() - dotPos - 1);
+  if(dotPos != 0 && dotPos < filename->size() - 1) {
+    return oatpp::String((const char*)&filename->data()[dotPos + 1], filename->size() - dotPos - 1);
   }
   return oatpp::String();
 }
@@ -18,19 +18,19 @@ oatpp::String Utils::guessMimeType(const oatpp::String &filename) {
   auto extension = getExtension(filename);
   if(extension) {
 
-    if(extension->equals("js")){
+    if(extension == "js"){
       return "application/javascript; charset=utf-8";
-    } else if(extension->equals("html")){
+    } else if(extension == "html"){
       return "text/html; charset=utf-8";
-    } else if(extension->equals("css")){
+    } else if(extension == "css"){
       return "text/css; charset=utf-8";
-    } else if(extension->equals("jpg") || extension->equals("jpeg")){
+    } else if(extension ==  "jpg" || extension == "jpeg"){
       return "image/jpeg";
-    } else if(extension->equals("png")){
+    } else if(extension == "png"){
       return "image/png";
-    } else if(extension->equals("ico")){
+    } else if(extension == "ico"){
       return "image/x-icon";
-    } else if(extension->equals("gif")){
+    } else if(extension == "gif"){
       return "image/gif";
     }
 

src/controller/CamAPIController.cpp

@@ -58,7 +58,7 @@ void apiv0::CamAPIController::handle_frame(void *data, const void *image, int si
 std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> apiv0::CamAPIController::stream() {
 
   try {
-    oatpp::String str = oatpp::base::StrBuffer::loadFromFile(WWW_FOLDER "/cam/wsImageView.html");
+    oatpp::String str = oatpp::String::loadFromFile(WWW_FOLDER "/cam/wsImageView.html");
     auto rsp = createResponse(Status::CODE_200, str);
     rsp->putHeader("Content-Type", "text/html; charset=utf-8");
     return rsp;
@@ -72,7 +72,7 @@ std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> apiv0::CamAPICon
   try {
     oatpp::String filteredName(basename(filename->c_str()));
     oatpp::String folderName(WWW_FOLDER "/cam/");
-    oatpp::String str = oatpp::base::StrBuffer::loadFromFile((folderName + filteredName)->c_str());
+    oatpp::String str = oatpp::String::loadFromFile((folderName + filteredName)->c_str());
     auto rsp = createResponse(Status::CODE_200, str);
     rsp->putHeader("Content-Type", Utils::guessMimeType(filteredName));
     return rsp;