rename

Signed-off-by: Chen Lihui <[email protected]>
ros2 · Oct 26, 2021 · 614e6f6 · 614e6f6
1 parent 7c75adc
commit 614e6f6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/rclcpp/include/rclcpp/subscription_base.hpp b/rclcpp/include/rclcpp/subscription_base.hpp
@@ -303,7 +303,7 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
   RCLCPP_PUBLIC
   virtual
   void
-  set_cft_expression_parameters(
+  set_content_filter(
     const std::string & filter_expression,
     const std::vector<std::string> & expression_parameters = {});
 
@@ -317,7 +317,7 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
   RCLCPP_PUBLIC
   virtual
   void
-  get_cft_expression_parameters(
+  get_content_filter(
     std::string & filter_expression,
     std::vector<std::string> & expression_parameters) const;
 

diff --git a/rclcpp/include/rclcpp/subscription_options.hpp b/rclcpp/include/rclcpp/subscription_options.hpp
@@ -141,14 +141,14 @@ struct SubscriptionOptionsWithAllocator : public SubscriptionOptionsBase
     if (!content_filter_options.filter_expression.empty()) {
       std::vector<const char *> cstrings =
         get_c_vector_string(content_filter_options.expression_parameters);
-      rcl_ret_t ret = rcl_subscription_options_set_content_filtered_topic_options(
+      rcl_ret_t ret = rcl_subscription_options_set_content_filter_options(
         get_c_string(content_filter_options.filter_expression),
         cstrings.size(),
         cstrings.data(),
         &result);
       if (RCL_RET_OK != ret) {
         rclcpp::exceptions::throw_from_rcl_error(
-          ret, "failed to set content_filtered_topic_options");
+          ret, "failed to set content_filter_options");
       }
     }
 

diff --git a/rclcpp/src/rclcpp/subscription_base.cpp b/rclcpp/src/rclcpp/subscription_base.cpp
@@ -336,16 +336,16 @@ SubscriptionBase::is_cft_enabled() const
 }
 
 void
-SubscriptionBase::set_cft_expression_parameters(
+SubscriptionBase::set_content_filter(
   const std::string & filter_expression,
   const std::vector<std::string> & expression_parameters)
 {
-  rcl_subscription_content_filtered_topic_options_t options =
-    rcl_subscription_get_default_content_filtered_topic_options();
+  rcl_subscription_content_filter_options_t options =
+    rcl_subscription_get_default_content_filter_options();
 
   std::vector<const char *> cstrings =
     get_c_vector_string(expression_parameters);
-  rcl_ret_t ret = rcl_subscription_content_filtered_topic_options_init(
+  rcl_ret_t ret = rcl_subscription_content_filter_options_init(
     get_c_string(filter_expression),
     cstrings.size(),
     cstrings.data(),
@@ -356,7 +356,7 @@ SubscriptionBase::set_cft_expression_parameters(
   }
   RCPPUTILS_SCOPE_EXIT(
   {
-    rcl_ret_t ret = rcl_subscription_content_filtered_topic_options_fini(&options);
+    rcl_ret_t ret = rcl_subscription_content_filter_options_fini(&options);
     if (RCL_RET_OK != ret) {
       RCLCPP_ERROR(
         rclcpp::get_logger("rclcpp"),
@@ -366,7 +366,7 @@ SubscriptionBase::set_cft_expression_parameters(
     }
   });
 
-  ret = rcl_subscription_set_cft_expression_parameters(
+  ret = rcl_subscription_set_content_filter(
     subscription_handle_.get(),
     &options);
 
@@ -376,15 +376,15 @@ SubscriptionBase::set_cft_expression_parameters(
 }
 
 void
-SubscriptionBase::get_cft_expression_parameters(
+SubscriptionBase::get_content_filter(
   std::string & filter_expression,
   std::vector<std::string> & expression_parameters) const
 {
-  rcl_subscription_content_filtered_topic_options_t options =
-    rcl_subscription_get_default_content_filtered_topic_options();
+  rcl_subscription_content_filter_options_t options =
+    rcl_subscription_get_default_content_filter_options();
 
-  // use rcl_content_filtered_topic_options_t instead of char * and
-  rcl_ret_t ret = rcl_subscription_get_cft_expression_parameters(
+  // use rcl_content_filter_options_t instead of char * and
+  rcl_ret_t ret = rcl_subscription_get_content_filter(
     subscription_handle_.get(),
     &options);
 
@@ -394,7 +394,7 @@ SubscriptionBase::get_cft_expression_parameters(
 
   RCPPUTILS_SCOPE_EXIT(
   {
-    rcl_ret_t ret = rcl_subscription_content_filtered_topic_options_fini(&options);
+    rcl_ret_t ret = rcl_subscription_content_filter_options_fini(&options);
     if (RCL_RET_OK != ret) {
       RCLCPP_ERROR(
         rclcpp::get_logger("rclcpp"),
@@ -404,16 +404,16 @@ SubscriptionBase::get_cft_expression_parameters(
     }
   });
 
-  rmw_subscription_content_filtered_topic_options_t * content_filtered_topic_options =
-    options.rmw_subscription_content_filtered_topic_options;
-  if (content_filtered_topic_options->filter_expression) {
-    filter_expression = content_filtered_topic_options->filter_expression;
+  rmw_subscription_content_filter_options_t * content_filter_options =
+    options.rmw_subscription_content_filter_options;
+  if (content_filter_options->filter_expression) {
+    filter_expression = content_filter_options->filter_expression;
   }
 
-  if (content_filtered_topic_options->expression_parameters) {
-    for (size_t i = 0; i < content_filtered_topic_options->expression_parameters->size; ++i) {
+  if (content_filter_options->expression_parameters) {
+    for (size_t i = 0; i < content_filter_options->expression_parameters->size; ++i) {
       expression_parameters.push_back(
-        content_filtered_topic_options->expression_parameters->data[i]);
+        content_filter_options->expression_parameters->data[i]);
     }
   }
 }
diff --git a/rclcpp/test/rclcpp/CMakeLists.txt b/rclcpp/test/rclcpp/CMakeLists.txt
@@ -740,14 +740,14 @@ if(TARGET test_graph_listener)
   target_link_libraries(test_graph_listener ${PROJECT_NAME} mimick)
 endif()
 
-ament_add_gtest(test_subscription_content_filtered_topic test_subscription_content_filtered_topic.cpp)
-if(TARGET test_subscription_content_filtered_topic)
-  ament_target_dependencies(test_subscription_content_filtered_topic
+ament_add_gtest(test_subscription_content_filter test_subscription_content_filter.cpp)
+if(TARGET test_subscription_content_filter)
+  ament_target_dependencies(test_subscription_content_filter
     "rcl_interfaces"
     "rmw"
     "rosidl_runtime_cpp"
     "rosidl_typesupport_cpp"
     "test_msgs"
   )
-  target_link_libraries(test_subscription_content_filtered_topic ${PROJECT_NAME} mimick)
+  target_link_libraries(test_subscription_content_filter ${PROJECT_NAME} mimick)
 endif()
diff --git a/...t_subscription_content_filtered_topic.cpp → ...lcpp/test_subscription_content_filter.cpp b/...t_subscription_content_filtered_topic.cpp → ...lcpp/test_subscription_content_filter.cpp
@@ -81,24 +81,24 @@ TEST_F(TestCftSubscription, is_cft_enabled) {
   }
 }
 
-TEST_F(TestCftSubscription, get_cft_expression_parameters_error) {
+TEST_F(TestCftSubscription, get_content_filter_error) {
   auto mock = mocking_utils::patch_and_return(
-    "lib:rclcpp", rcl_subscription_get_cft_expression_parameters, RCL_RET_ERROR);
+    "lib:rclcpp", rcl_subscription_get_content_filter, RCL_RET_ERROR);
 
   std::string filter_expression;
   std::vector<std::string> expression_parameters;
   EXPECT_THROW(
-    sub->get_cft_expression_parameters(filter_expression, expression_parameters),
+    sub->get_content_filter(filter_expression, expression_parameters),
     rclcpp::exceptions::RCLError);
 }
 
-TEST_F(TestCftSubscription, set_cft_expression_parameters_error) {
+TEST_F(TestCftSubscription, set_content_filter_error) {
   auto mock = mocking_utils::patch_and_return(
-    "lib:rclcpp", rcl_subscription_set_cft_expression_parameters, RCL_RET_ERROR);
+    "lib:rclcpp", rcl_subscription_set_content_filter, RCL_RET_ERROR);
 
   std::string filter_expression = "int32_value = %0";
   std::string expression_parameter = "100";
   EXPECT_THROW(
-    sub->set_cft_expression_parameters(filter_expression, {expression_parameter}),
+    sub->set_content_filter(filter_expression, {expression_parameter}),
     rclcpp::exceptions::RCLError);
 }