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
J
Java Client API
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
Java Client API
Commits
366d1c30
Commit
366d1c30
authored
Sep 18, 2019
by
Matija Obreza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'anno-29-add-aegis-flag' into 'master'
Added aegis to AccessionJson See merge request
!12
parents
fbbb75d6
ef6d3fcf
Pipeline
#11416
passed with stage
in 35 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
src/main/java/org/genesys2/client/oauth/api/accession/AccessionJson.java
...rg/genesys2/client/oauth/api/accession/AccessionJson.java
+13
-1
src/main/java/org/genesys2/client/oauth/api/accession/Api1Constants.java
...rg/genesys2/client/oauth/api/accession/Api1Constants.java
+6
-1
src/test/java/org/geneys2/client/oauth/MockGenesysServer.java
...test/java/org/geneys2/client/oauth/MockGenesysServer.java
+3
-0
No files found.
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
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