ADD mongoDriver library as first step to move the code to new MongoDB…

… new driver
telefonicaid · Feb 7, 2020 · 4335e0e · 4335e0e
1 parent 685698a
commit 4335e0e
Show file tree

Hide file tree

Showing 39 changed files with 4,481 additions and 322 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -185,6 +185,7 @@ SET (ORION_LIBS
     ngsi
     cache
     mongoBackend
+    mongoDriver
     parse
     apiTypesV2
     orionTypes
@@ -287,6 +288,7 @@ if (error EQUAL 0)
   ADD_SUBDIRECTORY(src/lib/jsonParseV2)
   ADD_SUBDIRECTORY(src/lib/rest)
   ADD_SUBDIRECTORY(src/lib/mongoBackend)
+  ADD_SUBDIRECTORY(src/lib/mongoDriver)
   ADD_SUBDIRECTORY(src/lib/cache)
   ADD_SUBDIRECTORY(src/lib/alarmMgr)
   ADD_SUBDIRECTORY(src/lib/metricsMgr)

diff --git a/scripts/style_check_in_makefile.sh b/scripts/style_check_in_makefile.sh
@@ -50,6 +50,7 @@ style_check src/lib/logSummary
 style_check src/lib/jsonParseV2
 style_check src/lib/apiTypesV2
 style_check src/lib/mongoBackend
+style_check src/lib/mongoDriver
 style_check src/lib/logMsg
 style_check src/lib/parseArgs
 style_check src/lib/cache

diff --git a/src/lib/apiTypesV2/HttpInfo.cpp b/src/lib/apiTypesV2/HttpInfo.cpp
@@ -25,23 +25,16 @@
 #include <string>
 #include <map>
 
-#include "mongo/client/dbclient.h"
 #include "logMsg/logMsg.h"
-
 #include "common/JsonHelper.h"
-#include "mongoBackend/dbConstants.h"
-#include "mongoBackend/safeMongo.h"
-#include "apiTypesV2/HttpInfo.h"
-
 
+#include "apiTypesV2/HttpInfo.h"
 
-/* ****************************************************************************
-*
-* USING
-*/
-using mongo::BSONObj;
-using mongo::BSONElement;
+#include "mongoBackend/dbConstants.h"
 
+#include "mongoDriver/BSONObj.h"
+#include "mongoDriver/BSONElement.h"
+#include "mongoDriver/safeMongo.h"
 
 
 namespace ngsiv2
@@ -108,7 +101,7 @@ std::string HttpInfo::toJson()
 *
 * HttpInfo::fill -
 */
-void HttpInfo::fill(const BSONObj& bo)
+void HttpInfo::fill(const orion::BSONObj& bo)
 {
   this->url    = bo.hasField(CSUB_REFERENCE)? getStringFieldF(bo, CSUB_REFERENCE) : "";
   this->custom = bo.hasField(CSUB_CUSTOM)?    getBoolFieldF(bo,   CSUB_CUSTOM)    : false;
@@ -122,30 +115,22 @@ void HttpInfo::fill(const BSONObj& bo)
       this->verb = str2Verb(getStringFieldF(bo, CSUB_METHOD));
     }
 
+    // FIXME P10: toStringMap could raise exception if array elements are not strings
+    // (the parsing stage should avoid the case, but better to be protetec with a catch statement)
     // qs
     if (bo.hasField(CSUB_QS))
     {
-      BSONObj qs = getObjectFieldF(bo, CSUB_QS);
-
-      for (BSONObj::iterator i = qs.begin(); i.more();)
-      {
-        BSONElement e = i.next();
-
-        this->qs[e.fieldName()] = e.String();
-      }
+      orion::BSONObj qs = getObjectFieldF(bo, CSUB_QS);
+      qs.toStringMap(&this->qs);
     }
 
+    // FIXME P10: toStringMap could raise exception if array elements are not strings
+    // (the parsing stage should avoid the case, but better to be protetec with a catch statement)
     // headers
     if (bo.hasField(CSUB_HEADERS))
     {
-      BSONObj headers = getObjectFieldF(bo, CSUB_HEADERS);
-
-      for (BSONObj::iterator i = headers.begin(); i.more();)
-      {
-        BSONElement e = i.next();
-
-        this->headers[e.fieldName()] = e.String();
-      }
+      orion::BSONObj headers = getObjectFieldF(bo, CSUB_HEADERS);
+      headers.toStringMap(&this->headers);
     }
   }
 }

diff --git a/src/lib/apiTypesV2/HttpInfo.h b/src/lib/apiTypesV2/HttpInfo.h
@@ -28,9 +28,10 @@
 #include <string>
 #include <map>
 
-#include "mongo/client/dbclient.h"
 #include "rest/Verb.h"
 
+#include "mongoDriver/BSONObj.h"
+
 
 
 namespace ngsiv2
@@ -52,7 +53,7 @@ struct HttpInfo
   explicit HttpInfo(const std::string& _url);
 
   std::string  toJson();
-  void         fill(const mongo::BSONObj& bo);
+  void         fill(const orion::BSONObj& bo);
 };
 }