The plugin headers are contained in the include directory

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,
                     ...);

include/json/neu_json_rw.h

@@ -26,7 +26,7 @@ extern "C" {
 #include <stdint.h>
 
 #include "neu_data_expr.h"
-#include "utils/json.h"
+#include "json/json.h"
 
 typedef struct neu_parse_read_req {
     uint32_t node_id;

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()

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"

plugins/mqtt/command/common.h

@@ -25,12 +25,12 @@ extern "C" {
 
 #include <neuron.h>
 
-#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)
 

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 <config.h>
 #include <neuron.h>
 

plugins/opcua/option.c

@@ -24,7 +24,7 @@
 
 #include "option.h"
 #include "schema/schema.h"
-#include "utils/json.h"
+#include "json/json.h"
 #include <config.h>
 
 #define BUF_SIZE 40960

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"

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"

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"

plugins/restful/normal_handle.c

@@ -24,8 +24,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#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"

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"

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"

src/parser/neu_json_fn.c

@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#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)
 {

src/parser/neu_json_group_config.c

@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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)

src/parser/neu_json_mqtt.c

@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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)
 {

src/parser/neu_json_node.c

@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#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)
 {

src/parser/neu_json_plugin.c

@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 
-#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)
 {

src/parser/neu_json_rw.c

@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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)
 {

src/parser/neu_json_tag.c

@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#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)
 {

src/parser/neu_json_tty.c

@@ -18,8 +18,8 @@
  **/
 #include <stdlib.h>
 
-#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)
 {

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;

src/utils/json.c

@@ -22,8 +22,8 @@
 
 #include <jansson.h>
 
-#include "json.h"
 #include "neu_log.h"
+#include "json/json.h"
 
 static json_t *encode_object_value(neu_json_elem_t *ele)
 {

tests/api_json_test.cc

@@ -2,9 +2,9 @@
 
 #include <gtest/gtest.h>
 
-#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)
 {

tests/json_datatag_table_test.cc

@@ -2,8 +2,8 @@
 
 #include <gtest/gtest.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"
 
 TEST(JsonDatatagTableTest, AddTagDecode)
 {

tests/json_group_config_test.cc

@@ -1,8 +1,8 @@
 #include <cstdlib>
 #include <gtest/gtest.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"
 
 TEST(TagGroupConfigTest, neu_parse_decode_get_group_config_req)
 {

tests/json_nodes_test.cc

@@ -2,8 +2,8 @@
 
 #include <gtest/gtest.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"
 
 TEST(JsonNodesTest, AddNodesDecode)
 {

tests/json_plugin_test.cc

@@ -2,8 +2,8 @@
 
 #include <gtest/gtest.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"
 
 TEST(JsonPluginTest, AddPluginDecode)
 {

tests/json_test.cc

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "utils/json.h"
+#include "json/json.h"
 
 TEST(JsonTest, DecodeField)
 {

tests/schema_valid_test.cc

@@ -3,7 +3,7 @@
 #include <gtest/gtest.h>
 
 #include "schema/schema.h"
-#include "utils/json.h"
+#include "json/json.h"
 
 #define SCHEMA_FILE "./plugin_param_schema_test.json"