Update to the latest oatpp API.

oatpp · May 17, 2020 · 49b746f · 49b746f
1 parent 25f7eb5
commit 49b746f
Show file tree

Hide file tree

Showing 35 changed files with 51 additions and 164 deletions.
diff --git a/async-server-rooms/CMakeLists.txt b/async-server-rooms/CMakeLists.txt
@@ -21,8 +21,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              1.0.0 REQUIRED)
-find_package(oatpp-websocket    1.0.0 REQUIRED)
+find_package(oatpp              1.1.0 REQUIRED)
+find_package(oatpp-websocket    1.1.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/async-server-rooms/src/controller/RoomsController.hpp b/async-server-rooms/src/controller/RoomsController.hpp
@@ -11,6 +11,9 @@
 #include "oatpp/core/macro/codegen.hpp"
 #include "oatpp/core/macro/component.hpp"
 
+
+#include OATPP_CODEGEN_BEGIN(ApiController) //<-- codegen begin
+
 /**
  * Controller with WebSocket-connect endpoint.
  */
@@ -25,11 +28,6 @@ class RoomsController : public oatpp::web::server::api::ApiController {
   {}
 public:
 
-/**
- *  Begin ENDPOINTs generation ('ApiController' codegen)
- */
-#include OATPP_CODEGEN_BEGIN(ApiController)
-
   ENDPOINT_ASYNC("GET", "/", Root) {
 
     ENDPOINT_ASYNC_INIT(Root)
@@ -82,11 +80,8 @@ class RoomsController : public oatpp::web::server::api::ApiController {
 
   // TODO Insert Your endpoints here !!!
 
-/**
- *  Finish ENDPOINTs generation ('ApiController' codegen)
- */
-#include OATPP_CODEGEN_END(ApiController)
-
 };
 
+#include OATPP_CODEGEN_END(ApiController) //<-- codegen end
+
 #endif /* RoomsController_hpp */
diff --git a/async-server-rooms/test/WSTest.hpp b/async-server-rooms/test/WSTest.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #ifndef MY_PROJECT_WEBSOCKETTEST_HPP
 #define MY_PROJECT_WEBSOCKETTEST_HPP

diff --git a/async-server/CMakeLists.txt b/async-server/CMakeLists.txt
@@ -17,8 +17,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              1.0.0 REQUIRED)
-find_package(oatpp-websocket    1.0.0 REQUIRED)
+find_package(oatpp              1.1.0 REQUIRED)
+find_package(oatpp-websocket    1.1.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/async-server/src/controller/MyController.hpp b/async-server/src/controller/MyController.hpp
@@ -1,10 +1,3 @@
-//
-//  MyController.hpp
-//  web-starter-project
-//
-//  Created by Leonid on 2/12/18.
-//  Copyright © 2018 oatpp. All rights reserved.
-//
 
 #ifndef MyController_hpp
 #define MyController_hpp
@@ -18,6 +11,8 @@
 #include "oatpp/core/macro/codegen.hpp"
 #include "oatpp/core/macro/component.hpp"
 
+#include OATPP_CODEGEN_BEGIN(ApiController) //<-- codegen begin
+
 /**
  * Controller with WebSocket-connect endpoint.
  */
@@ -32,11 +27,6 @@ class MyController : public oatpp::web::server::api::ApiController {
   {}
 public:
 
-/**
- *  Begin ENDPOINTs generation ('ApiController' codegen)
- */
-#include OATPP_CODEGEN_BEGIN(ApiController)
-
   ENDPOINT_ASYNC("GET", "/", Root) {
 
     ENDPOINT_ASYNC_INIT(Root)
@@ -72,12 +62,9 @@ class MyController : public oatpp::web::server::api::ApiController {
   };
 
   // TODO Insert Your endpoints here !!!
-
-/**
- *  Finish ENDPOINTs generation ('ApiController' codegen)
- */
-#include OATPP_CODEGEN_END(ApiController)
-
+
 };
 
+#include OATPP_CODEGEN_END(ApiController) //<-- codegen end
+
 #endif /* MyController_hpp */
diff --git a/async-server/src/websocket/WSListener.cpp b/async-server/src/websocket/WSListener.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #include "WSListener.hpp"
 

diff --git a/async-server/src/websocket/WSListener.hpp b/async-server/src/websocket/WSListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #ifndef WSListener_hpp
 #define WSListener_hpp

diff --git a/async-server/test/WSTest.cpp b/async-server/test/WSTest.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #include "WSTest.hpp"
 

diff --git a/async-server/test/WSTest.hpp b/async-server/test/WSTest.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #ifndef MY_PROJECT_WEBSOCKETTEST_HPP
 #define MY_PROJECT_WEBSOCKETTEST_HPP

diff --git a/client-binance.com/CMakeLists.txt b/client-binance.com/CMakeLists.txt
@@ -25,9 +25,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/module") # <--
 
 find_package(mbedtls 2.16.0 REQUIRED)
 
-find_package(oatpp              1.0.0 REQUIRED)
-find_package(oatpp-websocket    1.0.0 REQUIRED)
-find_package(oatpp-mbedtls      1.0.0 REQUIRED)
+find_package(oatpp              1.1.0 REQUIRED)
+find_package(oatpp-websocket    1.1.0 REQUIRED)
+find_package(oatpp-mbedtls      1.1.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client-binance.com/src/AggregateTradesListener.hpp b/client-binance.com/src/AggregateTradesListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-12.
-//
 
 #ifndef AggregateTradesListener_hpp
 #define AggregateTradesListener_hpp
@@ -21,12 +18,12 @@ class AggregateTradesListener : public WSEventListener<AggregateTrade> {
   void onEvent(const AggregateTrade::ObjectWrapper& trade) override {
 
     OATPP_LOGI("AggregateTrades", "%s - quantity=%s, price=%s, time=%d / firstTradeId=%d, lastTradeId=%d",
-      trade->symbol->getData(),
-      trade->quantity->getData(),
-      trade->price->getData(),
-      trade->tradeTime->getValue(),
-      trade->firstTradeId->getValue(),
-      trade->lastTradeId->getValue()
+      trade->symbol->c_str(),
+      trade->quantity->c_str(),
+      trade->price->c_str(),
+      *trade->tradeTime,
+      *trade->firstTradeId,
+      *trade->lastTradeId
     );
 
   }

diff --git a/client-binance.com/src/KlineCandlestickListener.hpp b/client-binance.com/src/KlineCandlestickListener.hpp
@@ -1,7 +1,3 @@
-//
-// Created by Leonid  on 2019-06-12.
-//
-
 #ifndef KlineCandlestickListener_hpp
 #define KlineCandlestickListener_hpp
 
@@ -21,13 +17,13 @@ class KlineCandlestickListener : public WSEventListener<Candlestick> {
   void onEvent(const Candlestick::ObjectWrapper& obj) override {
 
     OATPP_LOGI("Kline/Candlesticks", "%s - startTime=%d, closeTime=%d / openPrice=%s, closePrice=%s, highPrice=%s, lowPrice=%s",
-      obj->symbol->getData(),
-      obj->kline->klineStartTime->getValue(),
-      obj->kline->klineCloseTime->getValue(),
-      obj->kline->openPrice->getData(),
-      obj->kline->closePrice->getData(),
-      obj->kline->highPrice->getData(),
-      obj->kline->lowPrice->getData()
+      obj->symbol->c_str(),
+      *obj->kline->klineStartTime,
+      *obj->kline->klineCloseTime,
+      obj->kline->openPrice->c_str(),
+      obj->kline->closePrice->c_str(),
+      obj->kline->highPrice->c_str(),
+      obj->kline->lowPrice->c_str()
     );
 
   }

diff --git a/client-binance.com/src/Model.hpp b/client-binance.com/src/Model.hpp
@@ -1,11 +1,8 @@
-//
-// Created by Leonid  on 2019-06-12.
-//
 
 #ifndef Model_hpp
 #define Model_hpp
 
-#include "oatpp/core/data/mapping/type/Object.hpp"
+#include "oatpp/core/Types.hpp"
 #include "oatpp/core/macro/codegen.hpp"
 
 #include OATPP_CODEGEN_BEGIN(DTO)
@@ -14,7 +11,7 @@
  * DTO representing "Aggregate Trade Stream" object from binance-exchange.
  * See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#aggregate-trade-streams
  */
-class AggregateTrade : public oatpp::data::mapping::type::Object {
+class AggregateTrade : public oatpp::Object {
 
   DTO_INIT(AggregateTrade, Object)
 
@@ -36,7 +33,7 @@ class AggregateTrade : public oatpp::data::mapping::type::Object {
  * DTO representing "Trade Stream" object from binance-exchange.
  * See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#trade-streams
  */
-class Trade : public oatpp::data::mapping::type::Object {
+class Trade : public oatpp::Object {
 
   DTO_INIT(Trade, Object)
 
@@ -57,7 +54,7 @@ class Trade : public oatpp::data::mapping::type::Object {
 /**
  * Nested object for Candlestick
  */
-class Kline : public oatpp::data::mapping::type::Object {
+class Kline : public oatpp::Object {
 
   DTO_INIT(Kline, Object)
 
@@ -89,7 +86,7 @@ class Kline : public oatpp::data::mapping::type::Object {
  * DTO representing "Kline/Candlestick Stream" object from binance-exchange.
  * See https://github.com/binance-exchange/binance-official-api-docs/blob/master/web-socket-streams.md#klinecandlestick-streams
  */
-class Candlestick : public oatpp::data::mapping::type::Object {
+class Candlestick : public oatpp::Object {
 
   DTO_INIT(Candlestick, Object)
 

diff --git a/client-binance.com/src/TradesListener.hpp b/client-binance.com/src/TradesListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-12.
-//
 
 #ifndef TradesListener_hpp
 #define TradesListener_hpp
@@ -21,10 +18,10 @@ class TradesListener : public WSEventListener<Trade> {
   void onEvent(const Trade::ObjectWrapper& trade) override {
 
     OATPP_LOGI("Trades", "%s - quantity=%s, price=%s, time=%d",
-      trade->symbol->getData(),
-      trade->quantity->getData(),
-      trade->price->getData(),
-      trade->tradeTime->getValue()
+      trade->symbol->c_str(),
+      trade->quantity->c_str(),
+      trade->price->c_str(),
+      *trade->tradeTime
     );
 
   }

diff --git a/client-binance.com/src/WSEventListener.hpp b/client-binance.com/src/WSEventListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-12.
-//
 
 #ifndef WSEventListener_hpp
 #define WSEventListener_hpp

diff --git a/client-binance.com/src/WSListener.cpp b/client-binance.com/src/WSListener.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #include "WSListener.hpp"
 

diff --git a/client-binance.com/src/WSListener.hpp b/client-binance.com/src/WSListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #ifndef WSListener_hpp
 #define WSListener_hpp

diff --git a/client-binance.com/test/WSTest.cpp b/client-binance.com/test/WSTest.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #include "WSTest.hpp"
 

diff --git a/client-binance.com/test/WSTest.hpp b/client-binance.com/test/WSTest.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #ifndef MY_PROJECT_WEBSOCKETTEST_HPP
 #define MY_PROJECT_WEBSOCKETTEST_HPP

diff --git a/client-mbedtls/CMakeLists.txt b/client-mbedtls/CMakeLists.txt
@@ -20,9 +20,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/module") # <--
 
 find_package(mbedtls 2.16.0 REQUIRED)
 
-find_package(oatpp              1.0.0 REQUIRED)
-find_package(oatpp-websocket    1.0.0 REQUIRED)
-find_package(oatpp-mbedtls      1.0.0 REQUIRED)
+find_package(oatpp              1.1.0 REQUIRED)
+find_package(oatpp-websocket    1.1.0 REQUIRED)
+find_package(oatpp-mbedtls      1.1.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client-mbedtls/src/WSListener.cpp b/client-mbedtls/src/WSListener.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #include "WSListener.hpp"
 

diff --git a/client-mbedtls/src/WSListener.hpp b/client-mbedtls/src/WSListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #ifndef WSListener_hpp
 #define WSListener_hpp

diff --git a/client-mbedtls/test/WSTest.cpp b/client-mbedtls/test/WSTest.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #include "WSTest.hpp"
 

diff --git a/client-mbedtls/test/WSTest.hpp b/client-mbedtls/test/WSTest.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #ifndef MY_PROJECT_WEBSOCKETTEST_HPP
 #define MY_PROJECT_WEBSOCKETTEST_HPP

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -15,8 +15,8 @@ add_library(${project_name}-lib
 
 ## link libs
 
-find_package(oatpp              1.0.0 REQUIRED)
-find_package(oatpp-websocket    1.0.0 REQUIRED)
+find_package(oatpp              1.1.0 REQUIRED)
+find_package(oatpp-websocket    1.1.0 REQUIRED)
 
 target_link_libraries(${project_name}-lib
         PUBLIC oatpp::oatpp

diff --git a/client/src/WSListener.cpp b/client/src/WSListener.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #include "WSListener.hpp"
 

diff --git a/client/src/WSListener.hpp b/client/src/WSListener.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-06-07.
-//
 
 #ifndef WSListener_hpp
 #define WSListener_hpp

diff --git a/client/test/WSTest.cpp b/client/test/WSTest.cpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #include "WSTest.hpp"
 

diff --git a/client/test/WSTest.hpp b/client/test/WSTest.hpp
@@ -1,6 +1,3 @@
-//
-// Created by Leonid  on 2019-03-25.
-//
 
 #ifndef MY_PROJECT_WEBSOCKETTEST_HPP
 #define MY_PROJECT_WEBSOCKETTEST_HPP