Merge pull request #1485 from FIWARE/hardening/functest

A few improvements
FIWARE · Dec 2, 2023 · fa57d5b · fa57d5b
2 parents 41c5e9d + 977033c
commit fa57d5b
Show file tree

Hide file tree

Showing 7 changed files with 231 additions and 74 deletions.
diff --git a/src/lib/orionld/serviceRoutines/orionldGetEntities.cpp b/src/lib/orionld/serviceRoutines/orionldGetEntities.cpp
@@ -258,25 +258,25 @@ bool orionldGetEntities(void)
       orionldError(OrionldResourceNotFound, "Entity Map Not Found", orionldState.uriParams.entityMap, 404);
       return false;
     }
+  }
 
-    if (orionldState.uriParams.reset == true)
-    {
-      LM_T(LmtSR, ("Deleting entity map '%s'", orionldEntityMapId));
-      orionldEntityMapRelease();
-      orionldEntityMap      = NULL;
-      orionldEntityMapCount = 0;
-      orionldState.uriParams.entityMap = NULL;
-      entityMap = NULL;
-    }
-    else
+  if (orionldState.uriParams.reset == true)
+  {
+    LM_T(LmtSR, ("Deleting entity map '%s'", orionldEntityMapId));
+    orionldEntityMapRelease();
+    orionldEntityMap      = NULL;
+    orionldEntityMapCount = 0;
+    orionldState.uriParams.entityMap = NULL;
+    entityMap = NULL;
+  }
+  else if (orionldState.uriParams.entityMap != NULL)
+  {
+    // No query params can be used when asking for pages in an entity map
+    if ((id       != NULL) || (type  != NULL) || (idPattern != NULL) || (q != NULL)      ||
+        (geometry != NULL) || (attrs != NULL) || (orionldState.uriParams.local == true))
     {
-      // No query params can be used when asking for pages in an entity map
-      if ((id       != NULL) || (type  != NULL) || (idPattern != NULL) || (q != NULL)      ||
-          (geometry != NULL) || (attrs != NULL) || (orionldState.uriParams.local == true))
-      {
-        orionldError(OrionldBadRequestData, "Query parameters present", "not allowed when paginating using an entity map", 400);
-        return false;
-      }
+      orionldError(OrionldBadRequestData, "Query parameters present", "not allowed when paginating using an entity map", 400);
+      return false;
     }
   }
 

diff --git a/src/lib/orionld/serviceRoutines/orionldGetEntitiesDistributed.cpp b/src/lib/orionld/serviceRoutines/orionldGetEntitiesDistributed.cpp
@@ -286,8 +286,6 @@ static void distOpMatchIdsRequest(DistOp* distOpList)
   // Await all responses, if any
   if (forwards > 0)
     distOpsReceive(distOpList, idListResponse, orionldEntityMap, forwards);
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,8 +286,6 @@ static void distOpMatchIdsRequest(DistOp* distOpList) @@
       // Await all responses, if any
       if (forwards > 0)
         distOpsReceive(distOpList, idListResponse, orionldEntityMap, forwards);
     }
@@ Expand Down @@