don't merge resourceActions for nested queries, allow recursive engin…

…e to handle this for us
cryostatio · Aug 2, 2022 · d32a3aa · d32a3aa
1 parent 7feded2
commit d32a3aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/EnvironmentNodesFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/EnvironmentNodesFetcher.java
@@ -68,9 +68,7 @@ class EnvironmentNodesFetcher extends AbstractPermissionedDataFetcher<List<Envir
 
     @Override
     public Set<ResourceAction> resourceActions() {
-        EnumSet<ResourceAction> actions = EnumSet.of(ResourceAction.READ_TARGET);
-        actions.addAll(rootNodeFetcher.resourceActions());
-        return actions;
+        return EnumSet.of(ResourceAction.READ_TARGET);
     }
 
     @Override

diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/NodeFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/NodeFetcher.java
@@ -63,9 +63,7 @@ class NodeFetcher extends AbstractPermissionedDataFetcher<AbstractNode> {
 
     @Override
     public Set<ResourceAction> resourceActions() {
-        EnumSet<ResourceAction> actions = EnumSet.of(ResourceAction.READ_TARGET);
-        actions.addAll(rootNodeFetcher.resourceActions());
-        return actions;
+        return EnumSet.of(ResourceAction.READ_TARGET);
     }
 
     @Override

diff --git a/src/main/java/io/cryostat/net/web/http/api/v2/graph/TargetNodesFetcher.java b/src/main/java/io/cryostat/net/web/http/api/v2/graph/TargetNodesFetcher.java
@@ -73,10 +73,7 @@ class TargetNodesFetcher extends AbstractPermissionedDataFetcher<List<TargetNode
 
     @Override
     public Set<ResourceAction> resourceActions() {
-        EnumSet<ResourceAction> actions = EnumSet.of(ResourceAction.READ_TARGET);
-        actions.addAll(rootNodeFetcher.resourceActions());
-        actions.addAll(recurseFetcher.resourceActions());
-        return actions;
+        return EnumSet.of(ResourceAction.READ_TARGET);
     }
 
     @Override