Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
5fa4e769
Commit
5fa4e769
authored
Jul 11, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added null check
parent
0c872925
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
14 deletions
+24
-14
ConfigurationService.java
...ava/nl/uva/sne/drip/api/service/ConfigurationService.java
+3
-0
ProvisionService.java
...in/java/nl/uva/sne/drip/api/service/ProvisionService.java
+14
-12
ConfigurationController.java
.../nl/uva/sne/drip/api/v1/rest/ConfigurationController.java
+7
-2
No files found.
drip-api/src/main/java/nl/uva/sne/drip/api/service/ConfigurationService.java
View file @
5fa4e769
...
...
@@ -89,6 +89,9 @@ public class ConfigurationService {
@PostAuthorize
(
"(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))"
)
public
ConfigurationRepresentation
delete
(
String
id
)
{
ConfigurationRepresentation
tr
=
dao
.
findOne
(
id
);
if
(
tr
==
null
){
throw
new
NotFoundException
();
}
dao
.
delete
(
tr
);
return
tr
;
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
View file @
5fa4e769
...
...
@@ -250,18 +250,20 @@ public class ProvisionService {
parameters
.
add
(
topology
);
Set
<
String
>
ids
=
plan
.
getLoweLevelPlanIDs
();
for
(
String
lowID
:
ids
)
{
PlanResponse
lowPlan
=
planService
.
getDao
().
findOne
(
lowID
);
topology
=
new
MessageParameter
();
topology
.
setName
(
"topology"
);
String
value
=
Converter
.
map2YmlString
(
lowPlan
.
getKeyValue
());
value
=
value
.
replaceAll
(
"\\uff0E"
,
"."
);
topology
.
setValue
(
value
);
attributes
=
new
HashMap
<>();
attributes
.
put
(
"level"
,
String
.
valueOf
(
lowPlan
.
getLevel
()));
attributes
.
put
(
"filename"
,
FilenameUtils
.
removeExtension
(
lowPlan
.
getName
()));
topology
.
setAttributes
(
attributes
);
parameters
.
add
(
topology
);
if
(
ids
!=
null
)
{
for
(
String
lowID
:
ids
)
{
PlanResponse
lowPlan
=
planService
.
getDao
().
findOne
(
lowID
);
topology
=
new
MessageParameter
();
topology
.
setName
(
"topology"
);
String
value
=
Converter
.
map2YmlString
(
lowPlan
.
getKeyValue
());
value
=
value
.
replaceAll
(
"\\uff0E"
,
"."
);
topology
.
setValue
(
value
);
attributes
=
new
HashMap
<>();
attributes
.
put
(
"level"
,
String
.
valueOf
(
lowPlan
.
getLevel
()));
attributes
.
put
(
"filename"
,
FilenameUtils
.
removeExtension
(
lowPlan
.
getName
()));
topology
.
setAttributes
(
attributes
);
parameters
.
add
(
topology
);
}
}
return
parameters
;
}
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ConfigurationController.java
View file @
5fa4e769
...
...
@@ -135,11 +135,16 @@ public class ConfigurationController {
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
DELETE
)
@RolesAllowed
({
UserService
.
USER
,
UserService
.
ADMIN
})
@StatusCodes
({
@ResponseCode
(
code
=
200
,
condition
=
"Successful delete"
)
@ResponseCode
(
code
=
200
,
condition
=
"Successful delete"
),
@ResponseCode
(
code
=
404
,
condition
=
"Object not found"
)
})
public
@ResponseBody
String
delete
(
@PathVariable
(
"id"
)
String
id
)
{
configurationService
.
delete
(
id
);
try
{
configurationService
.
delete
(
id
);
}
catch
(
NotFoundException
ex
)
{
throw
ex
;
}
return
"Deleted : "
+
id
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment