Make ArduinoIoTCloudTimeService return a reference instead of a pointer

Author: pennam

extras/test/src/util/PropertyTestUtil.cpp

@@ -19,7 +19,7 @@ unsigned long getTime()
   return 0;
 }
 
-TimeService* ArduinoIoTCloudTimeService() {
+TimeService & ArduinoIoTCloudTimeService() {
   static TimeService _timeService_instance;
-  return &_timeService_instance;
+  return _timeService_instance;
 }

src/ArduinoIoTCloud.h

@@ -97,9 +97,9 @@ class ArduinoIoTCloudClass
 
     inline ConnectionHandler * getConnection()          { return _connection; }
 
-    inline unsigned long getInternalTime()              { return _time_service->getTime(); }
-    inline unsigned long getLocalTime()                 { return _time_service->getLocalTime(); }
-    inline void          updateInternalTimezoneInfo()   { _time_service->setTimeZoneData(_tz_offset, _tz_dst_until); }
+    inline unsigned long getInternalTime()              { return _time_service.getTime(); }
+    inline unsigned long getLocalTime()                 { return _time_service.getLocalTime(); }
+    inline void          updateInternalTimezoneInfo()   { _time_service.setTimeZoneData(_tz_offset, _tz_dst_until); }
 
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
@@ -147,7 +147,7 @@ class ArduinoIoTCloudClass
 
     ConnectionHandler * _connection = nullptr;
     PropertyContainer _property_container;
-    TimeService * _time_service = ArduinoIoTCloudTimeService();
+    TimeService & _time_service = ArduinoIoTCloudTimeService();
     int _tz_offset = 0;
     unsigned int _tz_dst_until = 0;
 

src/ArduinoIoTCloudLPWAN.cpp

@@ -68,7 +68,7 @@ int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)
 {
   _connection = &connection;
   _retryEnable = retry;
-  _time_service->begin(nullptr);
+  _time_service.begin(nullptr);
   return 1;
 }
 
@@ -105,7 +105,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()
 
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()
 {
-  unsigned long const internal_posix_time = _time_service->getTime();
+  unsigned long const internal_posix_time = _time_service.getTime();
   DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
   DEBUG_INFO("Connected to Arduino IoT Cloud");
   return State::Connected;

src/ArduinoIoTCloudTCP.cpp

@@ -115,7 +115,7 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_
   _connection = &connection;
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
-  _time_service->begin(&connection);
+  _time_service.begin(&connection);
   return begin(enable_watchdog, _brokerAddress, _brokerPort);
 }
 
@@ -371,7 +371,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SyncTime()
 {
-  unsigned long const internal_posix_time = _time_service->getTime();
+  unsigned long const internal_posix_time = _time_service.getTime();
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
   return State::ConnectMqttBroker;
 }
@@ -535,7 +535,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
     */
     sendPropertiesToCloud();
 
-    unsigned long const internal_posix_time = _time_service->getTime();
+    unsigned long const internal_posix_time = _time_service.getTime();
     if(internal_posix_time < _tz_dst_until) {
       return State::Connected;
     } else {
@@ -568,7 +568,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] last values received", __FUNCTION__, millis());
     CBORDecoder::decode(_property_container, (uint8_t*)bytes, length, true);
     sendPropertiesToCloud();
-    _time_service->setTimeZoneData(_tz_offset, _tz_dst_until);
+    _time_service.setTimeZoneData(_tz_offset, _tz_dst_until);
     execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
     _last_sync_request_cnt = 0;
     _last_sync_request_tick = 0;

src/property/types/CloudSchedule.h

@@ -115,7 +115,7 @@ class Schedule {
 
     bool isActive() {
 
-      ScheduleTimeType now = _schedule_time_service->getLocalTime();
+      ScheduleTimeType now = _schedule_time_service.getLocalTime();
 
       if(checkTimeValid(now)) {
         /* We have to wait RTC configuration and Timezone setting from the cloud */
@@ -201,7 +201,7 @@ class Schedule {
       return !(operator==(aSchedule));
     }
   private:
-    TimeService * _schedule_time_service = ArduinoIoTCloudTimeService();
+    TimeService & _schedule_time_service = ArduinoIoTCloudTimeService();
 
     ScheduleUnit getScheduleUnit(ScheduleConfigurationType msk) {
       return static_cast<ScheduleUnit>((msk & SCHEDULE_UNIT_MASK) >> SCHEDULE_UNIT_SHIFT);

src/utility/time/TimeService.cpp

@@ -268,7 +268,7 @@ time_t cvt_time(char const * time)
   return mktime(&t);
 }
 
-TimeService* ArduinoIoTCloudTimeService() {
+TimeService & ArduinoIoTCloudTimeService() {
   static TimeService _timeService_instance;
-  return &_timeService_instance;
+  return _timeService_instance;
 }

src/utility/time/TimeService.h

@@ -68,6 +68,6 @@ class TimeService
 
 };
 
-TimeService* ArduinoIoTCloudTimeService();
+TimeService & ArduinoIoTCloudTimeService();
 
 #endif /* ARDUINO_IOT_CLOUD_TIME_SERVICE_H_ */