Changed topic namespacing in services and clients

minor style changes

Delete assign_partitions.hpp and removed anything related to partitons

re-adding avoid_ros_namespace_conventions check for prefixing names

Corrected indentation

Added vertical space between the headers

rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/reader_info.hpp

@@ -71,11 +71,6 @@ class ReaderInfo : public eprosima::fastrtps::rtps::ReaderListener
       }
     }
 
-    auto partition_str = std::string("");
-    // don't use std::accumulate - schlemiel O(n2)
-    for (const auto & partition : proxyData.m_qos.m_partition.getNames()) {
-      partition_str += partition;
-    }
     auto fqdn = proxyData.topicName();
 
     bool trigger = false;

rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/writer_info.hpp

@@ -69,12 +69,7 @@ class WriterInfo : public eprosima::fastrtps::rtps::ReaderListener
       }
     }
 
-    auto partition_str = std::string("");
-    // don't use std::accumulate - schlemiel O(n2)
-    for (const auto & partition : proxyData.m_qos.m_partition.getNames()) {
-      partition_str += partition;
-    }
-    auto fqdn =  proxyData.topicName();
+    auto fqdn = proxyData.topicName();
 
     bool trigger = false;
     mapmutex.lock();

rmw_fastrtps_cpp/src/rmw_client.cpp

@@ -23,7 +23,6 @@
 
 #include "rosidl_typesupport_introspection_c/identifier.h"
 
-#include "assign_partitions.hpp"
 #include "client_service_common.hpp"
 #include "rmw_fastrtps_cpp/identifier.hpp"
 #include "namespace_prefix.hpp"
@@ -129,43 +128,23 @@ rmw_create_client(
   subscriberParam.topic.topicDataType = response_type_name;
   subscriberParam.historyMemoryPolicy =
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  subscriberParam.topic.topicName = service_name;
-  // rcutils_ret_t ret = _assign_partitions_to_attributes(
-  //   service_name, ros_service_response_prefix,
-  //   qos_policies->avoid_ros_namespace_conventions, &subscriberParam);
-  // if (ret != RCUTILS_RET_OK) {
-  //   // error msg already set
-  //   goto fail;
-  // }
-
->>>>>>> removed the use of partitions, use the complete topic_name directly
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
+  } else {
+    subscriberParam.topic.topicName = service_name;
+  }
   subscriberParam.topic.topicName += "Reply";
 
   publisherParam.topic.topicKind = eprosima::fastrtps::rtps::NO_KEY;
   publisherParam.topic.topicDataType = request_type_name;
-<<<<<<< 698de9c022c7079351735c65e8a4e70c55b4900f
   publisherParam.qos.m_publishMode.kind = eprosima::fastrtps::ASYNCHRONOUS_PUBLISH_MODE;
   publisherParam.historyMemoryPolicy =
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  ret = _assign_partitions_to_attributes(
-    service_name, ros_service_requester_prefix,
-    qos_policies->avoid_ros_namespace_conventions, &publisherParam);
-  if (ret != RCUTILS_RET_OK) {
-    // error msg already set
-    goto fail;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
+  } else {
+    publisherParam.topic.topicName = service_name;
   }
