mirrors/oatpp
1
0
Fork 0
mirror of https://gitee.com/zyjblog/oatpp.git synced 2024-12-22 22:16:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor: move data::Tree to data::mapping::Tree

Browse Source
This commit is contained in:
Leonid Stryzhevskyi 2024-04-29 00:56:29 +03:00
parent 1d64355eef
commit ad3136480a
13 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -62,12 +62,6 @@ add_library(oatpp
oatpp/concurrency/Utils.hpp
oatpp/data/Bundle.cpp
oatpp/data/Bundle.hpp
oatpp/data/ObjectToTreeMapper.cpp
oatpp/data/ObjectToTreeMapper.hpp
oatpp/data/Tree.cpp
oatpp/data/Tree.hpp
oatpp/data/TreeToObjectMapper.cpp
oatpp/data/TreeToObjectMapper.hpp
oatpp/data/buffer/FIFOBuffer.cpp
oatpp/data/buffer/FIFOBuffer.hpp
oatpp/data/buffer/IOBuffer.cpp
@ -76,6 +70,12 @@ add_library(oatpp
oatpp/data/buffer/Processor.hpp
oatpp/data/mapping/ObjectMapper.cpp
oatpp/data/mapping/ObjectMapper.hpp
oatpp/data/mapping/ObjectToTreeMapper.cpp
oatpp/data/mapping/ObjectToTreeMapper.hpp
oatpp/data/mapping/Tree.cpp
oatpp/data/mapping/Tree.hpp
oatpp/data/mapping/TreeToObjectMapper.cpp
oatpp/data/mapping/TreeToObjectMapper.hpp
oatpp/data/mapping/TypeResolver.cpp
oatpp/data/mapping/TypeResolver.hpp
oatpp/data/mapping/type/Any.cpp

0
src/oatpp/data/ObjectToTreeMapper.cpp → src/oatpp/data/mapping/ObjectToTreeMapper.cpp
View File

6
src/oatpp/data/ObjectToTreeMapper.hpp → src/oatpp/data/mapping/ObjectToTreeMapper.hpp
View File

@ -22,8 +22,8 @@
*
***************************************************************************/
#ifndef oatpp_data_ObjectToTreeMapper_hpp
#define oatpp_data_ObjectToTreeMapper_hpp
#ifndef oatpp_data_mapping_ObjectToTreeMapper_hpp
#define oatpp_data_mapping_ObjectToTreeMapper_hpp
#include "./Tree.hpp"
@ -88,4 +88,4 @@ public:
}}
#endif //oatpp_data_ObjectToTreeMapper_hpp
#endif //oatpp_data_mapping_ObjectToTreeMapper_hpp

0
src/oatpp/data/Tree.cpp → src/oatpp/data/mapping/Tree.cpp
View File

6
src/oatpp/data/Tree.hpp → src/oatpp/data/mapping/Tree.hpp
View File

@ -22,8 +22,8 @@
*
***************************************************************************/
#ifndef oatpp_data_Tree_hpp
#define oatpp_data_Tree_hpp
#ifndef oatpp_data_mapping_Tree_hpp
#define oatpp_data_mapping_Tree_hpp
#include "oatpp/Types.hpp"
@ -311,4 +311,4 @@ struct Tree::NodePrimitiveType<v_float64> {
}}
#endif //oatpp_data_Tree_hpp
#endif //oatpp_data_mapping_Tree_hpp

0
src/oatpp/data/TreeToObjectMapper.cpp → src/oatpp/data/mapping/TreeToObjectMapper.cpp
View File

6
src/oatpp/data/TreeToObjectMapper.hpp → src/oatpp/data/mapping/TreeToObjectMapper.hpp
View File

@ -22,8 +22,8 @@
*
***************************************************************************/
#ifndef oatpp_data_TreeToObjectMapper_hpp
#define oatpp_data_TreeToObjectMapper_hpp
#ifndef oatpp_data_mapping_TreeToObjectMapper_hpp
#define oatpp_data_mapping_TreeToObjectMapper_hpp
#include "./Tree.hpp"
@ -92,4 +92,4 @@ public:
}}
#endif //oatpp_data_TreeToObjectMapper_hpp
#endif //oatpp_data_mapping_TreeToObjectMapper_hpp

12
test/CMakeLists.txt
View File

