native -> isolated namespace

dxFeed · Mar 4, 2024 · 7a97efe · 7a97efe
1 parent 1b798fd
commit 7a97efe
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -153,8 +153,10 @@ set(dxFeedGraalCxxApi_InternalUtilsDebug_Sources
         src/internal/utils/debug/Debug.cpp
 )
 
-set(dxFeedGraalCxxApi_Native_Sources
-        src/native/JavaException.cpp)
+set(dxFeedGraalCxxApi_Isolated_Sources
+        src/isolated/exceptions/JavaException.cpp
+        src/isolated/api/IsolatedDXEndpoint.cpp
+)
 
 set(dxFeedGraalCxxApi_Api_Sources
         src/api/DXEndpoint.cpp
@@ -258,7 +260,7 @@ set(dxFeedGraalCxxApi_Sources
         ${dxFeedGraalCxxApi_Internal_Sources}
         ${dxFeedGraalCxxApi_InternalUtils_Sources}
         ${dxFeedGraalCxxApi_InternalUtilsDebug_Sources}
-        ${dxFeedGraalCxxApi_Native_Sources}
+        ${dxFeedGraalCxxApi_Isolated_Sources}
         ${dxFeedGraalCxxApi_Api_Sources}
         ${dxFeedGraalCxxApi_ApiOsub_Sources}
         ${dxFeedGraalCxxApi_Ipf_Sources}

diff --git a/include/dxfeed_graal_cpp_api/api.hpp b/include/dxfeed_graal_cpp_api/api.hpp
@@ -49,8 +49,8 @@ DXFCXX_DISABLE_MSC_WARNINGS_PUSH(4251 4996)
 
 #include "isolated/Isolated.hpp"
 
-#include "native/GraalException.hpp"
-#include "native/JavaException.hpp"
+#include "isolated/exceptions/JavaException.hpp"
+#include "isolated/exceptions/GraalException.hpp"
 
 #include "ondemand/OnDemandService.hpp"
 

diff --git a/include/dxfeed_graal_cpp_api/internal/Isolate.hpp b/include/dxfeed_graal_cpp_api/internal/Isolate.hpp
@@ -7,7 +7,7 @@
 
 DXFCXX_DISABLE_MSC_WARNINGS_PUSH(4251)
 
-#include "../native/GraalException.hpp"
+#include "../isolated/exceptions/GraalException.hpp"
 #include "CEntryPointErrors.hpp"
 #include "Common.hpp"
 #include "utils/StringUtils.hpp"

diff --git a/include/dxfeed_graal_cpp_api/isolated/api/IsolatedDXEndpoint.hpp b/include/dxfeed_graal_cpp_api/isolated/api/IsolatedDXEndpoint.hpp
@@ -0,0 +1,31 @@
+// Copyright (c) 2024 Devexperts LLC.
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include "../../internal/Conf.hpp"
+
+DXFCXX_DISABLE_MSC_WARNINGS_PUSH(4251)
+
+#include "../../api/DXEndpoint.hpp"
+
+DXFCPP_BEGIN_NAMESPACE
+
+namespace isolated::api {
+
+namespace IsolatedDXEndpoint {
+
+// Throws:
+//   std::invalid_argument if endpoint handle is invalid.
+//   JavaException if something happened with the dxFeed API backend
+//   GraalException if something happened with the GraalVM
+static dxfcpp::DXEndpoint::State
+getState(/* dxfg_endpoint_t* */ const JavaObjectHandle<dxfcpp::DXEndpoint> &endpoint);
+
+}
+
+}
+
+DXFCPP_END_NAMESPACE
+
+DXFCXX_DISABLE_MSC_WARNINGS_POP()
diff --git a/...d_graal_cpp_api/native/GraalException.hpp → ...pi/isolated/exceptions/GraalException.hpp b/...d_graal_cpp_api/native/GraalException.hpp → ...pi/isolated/exceptions/GraalException.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include "../internal/Conf.hpp"
+#include "../../internal/Conf.hpp"
 
 DXFCXX_DISABLE_MSC_WARNINGS_PUSH(4251 4275)
 
-#include "../internal/CEntryPointErrors.hpp"
+#include "../../internal/CEntryPointErrors.hpp"
 
 #include <stdexcept>
 #include <string>

diff --git a/...ed_graal_cpp_api/native/JavaException.hpp → ...api/isolated/exceptions/JavaException.hpp b/...ed_graal_cpp_api/native/JavaException.hpp → ...api/isolated/exceptions/JavaException.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../internal/Conf.hpp"
+#include "../../internal/Conf.hpp"
 
 DXFCXX_DISABLE_MSC_WARNINGS_PUSH(4251 4275)
 

diff --git a/src/api/osub/TimeSeriesSubscriptionSymbol.cpp b/src/api/osub/TimeSeriesSubscriptionSymbol.cpp
@@ -3,8 +3,8 @@
 
 #include <dxfg_api.h>
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
 
 DXFCPP_BEGIN_NAMESPACE
 

diff --git a/src/api/osub/WildcardSymbol.cpp b/src/api/osub/WildcardSymbol.cpp
@@ -3,8 +3,8 @@
 
 #include <dxfg_api.h>
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
 
 DXFCPP_BEGIN_NAMESPACE
 

diff --git a/src/internal/Isolate.cpp b/src/internal/Isolate.cpp
@@ -292,7 +292,7 @@ Tools::parseSymbols(const std::string &symbolList) noexcept {
 
 namespace api {
 
-static dxfcpp::DXEndpoint::State graalStateToState(dxfg_endpoint_state_t state) {
+dxfcpp::DXEndpoint::State graalStateToState(dxfg_endpoint_state_t state) noexcept {
     switch (state) {
     case DXFG_ENDPOINT_STATE_NOT_CONNECTED:
         return dxfcpp::DXEndpoint::State::NOT_CONNECTED;

diff --git a/src/isolated/api/IsolatedDXEndpoint.cpp b/src/isolated/api/IsolatedDXEndpoint.cpp
@@ -0,0 +1,21 @@
+// Copyright (c) 2024 Devexperts LLC.
+// SPDX-License-Identifier: MPL-2.0
+
+#include <dxfg_api.h>
+
+#include <dxfeed_graal_cpp_api/api.hpp>
+
+#include <fmt/format.h>
+
+DXFCPP_BEGIN_NAMESPACE
+
+namespace isolated::api {
+
+namespace IsolatedDXEndpoint {
+
+}
+
+}
+
+
+DXFCPP_END_NAMESPACE
diff --git a/src/native/JavaException.cpp → src/isolated/exceptions/JavaException.cpp b/src/native/JavaException.cpp → src/isolated/exceptions/JavaException.cpp
diff --git a/tests/api/CandleSymbolTest.cpp b/tests/api/CandleSymbolTest.cpp
@@ -3,14 +3,16 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
-#include <doctest.h>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
+#include <doctest.h>
+
 using namespace dxfcpp;
 
 using stringOpt = std::optional<std::string>;

diff --git a/tests/api/DXEndpointTest.cpp b/tests/api/DXEndpointTest.cpp
@@ -3,11 +3,14 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
+
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
 #include <doctest.h>
 
 TEST_CASE("DXEndpoint::Builder") {

diff --git a/tests/api/DXPublisherTest.cpp b/tests/api/DXPublisherTest.cpp
@@ -3,13 +3,16 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
-#include <doctest.h>
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
+#include <doctest.h>
+
 using namespace dxfcpp;
 using namespace dxfcpp::literals;
 using namespace std::literals;

diff --git a/tests/api/EventsTest.cpp b/tests/api/EventsTest.cpp
@@ -3,12 +3,16 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
-#include <doctest.h>
-#include <fmt/format.h>
+#include <string>
+#include <thread>
+#include <unordered_map>
 #include <vector>
 
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
+#include <doctest.h>
+
 using namespace dxfcpp;
 using namespace dxfcpp::literals;
 using namespace std::literals;

diff --git a/tests/api/MarketEventSymbolsTest.cpp b/tests/api/MarketEventSymbolsTest.cpp
@@ -3,14 +3,16 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
-#include <doctest.h>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
+#include <doctest.h>
+
 using namespace dxfcpp;
 
 using stringOpt = std::optional<std::string>;

diff --git a/tests/api/OrderSourceTest.cpp b/tests/api/OrderSourceTest.cpp
@@ -3,7 +3,14 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_cpp_api/api.hpp"
+#include <string>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
 #include <doctest.h>
 
 using namespace dxfcpp;

diff --git a/tests/system/SystemTest.cpp b/tests/system/SystemTest.cpp
@@ -3,12 +3,14 @@
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "dxfeed_graal_c_api/api.h"
-#include "dxfeed_graal_cpp_api/api.hpp"
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
+#include <dxfeed_graal_c_api/api.h>
+#include <dxfeed_graal_cpp_api/api.hpp>
+
 #include <doctest.h>
 
 TEST_CASE("System properties can be set, as well as get their values") {