Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Java Client API
Commits
366d1c30
Commit
366d1c30
authored
Sep 18, 2019
by
Matija Obreza
Browse files
Merge branch 'anno-29-add-aegis-flag' into 'master'
Added aegis to AccessionJson See merge request
!12
parents
fbbb75d6
ef6d3fcf
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/client/oauth/api/accession/AccessionJson.java
View file @
366d1c30
...
...
@@ -62,6 +62,10 @@ public class AccessionJson {
/** The mls stat. */
@JsonProperty
(
value
=
Accession
.
MLSSTAT
)
private
Boolean
mlsStat
;
/** The aegis. */
@JsonProperty
(
value
=
Accession
.
AEGIS
)
private
Boolean
aegis
;
/** The in trust. */
@JsonProperty
(
value
=
Accession
.
INTRUST
)
...
...
@@ -318,7 +322,15 @@ public class AccessionJson {
public
void
setMlsStat
(
final
Boolean
mlsStat
)
{
this
.
mlsStat
=
mlsStat
;
}
public
Boolean
getAegis
()
{
return
aegis
;
}
public
void
setAegis
(
Boolean
aegis
)
{
this
.
aegis
=
aegis
;
}
/**
* Gets the in trust.
*
...
...
src/main/java/org/genesys2/client/oauth/api/accession/Api1Constants.java
View file @
366d1c30
...
...
@@ -77,6 +77,11 @@ public interface Api1Constants {
* and Agriculture.
*/
public
static
final
String
MLSSTAT
=
"mlsStatus"
;
/**
* The status of an accession of being part of the European Collection
*/
public
static
final
String
AEGIS
=
"aegis"
;
/**
* Is the accession “FAO In trust”
...
...
@@ -141,7 +146,7 @@ public interface Api1Constants {
*/
public
static
final
String
GEO
=
"geo"
;
/**
/**
* Object containing taxonomy data.
* */
public
static
final
String
TAXONOMY
=
"taxonomy"
;
...
...
src/test/java/org/geneys2/client/oauth/MockGenesysServer.java
View file @
366d1c30
...
...
@@ -149,6 +149,9 @@ public class MockGenesysServer {
if
(
aj
.
getMlsStat
()
!=
null
)
{
existing
.
setMlsStat
(
aj
.
getMlsStat
());
}
if
(
aj
.
getAegis
()
!=
null
)
{
existing
.
setAegis
(
aj
.
getAegis
());
}
if
(
aj
.
getAccessionNumber
()
!=
null
)
{
existing
.
setAccessionNumber
(
aj
.
getAccessionNumber
());
}
...
...
Write
Preview
Supports
Markdown
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