Turning _thing_id into a private member variable

Author: aentinger

src/ArduinoIoTCloud.h

@@ -131,7 +131,6 @@ class ArduinoIoTCloudClass
     inline ArduinoIoTConnectionStatus getIoTStatus() { return _iotStatus; }
 
     String _device_id = "";
-    String _thing_id = "";
 
     ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
     ArduinoIoTSynchronizationStatus _syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
@@ -146,6 +145,10 @@ class ArduinoIoTCloudClass
 
     static void execCloudEventCallback(OnCloudEventCallback & callback, void * callback_arg);
     static void printConnectionStatus(ArduinoIoTConnectionStatus status);
+
+  private:
+
+    String _thing_id = "";
 };
 
 #ifdef HAS_TCP

src/ArduinoIoTCloudTCP.h

@@ -121,10 +121,10 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
 
     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"); }
+    inline String getTopic_shadowout() const { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/o"); }
+    inline String getTopic_shadowin () const { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/i"); }
+    inline String getTopic_dataout  () const { return ( getThingId().length() == 0) ? String("/a/d/" + _device_id + "/e/o") : String("/a/t/" + getThingId() + "/e/o"); }
+    inline String getTopic_datain   () const { return ( getThingId().length() == 0) ? String("/a/d/" + _device_id + "/e/i") : String("/a/t/" + getThingId() + "/e/i"); }
 
     static void onMessage(int length);
     void handleMessage(int length);