Refector topic string creation into small inline methods

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -71,8 +71,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
   _shadowTopicOut(""),
   _shadowTopicIn(""),
   _dataTopicOut(""),
-  _dataTopicIn(""),
-  _otaTopic("")
+  _dataTopicIn("")
 {}
 
 ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP() {
@@ -118,7 +117,12 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
   _mqttClient->setConnectionTimeout(1500);
   _mqttClient->setId(_device_id.c_str());
 
-  mqttClientBegin();
+  _stdinTopic     = getTopic_stdin();
+  _stdoutTopic    = getTopic_stdout();
+  _shadowTopicOut = getTopic_shadowout();
+  _shadowTopicIn  = getTopic_shadowin();
+  _dataTopicOut   = getTopic_dataout();
+  _dataTopicIn    = getTopic_datain();
 
   Thing.begin();
   Thing.registerGetTimeCallbackFunc(getTime);
@@ -336,21 +340,6 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
   return _iotStatus;
 }
 
-void ArduinoIoTCloudTCP::mqttClientBegin() {
-  // MQTT topics definition
-  _stdoutTopic = "/a/d/" + _device_id + "/s/o";
-  _stdinTopic = "/a/d/" + _device_id + "/s/i";
-  if (_thing_id == "") {
-    _dataTopicIn = "/a/d/" + _device_id + "/e/i";
-    _dataTopicOut = "/a/d/" + _device_id + "/e/o";
-  } else {
-    _dataTopicIn = "/a/t/" + _thing_id + "/e/i";
-    _dataTopicOut = "/a/t/" + _thing_id + "/e/o";
-    _shadowTopicIn = "/a/t/" + _thing_id + "/shadow/i";
-    _shadowTopicOut = "/a/t/" + _thing_id + "/shadow/o";
-  }
-}
-
 int ArduinoIoTCloudTCP::writeProperties(const byte data[], int length) {
   if (!_mqttClient->beginMessage(_dataTopicOut, length, false, 0)) {
     return 0;

src/ArduinoIoTCloudTCP.h

@@ -118,15 +118,20 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     String _shadowTopicIn;
     String _dataTopicOut;
     String _dataTopicIn;
-    String _otaTopic;
+
+    inline String getTopic_stdin    () const { return String("/a/d/" + _device_id + "/s/i"); }
+    inline String getTopic_stdout   () const { return String("/a/d/" + _device_id + "/s/o"); }
+    inline String getTopic_shadowout() const { return (_thing_id.length() == 0) ? String("")                            : String("/a/t/" + _thing_id + "/shadow/o"); }
+    inline String getTopic_shadowin () const { return (_thing_id.length() == 0) ? String("")                            : String("/a/t/" + _thing_id + "/shadow/i"); }
+    inline String getTopic_dataout  () const { return (_thing_id.length() == 0) ? String("/a/d/" + _device_id + "/e/o") : String("/a/t/" + _thing_id + "/e/o"); }
+    inline String getTopic_datain   () const { return (_thing_id.length() == 0) ? String("/a/d/" + _device_id + "/e/i") : String("/a/t/" + _thing_id + "/e/i"); }
 
     static void onMessage(int length);
     void handleMessage(int length);
     void sendPropertiesToCloud();
     void requestLastValue();
     NetworkConnectionState checkPhyConnection();
     ArduinoIoTConnectionStatus checkCloudConnection();
-    void mqttClientBegin();
     int writeStdout(const byte data[], int length);
     int writeProperties(const byte data[], int length);
     int writeShadowOut(const byte data[], int length);