[MDAPI-83][C++] Implement IndexedTxModel

TxModelListenerTag -> TxModelListener
dxFeed · Nov 18, 2024 · 34fa39d · 34fa39d
1 parent bb0b3d7
commit 34fa39d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/include/dxfeed_graal_cpp_api/isolated/model/IsolatedIndexedTxModel.hpp b/include/dxfeed_graal_cpp_api/isolated/model/IsolatedIndexedTxModel.hpp
@@ -86,7 +86,7 @@ JavaObjectHandle<IndexedTxModel::Builder> withSymbol(const JavaObjectHandle<Inde
 // dxfg_indexed_tx_model_builder_t* dxfg_IndexedTxModel_Builder_withListener(graal_isolatethread_t* thread,
 // dxfg_indexed_tx_model_builder_t* source, dxfg_tx_model_listener_t* listener);
 JavaObjectHandle<IndexedTxModel::Builder> withListener(const JavaObjectHandle<IndexedTxModel::Builder> &builder,
-                                                       const JavaObjectHandle<TxModelListenerTag> &listener);
+                                                       const JavaObjectHandle<TxModelListener> &listener);
 
 // dxfg_indexed_tx_model_builder_t* dxfg_IndexedTxModel_Builder_withExecutor(graal_isolatethread_t* thread,
 // dxfg_indexed_tx_model_builder_t* source, dxfg_executor_t* executor);

diff --git a/include/dxfeed_graal_cpp_api/isolated/model/IsolatedTimeSeriesTxModel.hpp b/include/dxfeed_graal_cpp_api/isolated/model/IsolatedTimeSeriesTxModel.hpp
@@ -86,7 +86,7 @@ JavaObjectHandle<TimeSeriesTxModel::Builder> withSymbol(const JavaObjectHandle<T
 // dxfg_time_series_tx_model_builder_t* dxfg_TimeSeriesTxModel_Builder_withListener(graal_isolatethread_t* thread,
 // dxfg_time_series_tx_model_builder_t* source, dxfg_tx_model_listener_t* listener);
 JavaObjectHandle<TimeSeriesTxModel::Builder> withListener(const JavaObjectHandle<TimeSeriesTxModel::Builder> &builder,
-                                                          const JavaObjectHandle<TxModelListenerTag> &listener);
+                                                          const JavaObjectHandle<TxModelListener> &listener);
 
 // dxfg_time_series_tx_model_builder_t* dxfg_TimeSeriesTxModel_Builder_withExecutor(graal_isolatethread_t* thread,
 // dxfg_time_series_tx_model_builder_t* source, dxfg_executor_t* executor);

diff --git a/include/dxfeed_graal_cpp_api/isolated/model/IsolatedTxModelListener.hpp b/include/dxfeed_graal_cpp_api/isolated/model/IsolatedTxModelListener.hpp
@@ -20,7 +20,7 @@ namespace isolated::model::IsolatedTxModelListener {
 // typedef void (*dxfg_TxModelListener_function_eventsReceived)(graal_isolatethread_t* thread, dxfg_indexed_event_source_t* source, dxfg_event_type_list* events, int32_t /* boolean */ isSnapshot, void* user_data);
 
 // dxfg_tx_model_listener_t* dxfg_TxModelListener_new(graal_isolatethread_t* thread, dxfg_TxModelListener_function_eventsReceived  function_eventsReceived, void* user_data);
-JavaObjectHandle<TxModelListenerTag> create(void* functionEventsReceived, void* userData);
+JavaObjectHandle<TxModelListener> create(void* functionEventsReceived, void* userData);
 
 }
 

diff --git a/include/dxfeed_graal_cpp_api/model/TxModelListener.hpp b/include/dxfeed_graal_cpp_api/model/TxModelListener.hpp
@@ -24,8 +24,6 @@ DXFCPP_BEGIN_NAMESPACE
 
 class IndexedEventSource;
 
-struct TxModelListenerTag {};
-
 struct DXFCPP_EXPORT TxModelListener : RequireMakeShared<TxModelListener> {
     explicit TxModelListener(LockExternalConstructionTag);
     ~TxModelListener() noexcept override;
@@ -35,11 +33,11 @@ struct DXFCPP_EXPORT TxModelListener : RequireMakeShared<TxModelListener> {
                               const std::vector<std::shared_ptr<EventType>> & /* events */, bool /* isSnapshot */)>
                onEventsReceived);
 
-    const JavaObjectHandle<TxModelListenerTag> &getHandle() const;
+    const JavaObjectHandle<TxModelListener> &getHandle() const;
 
   private:
     mutable std::recursive_mutex mutex_{};
