Removing redundant methods that use char* instrad of String

This will simplify the definition of the class since String class is
automatically built by providinc a C-string

Author: andreagilardoni

src/MqttClient.cpp

@@ -171,9 +171,9 @@ int MqttClient::messageRetain() const
   return -1;
 }
 
-int MqttClient::beginMessage(const char* topic, unsigned long size, bool retain, uint8_t qos, bool dup)
+int MqttClient::beginMessage(const String& topic, unsigned long size, bool retain, uint8_t qos, bool dup)
 {
-  _txMessageTopic = topic;
+  _txMessageTopic = topic.c_str();
   _txMessageRetain = retain;
   _txMessageQoS = qos;
   _txMessageDup = dup;
@@ -191,19 +191,9 @@ int MqttClient::beginMessage(const char* topic, unsigned long size, bool retain,
   return 1;
 }
 
-int MqttClient::beginMessage(const String& topic, unsigned long size, bool retain, uint8_t qos, bool dup)
-{
-  return beginMessage(topic.c_str(), size, retain, qos, dup);
-}
-
-int MqttClient::beginMessage(const char* topic, bool retain, uint8_t qos, bool dup)
-{
-  return beginMessage(topic, 0xffffffffL, retain, qos, dup);
-}
-
 int MqttClient::beginMessage(const String& topic, bool retain, uint8_t qos, bool dup)
 {
-  return beginMessage(topic.c_str(), retain, qos, dup);
+  return beginMessage(topic, 0xffffffffL, retain, qos, dup);
 }
 
 int MqttClient::endMessage()
@@ -286,17 +276,32 @@ int MqttClient::beginWill(const char* topic, unsigned short size, bool retain, u
 
 int MqttClient::beginWill(const String& topic, unsigned short size, bool retain, uint8_t qos)
 {
-  return beginWill(topic.c_str(), size, retain, qos);
-}
+  int topicLength = topic.length();
+  size_t willLength = (2 + topicLength + 2 + size);
 
-int MqttClient::beginWill(const char* topic, bool retain, uint8_t qos)
-{
-  return beginWill(topic, _tx_payload_buffer_size, retain, qos);
+  if (qos > 2) {
+    // invalid QoS
+  }
+
+  _willBuffer = (uint8_t*)realloc(_willBuffer, willLength);
+
+  _txBuffer = _willBuffer;
+  _txBufferIndex = 0;
+  writeString(topic.c_str(), topic.length());
+  write16(0); // dummy size for now
+  _willMessageIndex = _txBufferIndex;
+
+  _willFlags = (qos << 3) | 0x04;
+  if (retain) {
+    _willFlags |= 0x20;
+  }
+
+  return 0;
 }
 
 int MqttClient::beginWill(const String& topic, bool retain, uint8_t qos)
 {
-  return beginWill(topic.c_str(), retain, qos);
+  return beginWill(topic, _tx_payload_buffer_size, retain, qos);
 }
 
 int MqttClient::endWill()
@@ -314,9 +319,10 @@ int MqttClient::endWill()
   return 1;
 }
 
-int MqttClient::subscribe(const char* topic, uint8_t qos)
+int MqttClient::subscribe(const String& topic, uint8_t qos)
+
 {
-  int topicLength = strlen(topic);
+  int topicLength = topic.length();
   int remainingLength = topicLength + 5;
 
   if (qos > 2) {
@@ -334,7 +340,7 @@ int MqttClient::subscribe(const char* topic, uint8_t qos)
 
   beginPacket(MQTT_SUBSCRIBE, 0x02, remainingLength, packetBuffer);
   write16(_txPacketId);
-  writeString(topic, topicLength);
+  writeString(topic.c_str(), topicLength);
   write8(qos);
 
   if (!endPacket()) {
@@ -362,14 +368,9 @@ int MqttClient::subscribe(const char* topic, uint8_t qos)
   return 0;
 }
 
-int MqttClient::subscribe(const String& topic, uint8_t qos)
-{
-  return subscribe(topic.c_str(), qos);
-}
-
-int MqttClient::unsubscribe(const char* topic)
+int MqttClient::unsubscribe(const String& topic)
 {
-  int topicLength = strlen(topic);
+  int topicLength = topic.length();
   int remainingLength = topicLength + 4;
 
   _txPacketId++;
@@ -382,7 +383,7 @@ int MqttClient::unsubscribe(const char* topic)
 
   beginPacket(MQTT_UNSUBSCRIBE, 0x02, remainingLength, packetBuffer);
   write16(_txPacketId);
-  writeString(topic, topicLength);
+  writeString(topic.c_str(), topicLength);
 
   if (!endPacket()) {
     stop();
@@ -406,11 +407,6 @@ int MqttClient::unsubscribe(const char* topic)
   return 0;
 }
 
-int MqttClient::unsubscribe(const String& topic)
-{
-  return unsubscribe(topic.c_str());
-}
-
 void MqttClient::poll()
 {
   if (clientAvailable() == 0 && !clientConnected()) {
@@ -775,22 +771,11 @@ MqttClient::operator bool()
   return true;
 }
 
-void MqttClient::setId(const char* id)
-{
-  _id = id;
-}
-
 void MqttClient::setId(const String& id)
 {
   _id = id;
 }
 
-void MqttClient::setUsernamePassword(const char* username, const char* password)
-{
-  _username = username;
-  _password = password;
-}
-
 void MqttClient::setUsernamePassword(const String& username, const String& password)
 {
   _username = username;

src/MqttClient.h

@@ -59,21 +59,15 @@ class MqttClient : public Client {
   int messageQoS() const;
   int messageRetain() const;
 
-  int beginMessage(const char* topic, unsigned long size, bool retain = false, uint8_t qos = 0, bool dup = false);
   int beginMessage(const String& topic, unsigned long size, bool retain = false, uint8_t qos = 0, bool dup = false);
-  int beginMessage(const char* topic, bool retain = false, uint8_t qos = 0, bool dup = false);
   int beginMessage(const String& topic, bool retain = false, uint8_t qos = 0, bool dup = false);
   int endMessage();
 
-  int beginWill(const char* topic, unsigned short size, bool retain, uint8_t qos);
   int beginWill(const String& topic, unsigned short size, bool retain, uint8_t qos);
-  int beginWill(const char* topic, bool retain, uint8_t qos);
   int beginWill(const String& topic, bool retain, uint8_t qos);
   int endWill();
 
-  int subscribe(const char* topic, uint8_t qos = 0);
   int subscribe(const String& topic, uint8_t qos = 0);
-  int unsubscribe(const char* topic);
   int unsubscribe(const String& topic);
 
   void poll();
@@ -95,10 +89,8 @@ class MqttClient : public Client {
   virtual uint8_t connected();
   virtual operator bool();
 
-  void setId(const char* id);
   void setId(const String& id);
 
-  void setUsernamePassword(const char* username, const char* password);
   void setUsernamePassword(const String& username, const String& password);
 
   void setCleanSession(bool cleanSession);