Dont use tuple to processMessage

Signed-off-by: Nijat K <nijat.khanbabayev@gmail.com>

Author: NeejWeej

cpp/csp/adapters/websocket/ClientInputAdapter.cpp

@@ -32,25 +32,8 @@ ClientInputAdapter::ClientInputAdapter(
         m_converter = adapters::utils::MessageStructConverterCache::instance().create( type, properties );
 };
 
-void ClientInputAdapter::processMessage( void* c, size_t t, PushBatch* batch ) 
+void ClientInputAdapter::processMessage( const std::string& source, void * c, size_t t, PushBatch* batch ) 
 {
-
-    if( dataType() -> type() == CspType::Type::STRUCT )
-    {
-        auto tick = m_converter -> asStruct( c, t );
-        pushTick( std::move(tick), batch );
-    } else if ( dataType() -> type() == CspType::Type::STRING )
-    {
-        pushTick( std::string((char const*)c, t), batch );
-    }
-
-}
-
-void ClientInputAdapter::processMessage( std::tuple<std::string, void*> data, size_t t, PushBatch* batch ) 
-{
-    // Extract the source string and data pointer from tuple
-    std::string source = std::get<0>(data);
-    void* c = std::get<1>(data);
     if ( m_dynamic ){
         auto& actual_type = static_cast<const CspStructType &>( *dataType() );
         auto& nested_type = actual_type.meta()-> field( "msg" ) -> type();

cpp/csp/adapters/websocket/ClientInputAdapter.h

@@ -20,8 +20,7 @@ class ClientInputAdapter final: public PushInputAdapter {
         bool dynamic
     );
 
-    void processMessage( void* c, size_t t, PushBatch* batch );
-    void processMessage( std::tuple<std::string, void*> data, size_t t, PushBatch* batch );
+    void processMessage( const std::string& source, void * c, size_t t, PushBatch* batch );
 
 private:
     adapters::utils::MessageStructConverterPtr m_converter;

cpp/csp/adapters/websocket/WebsocketEndpointManager.cpp

@@ -176,7 +176,7 @@ void WebsocketEndpointManager::setupEndpoint(const std::string& endpoint_id,
                 std::vector<uint8_t> data_copy(static_cast<uint8_t*>(data), 
                                     static_cast<uint8_t*>(data) + len);
                 auto tup = std::tuple<std::string, void*>{endpoint_id, data_copy.data()};
-                m_inputAdapters[consumer_id] -> processMessage( std::move(tup), len, &batch );
+                m_inputAdapters[consumer_id] -> processMessage( endpoint_id, data_copy.data(), len, &batch );
             }
         }
     });

cpp/csp/python/Conversions.h

@@ -666,30 +666,6 @@ inline Dictionary fromPython( PyObject * o )
     return out;
 }
 
-template<>
-inline std::vector<Dictionary> fromPython(PyObject* o)
-{
-    if (!PyList_Check(o))
-        CSP_THROW(TypeError, "List of dictionaries conversion expected type list got " << Py_TYPE(o)->tp_name);
-
-    Py_ssize_t size = PyList_GET_SIZE(o);
-    std::vector<Dictionary> out;
-    out.reserve(size);
-
-    for (Py_ssize_t i = 0; i < size; ++i)
-    {
-        PyObject* item = PyList_GET_ITEM(o, i);
-        
-        // Skip None values like in Dictionary conversion
-        if (item == Py_None)
-            continue;
-            
-        out.emplace_back(fromPython<Dictionary>(item));
-    }
-
-    return out;
-}
-
 template<>
 inline std::vector<Dictionary::Data> fromPython( PyObject * o )
 {

csp/adapters/websocket_types.py

@@ -29,7 +29,7 @@ class WebsocketHeaderUpdate(Struct):
 class ConnectionRequest(Struct):
     uri: str
     action: ActionType = ActionType.CONNECT  # Connect, Disconnect, Ping, etc
-    # Whetehr we maintain the connection
+    # Whether we maintain the connection
     persistent: bool = True  # Only relevant for Connect requests
     reconnect_interval: timedelta = timedelta(seconds=2)
     on_connect_payload: str = ""  # message to send on connect