REMOVE NotifyConditionVector, NotifyCondition, ConditionValueList, Re…

…strictionString, AttributeExpression and ContextRegistrationVector
telefonicaid · Aug 12, 2024 · 383e668 · 383e668
1 parent eff5984
commit 383e668
Show file tree

Hide file tree

Showing 30 changed files with 2 additions and 1,437 deletions.
diff --git a/src/lib/cache/subCache.h b/src/lib/cache/subCache.h
@@ -30,7 +30,6 @@
 #include <vector>
 
 #include "common/RenderFormat.h"
-#include "ngsi/NotifyConditionVector.h"
 #include "ngsi/EntityIdVector.h"
 #include "ngsi/StringList.h"
 #include "apiTypesV2/HttpInfo.h"

diff --git a/src/lib/mongoBackend/MongoGlobal.cpp b/src/lib/mongoBackend/MongoGlobal.cpp
@@ -2153,39 +2153,6 @@ bool registrationsQuery
 
 
 
-/* ****************************************************************************
-*
-* isCondValueInContextElementResponse -
-*/
-bool isCondValueInContextElementResponse(ConditionValueList* condValues, ContextElementResponseVector* cerV)
-{
-  /* Empty conValue means that any attribute matches (aka ONANYCHANGE) */
-  if (condValues->size() == 0)
-  {
-    return true;
-  }
-
-  for (unsigned int cvlx = 0; cvlx < condValues->size(); ++cvlx)
-  {
-    for (unsigned int aclx = 0; aclx < cerV->size(); ++aclx)
-    {
-      ContextAttributeVector caV = (*cerV)[aclx]->entity.attributeVector;
-
-      for (unsigned int kx = 0; kx < caV.size(); ++kx)
-      {
-        if (caV[kx]->name == (*condValues)[cvlx])
-        {
-          return true;
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-
-
 /* ****************************************************************************
 *
 * condValueAttrMatch -

diff --git a/src/lib/mongoBackend/MongoGlobal.h b/src/lib/mongoBackend/MongoGlobal.h
@@ -41,9 +41,7 @@
 #include "ngsi/StringList.h"
 #include "ngsi/ContextElementResponseVector.h"
 #include "ngsi/ContextRegistrationResponseVector.h"
-#include "ngsi/ConditionValueList.h"
 #include "ngsi/Restriction.h"
-#include "ngsi/NotifyConditionVector.h"
 #include "ngsi10/UpdateContextResponse.h"
 #include "ngsiNotify/Notifier.h"
 #include "rest/uriParamNames.h"

diff --git a/src/lib/mongoBackend/mongoQueryContext.cpp b/src/lib/mongoBackend/mongoQueryContext.cpp
@@ -342,12 +342,6 @@ HttpStatusCode mongoQueryContext
   LM_T(LmtMongo, ("QueryContext Request"));
   LM_T(LmtPagination, ("Offset: %d, Limit: %d, Count: %s", offset, limit, (countP != NULL)? "true" : "false"));
 
-  /* FIXME: restriction not supported for the moment */
-  if (!requestP->restriction.attributeExpression.isEmpty())
-  {
-    alarmMgr.badInput(clientIp, "restriction found, but restrictions are not supported by mongo backend");
-  }
-
   std::string                  err;
   bool                         ok;
   bool                         limitReached = false;

diff --git a/src/lib/mongoBackend/mongoUpdateContext.cpp b/src/lib/mongoBackend/mongoUpdateContext.cpp
@@ -36,7 +36,6 @@
 #include "alarmMgr/alarmMgr.h"
 #include "ngsi10/UpdateContextRequest.h"
 #include "ngsi10/UpdateContextResponse.h"
-#include "ngsi/NotifyCondition.h"
 #include "rest/HttpStatusCode.h"
 
 #include "ngsiNotify/QueueNotifier.h"

diff --git a/src/lib/ngsi/AttributeExpression.cpp b/src/lib/ngsi/AttributeExpression.cpp
diff --git a/src/lib/ngsi/AttributeExpression.h b/src/lib/ngsi/AttributeExpression.h
diff --git a/src/lib/ngsi/CMakeLists.txt b/src/lib/ngsi/CMakeLists.txt
@@ -21,14 +21,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 SET (SOURCES
-    AttributeExpression.cpp
-    ConditionValueList.cpp
     ContextAttribute.cpp
     ContextAttributeVector.cpp
     ContextElementResponse.cpp
     ContextElementResponseVector.cpp
     ContextRegistration.cpp
-    ContextRegistrationVector.cpp
     ContextRegistrationAttribute.cpp
     ContextRegistrationAttributeVector.cpp
     ContextRegistrationResponse.cpp
@@ -37,40 +34,31 @@ SET (SOURCES
     EntityIdVector.cpp
     Metadata.cpp
     MetadataVector.cpp
-    NotifyCondition.cpp
-    NotifyConditionVector.cpp
     ProvidingApplication.cpp
     Request.cpp
     Restriction.cpp
-    RestrictionString.cpp
     Scope.cpp
     ScopeVector.cpp
     StatusCode.cpp
     StringList.cpp
 )
 
 SET (HEADERS
-    AttributeExpression.h
-    ConditionValueList.h
     ContextAttribute.h
     ContextAttributeVector.h
     ContextElementResponse.h
     ContextElementResponseVector.h
     ContextRegistrationAttribute.h
     ContextRegistrationAttributeVector.h
     ContextRegistration.h
-    ContextRegistrationVector.h
     ContextRegistrationResponse.h
     ContextRegistrationResponseVector.h
     EntityId.h
     EntityIdVector.h
     Metadata.h
     MetadataVector.h
-    NotifyCondition.h
-    NotifyConditionVector.h
     ProvidingApplication.h
     Restriction.h
-    RestrictionString.h
     Scope.h
     StatusCode.h
     StringList.h