Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
70067418
Commit
70067418
authored
Nov 21, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed {UUID} path variable to {uuid}
parent
473f89b2
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
100 additions
and
100 deletions
+100
-100
src/main/java/org/genesys2/server/api/v1/AccessionController.java
.../java/org/genesys2/server/api/v1/AccessionController.java
+4
-4
src/main/java/org/genesys2/server/api/v1/DatasetController.java
...in/java/org/genesys2/server/api/v1/DatasetController.java
+27
-27
src/main/java/org/genesys2/server/api/v1/DescriptorController.java
...java/org/genesys2/server/api/v1/DescriptorController.java
+6
-6
src/main/java/org/genesys2/server/api/v1/DescriptorListController.java
.../org/genesys2/server/api/v1/DescriptorListController.java
+12
-12
src/main/java/org/genesys2/server/api/v1/PartnerController.java
...in/java/org/genesys2/server/api/v1/PartnerController.java
+4
-4
src/main/java/org/genesys2/server/api/v1/SubsetController.java
...ain/java/org/genesys2/server/api/v1/SubsetController.java
+8
-8
src/main/java/org/genesys2/server/api/v1/SubsetCreatorController.java
...a/org/genesys2/server/api/v1/SubsetCreatorController.java
+5
-5
src/main/java/org/genesys2/server/api/v1/VocabularyController.java
...java/org/genesys2/server/api/v1/VocabularyController.java
+10
-10
src/main/java/org/genesys2/server/mvc/AccessionController.java
...ain/java/org/genesys2/server/mvc/AccessionController.java
+2
-2
src/main/java/org/genesys2/server/mvc/SubsetController.java
src/main/java/org/genesys2/server/mvc/SubsetController.java
+2
-2
src/test/java/org/genesys/test/server/api/v1/DatasetControllerTest.java
...org/genesys/test/server/api/v1/DatasetControllerTest.java
+5
-5
src/test/java/org/genesys/test/server/api/v1/DescriptorControllerTest.java
.../genesys/test/server/api/v1/DescriptorControllerTest.java
+1
-1
src/test/java/org/genesys/test/server/api/v1/DescriptorListControllerTest.java
...esys/test/server/api/v1/DescriptorListControllerTest.java
+3
-3
src/test/java/org/genesys/test/server/api/v1/PartnerControllerTest.java
...org/genesys/test/server/api/v1/PartnerControllerTest.java
+1
-1
src/test/java/org/genesys/test/server/api/v1/SubsetRestControllerTest.java
.../genesys/test/server/api/v1/SubsetRestControllerTest.java
+4
-4
src/test/java/org/genesys/test/server/api/v1/UserManagementControllerTest.java
...esys/test/server/api/v1/UserManagementControllerTest.java
+6
-6
No files found.
src/main/java/org/genesys2/server/api/v1/AccessionController.java
View file @
70067418
...
...
@@ -121,9 +121,9 @@ public class AccessionController {
* @param uuid the uuid
* @return the subset
*/
@GetMapping
(
value
=
"/{
UUID
:\\w{8}\\-\\w{4}.+}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
@GetMapping
(
value
=
"/{
uuid
:\\w{8}\\-\\w{4}.+}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
@JsonView
({
JsonViews
.
Protected
.
class
})
public
Accession
getByUuid
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
public
Accession
getByUuid
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
return
accessionService
.
getByUuid
(
uuid
);
}
...
...
@@ -215,9 +215,9 @@ public class AccessionController {
return
accessionService
.
getAccessionDetails
(
accession
);
}
@GetMapping
(
value
=
"/details/{
UUID
:\\w{8}\\-\\w{4}.+}"
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
@GetMapping
(
value
=
"/details/{
uuid
:\\w{8}\\-\\w{4}.+}"
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
@JsonView
(
JsonViews
.
Root
.
class
)
public
AccessionService
.
AccessionDetails
getAccessionDetailsByUUID
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
public
AccessionService
.
AccessionDetails
getAccessionDetailsByUUID
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
Accession
accession
=
accessionService
.
getByUuid
(
uuid
);
return
accessionService
.
getAccessionDetails
(
accession
);
}
...
...
src/main/java/org/genesys2/server/api/v1/DatasetController.java
View file @
70067418
...
...
@@ -75,9 +75,9 @@ public class DatasetController extends ApiBaseController {
// Rest controller base URL
public
static
final
String
CONTROLLER_URL
=
ApiBaseController
.
APIv1_BASE
+
"/dataset"
;
public
static
final
String
CREATOR_URL
=
"/{
UUID
}/datasetcreator"
;
public
static
final
String
FILES_URL
=
"/{
UUID
}/files"
;
protected
static
final
String
LOCATION_URL
=
"/{
UUID
}/location"
;
public
static
final
String
CREATOR_URL
=
"/{
uuid
}/datasetcreator"
;
public
static
final
String
FILES_URL
=
"/{
uuid
}/files"
;
protected
static
final
String
LOCATION_URL
=
"/{
uuid
}/location"
;
/** The dataset service. */
@Autowired
...
...
@@ -124,8 +124,8 @@ public class DatasetController extends ApiBaseController {
* @return the dataset
* @throws NotFoundElement the not found element
*/
@GetMapping
(
value
=
"/{
UUID
}"
)
public
Dataset
getDataset
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
throws
NotFoundElement
{
@GetMapping
(
value
=
"/{
uuid
}"
)
public
Dataset
getDataset
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
throws
NotFoundElement
{
LOG
.
debug
(
"Load Dataset by uuid {}"
,
uuid
);
return
datasetService
.
loadDataset
(
uuid
);
}
...
...
@@ -138,8 +138,8 @@ public class DatasetController extends ApiBaseController {
* @return the dataset
* @throws Exception the exception
*/
@DeleteMapping
(
"/{
UUID
},{version}"
)
public
Dataset
deleteDataset
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
throws
Exception
{
@DeleteMapping
(
"/{
uuid
},{version}"
)
public
Dataset
deleteDataset
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
throws
Exception
{
final
Dataset
dataset
=
datasetService
.
removeDataset
(
datasetService
.
loadDataset
(
uuid
,
version
));
dataset
.
setId
(
null
);
return
dataset
;
...
...
@@ -153,8 +153,8 @@ public class DatasetController extends ApiBaseController {
* @param descriptorUuids the descriptor uuids
* @return the dataset
*/
@PostMapping
(
value
=
"/add-descriptors/{
UUID
},{version}"
)
public
Dataset
addDescriptors
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/add-descriptors/{
uuid
},{version}"
)
public
Dataset
addDescriptors
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
uuid
,
version
);
final
Set
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toSet
());
return
datasetService
.
addDescriptors
(
dataset
,
descriptors
.
toArray
(
new
Descriptor
[]
{}));
...
...
@@ -169,8 +169,8 @@ public class DatasetController extends ApiBaseController {
* @return the dataset
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
"/upsertaccessions/{
UUID
},{version}"
)
public
Dataset
upsertAccessions
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@PostMapping
(
value
=
"/upsertaccessions/{
uuid
},{version}"
)
public
Dataset
upsertAccessions
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
AccessionRef
>
accessionRefs
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
uuid
,
version
);
return
datasetService
.
upsertAccessions
(
dataset
,
accessionRefs
);
...
...
@@ -226,15 +226,15 @@ public class DatasetController extends ApiBaseController {
* @param descriptorUuids the descriptor uuids
* @return the dataset
*/
@PostMapping
(
value
=
"/remove-descriptors/{
UUID
},{version}"
)
public
Dataset
removeDescriptors
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/remove-descriptors/{
uuid
},{version}"
)
public
Dataset
removeDescriptors
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
uuid
,
version
);
final
Set
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toSet
());
return
datasetService
.
removeDescriptors
(
dataset
,
descriptors
.
toArray
(
new
Descriptor
[]
{}));
}
@PostMapping
(
value
=
"/set-descriptors/{
UUID
},{version}"
)
public
Dataset
updateDescriptors
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/set-descriptors/{
uuid
},{version}"
)
public
Dataset
updateDescriptors
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
uuid
,
version
);
final
List
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toList
());
return
datasetService
.
updateDescriptors
(
dataset
,
descriptors
);
...
...
@@ -304,7 +304,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
CREATOR_URL
+
"/create"
)
public
DatasetCreator
createDatasetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
public
DatasetCreator
createDatasetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
uuid
);
return
datasetService
.
createDatasetCreator
(
dataset
,
datasetCreator
);
}
...
...
@@ -319,7 +319,7 @@ public class DatasetController extends ApiBaseController {
*/
// uses request body
@RequestMapping
(
value
=
CREATOR_URL
+
"/delete"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
DELETE
})
public
DatasetCreator
deleteDatasetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
public
DatasetCreator
deleteDatasetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
datasetUuid
);
return
datasetService
.
removeDatasetCreator
(
dataset
,
datasetCreator
);
}
...
...
@@ -332,7 +332,7 @@ public class DatasetController extends ApiBaseController {
* @return the page
*/
@GetMapping
(
value
=
CREATOR_URL
+
"/list"
)
public
Page
<
DatasetCreator
>
listDatasetCreators
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
public
Page
<
DatasetCreator
>
listDatasetCreators
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
return
datasetService
.
listDatasetCreators
(
uuid
,
page
.
toPageRequest
(
100
,
Sort
.
Direction
.
ASC
,
"id"
));
}
...
...
@@ -345,7 +345,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
CREATOR_URL
+
"/update"
)
public
DatasetCreator
updateDatasetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
public
DatasetCreator
updateDatasetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetCreator
datasetCreator
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
datasetUuid
);
return
datasetService
.
updateDatasetCreator
(
dataset
,
datasetCreator
);
}
...
...
@@ -375,7 +375,7 @@ public class DatasetController extends ApiBaseController {
* @throws IOException Signals that an I/O exception has occurred.
*/
@PostMapping
(
value
=
FILES_URL
+
"/add"
)
public
Dataset
addFileToDataset
(
@RequestParam
(
"file"
)
final
MultipartFile
inputFile
,
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
)
throws
NotFoundElement
,
public
Dataset
addFileToDataset
(
@RequestParam
(
"file"
)
final
MultipartFile
inputFile
,
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
)
throws
NotFoundElement
,
InvalidRepositoryFileDataException
,
InvalidRepositoryPathException
,
IOException
{
LOG
.
info
(
"Upload file to dataset by uuid {}"
,
datasetUuid
);
return
datasetService
.
addDatasetFile
(
datasetService
.
loadDataset
(
datasetUuid
),
inputFile
);
...
...
@@ -395,7 +395,7 @@ public class DatasetController extends ApiBaseController {
* @throws NoSuchRepositoryFileException the no such repository file exception
*/
@DeleteMapping
(
value
=
FILES_URL
+
"/delete/{fileUuid}"
)
public
Dataset
removeFileOfDataset
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@PathVariable
(
"fileUuid"
)
final
UUID
fileUuid
)
throws
NotFoundElement
,
public
Dataset
removeFileOfDataset
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@PathVariable
(
"fileUuid"
)
final
UUID
fileUuid
)
throws
NotFoundElement
,
InvalidRepositoryFileDataException
,
InvalidRepositoryPathException
,
IOException
,
NoSuchRepositoryFileException
{
return
datasetService
.
removeDatasetFile
(
datasetService
.
loadDataset
(
datasetUuid
),
fileUuid
);
}
...
...
@@ -408,7 +408,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@GetMapping
(
value
=
FILES_URL
+
"/list"
)
public
List
<
RepositoryFile
>
getList
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
)
throws
NotFoundElement
{
public
List
<
RepositoryFile
>
getList
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
)
throws
NotFoundElement
{
return
datasetService
.
listDatasetFiles
(
datasetService
.
loadDataset
(
datasetUuid
));
}
...
...
@@ -426,7 +426,7 @@ public class DatasetController extends ApiBaseController {
* @throws NoSuchRepositoryFileException the no such repository file exception
*/
@PostMapping
(
value
=
FILES_URL
+
"/update"
)
public
Dataset
updateDatasetFile
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
RepositoryFile
metadata
)
throws
NotFoundElement
,
public
Dataset
updateDatasetFile
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
RepositoryFile
metadata
)
throws
NotFoundElement
,
InvalidRepositoryFileDataException
,
InvalidRepositoryPathException
,
IOException
,
NoSuchRepositoryFileException
{
return
datasetService
.
updateDatasetFile
(
datasetService
.
loadDataset
(
datasetUuid
),
metadata
);
}
...
...
@@ -440,7 +440,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
LOCATION_URL
+
"/create"
)
public
DatasetLocation
createLocation
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
public
DatasetLocation
createLocation
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
datasetUuid
);
return
datasetService
.
createLocation
(
dataset
,
datasetLocation
);
}
...
...
@@ -454,7 +454,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@RequestMapping
(
value
=
LOCATION_URL
+
"/delete"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
DELETE
})
public
DatasetLocation
deleteLocation
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
public
DatasetLocation
deleteLocation
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
datasetUuid
);
return
datasetService
.
removeLocation
(
dataset
,
datasetLocation
);
}
...
...
@@ -467,7 +467,7 @@ public class DatasetController extends ApiBaseController {
* @return the page
*/
@GetMapping
(
value
=
LOCATION_URL
+
"/list"
)
public
Page
<
DatasetLocation
>
listLocation
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
public
Page
<
DatasetLocation
>
listLocation
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
return
datasetService
.
listLocation
(
uuid
,
page
.
toPageRequest
(
100
,
Sort
.
Direction
.
ASC
,
"id"
));
}
...
...
@@ -480,7 +480,7 @@ public class DatasetController extends ApiBaseController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
LOCATION_URL
+
"/update"
)
public
DatasetLocation
updateLocation
(
@PathVariable
(
"
UUID
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
public
DatasetLocation
updateLocation
(
@PathVariable
(
"
uuid
"
)
final
UUID
datasetUuid
,
@RequestBody
final
DatasetLocation
datasetLocation
)
throws
NotFoundElement
{
final
Dataset
dataset
=
datasetService
.
loadDataset
(
datasetUuid
);
return
datasetService
.
updateLocation
(
dataset
,
datasetLocation
);
}
...
...
src/main/java/org/genesys2/server/api/v1/DescriptorController.java
View file @
70067418
...
...
@@ -80,8 +80,8 @@ public class DescriptorController extends ApiBaseController {
* @param uuid the uuid
* @return the descriptor
*/
@RequestMapping
(
value
=
"/{
UUID
}"
,
method
=
RequestMethod
.
GET
)
public
Descriptor
getDescriptor
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@RequestMapping
(
value
=
"/{
uuid
}"
,
method
=
RequestMethod
.
GET
)
public
Descriptor
getDescriptor
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
return
descriptorService
.
getDescriptor
(
uuid
);
}
...
...
@@ -92,8 +92,8 @@ public class DescriptorController extends ApiBaseController {
* @param version the version
* @return the descriptor
*/
@DeleteMapping
(
value
=
"/{
UUID
},{version}"
)
public
Descriptor
deleteDescriptor
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
@DeleteMapping
(
value
=
"/{
uuid
},{version}"
)
public
Descriptor
deleteDescriptor
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
try
{
return
descriptorService
.
removeDescriptor
(
descriptorService
.
getDescriptor
(
uuid
,
version
));
}
catch
(
DataIntegrityViolationException
e
)
{
...
...
@@ -322,10 +322,10 @@ public class DescriptorController extends ApiBaseController {
* @param uuid descriptor UUID
* @return the other descriptor info
*/
@RequestMapping
(
value
=
"/extra/{
UUID
}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/extra/{
uuid
}"
,
method
=
RequestMethod
.
GET
)
@SuppressWarnings
(
"unused"
)
@JsonView
(
JsonViews
.
Minimal
.
class
)
public
Object
getOtherDescriptorInfo
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
public
Object
getOtherDescriptorInfo
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
final
Descriptor
descriptor
=
descriptorService
.
getDescriptor
(
uuid
);
return
new
Object
()
{
...
...
src/main/java/org/genesys2/server/api/v1/DescriptorListController.java
View file @
70067418
...
...
@@ -85,8 +85,8 @@ public class DescriptorListController {
* @param uuid the uuid
* @return the descriptor list
*/
@GetMapping
(
value
=
"/{
UUID
}"
)
public
DescriptorList
getDescriptorList
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@GetMapping
(
value
=
"/{
uuid
}"
)
public
DescriptorList
getDescriptorList
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
final
DescriptorList
descriptorList
=
descriptorListService
.
getDescriptorList
(
uuid
);
return
descriptorList
;
}
...
...
@@ -98,8 +98,8 @@ public class DescriptorListController {
* @param version the version
* @return the descriptor list
*/
@DeleteMapping
(
value
=
"/{
UUID
},{version}"
)
public
DescriptorList
deleteDescriptorList
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
@DeleteMapping
(
value
=
"/{
uuid
},{version}"
)
public
DescriptorList
deleteDescriptorList
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
return
descriptorListService
.
deleteDescriptorList
(
descriptorListService
.
getDescriptorList
(
uuid
,
version
));
}
...
...
@@ -111,8 +111,8 @@ public class DescriptorListController {
* @throws IOException Signals that an I/O exception has occurred.
*/
@Transactional
(
readOnly
=
true
)
@GetMapping
(
value
=
"/{
UUID
}/html"
,
produces
=
{
"text/html"
})
public
void
generateDocument
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
final
HttpServletResponse
response
)
throws
IOException
{
@GetMapping
(
value
=
"/{
uuid
}/html"
,
produces
=
{
"text/html"
})
public
void
generateDocument
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
final
HttpServletResponse
response
)
throws
IOException
{
final
DescriptorList
descriptorList
=
descriptorListService
.
getDescriptorList
(
uuid
);
final
String
descriptorListHtml
=
exporter
.
htmlDescriptorList
(
descriptorList
);
...
...
@@ -204,8 +204,8 @@ public class DescriptorListController {
* @param descriptorUuids the descriptor uuids
* @return the descriptor list
*/
@PostMapping
(
value
=
"/add-descriptors/{
UUID
},{version}"
)
public
DescriptorList
addDescriptor
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/add-descriptors/{
uuid
},{version}"
)
public
DescriptorList
addDescriptor
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
final
DescriptorList
descriptorList
=
descriptorListService
.
getDescriptorList
(
uuid
,
version
);
final
List
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toList
());
return
descriptorListService
.
addDescriptors
(
descriptorList
,
descriptors
.
toArray
(
new
Descriptor
[]
{}));
...
...
@@ -219,8 +219,8 @@ public class DescriptorListController {
* @param descriptorUuids the descriptor uuids
* @return the descriptor list
*/
@PostMapping
(
value
=
"/remove-descriptors/{
UUID
},{version}"
)
public
DescriptorList
removeDescriptor
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/remove-descriptors/{
uuid
},{version}"
)
public
DescriptorList
removeDescriptor
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
descriptorUuids
)
{
final
DescriptorList
descriptorList
=
descriptorListService
.
getDescriptorList
(
uuid
,
version
);
final
Set
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toSet
());
return
descriptorListService
.
removeDescriptors
(
descriptorList
,
descriptors
.
toArray
(
new
Descriptor
[]
{}));
...
...
@@ -234,8 +234,8 @@ public class DescriptorListController {
* @param descriptorUuids the descriptor uuids
* @return the descriptor list
*/
@PostMapping
(
value
=
"/set-descriptors/{
UUID
},{version}"
)
public
DescriptorList
setDescriptor
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
@PostMapping
(
value
=
"/set-descriptors/{
uuid
},{version}"
)
public
DescriptorList
setDescriptor
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
List
<
UUID
>
descriptorUuids
)
{
final
DescriptorList
descriptorList
=
descriptorListService
.
getDescriptorList
(
uuid
,
version
);
final
List
<
Descriptor
>
descriptors
=
descriptorUuids
.
stream
().
map
(
descriptorUuid
->
descriptorService
.
getDescriptor
(
descriptorUuid
)).
collect
(
Collectors
.
toList
());
return
descriptorListService
.
setDescriptors
(
descriptorList
,
descriptors
.
toArray
(
new
Descriptor
[]
{}));
...
...
src/main/java/org/genesys2/server/api/v1/PartnerController.java
View file @
70067418
...
...
@@ -68,8 +68,8 @@ public class PartnerController {
* @param uuid the uuid
* @return the partner
*/
@GetMapping
(
value
=
"/{
UUID
}"
)
public
Partner
getPartner
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@GetMapping
(
value
=
"/{
uuid
}"
)
public
Partner
getPartner
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
return
partnerService
.
loadPartner
(
uuid
);
}
...
...
@@ -80,8 +80,8 @@ public class PartnerController {
* @param version the version
* @return the partner
*/
@DeleteMapping
(
value
=
"/{
UUID
},{version}"
)
public
Partner
deletePartner
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
@DeleteMapping
(
value
=
"/{
uuid
},{version}"
)
public
Partner
deletePartner
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
return
partnerService
.
removePartner
(
partnerService
.
loadPartner
(
uuid
,
version
));
}
...
...
src/main/java/org/genesys2/server/api/v1/SubsetController.java
View file @
70067418
...
...
@@ -102,8 +102,8 @@ public class SubsetController {
* @param uuid the uuid
* @return the subset
*/
@GetMapping
(
value
=
"/{
UUID
}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
get
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@GetMapping
(
value
=
"/{
uuid
}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
get
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
return
subsetService
.
get
(
uuid
);
}
...
...
@@ -114,8 +114,8 @@ public class SubsetController {
* @param version the version
* @return the subset
*/
@DeleteMapping
(
value
=
"/{
UUID
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
remove
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
@DeleteMapping
(
value
=
"/{
uuid
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
remove
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
return
subsetService
.
delete
(
subsetService
.
get
(
uuid
,
version
));
}
...
...
@@ -169,8 +169,8 @@ public class SubsetController {
* @param accessionsUuids the accessions UUIDs to be removed
* @return the subset
*/
@PostMapping
(
value
=
"/remove-accessions/{
UUID
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
removeAccessions
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
accessionsUuids
)
{
@PostMapping
(
value
=
"/remove-accessions/{
uuid
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
removeAccessions
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
accessionsUuids
)
{
final
Subset
subset
=
subsetService
.
get
(
uuid
,
version
);
return
subsetService
.
removeAccessions
(
subset
,
accessionsUuids
);
}
...
...
@@ -183,8 +183,8 @@ public class SubsetController {
* @param accessionIds the accessions UUIDs to be added
* @return the subset
*/
@PostMapping
(
value
=
"/add-accessions/{
UUID
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
addAccessions
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
accessionIds
)
{
@PostMapping
(
value
=
"/add-accessions/{
uuid
},{version}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
public
Subset
addAccessions
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
,
@RequestBody
final
Set
<
UUID
>
accessionIds
)
{
final
Subset
subset
=
subsetService
.
get
(
uuid
,
version
);
return
subsetService
.
addAccessions
(
subset
,
accessionIds
);
}
...
...
src/main/java/org/genesys2/server/api/v1/SubsetCreatorController.java
View file @
70067418
...
...
@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*;
public
class
SubsetCreatorController
{
/** The Constant API_BASE. */
public
static
final
String
CONTROLLER_URL
=
SubsetController
.
API_BASE
+
"/{
UUID
}/subsetcreator"
;
public
static
final
String
CONTROLLER_URL
=
SubsetController
.
API_BASE
+
"/{
uuid
}/subsetcreator"
;
/** The subset service. */
@Autowired
...
...
@@ -62,7 +62,7 @@ public class SubsetCreatorController {
* @return the page
*/
@GetMapping
(
value
=
"/list"
)
public
Page
<
SubsetCreator
>
listSubsetCreators
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
public
Page
<
SubsetCreator
>
listSubsetCreators
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
return
subsetService
.
listSubsetCreators
(
uuid
,
page
.
toPageRequest
(
100
,
Sort
.
Direction
.
ASC
,
"id"
));
}
...
...
@@ -87,7 +87,7 @@ public class SubsetCreatorController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
"/create"
)
public
SubsetCreator
createSubsetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
public
SubsetCreator
createSubsetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
final
Subset
subset
=
subsetService
.
get
(
uuid
);
return
subsetService
.
createSubsetCreator
(
subset
,
subsetCreator
);
}
...
...
@@ -102,7 +102,7 @@ public class SubsetCreatorController {
*/
// uses request body
@RequestMapping
(
value
=
"/delete"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
DELETE
})
public
SubsetCreator
deleteSubsetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
subsetUuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
public
SubsetCreator
deleteSubsetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
subsetUuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
final
Subset
subset
=
subsetService
.
get
(
subsetUuid
);
return
subsetService
.
removeSubsetCreator
(
subset
,
subsetCreator
);
}
...
...
@@ -116,7 +116,7 @@ public class SubsetCreatorController {
* @throws NotFoundElement the not found element
*/
@PostMapping
(
value
=
"/update"
)
public
SubsetCreator
updateSubsetCreator
(
@PathVariable
(
"
UUID
"
)
final
UUID
subsetUuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
public
SubsetCreator
updateSubsetCreator
(
@PathVariable
(
"
uuid
"
)
final
UUID
subsetUuid
,
@RequestBody
final
SubsetCreator
subsetCreator
)
throws
NotFoundElement
{
final
Subset
subset
=
subsetService
.
get
(
subsetUuid
);
return
subsetService
.
updateSubsetCreator
(
subset
,
subsetCreator
);
}
...
...
src/main/java/org/genesys2/server/api/v1/VocabularyController.java
View file @
70067418
...
...
@@ -106,8 +106,8 @@ public class VocabularyController {
* @param uuid the uuid
* @return the controlled vocabulary
*/
@GetMapping
(
value
=
"/{
UUID
}"
)
public
ControlledVocabulary
get
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@GetMapping
(
value
=
"/{
uuid
}"
)
public
ControlledVocabulary
get
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
return
vocabularyService
.
getVocabulary
(
uuid
);
}
...
...
@@ -118,8 +118,8 @@ public class VocabularyController {
* @param code the code
* @return the term
*/
@GetMapping
(
value
=
"/{
UUID
}/{code}"
)
public
VocabularyTerm
getTerm
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"code"
)
final
String
code
)
throws
IOException
,
ServletException
{
@GetMapping
(
value
=
"/{
uuid
}/{code}"
)
public
VocabularyTerm
getTerm
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"code"
)
final
String
code
)
throws
IOException
,
ServletException
{
switch
(
uuid
.
toString
())
{
case
FAO_WIEWS_UUID:
...
...
@@ -142,9 +142,9 @@ public class VocabularyController {
* @param like the like
* @return the list
*/
@PostMapping
(
value
=
"/{
UUID
}/autocomplete"
)
@PostMapping
(
value
=
"/{
uuid
}/autocomplete"
)
@JsonView
({
JsonViews
.
Public
.
class
})
public
List
<
VocabularyTerm
>
autocompleteTerm
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@RequestParam
(
"q"
)
final
String
like
)
{
public
List
<
VocabularyTerm
>
autocompleteTerm
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@RequestParam
(
"q"
)
final
String
like
)
{
return
vocabularyService
.
autocompleteTerms
(
uuid
,
like
);
}
...
...
@@ -155,9 +155,9 @@ public class VocabularyController {
* @param page the page
* @return the page
*/
@PostMapping
(
value
=
"/{
UUID
}/terms"
)
@PostMapping
(
value
=
"/{
uuid
}/terms"
)
@JsonView
({
JsonViews
.
Public
.
class
})
public
Page
<
VocabularyTerm
>
listTerms
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
public
Page
<
VocabularyTerm
>
listTerms
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
final
Pagination
page
)
{
// LOG.warn("Loading vocab");
final
ControlledVocabulary
vocabulary
=
vocabularyService
.
getVocabulary
(
uuid
);
// LOG.warn("Loading terms");
...
...
@@ -183,8 +183,8 @@ public class VocabularyController {
* @param version the version
* @return the controlled vocabulary
*/
@DeleteMapping
(
value
=
"/{
UUID
},{version}"
)
public
ControlledVocabulary
delete
(
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
@DeleteMapping
(
value
=
"/{
uuid
},{version}"
)
public
ControlledVocabulary
delete
(
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@PathVariable
(
"version"
)
final
int
version
)
{
return
vocabularyService
.
deleteVocabulary
(
vocabularyService
.
getVocabulary
(
uuid
,
version
));
}
...
...
src/main/java/org/genesys2/server/mvc/AccessionController.java
View file @
70067418
...
...
@@ -256,8 +256,8 @@ public class AccessionController extends BaseController {
return
"/accession/resolve"
;
}
@GetMapping
(
value
=
"/{
UUID
:\\w{8}\\-\\w{4}.+}"
)
public
String
viewAccessionByUUID
(
final
ModelMap
model
,
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
)
{
@GetMapping
(
value
=
"/{
uuid
:\\w{8}\\-\\w{4}.+}"
)
public
String
viewAccessionByUUID
(
final
ModelMap
model
,
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
)
{
final
Accession
accession
=
accessionService
.
getByUuid
(
uuid
);
if
(
accession
==
null
)
{
...
...
src/main/java/org/genesys2/server/mvc/SubsetController.java
View file @
70067418
...
...
@@ -79,8 +79,8 @@ public class SubsetController extends BaseController {
return
"/subset/index"
;
}
@GetMapping
(
value
=
"/{
UUID
}"
)
public
String
subset
(
final
HttpServletResponse
response
,
final
ModelMap
model
,
@PathVariable
(
"
UUID
"
)
final
UUID
uuid
,
@GetMapping
(
value
=
"/{
uuid
}"
)
public
String
subset
(
final
HttpServletResponse
response
,
final
ModelMap
model
,
@PathVariable
(
"
uuid
"
)
final
UUID
uuid
,
@RequestParam
(
value
=
"page"
,
required
=
false
,
defaultValue
=
"1"
)
int
page
)
{
Subset
subset
;
...
...
src/test/java/org/genesys/test/server/api/v1/DatasetControllerTest.java
View file @
70067418
...
...
@@ -55,7 +55,7 @@ public class DatasetControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DatasetController
.
CONTROLLER_URL
.
concat
(
"/{
UUID
}"
),
dataset
.
getUuid
()))
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DatasetController
.
CONTROLLER_URL
.
concat
(
"/{
uuid
}"
),
dataset
.
getUuid
()))
// .andDo(MockMvcResultHandlers.print())
.
andExpect
(
status
().
isOk
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON_UTF8
))
...
...
@@ -136,7 +136,7 @@ public class DatasetControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DatasetController
.
CONTROLLER_URL
.
concat
(
"/{
UUID
}"
),
UUID
.
randomUUID
())
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DatasetController
.
CONTROLLER_URL
.
concat
(
"/{
uuid
}"
),
UUID
.
randomUUID
())
.
accept
(
MediaType
.
APPLICATION_JSON
))
// .andDo(MockMvcResultHandlers.print())
.
andExpect
(
status
().
isNotFound
());
...
...
@@ -289,7 +289,7 @@ public class DatasetControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/upsertaccessions/{
UUID
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/upsertaccessions/{
uuid
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
content
(
s
)
.
contentType
(
MediaType
.
APPLICATION_JSON
)
.
accept
(
MediaType
.
APPLICATION_JSON
))
...
...
@@ -314,7 +314,7 @@ public class DatasetControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/add-descriptors/{
UUID
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/add-descriptors/{
uuid
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
content
(
s
)
.
contentType
(
MediaType
.
APPLICATION_JSON
)
.
accept
(
MediaType
.
APPLICATION_JSON
))
...
...
@@ -339,7 +339,7 @@ public class DatasetControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/remove-descriptors/{
UUID
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
perform
(
RestDocumentationRequestBuilders
.
post
(
DatasetController
.
CONTROLLER_URL
+
"/remove-descriptors/{
uuid
},{version}"
,
dataset
.
getUuid
(),
dataset
.
getVersion
())
.
content
(
s
)
.
contentType
(
MediaType
.
APPLICATION_JSON
)
.
accept
(
MediaType
.
APPLICATION_JSON
))
...
...
src/test/java/org/genesys/test/server/api/v1/DescriptorControllerTest.java
View file @
70067418
...
...
@@ -192,7 +192,7 @@ public class DescriptorControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DescriptorController
.
CONTROLLER_URL
.
concat
(
"/{
UUID
}"
),
descriptor
.
getUuid
()))
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DescriptorController
.
CONTROLLER_URL
.
concat
(
"/{
uuid
}"
),
descriptor
.
getUuid
()))
// .andDo(MockMvcResultHandlers.print())
.
andExpect
(
status
().
isOk
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON_UTF8
))
...
...
src/test/java/org/genesys/test/server/api/v1/DescriptorListControllerTest.java
View file @
70067418
...
...
@@ -262,7 +262,7 @@ public class DescriptorListControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DescriptorListController
.
CONTROLLER_URL
+
"/{
UUID
}"
,
descriptorList
.
getUuid
())
.
perform
(
RestDocumentationRequestBuilders
.
get
(
DescriptorListController
.
CONTROLLER_URL
+
"/{
uuid
}"
,
descriptorList
.
getUuid
())
.
content
(
s
)
.
contentType
(
MediaType
.
APPLICATION_JSON
).
accept
(
MediaType
.
APPLICATION_JSON
))
// .andDo(MockMvcResultHandlers.print())
...
...
@@ -283,7 +283,7 @@ public class DescriptorListControllerTest extends AbstractApiTest {
/*@formatter:off*/
mockMvc
.
perform
(
RestDocumentationRequestBuilders
.
delete
(
DescriptorListController
.
CONTROLLER_URL
+
"/{
UUID
},{version}"
,
descriptorList
.
getUuid
(),
descriptorList
.
getVersion
())