fixup! implementing encoder interface

Author: andreagilardoni

src/cbor/CborEncoder.cpp

@@ -8,16 +8,21 @@
     file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 #include "CborEncoder.h"
-
-// static CBORMessageEncoderSingleton* singleton = nullptr;
+#include <algorithm>
 
 Encoder::Status CBORMessageEncoderSingleton::encode(Message* message, uint8_t * data, size_t& len) { // TODO do we need to propagate the maximum length?
   // prepare cbor structure
   CborEncoder encoder;
 
   cbor_encoder_init(&encoder, data, len, 0);
 
-  auto encoder_it = encoders.find(message->id);
+  auto encoder_it = encoders.begin();
+
+  for(; encoder_it != encoders.end(); encoder_it++) {
+    if(encoder_it->first == message->id) {
+      break;
+    }
+  }
 
   // check if message.id exists on the encoders list or return error
   if(encoder_it == encoders.end()) {
@@ -40,6 +45,20 @@ CBORMessageEncoderSingleton& CBORMessageEncoderSingleton::getInstance() {
   return singleton;
 }
 
+void CBORMessageEncoderSingleton::append(MessageId id, CBORMessageEncoderInterface* encoder) {
+  auto encoder_it = encoders.begin();
+
+  for(; encoder_it != encoders.end(); encoder_it++) {
+    if(encoder_it->first == id) {
+      return;
+    }
+  }
+
+  encoders.push_back(
+    std::make_pair(id, encoder)
+  );
+}
+
 CBORMessageEncoderInterface::CBORMessageEncoderInterface(const CBORTag tag, const MessageId id)
 : tag(tag), id(id) {
   // call singleton/global variable and insert this encoder

src/cbor/CborEncoder.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include <unordered_map>
+#include <vector>
 #include "../interfaces/Encoder.h"
 #include "CBOR.h"
 #include "../interfaces/message.h"
@@ -44,15 +44,12 @@ class CBORMessageEncoderSingleton: public Encoder {
 public:
   static CBORMessageEncoderSingleton& getInstance();
 
-  void append(CBORTag id, CBORMessageEncoderInterface* encoder) {
-    encoders[id] = encoder;
-  }
-
+  void append(MessageId id, CBORMessageEncoderInterface* encoder);
   Encoder::Status encode(Message* message, uint8_t * data, size_t& len);
 private:
   CBORMessageEncoderSingleton() {}
 
-  std::unordered_map<MessageId, CBORMessageEncoderInterface*> encoders;
+  std::vector<std::pair<MessageId, CBORMessageEncoderInterface*>> encoders;
 };
 
 class CBORMessageEncoder: public Encoder {