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
46
Issues
46
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
e358ef76
Commit
e358ef76
authored
Jul 24, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated API list methods: if filterCode is provided ignore filter
parent
71af5958
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
33 deletions
+53
-33
src/main/java/org/genesys/catalog/api/v0/DatasetController.java
...in/java/org/genesys/catalog/api/v0/DatasetController.java
+16
-9
src/main/java/org/genesys/catalog/api/v0/DescriptorController.java
...java/org/genesys/catalog/api/v0/DescriptorController.java
+2
-3
src/main/java/org/genesys/catalog/api/v0/DescriptorListController.java
.../org/genesys/catalog/api/v0/DescriptorListController.java
+19
-11
src/main/java/org/genesys/catalog/api/v0/MeController.java
src/main/java/org/genesys/catalog/api/v0/MeController.java
+3
-4
src/main/java/org/genesys/catalog/api/v0/PartnerController.java
...in/java/org/genesys/catalog/api/v0/PartnerController.java
+2
-3
src/main/java/org/genesys/catalog/api/v0/VocabularyController.java
...java/org/genesys/catalog/api/v0/VocabularyController.java
+11
-3
No files found.
src/main/java/org/genesys/catalog/api/v0/DatasetController.java
View file @
e358ef76
...
...
@@ -15,7 +15,11 @@
*/
package
org.genesys.catalog.api.v0
;
import
org.apache.commons.lang3.StringUtils
;
import
java.io.IOException
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.exceptions.NotFoundElement
;
import
org.genesys.catalog.model.dataset.AccessionIdentifier
;
...
...
@@ -32,15 +36,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
io.swagger.annotations.Api
;
import
java.io.IOException
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
/**
* The Class DatasetController.
*
...
...
@@ -86,9 +93,9 @@ public class DatasetController {
@RequestParam
(
name
=
"d"
,
required
=
false
,
defaultValue
=
"ASC"
)
final
Sort
.
Direction
direction
,
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
DatasetFilter
filter
)
throws
IOException
{
@RequestBody
(
required
=
false
)
DatasetFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DatasetFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
src/main/java/org/genesys/catalog/api/v0/DescriptorController.java
View file @
e358ef76
...
...
@@ -19,7 +19,6 @@ import java.io.IOException;
import
java.util.List
;
import
java.util.UUID
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.model.dataset.Dataset
;
...
...
@@ -95,9 +94,9 @@ public class DescriptorController {
@RequestParam
(
name
=
"d"
,
required
=
false
,
defaultValue
=
"ASC"
)
final
Sort
.
Direction
direction
,
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
DescriptorFilter
filter
)
throws
IOException
{
@RequestBody
(
required
=
false
)
DescriptorFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DescriptorFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
src/main/java/org/genesys/catalog/api/v0/DescriptorListController.java
View file @
e358ef76
...
...
@@ -15,7 +15,14 @@
*/
package
org.genesys.catalog.api.v0
;
import
org.apache.commons.lang3.StringUtils
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.model.filters.DescriptorListFilter
;
...
...
@@ -33,19 +40,20 @@ import org.springframework.http.HttpHeaders;
import
org.springframework.http.MediaType
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.fasterxml.jackson.annotation.JsonView
;
import
io.swagger.annotations.Api
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
/**
* The Class DescriptorListController.
*
...
...
@@ -182,9 +190,9 @@ public class DescriptorListController {
@RequestParam
(
name
=
"d"
,
required
=
false
,
defaultValue
=
"ASC"
)
final
Sort
.
Direction
direction
,
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
DescriptorListFilter
filter
)
throws
IOException
{
@RequestBody
(
required
=
false
)
DescriptorListFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DescriptorListFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
src/main/java/org/genesys/catalog/api/v0/MeController.java
View file @
e358ef76
...
...
@@ -18,7 +18,6 @@ package org.genesys.catalog.api.v0;
import
java.io.IOException
;
import
java.util.UUID
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.security.SecurityContextUtil
;
import
org.genesys.blocks.security.UserException
;
import
org.genesys.blocks.security.lockout.AccountLockoutManager
;
...
...
@@ -189,7 +188,7 @@ public class MeController {
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
(
required
=
false
)
DatasetFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DatasetFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
@@ -216,7 +215,7 @@ public class MeController {
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
(
required
=
false
)
DescriptorFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DescriptorFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
@@ -243,7 +242,7 @@ public class MeController {
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
(
required
=
false
)
DescriptorListFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DescriptorListFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
src/main/java/org/genesys/catalog/api/v0/PartnerController.java
View file @
e358ef76
...
...
@@ -18,7 +18,6 @@ package org.genesys.catalog.api.v0;
import
java.io.IOException
;
import
java.util.UUID
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.model.Partner
;
import
org.genesys.catalog.model.filters.PartnerFilter
;
...
...
@@ -77,9 +76,9 @@ public class PartnerController {
@RequestParam
(
name
=
"d"
,
required
=
false
,
defaultValue
=
"ASC"
)
final
Sort
.
Direction
direction
,
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
PartnerFilter
filter
)
throws
IOException
{
@RequestBody
(
required
=
false
)
PartnerFilter
filter
)
throws
IOException
{
if
(
StringUtils
.
isNotBlank
(
filterCode
)
)
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
PartnerFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
...
...
src/main/java/org/genesys/catalog/api/v0/VocabularyController.java
View file @
e358ef76
...
...
@@ -163,14 +163,22 @@ public class VocabularyController {
* @param sort the sort
* @param filter the controlled vocabulary filter
* @return the page
* @throws IOException
*/
@PostMapping
(
value
=
"/list"
)
public
FilteredPage
<
ControlledVocabulary
>
list
(
@RequestParam
(
name
=
"p"
,
required
=
false
,
defaultValue
=
"0"
)
final
int
page
,
@RequestParam
(
name
=
"l"
,
required
=
false
,
defaultValue
=
"50"
)
final
int
pageSize
,
@RequestParam
(
name
=
"d"
,
required
=
false
,
defaultValue
=
"ASC"
)
final
Sort
.
Direction
direction
,
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestBody
final
ControlledVocabularyFilter
filter
)
{
return
new
FilteredPage
<>(
shortFilterService
.
getCode
(
filter
),
filter
,
vocabularyService
.
listVocabularies
(
filter
,
new
PageRequest
(
page
,
Integer
.
min
(
pageSize
,
100
),
direction
,
sort
)));
@RequestParam
(
name
=
"s"
,
required
=
false
,
defaultValue
=
"id"
)
final
String
[]
sort
,
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
@RequestBody
(
required
=
false
)
ControlledVocabularyFilter
filter
)
throws
IOException
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
ControlledVocabularyFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
}
return
new
FilteredPage
<>(
filterCode
,
filter
,
vocabularyService
.
listVocabularies
(
filter
,
new
PageRequest
(
page
,
Integer
.
min
(
pageSize
,
100
),
direction
,
sort
)));
}
/**
...
...
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