-    JavaObjectHandle<TxModelListenerTag> handle_;
+    JavaObjectHandle<TxModelListener> handle_;
     SimpleHandler<void(const IndexedEventSource & /* source */,
                        const std::vector<std::shared_ptr<EventType>> & /* events */, bool /* isSnapshot */)>
         onEventsReceived_{};

diff --git a/src/internal/JavaObjectHandle.cpp b/src/internal/JavaObjectHandle.cpp
@@ -93,7 +93,7 @@ template struct JavaObjectHandle<TimePeriod>;
 
 template struct JavaObjectHandle<AuthToken>;
 
-template struct JavaObjectHandle<TxModelListenerTag>;
+template struct JavaObjectHandle<TxModelListener>;
 template struct JavaObjectHandle<IndexedTxModel>;
 template struct JavaObjectHandle<IndexedTxModel::Builder>;
 template struct JavaObjectHandle<TimeSeriesTxModel>;

diff --git a/src/isolated/model/IsolatedIndexedTxModel.cpp b/src/isolated/model/IsolatedIndexedTxModel.cpp
@@ -215,7 +215,7 @@ JavaObjectHandle<IndexedTxModel::Builder> withSymbol(const JavaObjectHandle<Inde
 // dxfg_indexed_tx_model_builder_t* dxfg_IndexedTxModel_Builder_withListener(graal_isolatethread_t* thread,
 // dxfg_indexed_tx_model_builder_t* source, dxfg_tx_model_listener_t* listener);
 JavaObjectHandle<IndexedTxModel::Builder> withListener(const JavaObjectHandle<IndexedTxModel::Builder> &builder,
-                                                       const JavaObjectHandle<TxModelListenerTag> &listener) {
+                                                       const JavaObjectHandle<TxModelListener> &listener) {
     if (!builder) {
         throw InvalidArgumentException("Unable to execute function `dxfg_IndexedTxModel_Builder_withListener`. The "
                                        "`builder` handle is invalid");

diff --git a/src/isolated/model/IsolatedTimeSeriesTxModel.cpp b/src/isolated/model/IsolatedTimeSeriesTxModel.cpp
@@ -207,7 +207,7 @@ JavaObjectHandle<TimeSeriesTxModel::Builder> withSymbol(const JavaObjectHandle<T
 // dxfg_time_series_tx_model_builder_t* dxfg_TimeSeriesTxModel_Builder_withListener(graal_isolatethread_t* thread,
 // dxfg_time_series_tx_model_builder_t* source, dxfg_tx_model_listener_t* listener);
 JavaObjectHandle<TimeSeriesTxModel::Builder> withListener(const JavaObjectHandle<TimeSeriesTxModel::Builder> &builder,
-                                                          const JavaObjectHandle<TxModelListenerTag> &listener) {
+                                                          const JavaObjectHandle<TxModelListener> &listener) {
     if (!builder) {
         throw InvalidArgumentException("Unable to execute function `dxfg_TimeSeriesTxModel_Builder_withListener`. The "
                                        "`builder` handle is invalid");

diff --git a/src/isolated/model/IsolatedTxModelListener.cpp b/src/isolated/model/IsolatedTxModelListener.cpp
@@ -16,13 +16,13 @@ namespace isolated::model::IsolatedTxModelListener {
 
 // dxfg_tx_model_listener_t* dxfg_TxModelListener_new(graal_isolatethread_t* thread,
 // dxfg_TxModelListener_function_eventsReceived  function_eventsReceived, void* user_data);
-JavaObjectHandle<TxModelListenerTag> create(void *functionEventsReceived, void *userData) {
+JavaObjectHandle<TxModelListener> create(void *functionEventsReceived, void *userData) {
     if (!functionEventsReceived) {
         throw InvalidArgumentException(
             "Unable to execute function `dxfg_TxModelListener_new`. The `functionEventsReceived` is nullptr");
     }
 
-    return JavaObjectHandle<TxModelListenerTag>{runGraalFunctionAndThrowIfNullptr(
+    return JavaObjectHandle<TxModelListener>{runGraalFunctionAndThrowIfNullptr(
         dxfg_TxModelListener_new,
         dxfcpp::bit_cast<dxfg_TxModelListener_function_eventsReceived>(functionEventsReceived), userData)};
 }

diff --git a/src/model/TxModelListener.cpp b/src/model/TxModelListener.cpp
@@ -55,7 +55,7 @@ std::shared_ptr<TxModelListener> TxModelListener::create(
     return listener;
 }
 
-const JavaObjectHandle<TxModelListenerTag> &TxModelListener::getHandle() const {
+const JavaObjectHandle<TxModelListener> &TxModelListener::getHandle() const {
     std::lock_guard guard{mutex_};
 
     return handle_;