diff --git a/src/utils/json.h b/include/json/json.h similarity index 100% rename from src/utils/json.h rename to include/json/json.h diff --git a/src/parser/neu_json_fn.h b/include/json/neu_json_fn.h similarity index 100% rename from src/parser/neu_json_fn.h rename to include/json/neu_json_fn.h diff --git a/src/parser/neu_json_group_config.h b/include/json/neu_json_group_config.h similarity index 100% rename from src/parser/neu_json_group_config.h rename to include/json/neu_json_group_config.h diff --git a/src/parser/neu_json_mqtt.h b/include/json/neu_json_mqtt.h similarity index 100% rename from src/parser/neu_json_mqtt.h rename to include/json/neu_json_mqtt.h diff --git a/src/parser/neu_json_node.h b/include/json/neu_json_node.h similarity index 100% rename from src/parser/neu_json_node.h rename to include/json/neu_json_node.h diff --git a/src/parser/neu_json_param.h b/include/json/neu_json_param.h similarity index 97% rename from src/parser/neu_json_param.h rename to include/json/neu_json_param.h index 93b3ddb8..0071febf 100644 --- a/src/parser/neu_json_param.h +++ b/include/json/neu_json_param.h @@ -24,7 +24,7 @@ extern "C" { #endif -#include "utils/json.h" +#include "json/json.h" int neu_parse_param(char *buf, char **err_param, int n, neu_json_elem_t *ele, ...); diff --git a/src/parser/neu_json_plugin.h b/include/json/neu_json_plugin.h similarity index 100% rename from src/parser/neu_json_plugin.h rename to include/json/neu_json_plugin.h diff --git a/src/parser/neu_json_rw.h b/include/json/neu_json_rw.h similarity index 98% rename from src/parser/neu_json_rw.h rename to include/json/neu_json_rw.h index ce25a2f8..4f6a25c2 100644 --- a/src/parser/neu_json_rw.h +++ b/include/json/neu_json_rw.h @@ -26,7 +26,7 @@ extern "C" { #include #include "neu_data_expr.h" -#include "utils/json.h" +#include "json/json.h" typedef struct neu_parse_read_req { uint32_t node_id; diff --git a/src/parser/neu_json_tag.h b/include/json/neu_json_tag.h similarity index 100% rename from src/parser/neu_json_tag.h rename to include/json/neu_json_tag.h diff --git a/src/parser/neu_json_tty.h b/include/json/neu_json_tty.h similarity index 100% rename from src/parser/neu_json_tty.h rename to include/json/neu_json_tty.h diff --git a/plugins/modbus/CMakeLists.txt b/plugins/modbus/CMakeLists.txt index 6a7e694f..9e1409a8 100644 --- a/plugins/modbus/CMakeLists.txt +++ b/plugins/modbus/CMakeLists.txt @@ -4,7 +4,7 @@ set(MODBUS_TCP_PLUGIN_SOURCES modbus.c modbus_tcp.c modbus_point.c) set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}") add_library(${MODBUS_TCP_PLUGIN} SHARED) target_sources(${MODBUS_TCP_PLUGIN} PRIVATE ${MODBUS_TCP_PLUGIN_SOURCES}) -target_include_directories(${MODBUS_TCP_PLUGIN} PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src) +target_include_directories(${MODBUS_TCP_PLUGIN} PRIVATE ${CMAKE_SOURCE_DIR}/include) if(APPLE) target_link_libraries(${MODBUS_TCP_PLUGIN} nng::nng neuron-base) else() diff --git a/plugins/modbus/modbus_tcp.c b/plugins/modbus/modbus_tcp.c index 85dbb9d8..159863f6 100644 --- a/plugins/modbus/modbus_tcp.c +++ b/plugins/modbus/modbus_tcp.c @@ -31,7 +31,7 @@ #include "neu_tag_group_config.h" #include "neu_vector.h" #include "neuron.h" -#include "parser/neu_json_param.h" +#include "json/neu_json_param.h" #include "modbus.h" #include "modbus_point.h" diff --git a/plugins/mqtt/command/common.h b/plugins/mqtt/command/common.h index e25fc8f6..75a87578 100644 --- a/plugins/mqtt/command/common.h +++ b/plugins/mqtt/command/common.h @@ -25,12 +25,12 @@ extern "C" { #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_group_config.h" -#include "parser/neu_json_mqtt.h" -#include "parser/neu_json_node.h" -#include "parser/neu_json_rw.h" -#include "parser/neu_json_tag.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_group_config.h" +#include "json/neu_json_mqtt.h" +#include "json/neu_json_node.h" +#include "json/neu_json_rw.h" +#include "json/neu_json_tag.h" #define UNUSED(x) (void) (x) diff --git a/plugins/mqtt/mqtt_client.c b/plugins/mqtt/mqtt_client.c index db9cb121..9fc6e8ee 100644 --- a/plugins/mqtt/mqtt_client.c +++ b/plugins/mqtt/mqtt_client.c @@ -24,7 +24,7 @@ #include "mqtt_client.h" #include "schema/schema.h" -#include "utils/json.h" +#include "json/json.h" #include #include diff --git a/plugins/opcua/option.c b/plugins/opcua/option.c index 492c4fc5..dec42583 100644 --- a/plugins/opcua/option.c +++ b/plugins/opcua/option.c @@ -24,7 +24,7 @@ #include "option.h" #include "schema/schema.h" -#include "utils/json.h" +#include "json/json.h" #include #define BUF_SIZE 40960 diff --git a/plugins/restful/adapter_handle.c b/plugins/restful/adapter_handle.c index 863a19a7..cedc9ecc 100644 --- a/plugins/restful/adapter_handle.c +++ b/plugins/restful/adapter_handle.c @@ -22,8 +22,8 @@ #include "vector.h" #include "neu_plugin.h" -#include "parser/neu_json_fn.h" -#include "parser/neu_json_node.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_node.h" #include "handle.h" #include "http.h" diff --git a/plugins/restful/datatag_handle.c b/plugins/restful/datatag_handle.c index 7a6bcf69..a74887d4 100644 --- a/plugins/restful/datatag_handle.c +++ b/plugins/restful/datatag_handle.c @@ -23,8 +23,8 @@ #include "neu_datatag_table.h" #include "neu_log.h" #include "neu_plugin.h" -#include "parser/neu_json_fn.h" -#include "parser/neu_json_tag.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_tag.h" #include "handle.h" #include "http.h" diff --git a/plugins/restful/group_config_handle.c b/plugins/restful/group_config_handle.c index cefdd8f0..c1d9f39e 100644 --- a/plugins/restful/group_config_handle.c +++ b/plugins/restful/group_config_handle.c @@ -24,8 +24,8 @@ #include "neu_log.h" #include "neu_plugin.h" #include "neu_subscribe.h" -#include "parser/neu_json_fn.h" -#include "parser/neu_json_group_config.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_group_config.h" #include "handle.h" #include "http.h" diff --git a/plugins/restful/normal_handle.c b/plugins/restful/normal_handle.c index 5c46008c..6b0ad3db 100644 --- a/plugins/restful/normal_handle.c +++ b/plugins/restful/normal_handle.c @@ -24,8 +24,8 @@ #include #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_tty.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_tty.h" #include "handle.h" #include "http.h" diff --git a/plugins/restful/plugin_handle.c b/plugins/restful/plugin_handle.c index 9977280e..1187d89d 100644 --- a/plugins/restful/plugin_handle.c +++ b/plugins/restful/plugin_handle.c @@ -22,8 +22,8 @@ #include "vector.h" #include "neu_plugin.h" -#include "parser/neu_json_fn.h" -#include "parser/neu_json_plugin.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_plugin.h" #include "handle.h" #include "http.h" diff --git a/plugins/restful/rw_handle.c b/plugins/restful/rw_handle.c index 2a484aa9..e7a61f17 100644 --- a/plugins/restful/rw_handle.c +++ b/plugins/restful/rw_handle.c @@ -4,8 +4,8 @@ #include "neu_log.h" #include "neu_plugin.h" -#include "parser/neu_json_fn.h" -#include "parser/neu_json_rw.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_rw.h" #include "handle.h" #include "http.h" diff --git a/src/parser/neu_json_fn.c b/src/parser/neu_json_fn.c index dcf40cf3..7983b22f 100644 --- a/src/parser/neu_json_fn.c +++ b/src/parser/neu_json_fn.c @@ -21,10 +21,10 @@ #include #include -#include "utils/json.h" +#include "json/json.h" -#include "neu_json_fn.h" -#include "neu_json_param.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_param.h" int neu_json_encode_by_fn(void *param, neu_json_encode_fn fn, char **result) { diff --git a/src/parser/neu_json_group_config.c b/src/parser/neu_json_group_config.c index 136bc60d..67bef22e 100644 --- a/src/parser/neu_json_group_config.c +++ b/src/parser/neu_json_group_config.c @@ -20,9 +20,9 @@ #include #include -#include "utils/json.h" +#include "json/json.h" -#include "neu_json_group_config.h" +#include "json/neu_json_group_config.h" int neu_parse_decode_add_group_config(char * buf, neu_parse_add_group_config_req_t **result) diff --git a/src/parser/neu_json_mqtt.c b/src/parser/neu_json_mqtt.c index f5eca994..acd7350f 100644 --- a/src/parser/neu_json_mqtt.c +++ b/src/parser/neu_json_mqtt.c @@ -19,9 +19,9 @@ #include #include -#include "utils/json.h" +#include "json/json.h" -#include "neu_json_mqtt.h" +#include "json/neu_json_mqtt.h" int neu_parse_decode_mqtt_param(char *buf, neu_parse_mqtt_t **req) { diff --git a/src/parser/neu_json_node.c b/src/parser/neu_json_node.c index 90934da7..92e2d90c 100644 --- a/src/parser/neu_json_node.c +++ b/src/parser/neu_json_node.c @@ -19,8 +19,8 @@ #include -#include "neu_json_node.h" -#include "utils/json.h" +#include "json/json.h" +#include "json/neu_json_node.h" int neu_parse_decode_add_node(char *buf, neu_parse_add_node_req_t **result) { diff --git a/src/parser/neu_json_plugin.c b/src/parser/neu_json_plugin.c index 96292f22..ff67a344 100644 --- a/src/parser/neu_json_plugin.c +++ b/src/parser/neu_json_plugin.c @@ -19,9 +19,9 @@ #include -#include "utils/json.h" +#include "json/json.h" -#include "neu_json_plugin.h" +#include "json/neu_json_plugin.h" int neu_parse_decode_add_plugin(char *buf, neu_parse_add_plugin_req_t **result) { diff --git a/src/parser/neu_json_rw.c b/src/parser/neu_json_rw.c index f18cba95..cffaefc7 100644 --- a/src/parser/neu_json_rw.c +++ b/src/parser/neu_json_rw.c @@ -20,9 +20,9 @@ #include #include -#include "utils/json.h" +#include "json/json.h" -#include "neu_json_rw.h" +#include "json/neu_json_rw.h" int neu_parse_decode_read(char *buf, neu_parse_read_req_t **result) { diff --git a/src/parser/neu_json_tag.c b/src/parser/neu_json_tag.c index cba7f90a..40d6ca03 100644 --- a/src/parser/neu_json_tag.c +++ b/src/parser/neu_json_tag.c @@ -19,8 +19,8 @@ #include -#include "neu_json_tag.h" -#include "utils/json.h" +#include "json/json.h" +#include "json/neu_json_tag.h" int neu_parse_decode_add_tags(char *buf, neu_parse_add_tags_req_t **result) { diff --git a/src/parser/neu_json_tty.c b/src/parser/neu_json_tty.c index 20d309cb..76ce1dbf 100644 --- a/src/parser/neu_json_tty.c +++ b/src/parser/neu_json_tty.c @@ -18,8 +18,8 @@ **/ #include -#include "neu_json_tty.h" -#include "utils/json.h" +#include "json/json.h" +#include "json/neu_json_tty.h" int neu_parse_encode_get_tty(void *json_object, void *param) { diff --git a/src/schema/schema.c b/src/schema/schema.c index 4c36bc11..628a6595 100644 --- a/src/schema/schema.c +++ b/src/schema/schema.c @@ -24,7 +24,7 @@ #include "neu_log.h" #include "schema.h" -#include "utils/json.h" +#include "json/json.h" struct neu_schema_valid { void * root; diff --git a/src/utils/json.c b/src/utils/json.c index 8a16b6ec..65155ef7 100644 --- a/src/utils/json.c +++ b/src/utils/json.c @@ -22,8 +22,8 @@ #include -#include "json.h" #include "neu_log.h" +#include "json/json.h" static json_t *encode_object_value(neu_json_elem_t *ele) { diff --git a/tests/api_json_test.cc b/tests/api_json_test.cc index a711121c..ee8b7fb2 100644 --- a/tests/api_json_test.cc +++ b/tests/api_json_test.cc @@ -2,9 +2,9 @@ #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_mqtt.h" -#include "parser/neu_json_rw.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_mqtt.h" +#include "json/neu_json_rw.h" TEST(JsonAPITest, ReadReqDecode) { diff --git a/tests/json_datatag_table_test.cc b/tests/json_datatag_table_test.cc index ddb39e19..8510d0ef 100644 --- a/tests/json_datatag_table_test.cc +++ b/tests/json_datatag_table_test.cc @@ -2,8 +2,8 @@ #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_tag.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_tag.h" TEST(JsonDatatagTableTest, AddTagDecode) { diff --git a/tests/json_group_config_test.cc b/tests/json_group_config_test.cc index 621f530b..671e9983 100644 --- a/tests/json_group_config_test.cc +++ b/tests/json_group_config_test.cc @@ -1,8 +1,8 @@ #include #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_group_config.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_group_config.h" TEST(TagGroupConfigTest, neu_parse_decode_get_group_config_req) { diff --git a/tests/json_nodes_test.cc b/tests/json_nodes_test.cc index 4f50305e..bc747e55 100644 --- a/tests/json_nodes_test.cc +++ b/tests/json_nodes_test.cc @@ -2,8 +2,8 @@ #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_node.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_node.h" TEST(JsonNodesTest, AddNodesDecode) { diff --git a/tests/json_plugin_test.cc b/tests/json_plugin_test.cc index c54d791d..f79cbc92 100644 --- a/tests/json_plugin_test.cc +++ b/tests/json_plugin_test.cc @@ -2,8 +2,8 @@ #include -#include "parser/neu_json_fn.h" -#include "parser/neu_json_plugin.h" +#include "json/neu_json_fn.h" +#include "json/neu_json_plugin.h" TEST(JsonPluginTest, AddPluginDecode) { diff --git a/tests/json_test.cc b/tests/json_test.cc index 825299e0..9037f91d 100644 --- a/tests/json_test.cc +++ b/tests/json_test.cc @@ -1,6 +1,6 @@ #include -#include "utils/json.h" +#include "json/json.h" TEST(JsonTest, DecodeField) { diff --git a/tests/schema_valid_test.cc b/tests/schema_valid_test.cc index 9224e6bb..55928151 100644 --- a/tests/schema_valid_test.cc +++ b/tests/schema_valid_test.cc @@ -3,7 +3,7 @@ #include #include "schema/schema.h" -#include "utils/json.h" +#include "json/json.h" #define SCHEMA_FILE "./plugin_param_schema_test.json"