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
Merge requests
!1
Immutable
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Immutable
immutable
into
master
Overview
0
Commits
5
Pipelines
0
Changes
4
Merged
Nicola Fulvio Calabria
requested to merge
immutable
into
master
2 years ago
Overview
0
Commits
5
Pipelines
0
Changes
4
Expand
Add immutable flag to nodes and prevent move and delete of immutable nodes
0
0
Merge request reports
Viewing commit
2df69c87
Prev
Next
Show latest version
4 files
+
161
−
235
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
2df69c87
refactored delete service tests
· 2df69c87
Nicola Fulvio Calabria
authored
2 years ago
src/main/java/it/inaf/oats/vospace/DeleteNodeController.java
+
9
−
27
Options
@@ -6,14 +6,7 @@
package
it.inaf.oats.vospace
;
import
it.inaf.ia2.aa.data.User
;
import
it.inaf.oats.vospace.datamodel.NodeUtils
;
import
it.inaf.oats.vospace.exception.LinkFoundException
;
import
it.inaf.oats.vospace.exception.NodeNotFoundException
;
import
it.inaf.oats.vospace.exception.PermissionDeniedException
;
import
it.inaf.oats.vospace.persistence.NodeDAO
;
import
java.util.List
;
import
javax.servlet.http.HttpServletRequest
;
import
net.ivoa.xml.vospace.v2.Node
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
@@ -23,36 +16,25 @@ import org.springframework.http.ResponseEntity;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.RestController
;
@RestController
public
class
DeleteNodeController
extends
BaseNodeController
{
public
class
DeleteNodeController
extends
BaseNodeController
{
@Autowired
DeleteNodeService
deleteNodeService
;
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
DeleteNodeController
.
class
);
@DeleteMapping
(
value
=
{
"/nodes"
,
"/nodes/**"
},
produces
=
{
MediaType
.
APPLICATION_XML_VALUE
,
MediaType
.
TEXT_XML_VALUE
,
MediaType
.
APPLICATION_JSON_VALUE
})
public
ResponseEntity
<
String
>
deleteNode
(
HttpServletRequest
request
,
User
principal
)
{
String
path
=
getPath
();
LOG
.
debug
(
"deleteNode called for path {}"
,
path
);
try
{
deleteNodeService
.
doPreliminaryChecks
(
path
);
deleteNodeService
.
deleteNode
(
path
,
principal
);
return
ResponseEntity
.
ok
(
"Node deleted"
);
}
catch
(
Exception
ex
)
{
return
new
ResponseEntity
<>(
ex
.
getMessage
(),
HttpStatus
.
BAD_REQUEST
);
}
}
}
deleteNodeService
.
doPreliminaryChecks
(
path
);
deleteNodeService
.
deleteNode
(
path
,
principal
);
return
ResponseEntity
.
ok
(
"Node deleted"
);
}
}
Loading