[EN-7587] Implement FetchDailyCandles sample

IsolatedDXFeedSubscription::clear IsolatedDXFeedSubscription::isClosed
dxFeed · Jun 17, 2024 · 4b48f6e · 4b48f6e
1 parent 5d4c1c4
commit 4b48f6e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 25 deletions.
diff --git a/include/dxfeed_graal_cpp_api/isolated/api/IsolatedDXFeedSubscription.hpp b/include/dxfeed_graal_cpp_api/isolated/api/IsolatedDXFeedSubscription.hpp
@@ -17,13 +17,6 @@ namespace isolated::api::IsolatedDXFeedSubscription {
 
 /*
 
-int32_t                   dxfg_DXFeedSubscription_clear(graal_isolatethread_t *thread, dxfg_subscription_t *sub);
-
-int32_t                   dxfg_DXFeedSubscription_attach(graal_isolatethread_t *thread, dxfg_subscription_t *sub,
-dxfg_feed_t *feed);
-
-int32_t                   dxfg_DXFeedSubscription_detach(graal_isolatethread_t *thread, dxfg_subscription_t *sub,
-dxfg_feed_t *feed);
 
 int32_t                   dxfg_DXFeedSubscription_isClosed(graal_isolatethread_t *thread, dxfg_subscription_t *sub);
 
@@ -146,6 +139,32 @@ void /* int32_t */ removeSymbol(/* dxfg_subscription_t * */ const JavaObjectHand
 void /* int32_t */ removeSymbols(/* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub,
                                  /* dxfg_symbol_list * */ void *symbols);
 
+/**
+ * Calls the Graal SDK function `dxfg_DXFeedSubscription_clear` in isolation.
+ *
+ * @param sub The subscription's handle.
+ * @throws std::invalid_argument if DXFeedSubscription's handle is invalid.
+ * @throws JavaException if something happened with the dxFeed API backend.
+ * @throws GraalException if something happened with the GraalVM.
+ */
+void /* int32_t */ clear(/* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub);
+
+// int32_t dxfg_DXFeedSubscription_attach(graal_isolatethread_t *thread, dxfg_subscription_t *sub, dxfg_feed_t *feed);
+
+// int32_t dxfg_DXFeedSubscription_detach(graal_isolatethread_t *thread, dxfg_subscription_t *sub, dxfg_feed_t *feed);
+
+// int32_t dxfg_DXFeedSubscription_isClosed(graal_isolatethread_t *thread, dxfg_subscription_t *sub);
+/**
+ * Calls the Graal SDK function `dxfg_DXFeedSubscription_clear` in isolation.
+ *
+ * @param sub The subscription's handle.
+ * @return `true` if subscription is closed.
+ * @throws std::invalid_argument if DXFeedSubscription's handle is invalid.
+ * @throws JavaException if something happened with the dxFeed API backend.
+ * @throws GraalException if something happened with the GraalVM.
+ */
+bool /* int32_t */ isClosed(/* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub);
+
 /**
  * Calls the Graal SDK function `dxfg_DXFeedSubscription_addChangeListener` in isolation.
  *

diff --git a/src/api/DXFeedSubscription.cpp b/src/api/DXFeedSubscription.cpp
@@ -164,27 +164,11 @@ void DXFeedSubscription::closeImpl() const {
 }
 
 void DXFeedSubscription::clearImpl() const {
-    if (!handle_) {
-        return;
-    }
-
-    runIsolatedOrElse(
-        [handle = static_cast<dxfg_subscription_t *>(handle_.get())](auto threadHandle) {
-            return dxfg_DXFeedSubscription_clear(static_cast<graal_isolatethread_t *>(threadHandle), handle) == 0;
-        },
-        false);
+     isolated::api::IsolatedDXFeedSubscription::clear(handle_);
 }
 
 bool DXFeedSubscription::isClosedImpl() const {
-    if (!handle_) {
-        return false;
-    }
-
-    return runIsolatedOrElse(
-        [handle = static_cast<dxfg_subscription_t *>(handle_.get())](auto threadHandle) {
-            return dxfg_DXFeedSubscription_isClosed(static_cast<graal_isolatethread_t *>(threadHandle), handle) != 0;
-        },
-        false);
+    return isolated::api::IsolatedDXFeedSubscription::isClosed(handle_);
 }
 
 DXFeedSubscription::DXFeedSubscription(LockExternalConstructionTag)

diff --git a/src/isolated/api/IsolatedDXFeedSubscription.cpp b/src/isolated/api/IsolatedDXFeedSubscription.cpp
@@ -122,6 +122,26 @@ void /* int32_t */ removeSymbols(/* dxfg_subscription_t * */ const JavaObjectHan
                                            static_cast<dxfg_symbol_list *>(symbols));
 }
 
+void /* int32_t */ clear(/* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub) {
+    if (!sub) {
+        throw std::invalid_argument(
+            "Unable to execute function `dxfg_DXFeedSubscription_clear`. The `sub` handle is invalid");
+    }
+
+    runGraalFunctionAndThrowIfLessThanZero(dxfg_DXFeedSubscription_clear,
+                                           static_cast<dxfg_subscription_t *>(sub.get()));
+}
+
+bool /* int32_t */ isClosed(/* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub) {
+    if (!sub) {
+        throw std::invalid_argument(
+            "Unable to execute function `dxfg_DXFeedSubscription_isClosed`. The `sub` handle is invalid");
+    }
+
+    return runGraalFunctionAndThrowIfLessThanZero(dxfg_DXFeedSubscription_isClosed,
+                                                  static_cast<dxfg_subscription_t *>(sub.get())) == 1;
+}
+
 void /* int32_t */ addChangeListener(
     /* dxfg_subscription_t * */ const JavaObjectHandle<DXFeedSubscription> &sub,
     /* dxfg_observable_subscription_change_listener_t * */ const JavaObjectHandle<ObservableSubscriptionChangeListener>