Commit 9cab9d3a authored by Matija Obreza's avatar Matija Obreza

Added CROPNAME, ACCEURL

parent 6b17b3ee
......@@ -217,12 +217,12 @@ public class GenesysClient {
*
* @param clientId the client id
* @param clientSecret the client secret
* @param callback the callback
* @param callbackUrl the callback URL for web-based clients. Use "oob" for out-of-band authentication.
*/
public void connect(final String clientId, final String clientSecret, final String callback) {
public void connect(final String clientId, final String clientSecret, final String callbackUrl) {
this.apiKey = clientId;
this.apiSecret = clientSecret;
this.service = new ServiceBuilder().provider(this.genesysApi).apiKey(clientId).apiSecret(clientSecret).callback(callback).scope(SCOPE).build();
this.service = new ServiceBuilder().provider(this.genesysApi).apiKey(clientId).apiSecret(clientSecret).callback(callbackUrl).scope(SCOPE).build();
}
/**
......
......@@ -16,10 +16,10 @@
package org.genesys2.client.oauth.api.accession;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.genesys2.client.oauth.api.accession.Api1Constants.Accession;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* The Class AccessionJson.
*/
......@@ -139,6 +139,14 @@ public class AccessionJson {
@JsonProperty(value = Accession.HISTORIC)
private Boolean historic;
/** Accession URL */
@JsonProperty(value = Accession.ACCEURL)
private String acceUrl;
/** Crop name */
@JsonProperty(value = Accession.CROPNAME)
private String cropName;
/**
* Gets the version.
*
......@@ -151,7 +159,8 @@ public class AccessionJson {
/**
* Sets the version.
*
* @param l the new version
* @param l
* the new version
*/
public void setVersion(final Long l) {
this.version = l;
......@@ -169,7 +178,8 @@ public class AccessionJson {
/**
* Sets the genesys id.
*
* @param genesysId the new genesys id
* @param genesysId
* the new genesys id
*/
public void setGenesysId(final Long genesysId) {
this.genesysId = genesysId;
......@@ -187,7 +197,8 @@ public class AccessionJson {
/**
* Sets the inst code.
*
* @param instCode the new inst code
* @param instCode
* the new inst code
*/
public void setInstCode(final String instCode) {
this.instCode = instCode;
......@@ -205,7 +216,8 @@ public class AccessionJson {
/**
* Sets the acce numb.
*
* @param acceNumb the new acce numb
* @param acceNumb
* the new acce numb
*/
public void setAcceNumb(final String acceNumb) {
this.acceNumb = acceNumb;
......@@ -223,7 +235,8 @@ public class AccessionJson {
/**
* Sets the new acce numb.
*
* @param newAcceNumb the new new acce numb
* @param newAcceNumb
* the new new acce numb
*/
public void setNewAcceNumb(final String newAcceNumb) {
this.newAcceNumb = newAcceNumb;
......@@ -241,7 +254,8 @@ public class AccessionJson {
/**
* Sets the genus.
*
* @param genus the new genus
* @param genus
* the new genus
*/
public void setGenus(final String genus) {
this.genus = genus;
......@@ -259,7 +273,8 @@ public class AccessionJson {
/**
* Sets the new genus.
*
* @param newGenus the new new genus
* @param newGenus
* the new new genus
*/
public void setNewGenus(final String newGenus) {
this.newGenus = newGenus;
......@@ -277,7 +292,8 @@ public class AccessionJson {
/**
* Sets the species.
*
* @param species the new species
* @param species
* the new species
*/
public void setSpecies(final String species) {
this.species = species;
......@@ -295,7 +311,8 @@ public class AccessionJson {
/**
* Sets the spauthor.
*
* @param spauthor the new spauthor
* @param spauthor
* the new spauthor
*/
public void setSpauthor(final String spauthor) {
this.spauthor = spauthor;
......@@ -313,7 +330,8 @@ public class AccessionJson {
/**
* Sets the subtaxa.
*
* @param subtaxa the new subtaxa
* @param subtaxa
* the new subtaxa
*/
public void setSubtaxa(final String subtaxa) {
this.subtaxa = subtaxa;
......@@ -331,7 +349,8 @@ public class AccessionJson {
/**
* Sets the subtauthor.
*
* @param subtauthor the new subtauthor
* @param subtauthor
* the new subtauthor
*/
public void setSubtauthor(final String subtauthor) {
this.subtauthor = subtauthor;
......@@ -349,7 +368,8 @@ public class AccessionJson {
/**
* Sets the uuid.
*
* @param uuid the new uuid
* @param uuid
* the new uuid
*/
public void setUuid(final String uuid) {
this.uuid = uuid;
......@@ -367,7 +387,8 @@ public class AccessionJson {
/**
* Sets the org cty.
*
* @param orgCty the new org cty
* @param orgCty
* the new org cty
*/
public void setOrgCty(final String orgCty) {
this.orgCty = orgCty;
......@@ -385,7 +406,8 @@ public class AccessionJson {
/**
* Sets the acq date.
*
* @param acqDate the new acq date
* @param acqDate
* the new acq date
*/
public void setAcqDate(final String acqDate) {
this.acqDate = acqDate;
......@@ -403,7 +425,8 @@ public class AccessionJson {
/**
* Sets the mls stat.
*
* @param mlsStat the new mls stat
* @param mlsStat
* the new mls stat
*/
public void setMlsStat(final Boolean mlsStat) {
this.mlsStat = mlsStat;
......@@ -421,7 +444,8 @@ public class AccessionJson {
/**
* Sets the in trust.
*
* @param inTrust the new in trust
* @param inTrust
* the new in trust
*/
public void setInTrust(final Boolean inTrust) {
this.inTrust = inTrust;
......@@ -439,7 +463,8 @@ public class AccessionJson {
/**
* Sets the available.
*
* @param available the new available
* @param available
* the new available
*/
public void setAvailable(final Boolean available) {
this.available = available;
......@@ -457,7 +482,8 @@ public class AccessionJson {
/**
* Sets the storage.
*
* @param storage the new storage
* @param storage
* the new storage
*/
public void setStorage(final Integer[] storage) {
this.storage = storage;
......@@ -475,7 +501,8 @@ public class AccessionJson {
/**
* Sets the samp stat.
*
* @param sampStat the new samp stat
* @param sampStat
* the new samp stat
*/
public void setSampStat(final Integer sampStat) {
this.sampStat = sampStat;
......@@ -493,7 +520,8 @@ public class AccessionJson {
/**
* Sets the dupl site.
*
* @param duplSite the new dupl site
* @param duplSite
* the new dupl site
*/
public void setDuplSite(final String[] duplSite) {
this.duplSite = duplSite;
......@@ -511,7 +539,8 @@ public class AccessionJson {
/**
* Sets the bred code.
*
* @param bredCode the new bred code
* @param bredCode
* the new bred code
*/
public void setBredCode(final String bredCode) {
this.bredCode = bredCode;
......@@ -529,7 +558,8 @@ public class AccessionJson {
/**
* Sets the ancest.
*
* @param ancest the new ancest
* @param ancest
* the new ancest
*/
public void setAncest(final String ancest) {
this.ancest = ancest;
......@@ -547,7 +577,8 @@ public class AccessionJson {
/**
* Sets the donor code.
*
* @param donorCode the new donor code
* @param donorCode
* the new donor code
*/
public void setDonorCode(final String donorCode) {
this.donorCode = donorCode;
......@@ -565,7 +596,8 @@ public class AccessionJson {
/**
* Sets the donor numb.
*
* @param donorNumb the new donor numb
* @param donorNumb
* the new donor numb
*/
public void setDonorNumb(final String donorNumb) {
this.donorNumb = donorNumb;
......@@ -583,7 +615,8 @@ public class AccessionJson {
/**
* Sets the donor name.
*
* @param donorName the new donor name
* @param donorName
* the new donor name
*/
public void setDonorName(final String donorName) {
this.donorName = donorName;
......@@ -601,7 +634,8 @@ public class AccessionJson {
/**
* Sets the coll.
*
* @param coll the new coll
* @param coll
* the new coll
*/
public void setColl(final CollectingJson coll) {
this.coll = coll;
......@@ -619,7 +653,8 @@ public class AccessionJson {
/**
* Sets the geo.
*
* @param geo the new geo
* @param geo
* the new geo
*/
public void setGeo(final GeoJson geo) {
this.geo = geo;
......@@ -637,7 +672,8 @@ public class AccessionJson {
/**
* Sets the remarks.
*
* @param remarks the new remarks
* @param remarks
* the new remarks
*/
public void setRemarks(final Remark[] remarks) {
this.remarks = remarks;
......@@ -646,7 +682,8 @@ public class AccessionJson {
/**
* Sets the historic.
*
* @param historic the new historic
* @param historic
* the new historic
*/
public void setHistoric(final Boolean historic) {
this.historic = historic;
......@@ -660,4 +697,40 @@ public class AccessionJson {
public Boolean getHistoric() {
return this.historic;
}
/**
* Sets the accesion URL.
*
* @param acceUrl the new accession URL
*/
public void setAcceUrl(String acceUrl) {
this.acceUrl = acceUrl;
}
/**
* Gets the accesion URL.
*
* @return the accession URL
*/
public String getAcceUrl() {
return acceUrl;
}
/**
* Sets the crop name.
*
* @param cropName the new crop name
*/
public void setCropName(String cropName) {
this.cropName = cropName;
}
/**
* Gets the crop name.
*
* @return the crop name
*/
public String getCropName() {
return cropName;
}
}
......@@ -148,6 +148,16 @@ public interface Api1Constants {
/** Other numbers. */
public static final String OTHERNUMB = "otherNumb";
/**
* URL linking to additional data about the accession either in the
* holding genebank or from another source.
*/
public static final String ACCEURL = "acceUrl";
/**
* Gene bank provided MCPD#CROPNAME
*/
public static final String CROPNAME = "cropName";
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment