fixup! Making MqttClient inherit from MqttClientInterface

Author: andreagilardoni

src/MqttClient.cpp

@@ -151,14 +151,25 @@ int MqttClient::messageDup() const
   return -1;
 }
 
-int MqttClient::messageQoS() const
+uint16_t MqttClient::messageId() const
 {
   if (_rxState == MQTT_CLIENT_RX_STATE_READ_PUBLISH_PAYLOAD) {
     // message received and ready for reading
-    return _rxMessageQoS;
+    // return _rxMessageId; // TODO
   }
 
-  return -1;
+  return 0;
+}
+
+
+MqttQos MqttClient::messageQoS() const
+{
+  if (_rxState == MQTT_CLIENT_RX_STATE_READ_PUBLISH_PAYLOAD) {
+    // message received and ready for reading
+    return static_cast<MqttQos>(_rxMessageQoS);
+  }
+
+  return QosDefault;
 }
 
 int MqttClient::messageRetain() const
@@ -184,64 +195,6 @@ void MqttClient::setReceiveCallback(MqttReceiveCallback cbk) {
   _cbk = cbk;
 }
 
-class MqttReadStream: public IStream {
-public:
-  MqttReadStream(MqttClient& ref, int available)
-  : ref(ref), _available(available) { }
-
-  size_t readBytes(uint8_t* buf, size_t s) override {
-    size_t to_read = s < _available ? s : _available;
-    to_read = ref.readBytes(buf, to_read);
-    _available -= to_read;
-    return to_read;
-  }
-
-  int available() override { return _available; }
-
-  int read() override {
-    if(_available > 0) {
-      _available--;
-      return ref.read();
-    } else {
-      return -1; // TODO return proper error code
-    }
-  }
-private:
-  MqttClient& ref;
-  int _available;
-};
-
-class ArduinoMqttOStream: public MqttOStream {
-public:
-  // TODO change pointer to reference, since it won't change
-	ArduinoMqttOStream(MqttClient &ref, error_t err=0)
-  : MqttOStream(err), ref(ref) { }// TODO replace err default value with success
-
-  ~ArduinoMqttOStream() {
-    ref.endMessage();
-  }
-
-  size_t write(uint8_t a) override {
-    if(rc == 1) {
-      return ref.write(a);
-    }
-    return 0;
-  }
-
-  size_t write(const uint8_t *buffer, size_t size) override {
-    if(rc == 1) {
-      return ref.write(buffer, size);
-    }
-    return 0;
-  }
-
-  int availableForWrite() override { return 0; }
-
-private:
-  MqttClient& ref;
-};
-
-
 error_t MqttClient::publish(Topic t, uint8_t payload[], size_t size, MqttQos qos, MqttPublishFlag flags) {
   int error = this->beginMessage(t, (flags & RetainEnabled) == RetainEnabled, qos, (flags & DupEnabled) == DupEnabled);
 
@@ -255,14 +208,6 @@ error_t MqttClient::publish(Topic t, uint8_t payload[], size_t size, MqttQos qos
   return res;
 }
 
-MqttOStream&& MqttClient::publish(Topic t, MqttQos qos, MqttPublishFlag flags) {
-  int error = this->beginMessage(
-    t, (flags & RetainEnabled) == RetainEnabled,
-    static_cast<uint8_t>(qos), (flags & DupEnabled) == DupEnabled);
-
-  return std::move(ArduinoMqttOStream(*this, error));
-}
-
 int MqttClient::beginMessage(const char* topic, unsigned long size, bool retain, uint8_t qos, bool dup)
 {
   _txMessageTopic = topic;
@@ -672,8 +617,7 @@ void MqttClient::poll()
             _rxState = MQTT_CLIENT_RX_STATE_READ_PUBLISH_PAYLOAD;
 
             if(_cbk) {
-              MqttReadStream stream(*this, _rxLength);
-              _cbk(_rxMessageTopic.c_str(), stream);
+              _cbk(_rxMessageTopic.c_str());
             } else if (_onMessage) {
 #ifdef MQTT_CLIENT_STD_FUNCTION_CALLBACK
               _onMessage(this,_rxLength);
@@ -702,8 +646,7 @@ void MqttClient::poll()
           _rxState = MQTT_CLIENT_RX_STATE_READ_PUBLISH_PAYLOAD;
 
           if(_cbk) {
-            MqttReadStream stream(*this, _rxLength);
-            _cbk(_rxMessageTopic.c_str(), stream);
+            _cbk(_rxMessageTopic.c_str());
           } else if (_onMessage) {
 #ifdef MQTT_CLIENT_STD_FUNCTION_CALLBACK
             _onMessage(this,_rxLength);
@@ -818,7 +761,7 @@ int MqttClient::read()
   return b;
 }
 
-int MqttClient::read(uint8_t *buf, size_t size)
+int MqttClient::read(uint8_t buf[], size_t size)
 {
   size_t result = 0;
 

src/MqttClient.h

@@ -60,10 +60,6 @@ class MqttClient : public MqttClientInterface, public Client {
       size_t size, MqttQos qos = QosDefault,
       MqttPublishFlag flags = MqttPublishFlags::None);
 
-  MqttOStream&& publish(
-      Topic t, MqttQos qos = QosDefault,
-      MqttPublishFlag flags = MqttPublishFlags::None);
-
   error_t ping() override;
 
   void setReceiveCallback(MqttReceiveCallback cbk);
@@ -76,10 +72,11 @@ class MqttClient : public MqttClientInterface, public Client {
   void setClient(arduino::Client*) override;
 
   int parseMessage();
-  String messageTopic() const;
-  int messageDup() const;
-  int messageQoS() const;
-  int messageRetain() const;
+  String messageTopic() const override;
+  int messageDup()      const override;
+  uint16_t messageId()  const override;
+  MqttQos messageQoS()  const override;
+  int messageRetain()   const override;
 
   int beginMessage(const char* topic, unsigned long size, bool retain = false, uint8_t qos = QosDefault, bool dup = false);
   int beginMessage(const String& topic, unsigned long size, bool retain = false, uint8_t qos = QosDefault, bool dup = false);
@@ -110,7 +107,7 @@ class MqttClient : public MqttClientInterface, public Client {
   virtual size_t write(const uint8_t *buf, size_t size);
   virtual int available();
   virtual int read();
-  virtual int read(uint8_t *buf, size_t size);
+  virtual int read(uint8_t buf[], size_t size);
   virtual int peek();
   virtual void flush();
   virtual void stop();