Fixed query and count methods in order to stop traversal of parents i…

…f endpoints are found
eclipse · May 22, 2023 · e2cac00 · e2cac00
1 parent 1eb7762
commit e2cac00
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/...al/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoServiceImpl.java b/...al/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoServiceImpl.java
@@ -234,17 +234,16 @@ public EndpointInfoListResult query(KapuaQuery query, String section)
         return entityManagerSession.doAction(em -> {
             EndpointInfoListResult endpointInfoListResult = EndpointInfoDAO.query(em, query);
 
-            if (endpointInfoListResult.isEmpty() && query.getScopeId() != null) {
-
-                // First check if there are any endpoint specified at all
-                if (countAllEndpointsInScope(em, query.getScopeId(), section)) {
-                    // if there are endpoints (even not matching the query), return the empty list
-                    return endpointInfoListResult;
-                }
+            if (endpointInfoListResult.isEmpty() && query.getScopeId() != null) { //query did not find results
 
                 KapuaId originalScopeId = query.getScopeId();
 
                 do {
+                    // First check if there are any endpoint AT ALL specified in this scope
+                    if (countAllEndpointsInScope(em, query.getScopeId(), section)) {
+                        // There are endpoints (even not matching the query), exit because I found the "nearest usable" endpoints which don't have what I'm searching
+                        break;
+                    }
                     Account account = KapuaSecurityUtils.doPrivileged(() -> ACCOUNT_SERVICE.find(query.getScopeId()));
 
                     if (account == null) {
@@ -291,15 +290,14 @@ public long count(KapuaQuery query, String section)
 
             if (endpointInfoCount == 0 && query.getScopeId() != null) {
 
-                // First check if there are any endpoint specified at all
-                if (countAllEndpointsInScope(em, query.getScopeId(), section)) {
-                    // if there are endpoints (even not matching the query), return 0
-                    return endpointInfoCount;
-                }
-
                 KapuaId originalScopeId = query.getScopeId();
 
                 do {
+                    // First check if there are any endpoint AT ALL specified in this scope
+                    if (countAllEndpointsInScope(em, query.getScopeId(), section)) {
+                        // There are endpoints (even not matching the query), exit because I found the "nearest usable" endpoints which don't have what I'm searching
+                        break;
+                    }
                     Account account = KapuaSecurityUtils.doPrivileged(() -> ACCOUNT_SERVICE.find(query.getScopeId()));
 
                     if (account == null) {