Moving protected functions to be private since there is no need for them to be protected

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -122,29 +122,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
   return 1;
 }
 
-// private class method used to initialize mqttClient class member. (called in the begin class method)
-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";
-  }
-
-  // use onMessage as callback for received mqtt messages
-  _mqttClient->onMessage(ArduinoIoTCloudTCP::onMessage);
-  _mqttClient->setKeepAliveInterval(30 * 1000);
-  _mqttClient->setConnectionTimeout(1500);
-  _mqttClient->setId(_device_id.c_str());
-}
-
-
 int ArduinoIoTCloudTCP::connect() {
 
   if (!_mqttClient->connect(_brokerAddress.c_str(), _brokerPort)) {
@@ -230,54 +207,6 @@ int ArduinoIoTCloudTCP::connected() {
   return _mqttClient->connected();
 }
 
-int ArduinoIoTCloudTCP::writeProperties(const byte data[], int length) {
-  if (!_mqttClient->beginMessage(_dataTopicOut, length, false, 0)) {
-    return 0;
-  }
-
-  if (!_mqttClient->write(data, length)) {
-    return 0;
-  }
-
-  if (!_mqttClient->endMessage()) {
-    return 0;
-  }
-
-  return 1;
-}
-
-int ArduinoIoTCloudTCP::writeStdout(const byte data[], int length) {
-  if (!_mqttClient->beginMessage(_stdoutTopic, length, false, 0)) {
-    return 0;
-  }
-
-  if (!_mqttClient->write(data, length)) {
-    return 0;
-  }
-
-  if (!_mqttClient->endMessage()) {
-    return 0;
-  }
-
-  return 1;
-}
-
-int ArduinoIoTCloudTCP::writeShadowOut(const byte data[], int length) {
-  if (!_mqttClient->beginMessage(_shadowTopicOut, length, false, 0)) {
-    return 0;
-  }
-
-  if (!_mqttClient->write(data, length)) {
-    return 0;
-  }
-
-  if (!_mqttClient->endMessage()) {
-    return 0;
-  }
-
-  return 1;
-}
-
 /******************************************************************************
  * PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
@@ -404,6 +333,75 @@ 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";
+  }
+
+  // use onMessage as callback for received mqtt messages
+  _mqttClient->onMessage(ArduinoIoTCloudTCP::onMessage);
+  _mqttClient->setKeepAliveInterval(30 * 1000);
+  _mqttClient->setConnectionTimeout(1500);
+  _mqttClient->setId(_device_id.c_str());
+}
+
+int ArduinoIoTCloudTCP::writeProperties(const byte data[], int length) {
+  if (!_mqttClient->beginMessage(_dataTopicOut, length, false, 0)) {
+    return 0;
+  }
+
+  if (!_mqttClient->write(data, length)) {
+    return 0;
+  }
+
+  if (!_mqttClient->endMessage()) {
+    return 0;
+  }
+
+  return 1;
+}
+
+int ArduinoIoTCloudTCP::writeStdout(const byte data[], int length) {
+  if (!_mqttClient->beginMessage(_stdoutTopic, length, false, 0)) {
+    return 0;
+  }
+
+  if (!_mqttClient->write(data, length)) {
+    return 0;
+  }
+
+  if (!_mqttClient->endMessage()) {
+    return 0;
+  }
+
+  return 1;
+}
+
+int ArduinoIoTCloudTCP::writeShadowOut(const byte data[], int length) {
+  if (!_mqttClient->beginMessage(_shadowTopicOut, length, false, 0)) {
+    return 0;
+  }
+
+  if (!_mqttClient->write(data, length)) {
+    return 0;
+  }
+
+  if (!_mqttClient->endMessage()) {
+    return 0;
+  }
+
+  return 1;
+}
+
 /******************************************************************************
  * EXTERN DEFINITION
  ******************************************************************************/

src/ArduinoIoTCloudTCP.h

@@ -91,18 +91,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     // Clean up existing Mqtt connection, create a new one and initialize it
     int reconnect();
 
-  protected:
     friend class CloudSerialClass;
-    // Used to initialize MQTTClient
-    void mqttClientBegin();
-    // Function in charge of perform MQTT reconnection, basing on class parameters(retries,and timeout)
-    bool mqttReconnect(int const maxRetries, int const timeout);
-    // Used to retrieve last values from _shadowTopicIn
-    int writeStdout(const byte data[], int length);
-    int writeProperties(const byte data[], int length);
-    int writeShadowOut(const byte data[], int length);
-
-    void requestLastValue();
 
   private:
     ConnectionHandler * _connection;
@@ -132,12 +121,16 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     String _otaTopic;
 
     static void onMessage(int length);
-
     void handleMessage(int length);
-
     void sendPropertiesToCloud();
+    void requestLastValue();
     NetworkConnectionState checkPhyConnection();
     ArduinoIoTConnectionStatus checkCloudConnection();
+    void mqttClientBegin();
+    bool mqttReconnect(int const maxRetries, int const timeout);
+    int writeStdout(const byte data[], int length);
+    int writeProperties(const byte data[], int length);
+    int writeShadowOut(const byte data[], int length);
 };
 
 /******************************************************************************