Rename rcljava_common cpp headers to have .hpp suffix (#93)

jacobperron · esteve · web-flow · commit 941af4d1dbd4 · 2020-03-18T16:41:47.000+01:00
* Fix service and action interface generation

Before, we were not generating code for the messages and services that make up service and action
interfaces.

Due to issues with duplicate definitions caused by instantiating the msg.cpp.em template
multiple times, I've opted to generate separate files for each service, action, and the interfaces
that they are made of. This is similar to what we are doing with the generated Java code.

I've added a test confirming that generated service code can be used. Adding a test for actions is
difficult at the moment due to a circular dependency with action_msgs.

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Add missing header include

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Rename top level generated cpp file

This avoids name clashing with other generated files. Similar to what we do with generated Java files.

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Fix JNI name mangling function so it works for service and action subtypes

For example, 'example_interfaces/srv/AddTwoInts_Request' should be mangled to 'example_1interfaces_srv_AddTwoInts_1Request'.

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Remove vestigal references to jni_package_name

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Add comment about action and service headers

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Simplify include logic

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Rename cpp headers to have .hpp suffix

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

* Update files to reflect new header suffix

This resolves a cppcheck linter error complaining about "is invalid C code".
Changing the suffix causes cppcheck to treat the files as C++ code.

Signed-off-by: Jacob Perron &lt;jacob@openrobotics.org&gt;

Co-authored-by: Esteve Fernandez &lt;esteve@apache.org&gt;
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_RCLJava.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_RCLJava.cpp
@@ -25,8 +25,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_RCLJava.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_Time.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_Time.cpp
@@ -19,7 +19,7 @@
 #include "rcl/error_handling.h"
 #include "rcl/rcl.h"
 
-#include "rcljava_common/exceptions.h"
+#include "rcljava_common/exceptions.hpp"
 
 #include "org_ros2_rcljava_Time.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_client_ClientImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_client_ClientImpl.cpp
@@ -24,8 +24,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_client_ClientImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_contexts_ContextImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_contexts_ContextImpl.cpp
@@ -20,8 +20,8 @@
 #include "rcl/error_handling.h"
 #include "rcl/init.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_contexts_ContextImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_executors_BaseExecutor.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_executors_BaseExecutor.cpp
@@ -25,8 +25,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_executors_BaseExecutor.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp
@@ -24,8 +24,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_node_NodeImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_publisher_PublisherImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_publisher_PublisherImpl.cpp
@@ -24,8 +24,8 @@
 #include "rcl/rcl.h"
 #include "rmw/rmw.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_publisher_PublisherImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_service_ServiceImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_service_ServiceImpl.cpp
@@ -24,8 +24,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_service_ServiceImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_subscription_SubscriptionImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_subscription_SubscriptionImpl.cpp
@@ -24,8 +24,8 @@
 #include "rmw/rmw.h"
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_subscription_SubscriptionImpl.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_time_Clock.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_time_Clock.cpp
@@ -20,8 +20,8 @@
 #include "rcl/error_handling.h"
 #include "rcl/time.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_time_Clock.h"
 
diff --git a/rcljava/src/main/cpp/org_ros2_rcljava_timer_WallTimerImpl.cpp b/rcljava/src/main/cpp/org_ros2_rcljava_timer_WallTimerImpl.cpp
@@ -24,8 +24,8 @@
 #include "rcl/rcl.h"
 #include "rmw/rmw.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 #include "org_ros2_rcljava_timer_WallTimerImpl.h"
 
diff --git a/rcljava_common/include/rcljava_common/exceptions.hpp b/rcljava_common/include/rcljava_common/exceptions.hpp
@@ -11,13 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef RCLJAVA_COMMON__EXCEPTIONS_H_
-#define RCLJAVA_COMMON__EXCEPTIONS_H_
+#ifndef RCLJAVA_COMMON__EXCEPTIONS_HPP_
+#define RCLJAVA_COMMON__EXCEPTIONS_HPP_
 #include <jni.h>
 
 #include <string>
 
-#include "rcljava_common/visibility_control.h"
+#include "rcljava_common/visibility_control.hpp"
 
 namespace rcljava_common
 {
@@ -31,4 +31,4 @@ void rcljava_throw_exception(JNIEnv *, const char *, const std::string &);
 }  // namespace exceptions
 }  // namespace rcljava_common
 
-#endif  // RCLJAVA_COMMON__EXCEPTIONS_H_
+#endif  // RCLJAVA_COMMON__EXCEPTIONS_HPP_
diff --git a/rcljava_common/include/rcljava_common/signatures.hpp b/rcljava_common/include/rcljava_common/signatures.hpp
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef RCLJAVA_COMMON__SIGNATURES_H_
-#define RCLJAVA_COMMON__SIGNATURES_H_
+#ifndef RCLJAVA_COMMON__SIGNATURES_HPP_
+#define RCLJAVA_COMMON__SIGNATURES_HPP_
 #include <jni.h>
 
 #include <string>
@@ -29,4 +29,4 @@ using destroy_ros_message_signature = void (*)(void *);
 }  // namespace signatures
 }  // namespace rcljava_common
 
-#endif  // RCLJAVA_COMMON__SIGNATURES_H_
+#endif  // RCLJAVA_COMMON__SIGNATURES_HPP_
diff --git a/rcljava_common/include/rcljava_common/visibility_control.hpp b/rcljava_common/include/rcljava_common/visibility_control.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
-#define RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
+#ifndef RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_
+#define RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_
 
 #ifdef __cplusplus
 extern "C"
@@ -55,4 +55,4 @@ extern "C"
 }
 #endif
 
-#endif  // RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
+#endif  // RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_
diff --git a/rcljava_common/src/main/cpp/rcljava_common.cpp b/rcljava_common/src/main/cpp/rcljava_common.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include <string>
 
-#include "rcljava_common/exceptions.h"
+#include "rcljava_common/exceptions.hpp"
 
 namespace rcljava_common
 {
diff --git a/rosidl_generator_java/resource/msg.cpp.em b/rosidl_generator_java/resource/msg.cpp.em
@@ -102,8 +102,8 @@ elif message_c_include_prefix.endswith('__feedback'):
 
 #include "rosidl_generator_c/message_type_support_struct.h"
 
-#include "rcljava_common/exceptions.h"
-#include "rcljava_common/signatures.h"
+#include "rcljava_common/exceptions.hpp"
+#include "rcljava_common/signatures.hpp"
 
 @[for include in member_includes]@
 #include "@(include)"
