Moving member variable _connection up into base class ArduinoIoTCloud since it does exist in both LPWAN and TCP cloud classes

Author: aentinger

src/ArduinoIoTCloud.h

@@ -25,8 +25,9 @@
 #include <ArduinoIoTCloud_Defines.h>
 
 #include <ArduinoCloudThing.h>
-
+#include <Arduino_ConnectionHandler.h>
 #include <Arduino_DebugUtils.h>
+
 #include "types/CloudWrapperBool.h"
 #include "types/CloudWrapperFloat.h"
 #include "types/CloudWrapperInt.h"
@@ -91,6 +92,8 @@ class ArduinoIoTCloudClass
     inline void     setDeviveId(String const device_id) { _device_id = device_id; };
     inline String & getDeviceId()                       { return _device_id; };
 
+    inline ConnectionHandler * getConnection()          { return _connection; }
+
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
 #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
@@ -133,9 +136,9 @@ class ArduinoIoTCloudClass
 
     inline ArduinoIoTConnectionStatus getIoTStatus() { return _iotStatus; }
 
-    ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
-
+    ConnectionHandler * _connection = nullptr;
     ArduinoCloudThing _thing;
+    ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
 
            void execCloudEventCallback(ArduinoIoTCloudEvent const event);
     static void printConnectionStatus(ArduinoIoTConnectionStatus status);

src/ArduinoIoTCloudLPWAN.cpp

@@ -29,8 +29,13 @@
    CTOR/DTOR
  ******************************************************************************/
 
-ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN() :
-  _connection(NULL) {}
+ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()
+: _retryEnable{false}
+, _maxNumRetry{5}
+, _intervalRetry{1000}
+{
+
+}
 
 /******************************************************************************
  * PUBLIC MEMBER FUNCTIONS
@@ -55,8 +60,6 @@ int ArduinoIoTCloudLPWAN::connected() {
 int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry) {
   _connection = &connection;
   _retryEnable = retry;
-  _maxNumRetry = 5;
-  _intervalRetry = 1000;
   _thing.begin();
   return 1;
 }
@@ -77,14 +80,8 @@ void ArduinoIoTCloudLPWAN::update() {
     _thing.decode(msgBuf, sizeof(msgBuf));
   }
 
-
-
-
   sendPropertiesToCloud();
-
-
   execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
-
 }
 
 ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
@@ -156,7 +153,6 @@ void ArduinoIoTCloudLPWAN::printDebugInfo() {
   Debug.print(DBG_INFO, "***** Arduino IoT Cloud LPWAN- configuration info *****");
   Debug.print(DBG_INFO, "Device ID: %s", getDeviceId().c_str());
   Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
-
 }
 
 

src/ArduinoIoTCloudLPWAN.h

@@ -23,7 +23,6 @@
  ******************************************************************************/
 
 #include <ArduinoIoTCloud.h>
-#include <Arduino_ConnectionHandler.h>
 
 /******************************************************************************
    CONSTANTS
@@ -49,9 +48,7 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
 
     ArduinoIoTConnectionStatus connectionCheck();
     int begin(ConnectionHandler& connection, bool retry = false);
-    inline ConnectionHandler* getConnection() {
-      return _connection;
-    }
+
     bool isRetryEnabled() {
       return _retryEnable;
     }
@@ -80,7 +77,6 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
     int writeProperties(const byte data[], int length);
 
   private:
-    ConnectionHandler* _connection;
     void sendPropertiesToCloud();
     bool _retryEnable;
     int _maxNumRetry;

src/ArduinoIoTCloudTCP.cpp

@@ -57,7 +57,6 @@ static unsigned long getTime() {
  ******************************************************************************/
 
 ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
-  _connection(NULL),
   _lastSyncRequestTickTime{0},
   _mqtt_data_buf{0},
   _mqtt_data_len{0},

src/ArduinoIoTCloudTCP.h

@@ -23,7 +23,6 @@
  ******************************************************************************/
 
 #include <ArduinoIoTCloud.h>
-#include <Arduino_ConnectionHandler.h>
 
 #ifdef BOARD_HAS_ECCX08
   #include <ArduinoBearSSL.h>
@@ -79,10 +78,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     }
     #endif
 
-    inline ConnectionHandler * getConnection() {
-      return _connection;
-    }
-
     String getBrokerAddress() {
       return _brokerAddress;
     }
@@ -96,7 +91,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     friend class CloudSerialClass;
 
   private:
-    ConnectionHandler * _connection;
     int _lastSyncRequestTickTime;
     String _brokerAddress;
     uint16_t _brokerPort;