make service_helper private

lia-viam · lia-viam · commit 546d78283c3d · 2025-01-07T12:30:01.000-05:00
diff --git a/src/viam/sdk/CMakeLists.txt b/src/viam/sdk/CMakeLists.txt
@@ -53,10 +53,10 @@ target_sources(viamsdk
     common/linear_algebra.cpp
     common/pose.cpp
     common/proto_value.cpp
-    common/service_helper.cpp
     common/utils.cpp
     common/version_metadata.cpp
     common/world_state.cpp
+    common/private/service_helper.cpp
     components/arm.cpp
     components/base.cpp
     components/board.cpp
@@ -147,7 +147,6 @@ target_sources(viamsdk
       ../../viam/sdk/common/pose.hpp
       ../../viam/sdk/common/proto_convert.hpp
       ../../viam/sdk/common/proto_value.hpp
-      ../../viam/sdk/common/service_helper.hpp
       ../../viam/sdk/common/utils.hpp
       ../../viam/sdk/common/version_metadata.hpp
       ../../viam/sdk/common/world_state.hpp
diff --git a/src/viam/sdk/common/private/service_helper.cpp b/src/viam/sdk/common/private/service_helper.cpp
@@ -1,4 +1,4 @@
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 
 #include <sstream>
 
diff --git a/src/viam/sdk/common/private/service_helper.hpp b/src/viam/sdk/common/private/service_helper.hpp
diff --git a/src/viam/sdk/components/private/arm_server.cpp b/src/viam/sdk/components/private/arm_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/arm_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 
 namespace viam {
 namespace sdk {
diff --git a/src/viam/sdk/components/private/base_server.cpp b/src/viam/sdk/components/private/base_server.cpp
@@ -3,7 +3,7 @@
 #include <viam/api/component/base/v1/base.pb.h>
 
 #include <viam/sdk/common/linear_algebra.hpp>
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/base.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/board_server.cpp b/src/viam/sdk/components/private/board_server.cpp
@@ -1,7 +1,7 @@
 #include <viam/sdk/components/private/board_server.hpp>
 
 #include <viam/sdk/common/exception.hpp>
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/board.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/camera_server.cpp b/src/viam/sdk/components/private/camera_server.cpp
@@ -3,7 +3,7 @@
 #include <google/protobuf/util/time_util.h>
 #include <grpcpp/support/status.h>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/camera.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/encoder_server.cpp b/src/viam/sdk/components/private/encoder_server.cpp
@@ -1,7 +1,7 @@
 #include <viam/sdk/components/private/encoder_server.hpp>
 
 #include <viam/sdk/common/exception.hpp>
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/encoder.hpp>
 #include <viam/sdk/components/private/encoder.hpp>
diff --git a/src/viam/sdk/components/private/gantry_server.cpp b/src/viam/sdk/components/private/gantry_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/gantry_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 
 namespace viam {
 namespace sdk {
diff --git a/src/viam/sdk/components/private/generic_server.cpp b/src/viam/sdk/components/private/generic_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/generic_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/components/generic.hpp>
 #include <viam/sdk/rpc/server.hpp>
 
diff --git a/src/viam/sdk/components/private/gripper_server.cpp b/src/viam/sdk/components/private/gripper_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/gripper_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 
 namespace viam {
 namespace sdk {
diff --git a/src/viam/sdk/components/private/motor_server.cpp b/src/viam/sdk/components/private/motor_server.cpp
@@ -1,7 +1,7 @@
 #include <viam/sdk/components/private/motor_server.hpp>
 
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/proto_value.hpp>
-#include <viam/sdk/common/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/motor.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/movement_sensor_server.cpp b/src/viam/sdk/components/private/movement_sensor_server.cpp
@@ -1,7 +1,7 @@
 #include <viam/sdk/components/private/movement_sensor_server.hpp>
 
 #include <viam/sdk/common/linear_algebra.hpp>
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/movement_sensor.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/pose_tracker_server.cpp b/src/viam/sdk/components/private/pose_tracker_server.cpp
@@ -2,7 +2,7 @@
 
 #include <viam/api/component/posetracker/v1/pose_tracker.pb.h>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/pose_tracker.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/power_sensor_server.cpp b/src/viam/sdk/components/private/power_sensor_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/power_sensor_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/power_sensor.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/sensor_server.cpp b/src/viam/sdk/components/private/sensor_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/sensor_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/sensor.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/components/private/servo_server.cpp b/src/viam/sdk/components/private/servo_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/components/private/servo_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/components/servo.hpp>
 #include <viam/sdk/config/resource.hpp>
diff --git a/src/viam/sdk/services/private/generic_server.cpp b/src/viam/sdk/services/private/generic_server.cpp
@@ -1,6 +1,6 @@
 #include <viam/sdk/services/private/generic_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/rpc/server.hpp>
 #include <viam/sdk/services/generic.hpp>
 
diff --git a/src/viam/sdk/services/private/mlmodel_server.cpp b/src/viam/sdk/services/private/mlmodel_server.cpp
@@ -14,7 +14,7 @@
 
 #include <viam/sdk/services/private/mlmodel_server.hpp>
 
-#include <viam/sdk/common/service_helper.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/rpc/server.hpp>
 #include <viam/sdk/services/mlmodel.hpp>
 #include <viam/sdk/services/private/mlmodel.hpp>
diff --git a/src/viam/sdk/services/private/motion_server.cpp b/src/viam/sdk/services/private/motion_server.cpp
@@ -5,8 +5,8 @@
 #include <viam/sdk/common/exception.hpp>
 #include <viam/sdk/common/pose.hpp>
 #include <viam/sdk/common/private/repeated_ptr_convert.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/proto_value.hpp>
-#include <viam/sdk/common/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/services/motion.hpp>
 #include <viam/sdk/services/private/motion_server.hpp>
diff --git a/src/viam/sdk/services/private/navigation_server.cpp b/src/viam/sdk/services/private/navigation_server.cpp
@@ -4,8 +4,8 @@
 
 #include <viam/sdk/common/pose.hpp>
 #include <viam/sdk/common/private/repeated_ptr_convert.hpp>
+#include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/proto_value.hpp>
-#include <viam/sdk/common/service_helper.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/services/motion.hpp>
 #include <viam/sdk/services/private/navigation_server.hpp>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <viam/sdk/common/service_helper.hpp>`
	`1`	`+#include <viam/sdk/common/private/service_helper.hpp>`
`2`	`2`
`3`	`3`	`#include <sstream>`
`4`	`4`