code review fixes.

Author: dmbuck32

mqtt_client/CMakeLists.txt

@@ -15,10 +15,10 @@ if(${ROS_VERSION} EQUAL 2)
 
   find_package(ament_cmake REQUIRED)
 
+  find_package(fmt REQUIRED)
   find_package(mqtt_client_interfaces REQUIRED)
   find_package(rclcpp REQUIRED)
   find_package(std_msgs REQUIRED)
-  find_package(fmt REQUIRED)
 
   # Paho MQTT C++ apt package doesn't include CMake config
   # find_package(PahoMqttCpp REQUIRED)
@@ -37,10 +37,10 @@ if(${ROS_VERSION} EQUAL 2)
   )
 
   ament_target_dependencies(${PROJECT_NAME}
+    fmt
     mqtt_client_interfaces
     rclcpp
     std_msgs
-    fmt
   )
 
   install(TARGETS
@@ -84,9 +84,9 @@ elseif(${ROS_VERSION} EQUAL 1)
     mqtt_client_interfaces
     nodelet
     roscpp
+    rosfmt ## For fmt::format.
     std_msgs
     topic_tools
-    rosfmt ## For fmt::format.
   )
 
   ## System dependencies are found with CMake's conventions

mqtt_client/include/mqtt_client/MqttClient.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #include <map>
 #include <memory>
 #include <string>
-#include <rosfmt/full.h> // fmt::format, fmt::join
 
-#include <mqtt/async_client.h>
 #include <mqtt_client_interfaces/IsConnected.h>
+#include <mqtt/async_client.h>
 #include <nodelet/nodelet.h>
 #include <ros/ros.h>
+#include <rosfmt/full.h> // fmt::format, fmt::join
 #include <topic_tools/shape_shifter.h>
 
 
@@ -364,7 +364,7 @@ class MqttClient : public nodelet::Nodelet,
       std::filesystem::path certificate;    ///< client certificate
       std::filesystem::path key;            ///< client private keyfile
       std::string password;                 ///< decryption password for private key
-      int version;                          ///< TLS version
+      int version;                          ///< TLS version (https://github.com/eclipse/paho.mqtt.cpp/blob/master/src/mqtt/ssl_options.h#L305)
       bool verify;                          ///< Verify the client should conduct
                                             ///< post-connect checks
       std::vector<std::string> alpn_protos; ///< list of ALPN protocols

mqtt_client/include/mqtt_client/MqttClient.ros2.hpp

@@ -31,11 +31,11 @@ SOFTWARE.
 #include <map>
 #include <memory>
 #include <string>
+
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
-
-#include <mqtt/async_client.h>
 #include <mqtt_client_interfaces/srv/is_connected.hpp>
+#include <mqtt/async_client.h>
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp/serialization.hpp>
 #include <std_msgs/msg/float64.hpp>
@@ -356,7 +356,7 @@ class MqttClient : public rclcpp::Node,
       std::filesystem::path certificate;    ///< client certificate
       std::filesystem::path key;            ///< client private keyfile
       std::string password;                 ///< decryption password for private key
-      int version;                          ///< TLS version
+      int version;                          ///< TLS version (https://github.com/eclipse/paho.mqtt.cpp/blob/master/src/mqtt/ssl_options.h#L305)
       bool verify;                          ///< Verify the client should conduct
                                             ///< post-connect checks
       std::vector<std::string> alpn_protos; ///< list of ALPN protocols

mqtt_client/package.xml

@@ -23,19 +23,19 @@
 
   <!-- ROS2 -->
   <buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
+  <depend condition="$ROS_VERSION == 2">fmt</depend>
   <depend condition="$ROS_VERSION == 2">libpaho-mqtt-dev</depend>
   <depend condition="$ROS_VERSION == 2">libpaho-mqttpp-dev</depend>
   <depend condition="$ROS_VERSION == 2">rclcpp</depend>
   <depend condition="$ROS_VERSION == 2">rcpputils</depend>
-  <depend condition="$ROS_VERSION == 2">fmt</depend>
 
   <!-- ROS1 -->
   <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
   <depend condition="$ROS_VERSION == 1">nodelet</depend>
   <depend condition="$ROS_VERSION == 1">paho-mqtt-cpp</depend>
   <depend condition="$ROS_VERSION == 1">roscpp</depend>
-  <depend condition="$ROS_VERSION == 1">topic_tools</depend>
   <depend condition="$ROS_VERSION == 1">rosfmt</depend> <!-- Needed for fmt library. -->
+  <depend condition="$ROS_VERSION == 1">topic_tools</depend>
 
   <export>
     <build_type condition="$ROS_VERSION == 1">catkin</build_type>