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
12
Issues
12
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
092f1bad
Commit
092f1bad
authored
Jul 26, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated JSON serialization
- Minimize JSON response, ignore properties, use views
parent
4dda87bc
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
src/main/java/org/genesys2/server/api/v1/AccessionController.java
.../java/org/genesys2/server/api/v1/AccessionController.java
+6
-0
src/main/java/org/genesys2/server/model/genesys/AccessionData.java
...java/org/genesys2/server/model/genesys/AccessionData.java
+1
-1
src/main/java/org/genesys2/server/model/impl/Country.java
src/main/java/org/genesys2/server/model/impl/Country.java
+2
-2
src/main/java/org/genesys2/server/model/impl/Crop.java
src/main/java/org/genesys2/server/model/impl/Crop.java
+4
-0
src/main/java/org/genesys2/server/model/impl/FaoInstitute.java
...ain/java/org/genesys2/server/model/impl/FaoInstitute.java
+1
-1
No files found.
src/main/java/org/genesys2/server/api/v1/AccessionController.java
View file @
092f1bad
...
...
@@ -21,6 +21,7 @@ import java.util.UUID;
import
javax.servlet.http.HttpServletRequest
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.catalog.api.FilteredPage
;
import
org.genesys.catalog.service.ShortFilterService
;
import
org.genesys2.server.api.ApiBaseController
;
...
...
@@ -42,6 +43,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.servlet.HandlerMapping
;
import
com.fasterxml.jackson.annotation.JsonView
;
import
io.swagger.annotations.Api
;
/**
...
...
@@ -71,6 +74,7 @@ public class AccessionController {
* @return the subset
*/
@GetMapping
(
value
=
"/{UUID:\\w{8}\\-\\w{4}.+}"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
@JsonView
({
JsonViews
.
Protected
.
class
})
public
Accession
getByUuid
(
@PathVariable
(
"UUID"
)
final
UUID
uuid
)
{
return
accessionService
.
getByUuid
(
uuid
);
}
...
...
@@ -83,6 +87,7 @@ public class AccessionController {
* @return the subset
*/
@RequestMapping
(
value
=
"/10.{dummy:[0-9]+}/**"
,
method
=
RequestMethod
.
GET
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
@JsonView
({
JsonViews
.
Protected
.
class
})
public
Accession
getByDoi
(
HttpServletRequest
request
)
{
final
String
fullpath
=
(
String
)
request
.
getAttribute
(
HandlerMapping
.
PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE
);
final
String
doi
=
fullpath
.
substring
(
API_BASE
.
length
()+
1
);
...
...
@@ -104,6 +109,7 @@ public class AccessionController {
* @throws IOException
*/
@PostMapping
(
value
=
"/list"
,
produces
=
{
MediaType
.
APPLICATION_JSON_VALUE
})
@JsonView
({
JsonViews
.
Public
.
class
})
public
FilteredPage
<
Accession
>
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
,
...
...
src/main/java/org/genesys2/server/model/genesys/AccessionData.java
View file @
092f1bad
...
...
@@ -104,7 +104,7 @@ public abstract class AccessionData extends AuditedVersionedModel implements IdU
@ManyToOne
(
cascade
=
{},
optional
=
true
)
@JoinColumn
(
name
=
"orgCtyId"
,
nullable
=
true
)
@JsonView
({
JsonViews
.
Minimal
.
class
})
@JsonView
({
JsonViews
.
Public
.
class
})
private
Country
countryOfOrigin
;
@Column
(
name
=
"sampStat"
,
length
=
3
)
...
...
src/main/java/org/genesys2/server/model/impl/Country.java
View file @
092f1bad
...
...
@@ -92,7 +92,7 @@ public class Country extends BasicModel {
*/
@Lob
@Type
(
type
=
"org.hibernate.type.TextType"
)
@JsonView
({
JsonViews
.
Public
.
class
})
@JsonView
({
JsonViews
.
Internal
.
class
})
private
String
nameL
;
@Lob
...
...
@@ -106,7 +106,7 @@ public class Country extends BasicModel {
@ManyToOne
(
cascade
=
{},
optional
=
true
)
@JoinColumn
(
name
=
"replacedBy"
)
@JsonView
({
JsonViews
.
Public
.
class
})
@JsonView
({
JsonViews
.
Internal
.
class
})
private
Country
replacedBy
;
public
Country
()
{
...
...
src/main/java/org/genesys2/server/model/impl/Crop.java
View file @
092f1bad
...
...
@@ -40,10 +40,12 @@ import javax.persistence.Transient;
import
javax.persistence.UniqueConstraint
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonView
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.apache.commons.lang3.StringUtils
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.blocks.security.model.AclAwareModel
;
import
org.genesys2.server.model.GlobalVersionedAuditedModel
;
import
org.hibernate.annotations.Type
;
...
...
@@ -70,6 +72,7 @@ public class Crop extends GlobalVersionedAuditedModel implements AclAwareModel {
@ElementCollection
(
fetch
=
FetchType
.
LAZY
)
@CollectionTable
(
name
=
"cropname"
,
joinColumns
=
@JoinColumn
(
name
=
"cropId"
,
referencedColumnName
=
"id"
),
uniqueConstraints
=
{
@UniqueConstraint
(
columnNames
=
"otherName"
)
})
@OrderBy
(
"otherName"
)
@JsonView
({
JsonViews
.
Public
.
class
})
private
List
<
String
>
otherNames
;
@Column
(
nullable
=
false
,
length
=
200
)
...
...
@@ -81,6 +84,7 @@ public class Crop extends GlobalVersionedAuditedModel implements AclAwareModel {
@Lob
@Type
(
type
=
"org.hibernate.type.TextType"
)
@JsonView
({
JsonViews
.
Internal
.
class
})
private
String
i18n
;
/**
...
...
src/main/java/org/genesys2/server/model/impl/FaoInstitute.java
View file @
092f1bad
...
...
@@ -84,7 +84,7 @@ public class FaoInstitute extends BasicModel implements GeoReferencedEntity, Acl
@ManyToOne
(
cascade
=
{},
optional
=
true
)
@JoinColumn
(
name
=
"countryId"
)
@JsonView
({
JsonViews
.
Minimal
.
class
})
@JsonView
({
JsonViews
.
Public
.
class
})
private
Country
country
;
@JsonView
({
JsonViews
.
Protected
.
class
})
...
...
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