REMOVE some ngsi9 and ngsi10 text leftovers

telefonicaid · Aug 27, 2024 · 4e83aef · 4e83aef
1 parent 24b7753
commit 4e83aef
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/src/app/contextBroker/contextBroker.cpp b/src/app/contextBroker/contextBroker.cpp
@@ -373,8 +373,8 @@ static const char* validLogLevels[] =
 * to treat the incoming request.
 *
 * The URL path is divided into components (Using '/' as field separator) so that the URL
-* "/ngsi9/registerContext" becomes a component vector of the two components
-* "ngsi9" and "registerContext".
+* "/v2/entities" becomes a component vector of the two components
+* "v2" and "entities".
 *
 * Each line contains the necessary information for ONE service:
 *   RequestType   request     - The type of the request

diff --git a/src/lib/mongoBackend/TriggeredSubscription.cpp b/src/lib/mongoBackend/TriggeredSubscription.cpp
@@ -99,10 +99,6 @@ TriggeredSubscription::~TriggeredSubscription()
 /* ****************************************************************************
 *
 * TriggeredSubscription::fillExpression -
-*
-* TriggeredSubscription class is shared for NGSI9 and NGSI10 subscriptions, so it is better
-* to keep expressions (an artifact for NGSI10) out of the constructor, in its independent fill
-* method
 */
 void TriggeredSubscription::fillExpression
 (

diff --git a/src/lib/mongoBackend/TriggeredSubscription.h b/src/lib/mongoBackend/TriggeredSubscription.h
@@ -45,10 +45,6 @@
 * the csbubs collection. Note that adding all the BSON object retrieved from the
 * csubs collection is not efficient, so we use only the needed fields-
 *
-* We use the same class for both NGSI10 and NGSI9 subscription. The only difference
-* is that throttling and lastNotification are not needed in the second case (note
-* that there are different constructor depending the case)
-*
 */
 class TriggeredSubscription
 {

diff --git a/src/lib/mongoBackend/mongoNotifyContext.cpp b/src/lib/mongoBackend/mongoNotifyContext.cpp
@@ -56,7 +56,7 @@ HttpStatusCode mongoNotifyContext
 {
   bool reqSemTaken;
 
-  reqSemTake(__FUNCTION__, "ngsi10 notification", SemWriteOp, &reqSemTaken);
+  reqSemTake(__FUNCTION__, "notification", SemWriteOp, &reqSemTaken);
 
   // Process each ContextElement
   for (unsigned int ix = 0; ix < requestP->contextElementResponseVector.size(); ++ix)
@@ -70,7 +70,7 @@ HttpStatusCode mongoNotifyContext
     processContextElement(eP, &ucr, ActionTypeAppend, tenant, servicePathV, uriParams, xauthToken, fiwareCorrelator, ngsiV2AttrsFormat, forcedUpdate, overrideMetadata, 0);
   }
 
-  reqSemGive(__FUNCTION__, "ngsi10 notification", reqSemTaken);
+  reqSemGive(__FUNCTION__, "notification", reqSemTaken);
   responseP->responseCode.fill(SccOk);
 
   return SccOk;

diff --git a/src/lib/mongoBackend/mongoQueryContext.cpp b/src/lib/mongoBackend/mongoQueryContext.cpp
@@ -345,7 +345,7 @@ HttpStatusCode mongoQueryContext
   bool                         reqSemTaken;
   ContextElementResponseVector rawCerV;
 
-  reqSemTake(__FUNCTION__, "ngsi10 query request", SemReadOp, &reqSemTaken);
+  reqSemTake(__FUNCTION__, "query request", SemReadOp, &reqSemTaken);
 
   ok = entitiesQuery(requestP->entityIdVector,
                      requestP->attributeList,
@@ -364,7 +364,7 @@ HttpStatusCode mongoQueryContext
   {
     responseP->errorCode.fill(SccReceiverInternalError, err);
     rawCerV.release();
-    reqSemGive(__FUNCTION__, "ngsi10 query request", reqSemTaken);
+    reqSemGive(__FUNCTION__, "query request", reqSemTaken);
 
     return SccOk;
   }
@@ -474,6 +474,6 @@ HttpStatusCode mongoQueryContext
 
   rawCerV.release();
 
-  reqSemGive(__FUNCTION__, "ngsi10 query request", reqSemTaken);
+  reqSemGive(__FUNCTION__, "query request", reqSemTaken);
   return SccOk;
 }
diff --git a/src/lib/mongoBackend/mongoUnsubscribeContext.cpp b/src/lib/mongoBackend/mongoUnsubscribeContext.cpp
@@ -56,13 +56,13 @@ HttpStatusCode mongoUnsubscribeContext
   bool         reqSemTaken;
   std::string  err;
 
-  reqSemTake(__FUNCTION__, "ngsi10 unsubscribe request", SemWriteOp, &reqSemTaken);
+  reqSemTake(__FUNCTION__, "unsubscribe request", SemWriteOp, &reqSemTaken);
 
   LM_T(LmtMongo, ("Unsubscribe Context"));
 
   if (subId.empty())
   {
-    reqSemGive(__FUNCTION__, "ngsi10 unsubscribe request (no subscriptions found)", reqSemTaken);
+    reqSemGive(__FUNCTION__, "unsubscribe request (no subscriptions found)", reqSemTaken);
     responseP->fill(SccContextElementNotFound, ERROR_DESC_NOT_FOUND_SUBSCRIPTION, ERROR_NOT_FOUND);
     alarmMgr.badInput(clientIp, "no subscriptionId");
 
@@ -78,15 +78,15 @@ HttpStatusCode mongoUnsubscribeContext
 
   if (!orion::collectionFindOne(composeDatabaseName(tenant), COL_CSUBS, bobId.obj(), &sub, &err) && (err != ""))
   {
-    reqSemGive(__FUNCTION__, "ngsi10 unsubscribe request (mongo db exception)", reqSemTaken);
+    reqSemGive(__FUNCTION__, "unsubscribe request (mongo db exception)", reqSemTaken);
 
     responseP->fill(SccReceiverInternalError, err, ERROR_INTERNAL_ERROR);
     return SccOk;
   }
 
   if (sub.isEmpty())
   {
-    reqSemGive(__FUNCTION__, "ngsi10 unsubscribe request (no subscriptions found)", reqSemTaken);
+    reqSemGive(__FUNCTION__, "unsubscribe request (no subscriptions found)", reqSemTaken);
 
     responseP->fill(SccContextElementNotFound, ERROR_DESC_NOT_FOUND_SUBSCRIPTION, ERROR_NOT_FOUND);
     return SccOk;
@@ -104,7 +104,7 @@ HttpStatusCode mongoUnsubscribeContext
 
   if (!orion::collectionRemove(composeDatabaseName(tenant), COL_CSUBS, bobId2.obj(), &err))
   {
-    reqSemGive(__FUNCTION__, "ngsi10 unsubscribe request (mongo db exception)", reqSemTaken);
+    reqSemGive(__FUNCTION__, "unsubscribe request (mongo db exception)", reqSemTaken);
 
     responseP->fill(SccReceiverInternalError, err, ERROR_INTERNAL_ERROR);
     return SccOk;
@@ -131,7 +131,7 @@ HttpStatusCode mongoUnsubscribeContext
     cacheSemGive(__FUNCTION__, "Removing subscription from cache");
   }
 
-  reqSemGive(__FUNCTION__, "ngsi10 unsubscribe request", reqSemTaken);
+  reqSemGive(__FUNCTION__, "unsubscribe request", reqSemTaken);
 
   return SccOk;
 }
diff --git a/src/lib/mongoBackend/mongoUpdateContext.cpp b/src/lib/mongoBackend/mongoUpdateContext.cpp
@@ -120,7 +120,7 @@ HttpStatusCode mongoUpdateContext
 {
   bool reqSemTaken;
 
-  reqSemTake(__FUNCTION__, "ngsi10 update request", SemWriteOp, &reqSemTaken);
+  reqSemTake(__FUNCTION__, "update request", SemWriteOp, &reqSemTaken);
 
   // Initial size of notification queue (could be used by flow control algorithm)
   unsigned int q0 = 0;
@@ -231,7 +231,7 @@ HttpStatusCode mongoUpdateContext
     responseP->errorCode.fill(SccOk);
   }
 
-  reqSemGive(__FUNCTION__, "ngsi10 update request", reqSemTaken);
+  reqSemGive(__FUNCTION__, "update request", reqSemTaken);
 
   if (flowControl && fcEnabled && (responseP->errorCode.code == SccOk))
   {

diff --git a/test/unittests/serviceRoutines/badVerbGetPostOnly_test.cpp b/test/unittests/serviceRoutines/badVerbGetPostOnly_test.cpp
@@ -53,7 +53,7 @@ TEST(badVerbGetPostOnly, ok)
   ConnectionInfo  ci("/v2/entities",  "PUT", "1.1");
   std::string     expected = "{\"error\":\"MethodNotAllowed\",\"description\":\"method not allowed\"}";
   std::string     out;
-  RestService     restService = { VersionRequest, 3, { "ngsi9", "contextEntities", "aaa" }, NULL };
+  RestService     restService = { VersionRequest, 3, { "foo", "bar", "aaa" }, NULL };
 
   ci.restServiceP = &restService;