@ -8,8 +8,6 @@ add_executable(oatppAllTests
oatpp/base/CommandLineArgumentsTest.hpp
oatpp/data/buffer/ProcessorTest.cpp
oatpp/data/buffer/ProcessorTest.hpp
oatpp/data/mapping/TypeResolverTest.cpp
oatpp/data/mapping/TypeResolverTest.hpp
oatpp/data/mapping/type/AnyTest.cpp
oatpp/data/mapping/type/AnyTest.hpp
oatpp/data/mapping/type/EnumTest.cpp
@ -36,6 +34,12 @@ add_executable(oatppAllTests
oatpp/data/mapping/type/UnorderedSetTest.hpp
oatpp/data/mapping/type/VectorTest.cpp
oatpp/data/mapping/type/VectorTest.hpp
oatpp/data/mapping/TreeTest.cpp
oatpp/data/mapping/TreeTest.hpp
oatpp/data/mapping/TreeToObjectMapperTest.cpp
oatpp/data/mapping/TreeToObjectMapperTest.hpp
oatpp/data/mapping/TypeResolverTest.cpp
oatpp/data/mapping/TypeResolverTest.hpp
oatpp/data/resource/InMemoryDataTest.cpp
oatpp/data/resource/InMemoryDataTest.hpp
oatpp/data/share/LazyStringMapTest.cpp
@ -46,10 +50,6 @@ add_executable(oatppAllTests
oatpp/data/share/StringTemplateTest.hpp
oatpp/data/stream/BufferStreamTest.cpp
oatpp/data/stream/BufferStreamTest.hpp
oatpp/data/TreeTest.cpp
oatpp/data/TreeTest.hpp
oatpp/data/TreeToObjectMapperTest.cpp
oatpp/data/TreeToObjectMapperTest.hpp
oatpp/encoding/Base64Test.cpp
oatpp/encoding/Base64Test.hpp
oatpp/encoding/UnicodeTest.cpp

8
test/oatpp/AllTestsMain.cpp
View File

@ -54,8 +54,8 @@
#include "oatpp/data/stream/BufferStreamTest.hpp"
#include "oatpp/data/TreeTest.hpp"
#include "oatpp/data/TreeToObjectMapperTest.hpp"
#include "oatpp/data/mapping/TreeTest.hpp"
#include "oatpp/data/mapping/TreeToObjectMapperTest.hpp"
#include "oatpp/data/share/LazyStringMapTest.hpp"
#include "oatpp/data/share/StringTemplateTest.hpp"
@ -107,8 +107,8 @@ void runTests() {
OATPP_RUN_TEST(oatpp::data::stream::BufferStreamTest);
*/
//OATPP_RUN_TEST(oatpp::data::TreeTest);
OATPP_RUN_TEST(oatpp::data::TreeToObjectMapperTest);
//OATPP_RUN_TEST(oatpp::data::mapping::TreeTest);
OATPP_RUN_TEST(oatpp::data::mapping::TreeToObjectMapperTest);
/*
OATPP_RUN_TEST(oatpp::data::mapping::type::ObjectWrapperTest);

6
test/oatpp/data/TreeTest.cpp → test/oatpp/data/mapping/TreeTest.cpp
View File

@ -24,12 +24,12 @@
#include "TreeTest.hpp"
#include "oatpp/data/Tree.hpp"
#include "oatpp/data/mapping/Tree.hpp"
#include "oatpp/utils/Conversion.hpp"
#include <limits>
namespace oatpp { namespace data {
namespace oatpp { namespace data { namespace mapping {
namespace {
@ -176,4 +176,4 @@ void TreeTest::onRun() {
}
}}
}}}

12
test/oatpp/data/TreeTest.hpp → test/oatpp/data/mapping/TreeTest.hpp
View File

@ -22,19 +22,19 @@
*
***************************************************************************/
#ifndef oatpp_json_TreeTest_hpp
#define oatpp_json_TreeTest_hpp
#ifndef oatpp_data_mapping_TreeTest_hpp
#define oatpp_data_mapping_TreeTest_hpp
#include "oatpp-test/UnitTest.hpp"
namespace oatpp { namespace data {
namespace oatpp { namespace data { namespace mapping {
class TreeTest : public oatpp::test::UnitTest {
public:
TreeTest() : UnitTest("TEST[oatpp::data::TreeTest]") {}
TreeTest() : UnitTest("TEST[oatpp::data::mapping::TreeTest]") {}
void onRun() override;
};
}}
}}}
#endif /* oatpp_json_TreeTest_hpp */
#endif /* oatpp_data_mapping_TreeTest_hpp */

8
test/oatpp/data/TreeToObjectMapperTest.cpp → test/oatpp/data/mapping/TreeToObjectMapperTest.cpp
View File

@ -26,14 +26,14 @@
#include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/data/ObjectToTreeMapper.hpp"
#include "oatpp/data/TreeToObjectMapper.hpp"
#include "oatpp/data/mapping/ObjectToTreeMapper.hpp"
#include "oatpp/data/mapping/TreeToObjectMapper.hpp"
#include "oatpp/macro/codegen.hpp"
#include <iostream>
namespace oatpp { namespace data {
namespace oatpp { namespace data { namespace mapping {
namespace {
@ -130,4 +130,4 @@ void TreeToObjectMapperTest::onRun() {
}
}}
}}}

12
test/oatpp/data/TreeToObjectMapperTest.hpp → test/oatpp/data/mapping/TreeToObjectMapperTest.hpp
View File

@ -22,19 +22,19 @@
*
***************************************************************************/
#ifndef oatpp_json_TreeToObjectMapperTest_hpp
#define oatpp_json_TreeToObjectMapperTest_hpp
#ifndef oatpp_data_mapping_TreeToObjectMapperTest_hpp
#define oatpp_data_mapping_TreeToObjectMapperTest_hpp
#include "oatpp-test/UnitTest.hpp"
namespace oatpp { namespace data {
namespace oatpp { namespace data { namespace mapping {
class TreeToObjectMapperTest : public oatpp::test::UnitTest {
public:
TreeToObjectMapperTest() : UnitTest("TEST[oatpp::data::TreeToObjectMapperTest]") {}
TreeToObjectMapperTest() : UnitTest("TEST[oatpp::data::mapping::TreeToObjectMapperTest]") {}
void onRun() override;
};
}}
}}}
#endif /* oatpp_json_TreeToObjectMapperTest_hpp */
#endif /* oatpp_data_mapping_TreeToObjectMapperTest_hpp */