Refs #21120. Rename to on_new_cache_change_added.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Jun 4, 2024 · 6f26cc5 · 6f26cc5
1 parent 848a4af
commit 6f26cc5
Show file tree

Hide file tree

Showing 30 changed files with 64 additions and 64 deletions.
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
@@ -88,7 +88,7 @@ void TestReaderSocket::run()
     std::cin >> aux;
 }
 
-void TestReaderSocket::MyListener::onNewCacheChangeAdded(
+void TestReaderSocket::MyListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change)
 {

diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.h b/examples/cpp/rtps/AsSocket/TestReaderSocket.h
@@ -65,7 +65,7 @@ class TestReaderSocket
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 eprosima::fastrtps::rtps::RTPSReader* reader,
                 const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
         uint32_t m_received;

diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
@@ -101,7 +101,7 @@ void TestReaderPersistent::run()
     std::cin.ignore();
 }
 
-void TestReaderPersistent::MyListener::onNewCacheChangeAdded(
+void TestReaderPersistent::MyListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change)
 {

diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.h b/examples/cpp/rtps/Persistent/TestReaderPersistent.h
@@ -58,7 +58,7 @@ class TestReaderPersistent
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 eprosima::fastrtps::rtps::RTPSReader* reader,
                 const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
         void on_reader_matched(

diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
@@ -93,7 +93,7 @@ void TestReaderRegistered::run()
     std::cin.ignore();
 }
 
-void TestReaderRegistered::MyListener::onNewCacheChangeAdded(
+void TestReaderRegistered::MyListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change)
 {

diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.h b/examples/cpp/rtps/Registered/TestReaderRegistered.h
@@ -59,7 +59,7 @@ class TestReaderRegistered
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 eprosima::fastrtps::rtps::RTPSReader* reader,
                 const eprosima::fastrtps::rtps::CacheChange_t* const change) override;
         void on_reader_matched(

diff --git a/include/fastdds/rtps/reader/ReaderListener.h b/include/fastdds/rtps/reader/ReaderListener.h
@@ -69,7 +69,7 @@ class FASTDDS_EXPORTED_API ReaderListener
      * To remove the data call the remove_change method of the ReaderHistory.
      * reader->get_history()->remove_change((CacheChange_t*)change).
      */
-    virtual void onNewCacheChangeAdded(
+    virtual void on_new_cache_change_added(
             RTPSReader* reader,
             const CacheChange_t* const change)
     {
@@ -168,7 +168,7 @@ class FASTDDS_EXPORTED_API ReaderListener
      * @param [in]  last_sequence                     Sequence number of the last change made available.
      *                                                It will always be greater or equal than @c first_sequence.
      * @param [out] should_notify_individual_changes  Whether the individual changes should be notified by means of
-     *                                                @c onNewCacheChangeAdded.
+     *                                                @c on_new_cache_change_added.
      */
     virtual void on_data_available(
             RTPSReader* reader,

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp
@@ -271,7 +271,7 @@ void TypeLookupReplyListener::check_get_type_dependencies_reply(
     typelookup_manager_->remove_async_get_type_request(request_id);
 }
 
-void TypeLookupReplyListener::onNewCacheChangeAdded(
+void TypeLookupReplyListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp
@@ -124,7 +124,7 @@ class TypeLookupReplyListener : public fastrtps::rtps::ReaderListener, public fa
      * @param reader The reader receiving the cache change.
      * @param change The cache change.
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             fastrtps::rtps::RTPSReader* reader,
             const fastrtps::rtps::CacheChange_t* const change) override;
 

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
@@ -416,7 +416,7 @@ void TypeLookupRequestListener::answer_request(
     typelookup_manager_->reply_type_.deleteData(reply);
 }
 
-void TypeLookupRequestListener::onNewCacheChangeAdded(
+void TypeLookupRequestListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const changeIN)
 {

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp
@@ -162,7 +162,7 @@ class TypeLookupRequestListener : public fastrtps::rtps::ReaderListener, public
      * @param reader The reader receiving the cache change.
      * @param change The cache change.
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             fastrtps::rtps::RTPSReader* reader,
             const fastrtps::rtps::CacheChange_t* const change) override;
 

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
@@ -45,7 +45,7 @@ EDPServerPUBListener::EDPServerPUBListener(
 {
 }
 
-void EDPServerPUBListener::onNewCacheChangeAdded(
+void EDPServerPUBListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {
@@ -182,7 +182,7 @@ EDPServerSUBListener::EDPServerSUBListener(
 {
 }
 
-void EDPServerSUBListener::onNewCacheChangeAdded(
+void EDPServerSUBListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp
@@ -69,7 +69,7 @@ class EDPServerPUBListener : public fastrtps::rtps::EDPBasePUBListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             fastrtps::rtps::RTPSReader* reader,
             const fastrtps::rtps::CacheChange_t* const change) override;
 
@@ -115,7 +115,7 @@ class EDPServerSUBListener : public fastrtps::rtps::EDPBaseSUBListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             fastrtps::rtps::RTPSReader* reader,
             const fastrtps::rtps::CacheChange_t* const change) override;
 

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -156,7 +156,7 @@ void EDPBasePUBListener::add_writer_from_change(
     }
 }
 
-void EDPSimplePUBListener::onNewCacheChangeAdded(
+void EDPSimplePUBListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {
@@ -296,7 +296,7 @@ void EDPBaseSUBListener::add_reader_from_change(
     }
 }
 
-void EDPSimpleSUBListener::onNewCacheChangeAdded(
+void EDPSimpleSUBListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h
@@ -134,7 +134,7 @@ class EDPSimplePUBListener : public EDPBasePUBListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             RTPSReader* reader,
             const CacheChange_t* const change) override;
 
@@ -179,7 +179,7 @@ class EDPSimpleSUBListener : public EDPBaseSUBListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             RTPSReader* reader,
             const CacheChange_t* const change) override;
 

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
@@ -51,7 +51,7 @@ PDPListener::PDPListener(
 {
 }
 
-void PDPListener::onNewCacheChangeAdded(
+void PDPListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
@@ -55,15 +55,15 @@ class PDPListener : public ReaderListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             RTPSReader* reader,
             const CacheChange_t* const change) override;
 
 protected:
 
     /**
      * Process an incoming DATA(p).
-     * This method is called from PDPListener::onNewCacheChangeAdded() when an alive DATA(p) is received.
+     * This method is called from PDPListener::on_new_cache_change_added() when an alive DATA(p) is received.
      * Both the reader lock and the PDP lock are held when this method is called.
      *
      * @param  old_data     Pointer to the ParticipantProxyData currently stored in the database. May be nullptr, for a

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -1781,7 +1781,7 @@ bool PDPServer::process_backup_discovery_database_restore(
             {
                 change_aux->writerGUID = change_aux->write_params.sample_identity().writer_guid();
                 change_aux->sequenceNumber = change_aux->write_params.sample_identity().sequence_number();
-                builtin_endpoints_->main_listener()->onNewCacheChangeAdded(endpoints->reader.reader_, change_aux);
+                builtin_endpoints_->main_listener()->on_new_cache_change_added(endpoints->reader.reader_, change_aux);
             }
         }
 
@@ -1821,7 +1821,7 @@ bool PDPServer::process_backup_discovery_database_restore(
                     && change_aux->kind == fastrtps::rtps::ALIVE
                     && it.value()["topic"] != discovery_db().virtual_topic())
             {
-                edp_pub_listener->onNewCacheChangeAdded(edp->publications_reader_.first, change_aux);
+                edp_pub_listener->on_new_cache_change_added(edp->publications_reader_.first, change_aux);
             }
         }
 
@@ -1857,7 +1857,7 @@ bool PDPServer::process_backup_discovery_database_restore(
                     && change_aux->kind == fastrtps::rtps::ALIVE
                     && it.value()["topic"] != discovery_db().virtual_topic())
             {
-                edp_sub_listener->onNewCacheChangeAdded(edp->subscriptions_reader_.first, change_aux);
+                edp_sub_listener->on_new_cache_change_added(edp->subscriptions_reader_.first, change_aux);
             }
         }
 
@@ -1918,7 +1918,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     listener_->onNewCacheChangeAdded(endpoints->reader.reader_, change_aux);
+    //                     listener_->on_new_cache_change_added(endpoints->reader.reader_, change_aux);
     //                 }
 
     //             }
@@ -1932,7 +1932,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     edp_pub_listener->onNewCacheChangeAdded(edp->publications_reader_.first, change_aux);
+    //                     edp_pub_listener->on_new_cache_change_added(edp->publications_reader_.first, change_aux);
     //                 }
     //             }
     //             else if (discovery_db_.is_reader(iHandle2GUID(instance_handle_aux)))
@@ -1945,7 +1945,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     edp_sub_listener->onNewCacheChangeAdded(edp->subscriptions_reader_.first, change_aux);
+    //                     edp_sub_listener->on_new_cache_change_added(edp->subscriptions_reader_.first, change_aux);
     //                 }
     //             }
     //         }
@@ -1962,7 +1962,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     listener_->onNewCacheChangeAdded(endpoints->reader.reader_, change_aux);
+    //                     listener_->on_new_cache_change_added(endpoints->reader.reader_, change_aux);
     //                 }
 
     //             }
@@ -1976,7 +1976,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     edp_pub_listener->onNewCacheChangeAdded(edp->publications_reader_.first, change_aux);
+    //                     edp_pub_listener->on_new_cache_change_added(edp->publications_reader_.first, change_aux);
     //                 }
     //             }
     //             else if (discovery_db_.is_reader(iHandle2GUID(instance_handle_aux)))
@@ -1989,7 +1989,7 @@ bool PDPServer::process_backup_restore_queue(
     //                 else
     //                 {
     //                     ddb::from_json(json_change, *change_aux);
-    //                     edp_sub_listener->onNewCacheChangeAdded(edp->subscriptions_reader_.first, change_aux);
+    //                     edp_sub_listener->on_new_cache_change_added(edp->subscriptions_reader_.first, change_aux);
     //                 }
     //             }
     //         }

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
@@ -50,7 +50,7 @@ PDPServer* PDPServerListener::pdp_server()
     return static_cast<PDPServer*>(parent_pdp_);
 }
 
-void PDPServerListener::onNewCacheChangeAdded(
+void PDPServerListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change_in)
 {

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp
@@ -55,7 +55,7 @@ class PDPServerListener : public fastrtps::rtps::PDPListener
      * @param reader
      * @param change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             fastrtps::rtps::RTPSReader* reader,
             const fastrtps::rtps::CacheChange_t* const change) override;
 };

diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp
@@ -54,7 +54,7 @@ WLPListener::~WLPListener()
 {
 }
 
-void WLPListener::onNewCacheChangeAdded(
+void WLPListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const changeIN)
 {

diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.h b/src/cpp/rtps/builtin/liveliness/WLPListener.h
@@ -60,7 +60,7 @@ class WLPListener : public ReaderListener
      * @param reader The reader receiving the cache change
      * @param change The cache change
      */
-    void onNewCacheChangeAdded(
+    void on_new_cache_change_added(
             RTPSReader* reader,
             const CacheChange_t* const change) override;
 

diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -1128,7 +1128,7 @@ bool StatefulReader::change_received(
                             listener->on_data_available(this, guid, seq, seq, notify_single);
                             if (notify_single)
                             {
-                                listener->onNewCacheChangeAdded(this, a_change);
+                                listener->on_new_cache_change_added(this, a_change);
                             }
                         }
 
@@ -1269,7 +1269,7 @@ void StatefulReader::NotifyChanges(
             {
                 aux_ch = *it;
                 next_seq = aux_ch->sequenceNumber + 1;
-                listener->onNewCacheChangeAdded(this, aux_ch);
+                listener->on_new_cache_change_added(this, aux_ch);
 
                 // Reset the iterator to the beginning, since it may be invalidated inside the callback
                 it = history_->changesBegin();

diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -385,7 +385,7 @@ bool StatelessReader::change_received(
                 listener->on_data_available(this, guid, seq, seq, notify_single);
                 if (notify_single)
                 {
-                    listener->onNewCacheChangeAdded(this, change);
+                    listener->on_new_cache_change_added(this, change);
                 }
             }
 

diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
@@ -1920,7 +1920,7 @@ void SecurityManager::process_participant_volatile_message_secure(
     }
 }
 
-void SecurityManager::ParticipantStatelessMessageListener::onNewCacheChangeAdded(
+void SecurityManager::ParticipantStatelessMessageListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change)
 {
@@ -1931,7 +1931,7 @@ void SecurityManager::ParticipantStatelessMessageListener::onNewCacheChangeAdded
     history->remove_change(const_cast<CacheChange_t*>(change));
 }
 
-void SecurityManager::ParticipantVolatileMessageListener::onNewCacheChangeAdded(
+void SecurityManager::ParticipantVolatileMessageListener::on_new_cache_change_added(
         RTPSReader* reader,
         const CacheChange_t* const change)
 {

diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h
@@ -573,7 +573,7 @@ class SecurityManager : private WriterListener
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 RTPSReader* reader,
                 const CacheChange_t* const change) override;
 
@@ -600,7 +600,7 @@ class SecurityManager : private WriterListener
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 RTPSReader* reader,
                 const CacheChange_t* const change) override;
 

diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp
@@ -79,7 +79,7 @@ class RTPSAsSocketReader
         {
         }
 
-        void onNewCacheChangeAdded(
+        void on_new_cache_change_added(
                 eprosima::fastrtps::rtps::RTPSReader* reader,
                 const eprosima::fastrtps::rtps::CacheChange_t* const change) override
         {