Moved json_value/yson_value

Gazizonoki · Gazizonoki · commit 4069f96f8132 · 2024-08-01T18:31:36.000Z
diff --git a/include/ydb-cpp-sdk/library/json_value/ydb_json_value.h b/include/ydb-cpp-sdk/library/json_value/ydb_json_value.h
diff --git a/include/ydb-cpp-sdk/library/yson_value/ydb_yson_value.h b/include/ydb-cpp-sdk/library/yson_value/ydb_yson_value.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
 add_subdirectory(api)
 add_subdirectory(client)
-add_subdirectory(json_value)
-add_subdirectory(library)
-add_subdirectory(yson_value)
+add_subdirectory(library)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(grpc/client)
+add_subdirectory(json_value)
 add_subdirectory(jwt)
 add_subdirectory(malloc/api)
 add_subdirectory(operation_id)
@@ -10,3 +11,4 @@ add_subdirectory(string_utils/helpers)
 add_subdirectory(string_utils/misc)
 add_subdirectory(uuid)
 add_subdirectory(yql)
+add_subdirectory(yson_value)
diff --git a/src/library/json_value/CMakeLists.txt b/src/library/json_value/CMakeLists.txt
diff --git a/src/library/json_value/ydb_json_value.cpp b/src/library/json_value/ydb_json_value.cpp
@@ -1,4 +1,4 @@
-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
 
 #include <src/library/string_utils/base64/base64.h>
 
diff --git a/src/library/yson_value/CMakeLists.txt b/src/library/yson_value/CMakeLists.txt
diff --git a/src/library/yson_value/ydb_yson_value.cpp b/src/library/yson_value/ydb_yson_value.cpp
@@ -1,4 +1,4 @@
-#include <ydb-cpp-sdk/yson_value/ydb_yson_value.h>
+#include <ydb-cpp-sdk/library/yson_value/ydb_yson_value.h>
 
 #include <ydb-cpp-sdk/client/value/value.h>
 #include <ydb-cpp-sdk/client/result/result.h>
diff --git a/tests/integration/basic_example_it/basic_example.cpp b/tests/integration/basic_example_it/basic_example.cpp
@@ -1,6 +1,6 @@
 #include "basic_example.h"
 
-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
 
 #include <filesystem>
 #include <format>
diff --git a/tests/integration/basic_example_it/main.cpp b/tests/integration/basic_example_it/main.cpp
@@ -1,6 +1,6 @@
 #include "basic_example.h"
 
-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
 
 #include <cstdlib>
 #include <format>
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_subdirectory(client)
-add_subdirectory(json_value)
 add_subdirectory(library)
diff --git a/tests/unit/client/params_ut.cpp b/tests/unit/client/params_ut.cpp
@@ -1,6 +1,6 @@
 #include <ydb-cpp-sdk/client/params/params.h>
 
-#include <ydb-cpp-sdk/yson_value/ydb_yson_value.h>
+#include <ydb-cpp-sdk/library/yson_value/ydb_yson_value.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 #include <library/cpp/testing/unittest/tests_data.h>
diff --git a/tests/unit/client/value_ut.cpp b/tests/unit/client/value_ut.cpp
@@ -2,8 +2,8 @@
 
 #include <ydb-cpp-sdk/src/api/protos/ydb_value.pb.h>
 #include <ydb-cpp-sdk/client/types/exceptions/exceptions.h>
-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
-#include <ydb-cpp-sdk/yson_value/ydb_yson_value.h>
+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
+#include <ydb-cpp-sdk/library/yson_value/ydb_yson_value.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 #include <library/cpp/testing/unittest/tests_data.h>
diff --git a/tests/unit/library/CMakeLists.txt b/tests/unit/library/CMakeLists.txt
@@ -1,2 +1,3 @@
+add_subdirectory(json_value)
 add_subdirectory(operation_id)
 add_subdirectory(yql)
diff --git a/tests/unit/library/json_value/CMakeLists.txt b/tests/unit/library/json_value/CMakeLists.txt
diff --git a/tests/unit/library/json_value/ydb_json_value_ut.cpp b/tests/unit/library/json_value/ydb_json_value_ut.cpp
@@ -1,4 +1,4 @@
-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>
+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>
 
 #include <library/cpp/testing/unittest/tests_data.h>
 #include <library/cpp/testing/unittest/registar.h>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <ydb-cpp-sdk/json_value/ydb_json_value.h>`
	`1`	`+#include <ydb-cpp-sdk/library/json_value/ydb_json_value.h>`
`2`	`2`
`3`	`3`	`#include <src/library/string_utils/base64/base64.h>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <ydb-cpp-sdk/yson_value/ydb_yson_value.h>`
	`1`	`+#include <ydb-cpp-sdk/library/yson_value/ydb_yson_value.h>`
`2`	`2`
`3`	`3`	`#include <ydb-cpp-sdk/client/value/value.h>`
`4`	`4`	`#include <ydb-cpp-sdk/client/result/result.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`add_subdirectory(client)`
`2`		`-add_subdirectory(json_value)`
`3`	`2`	`add_subdirectory(library)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+add_subdirectory(json_value)`
`1`	`2`	`add_subdirectory(operation_id)`
`2`	`3`	`add_subdirectory(yql)`