-=======
-  publisherParam.qos.m_publishMode.kind = ASYNCHRONOUS_PUBLISH_MODE;
-  publisherParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  publisherParam.topic.topicName = service_name;
-  // ret = _assign_partitions_to_attributes(
-  //   service_name, ros_service_requester_prefix,
-  //   qos_policies->avoid_ros_namespace_conventions, &publisherParam);
-  // if (ret != RCUTILS_RET_OK) {
-  //   // error msg already set
-  //   goto fail;
-  // }
->>>>>>> removed the use of partitions, use the complete topic_name directly
   publisherParam.topic.topicName += "Request";
 
   RCUTILS_LOG_DEBUG_NAMED(
@@ -174,15 +153,9 @@ rmw_create_client(
   RCUTILS_LOG_DEBUG_NAMED(
     "rmw_fastrtps_cpp",
     "Sub Topic %s", subscriberParam.topic.topicName.c_str())
-  RCUTILS_LOG_DEBUG_NAMED(
-    "rmw_fastrtps_cpp",
-    "Sub Partition %s", subscriberParam.qos.m_partition.getNames()[0].c_str())
   RCUTILS_LOG_DEBUG_NAMED(
     "rmw_fastrtps_cpp",
     "Pub Topic %s", publisherParam.topic.topicName.c_str())
-  RCUTILS_LOG_DEBUG_NAMED(
-    "rmw_fastrtps_cpp",
-    "Pub Partition %s", publisherParam.qos.m_partition.getNames()[0].c_str())
   RCUTILS_LOG_DEBUG_NAMED("rmw_fastrtps_cpp", "***********")
 
   // Create Client Subscriber and set QoS

rmw_fastrtps_cpp/src/rmw_publisher.cpp

@@ -107,7 +107,11 @@ rmw_create_publisher(
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   publisherParam.topic.topicKind = eprosima::fastrtps::rtps::NO_KEY;
   publisherParam.topic.topicDataType = type_name;
-  publisherParam.topic.topicName = std::string(ros_topic_prefix)+topic_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
+  } else {
+    publisherParam.topic.topicName = topic_name;
+  }
 
 #if HAVE_SECURITY
   // see if our participant has a security property set

rmw_fastrtps_cpp/src/rmw_service.cpp

@@ -31,9 +31,9 @@
 #include "rmw/rmw.h"
 
 #include "rosidl_typesupport_introspection_cpp/identifier.hpp"
+
 #include "rosidl_typesupport_introspection_c/identifier.h"
 
-#include "assign_partitions.hpp"
 #include "client_service_common.hpp"
 #include "rmw_fastrtps_cpp/identifier.hpp"
 #include "namespace_prefix.hpp"
@@ -139,34 +139,23 @@ rmw_create_service(
   subscriberParam.historyMemoryPolicy =
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   subscriberParam.topic.topicDataType = request_type_name;
-  subscriberParam.topic.topicName = service_name;
-  // rcutils_ret_t ret = _assign_partitions_to_attributes(
-  //   service_name, ros_service_requester_prefix,
-  //   qos_policies->avoid_ros_namespace_conventions, &subscriberParam);
-  // if (ret != RCUTILS_RET_OK) {
-  //   // error msg already set
-  //   goto fail;
-  // }
-  // std::cout << "Direct print :" << std::endl;
-  // std::cout << service_name << std::endl;
-  // std::cout << "After Partition:" << std::endl;
-  // std::cout << subscriberParam.topic.topicName << std::endl;
-
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
+  } else {
+    subscriberParam.topic.topicName = service_name;
+  }
   subscriberParam.topic.topicName += "Request";
 
   publisherParam.topic.topicKind = eprosima::fastrtps::rtps::NO_KEY;
   publisherParam.topic.topicDataType = response_type_name;
   publisherParam.qos.m_publishMode.kind = eprosima::fastrtps::ASYNCHRONOUS_PUBLISH_MODE;
   publisherParam.historyMemoryPolicy =
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  publisherParam.topic.topicName = service_name;
-  // ret = _assign_partitions_to_attributes(
-  //   service_name, ros_service_response_prefix,
-  //   qos_policies->avoid_ros_namespace_conventions, &publisherParam);
-  // if (ret != RCUTILS_RET_OK) {
-  //   // error msg already set
-  //   goto fail;
-  // }
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
+  } else {
+    publisherParam.topic.topicName = service_name;
+  }
   publisherParam.topic.topicName += "Reply";
 
   RCUTILS_LOG_DEBUG_NAMED(
@@ -175,15 +164,9 @@ rmw_create_service(
   RCUTILS_LOG_DEBUG_NAMED(
     "rmw_fastrtps_cpp",
     "Sub Topic %s", subscriberParam.topic.topicName.c_str())
-  RCUTILS_LOG_DEBUG_NAMED(
-    "rmw_fastrtps_cpp",
-    "Sub Partition %s", subscriberParam.qos.m_partition.getNames()[0].c_str())
   RCUTILS_LOG_DEBUG_NAMED(
     "rmw_fastrtps_cpp",
     "Pub Topic %s", publisherParam.topic.topicName.c_str())
-  RCUTILS_LOG_DEBUG_NAMED(
-    "rmw_fastrtps_cpp",
-    "Pub Partition %s", publisherParam.qos.m_partition.getNames()[0].c_str())
   RCUTILS_LOG_DEBUG_NAMED("rmw_fastrtps_cpp", "***********")
 
   // Create Service Subscriber and set QoS

rmw_fastrtps_cpp/src/rmw_service_server_is_available.cpp

@@ -64,32 +64,14 @@ rmw_service_server_is_available(
 
   auto pub_topic_name =
     client_info->request_publisher_->getAttributes().topic.getTopicName();
-  auto pub_partitions =
-    client_info->request_publisher_->getAttributes().qos.m_partition.getNames();
-  // every rostopic has exactly 1 partition field set
-  if (pub_partitions.size() != 1) {
-    RCUTILS_LOG_ERROR_NAMED(
-      "rmw_fastrtps_cpp",
-      "Topic %s is not a ros topic", pub_topic_name.c_str())
-    RMW_SET_ERROR_MSG((std::string(pub_topic_name) + " is a non-ros topic\n").c_str());
-    return RMW_RET_ERROR;
-  }
-  auto pub_fqdn = pub_partitions[0] + "/" + pub_topic_name;
+
+  auto pub_fqdn = pub_topic_name;
   pub_fqdn = _demangle_if_ros_topic(pub_fqdn);
 
   auto sub_topic_name =
     client_info->response_subscriber_->getAttributes().topic.getTopicName();
-  auto sub_partitions =
-    client_info->response_subscriber_->getAttributes().qos.m_partition.getNames();
-  // every rostopic has exactly 1 partition field set
-  if (sub_partitions.size() != 1) {
-    RCUTILS_LOG_ERROR_NAMED(
-      "rmw_fastrtps_cpp",
-      "Topic %s is not a ros topic", pub_topic_name.c_str())
-    RMW_SET_ERROR_MSG((std::string(sub_topic_name) + " is a non-ros topic\n").c_str());
-    return RMW_RET_ERROR;
-  }
-  auto sub_fqdn = sub_partitions[0] + "/" + sub_topic_name;
+
+  auto sub_fqdn = sub_topic_name;
   sub_fqdn = _demangle_if_ros_topic(sub_fqdn);
 
   *is_available = false;

rmw_fastrtps_cpp/src/rmw_subscription.cpp

@@ -109,7 +109,11 @@ rmw_create_subscription(
     eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   subscriberParam.topic.topicKind = eprosima::fastrtps::rtps::NO_KEY;
   subscriberParam.topic.topicDataType = type_name;
-  subscriberParam.topic.topicName = std::string(ros_topic_prefix)+ topic_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
+  } else {
+    subscriberParam.topic.topicName = topic_name;
+  }
 
 #if HAVE_SECURITY
   // see if our subscriber has a security property set