Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-rest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-rest
Commits
8339cc20
Commit
8339cc20
authored
4 years ago
by
Nicola Fulvio Calabria
Browse files
Options
Downloads
Patches
Plain Diff
Fixed Task #6363 disappearance (likely due to local git client/IDE
bug). Commit from fresh cloned local copy.
parent
d2500f43
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/it/inaf/oats/vospace/ListNodeController.java
+18
-0
18 additions, 0 deletions
src/main/java/it/inaf/oats/vospace/ListNodeController.java
src/test/java/it/inaf/oats/vospace/ListNodeControllerTest.java
+1
-1
1 addition, 1 deletion
...est/java/it/inaf/oats/vospace/ListNodeControllerTest.java
with
19 additions
and
1 deletion
src/main/java/it/inaf/oats/vospace/ListNodeController.java
+
18
−
0
View file @
8339cc20
...
...
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import
org.springframework.http.ResponseEntity
;
import
net.ivoa.xml.vospace.v2.Node
;
import
net.ivoa.xml.vospace.v2.ContainerNode
;
import
it.inaf.oats.vospace.persistence.NodeDAO
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -17,6 +18,8 @@ import it.inaf.ia2.aa.data.User;
import
it.inaf.oats.vospace.datamodel.NodeUtils
;
import
java.util.Optional
;
import
it.inaf.oats.vospace.exception.PermissionDeniedException
;
import
java.util.stream.Collectors
;
import
java.util.List
;
@RestController
public
class
ListNodeController
extends
BaseNodeController
{
...
...
@@ -43,6 +46,21 @@ public class ListNodeController extends BaseNodeController {
}
}
Node
node
=
optNode
.
get
();
if
(
node
instanceof
ContainerNode
)
{
ContainerNode
cnd
=
(
ContainerNode
)
node
;
List
<
Node
>
children
=
cnd
.
getNodes
().
stream
().
filter
(
(
n
)
->
NodeUtils
.
checkIfReadable
(
n
,
principal
.
getName
(),
principal
.
getGroups
()))
.
collect
(
Collectors
.
toList
());
cnd
.
setNodes
(
children
);
optNode
=
Optional
.
of
(
cnd
);
}
return
ResponseEntity
.
ok
(
optNode
.
get
());
}
}
This diff is collapsed.
Click to expand it.
src/test/java/it/inaf/oats/vospace/ListNodeControllerTest.java
+
1
−
1
View file @
8339cc20
...
...
@@ -111,7 +111,7 @@ public class ListNodeControllerTest {
.
andExpect
(
status
().
is2xxSuccessful
());
}
//
@Test
@Test
public
void
testListOnlyReadableChildren
()
throws
Exception
{
ContainerNode
node
=
new
ContainerNode
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment