Remove coroutine parameter from oatpp::data::stream::ReadCallback.

caoxianfei1 · Sep 20, 2019 · 4422011 · 4422011
1 parent cb9b2b2
commit 4422011
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/src/oatpp/core/data/stream/Stream.hpp b/src/oatpp/core/data/stream/Stream.hpp
@@ -539,14 +539,11 @@ class AsyncReadCallback {
 
   /**
    * Async-Inline read callback.
-   * @param coroutine - caller coroutine.
    * @param inlineData - &id:oatpp::data::stream::AsyncInlineReadData;.
    * @param nextAction - next action when read finished.
    * @return - &id:oatpp::async::Action;.
    */
-  virtual oatpp::async::Action readAsyncInline(oatpp::async::AbstractCoroutine* coroutine,
-                                               AsyncInlineReadData& inlineData,
-                                               oatpp::async::Action&& nextAction) = 0;
+  virtual oatpp::async::Action readAsyncInline(AsyncInlineReadData& inlineData, oatpp::async::Action&& nextAction) = 0;
 
 };
 

diff --git a/src/oatpp/web/protocol/http/outgoing/ChunkedBody.cpp b/src/oatpp/web/protocol/http/outgoing/ChunkedBody.cpp
@@ -115,7 +115,7 @@ oatpp::async::CoroutineStarter ChunkedBody::writeToStreamAsync(const std::shared
     }
 
     Action readCallback() {
-      return m_body->m_asyncReadCallback->readAsyncInline(this, m_inlineReadData, yieldTo(&WriteCoroutine::onChunkRead));
+      return m_body->m_asyncReadCallback->readAsyncInline(m_inlineReadData, yieldTo(&WriteCoroutine::onChunkRead));
     }
 
     Action onChunkRead() {

diff --git a/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp b/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp
@@ -121,11 +121,9 @@ MultipartBody::AsyncMultipartReadCallback::AsyncMultipartReadCallback(const std:
   , m_readStream(nullptr, nullptr, 0)
 {}
 
-oatpp::async::Action MultipartBody::AsyncMultipartReadCallback::readAsyncInline(oatpp::async::AbstractCoroutine* coroutine,
-                                                                                oatpp::data::stream::AsyncInlineReadData& inlineData,
+oatpp::async::Action MultipartBody::AsyncMultipartReadCallback::readAsyncInline(oatpp::data::stream::AsyncInlineReadData& inlineData,
                                                                                 oatpp::async::Action&& nextAction)
 {
-  (void)coroutine;
 
   class ReadCoroutine : public oatpp::async::Coroutine<ReadCoroutine> {
   private:

diff --git a/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp b/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp
@@ -108,9 +108,7 @@ class MultipartBody : public ChunkedBody {
 
     AsyncMultipartReadCallback(const std::shared_ptr<Multipart>& multipart);
 
-    oatpp::async::Action readAsyncInline(oatpp::async::AbstractCoroutine* coroutine,
-                                         oatpp::data::stream::AsyncInlineReadData& inlineData,
-                                         oatpp::async::Action&& nextAction) override;
+    oatpp::async::Action readAsyncInline(oatpp::data::stream::AsyncInlineReadData& inlineData, oatpp::async::Action&& nextAction) override;
 
   };
 

diff --git a/test/oatpp/web/app/ControllerAsync.hpp b/test/oatpp/web/app/ControllerAsync.hpp
@@ -151,11 +151,7 @@ class ControllerAsync : public oatpp::web::server::api::ApiController {
         , m_iterations(iterations)
       {}
 
-      oatpp::async::Action readAsyncInline(oatpp::async::AbstractCoroutine* coroutine,
-                                           oatpp::data::stream::AsyncInlineReadData& inlineData,
-                                           oatpp::async::Action&& nextAction) override
-      {
-        (void)coroutine;
+      oatpp::async::Action readAsyncInline(oatpp::data::stream::AsyncInlineReadData& inlineData, oatpp::async::Action&& nextAction) override {
         if(m_counter < m_iterations) {
           std::memcpy(inlineData.currBufferPtr, m_text->getData(), m_text->getSize());
           inlineData.inc(m_text->getSize());