Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
API
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
europdx
k8s
cbio-on-demand
API
Merge requests
!12
WIP: Resolve "Rozsirenie instance o atributy"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
WIP: Resolve "Rozsirenie instance o atributy"
5-rozsirenie-instance-o-atributy-2
into
v2
Overview
0
Commits
2
Pipelines
2
Changes
12
Closed
Ľuboslav Pivarč
requested to merge
5-rozsirenie-instance-o-atributy-2
into
v2
5 years ago
Overview
0
Commits
2
Pipelines
2
Changes
12
Expand
Closes
#5 (closed)
0
0
Merge request reports
Compare
v2
v2 (base)
and
latest version
latest version
56476ba6
2 commits,
5 years ago
12 files
+
219
−
174
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
12
Search (e.g. *.vue) (Ctrl+P)
cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/api/V2.java
+
16
−
18
Options
package
cz.muni.ics.edirex.cbioondemandK8S.api
;
package
cz.muni.ics.edirex.cbioondemandK8S.api
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
InitialBody
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
v2.InstanceId
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
Instance
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
v2.User
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
InstanceExte
nd
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
v2.CbioDema
nd
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.Instance
Id
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
v2.
Instance
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
User
;
import
cz.muni.ics.edirex.cbioondemandK8S.model.
v2.InstanceDTO
;
import
cz.muni.ics.edirex.cbioondemandK8S.service.CBioOnDemandService
;
import
cz.muni.ics.edirex.cbioondemandK8S.service.
v2.
CBioOnDemandService
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
@@ -21,8 +21,8 @@ import java.util.List;
@@ -21,8 +21,8 @@ import java.util.List;
@RestController
@RestController
@RequestMapping
(
"/v2"
)
@RequestMapping
(
"/v2"
)
public
class
V2
{
public
class
V2
{
private
final
String
cbio
od
=
"/cbioondemand"
;
private
final
String
cbio
=
"/cbioondemand"
;
private
final
String
cbioods
=
"/cbioondemands"
;
private
final
String
allCbio
=
"/cbioondemands"
;
private
CBioOnDemandService
cBioOnDemand
;
private
CBioOnDemandService
cBioOnDemand
;
@@ -30,40 +30,38 @@ public class V2 {
@@ -30,40 +30,38 @@ public class V2 {
this
.
cBioOnDemand
=
cBioOnDemand
;
this
.
cBioOnDemand
=
cBioOnDemand
;
}
}
@PostMapping
(
cbio
od
)
@PostMapping
(
cbio
)
public
ResponseEntity
createCbioOnDemand
(
@RequestBody
InitialBody
demand
){
public
ResponseEntity
createCbioOnDemand
(
@RequestBody
CbioDemand
demand
){
Instance
instance
=
cBioOnDemand
.
create
(
demand
);
Instance
instance
=
cBioOnDemand
.
create
(
demand
);
if
(
instance
==
null
)
if
(
instance
==
null
)
return
new
ResponseEntity
<>(
HttpStatus
.
SERVICE_UNAVAILABLE
);
return
new
ResponseEntity
<>(
HttpStatus
.
SERVICE_UNAVAILABLE
);
return
new
ResponseEntity
<>(
instance
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
instance
,
HttpStatus
.
OK
);
}
}
@GetMapping
(
cbio
od
)
@GetMapping
(
cbio
)
public
ResponseEntity
statusCbioOnDemand
(
InstanceId
id
){
public
ResponseEntity
statusCbioOnDemand
(
InstanceId
id
){
Instance
instance
=
cBioOnDemand
.
status
(
id
.
getInstance
());
Instance
instance
=
cBioOnDemand
.
status
(
id
.
getInstance
());
if
(
instance
==
null
)
return
new
ResponseEntity
<>(
HttpStatus
.
BAD_REQUEST
);
return
new
ResponseEntity
<>(
instance
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
instance
,
HttpStatus
.
OK
);
}
}
@DeleteMapping
(
cbio
od
)
@DeleteMapping
(
cbio
)
public
ResponseEntity
removeCbioOnDemand
(
InstanceId
id
){
public
ResponseEntity
removeCbioOnDemand
(
InstanceId
id
){
if
(!
cBioOnDemand
.
remove
(
id
.
getInstance
()))
if
(!
cBioOnDemand
.
remove
(
id
.
getInstance
()))
return
new
ResponseEntity
<>(
HttpStatus
.
INTERNAL_SERVER_ERROR
);
return
new
ResponseEntity
<>(
HttpStatus
.
INTERNAL_SERVER_ERROR
);
return
new
ResponseEntity
<>(
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
HttpStatus
.
OK
);
}
}
@PutMapping
(
cbio
od
)
@PutMapping
(
cbio
)
public
ResponseEntity
extendCbioOnDemand
(
@RequestBody
Instance
Extend
extend
){
public
ResponseEntity
extendCbioOnDemand
(
@RequestBody
Instance
DTO
extend
){
Instance
instance
=
cBioOnDemand
.
extend
(
extend
.
getInstance
()
);
Instance
instance
=
cBioOnDemand
.
extend
(
extend
);
if
(
instance
==
null
)
if
(
instance
==
null
)
return
new
ResponseEntity
<>(
HttpStatus
.
INTERNAL_SERVER_ERROR
);
return
new
ResponseEntity
<>(
HttpStatus
.
INTERNAL_SERVER_ERROR
);
return
new
ResponseEntity
(
HttpStatus
.
OK
);
return
new
ResponseEntity
(
HttpStatus
.
OK
);
}
}
@GetMapping
(
cbioods
)
@GetMapping
(
allCbio
)
public
ResponseEntity
listInstancesForUser
(
User
user
){
public
ResponseEntity
listInstancesForUser
(
User
user
){
List
<
Instance
>
instances
=
cBioOnDemand
.
listInstancesForUser
(
user
);
List
<
Instance
>
instances
=
cBioOnDemand
.
listInstancesForUser
(
user
);
if
(
instances
==
null
){
if
(
instances
==
null
){
Loading