REMOVE redundant Entities class (in favour of EntityVector)

telefonicaid · Sep 5, 2024 · b50c413 · b50c413
1 parent c3fe132
commit b50c413
Show file tree

Hide file tree

Showing 27 changed files with 163 additions and 259 deletions.
diff --git a/src/lib/apiTypesV2/BatchQuery.h b/src/lib/apiTypesV2/BatchQuery.h
@@ -31,7 +31,8 @@
 #include "ngsi/StringList.h"
 #include "ngsi/Request.h"
 #include "ngsi/ScopeVector.h"
-#include "apiTypesV2/Entities.h"
+
+#include "apiTypesV2/EntityVector.h"
 
 
 
@@ -42,7 +43,7 @@
 class BatchQuery
 {
  public:
-  Entities       entities;
+  EntityVector   entities;
   StringList     attributeV;  // Deprecated
   StringList     attrsV;
   ScopeVector    scopeV;

diff --git a/src/lib/apiTypesV2/BatchUpdate.h b/src/lib/apiTypesV2/BatchUpdate.h
@@ -30,7 +30,8 @@
 
 #include "orionTypes/UpdateActionType.h"
 #include "ngsi/Request.h"
-#include "apiTypesV2/Entities.h"
+
+#include "apiTypesV2/EntityVector.h"
 
 
 
@@ -42,7 +43,7 @@ class BatchUpdate
 {
  public:
   ActionType        updateActionType;   // Mandatory
-  Entities          entities;           // Mandatory
+  EntityVector      entities;           // Mandatory
 
   BatchUpdate();
   ~BatchUpdate();

diff --git a/src/lib/apiTypesV2/CMakeLists.txt b/src/lib/apiTypesV2/CMakeLists.txt
@@ -23,7 +23,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 SET (SOURCES
     Entity.cpp
     EntityVector.cpp
-    Entities.cpp
     Subscription.cpp
     Registration.cpp
     BatchQuery.cpp
@@ -35,7 +34,6 @@ SET (SOURCES
 SET (HEADERS
     Entity.h
     EntityVector.h
-    Entities.h    
     Subscription.h
     Registration.h
     BatchQuery.h

diff --git a/src/lib/apiTypesV2/Entities.cpp b/src/lib/apiTypesV2/Entities.cpp
diff --git a/src/lib/apiTypesV2/Entities.h b/src/lib/apiTypesV2/Entities.h
diff --git a/src/lib/jsonParseV2/parseEntitiesResponse.cpp b/src/lib/jsonParseV2/parseEntitiesResponse.cpp
@@ -33,7 +33,6 @@
 #include "common/errorMessages.h"
 #include "alarmMgr/AlarmManager.h"
 #include "alarmMgr/alarmMgr.h"
-#include "apiTypesV2/Entities.h"
 #include "rest/ConnectionInfo.h"
 #include "rest/OrionError.h"
 #include "jsonParseV2/parseEntityObject.h"
@@ -55,7 +54,7 @@
 * of forwarded request so maybe it can be simplified)
 *
 */
-bool parseEntitiesResponse(ConnectionInfo* ciP, const char* payload, Entities* evP, OrionError* oeP)
+bool parseEntitiesResponse(ConnectionInfo* ciP, const char* payload, EntityVector* evP, OrionError* oeP)
 {
   rapidjson::Document  document;
 

diff --git a/src/lib/jsonParseV2/parseEntitiesResponse.h b/src/lib/jsonParseV2/parseEntitiesResponse.h
@@ -31,7 +31,6 @@
 #include "rapidjson/document.h"
 
 #include "rest/ConnectionInfo.h"
-#include "apiTypesV2/Entities.h"
 
 
 
@@ -43,7 +42,7 @@ extern bool parseEntitiesResponse
 (
   ConnectionInfo*   ciP,
   const char*       payload,
-  Entities*         evP,
+  EntityVector*     evP,
   OrionError*       oeP
 );
 

diff --git a/src/lib/jsonParseV2/parseEntitiesResponseV1.cpp b/src/lib/jsonParseV2/parseEntitiesResponseV1.cpp
@@ -33,7 +33,6 @@
 #include "common/errorMessages.h"
 #include "alarmMgr/AlarmManager.h"
 #include "alarmMgr/alarmMgr.h"
-#include "apiTypesV2/Entities.h"
 #include "rest/ConnectionInfo.h"
 #include "rest/OrionError.h"
 #include "jsonParseV2/jsonParseTypeNames.h"
@@ -413,7 +412,7 @@ static std::string parseEntity(ConnectionInfo* ciP, rapidjson::Value::ConstMembe
 * }
 *
 */
-bool parseEntitiesResponseV1(ConnectionInfo* ciP, const char* payload, Entities* evP, OrionError* oeP)
+bool parseEntitiesResponseV1(ConnectionInfo* ciP, const char* payload, EntityVector* evP, OrionError* oeP)
 {
   rapidjson::Document  document;
 

diff --git a/src/lib/jsonParseV2/parseEntitiesResponseV1.h b/src/lib/jsonParseV2/parseEntitiesResponseV1.h
@@ -31,7 +31,8 @@
 #include "rapidjson/document.h"
 
 #include "rest/ConnectionInfo.h"
-#include "apiTypesV2/Entities.h"
+
+#include "apiTypesV2/EntityVector.h"
 
 
 
@@ -43,7 +44,7 @@ extern bool parseEntitiesResponseV1
 (
   ConnectionInfo*   ciP,
   const char*       payload,
-  Entities*         evP,
+  EntityVector*     evP,
   OrionError*       oeP
 );
 

diff --git a/src/lib/jsonParseV2/parseEntityVector.cpp b/src/lib/jsonParseV2/parseEntityVector.cpp
@@ -30,7 +30,7 @@
 
 #include "ngsi/ContextAttribute.h"
 
-#include "apiTypesV2/Entities.h"
+#include "apiTypesV2/EntityVector.h"
 #include "rest/ConnectionInfo.h"
 #include "jsonParseV2/jsonParseTypeNames.h"
 #include "jsonParseV2/parseEntityObject.h"
@@ -46,7 +46,7 @@ std::string parseEntityVector
 (
   ConnectionInfo*                               ciP,
   const rapidjson::Value::ConstMemberIterator&  iter,
-  Entities*                                     evP,
+  EntityVector*                                 evP,
   bool                                          idPatternAllowed,
   bool                                          attributesAllowed
 )

diff --git a/src/lib/jsonParseV2/parseEntityVector.h b/src/lib/jsonParseV2/parseEntityVector.h
@@ -29,7 +29,6 @@
 
 #include "rapidjson/document.h"
 
-#include "apiTypesV2/Entities.h"
 #include "rest/ConnectionInfo.h"
 
 
@@ -42,7 +41,7 @@ extern std::string parseEntityVector
 (
   ConnectionInfo*                               ciP,
   const rapidjson::Value::ConstMemberIterator&  iter,
-  Entities*                                     evP,
+  EntityVector*                                 evP,
   bool                                          idPatternAllowed,
   bool                                          attributesAllowed
 );

diff --git a/src/lib/ngsi10/QueryContextRequest.cpp b/src/lib/ngsi10/QueryContextRequest.cpp
@@ -222,7 +222,7 @@ void QueryContextRequest::fill(BatchQuery* bqP)
 {
   if (bqP->entities.vec.size() != 0)
   {
-    entityIdVector.fill(bqP->entities.vec);
+    entityIdVector.fill(bqP->entities);
   }
   else
   {

diff --git a/src/lib/ngsi10/QueryContextResponse.cpp b/src/lib/ngsi10/QueryContextResponse.cpp
@@ -74,11 +74,11 @@ void QueryContextResponse::release(void)
 *
 * QueryContextResponse::fill -
 */
-void QueryContextResponse::fill(const Entities& entities)
+void QueryContextResponse::fill(const EntityVector& entities)
 {
-  for (int eIx = 0; eIx < entities.size(); eIx++)
+  for (unsigned int eIx = 0; eIx < entities.vec.size(); eIx++)
   {
-    ContextElementResponse* cerP = new ContextElementResponse(entities.vec.vec[eIx]);
+    ContextElementResponse* cerP = new ContextElementResponse(entities.vec[eIx]);
     contextElementResponseVector.push_back(cerP);
   }
 }