Field names changed

src/main/java/org/genesys2/client/oauth/api/accession/Api1Constants.java

@@ -47,17 +47,15 @@ public interface Api1Constants {
 		 */
 		public static final String ACCENUMB = "accessionNumber";
 
-		/** Used to assign new ACCENUMB. */
-		public static final String ACCENUMB_NEW = "newAcceNumb";
-
 		/**
-		 * Reported genus of accession.
+		 * Used to assign new ACCENUMB
 		 */
-		public static final String GENUS = "genus";
+		public static final String ACCENUMB_NEW = "newAcceNumb";
 
 		/**
-		 * Universally Unique IDentifier for the accession, assigned by the first holding institute
-		 * and immutable when accession is duplicated in another institute.
+		 * Universally Unique IDentifier for the accession, assigned by the
+		 * first holding institute and immutable when accession is duplicated in
+		 * another institute.
 		 */
 		public static final String UUID = "uuid";
 
@@ -67,22 +65,27 @@ public interface Api1Constants {
 		public static final String ORIGCTY = "origCty";
 
 		/**
-		 * Date on which the accession entered the collection as YYYYMMDD. Missing data (MM or DD)
-		 * should be indicated with hyphens. Leading zeros are required.
+		 * Date on which the accession entered the collection as YYYYMMDD.
+		 * Missing data (MM or DD) should be indicated with hyphens. Leading
+		 * zeros are required.
 		 */
 		public static final String ACQDATE = "acquisitionDate";
 
 		/**
-		 * The status of an accession with regards to the Multilateral System (MLS) of the
-		 * International Treaty on PlantGenetic Resources for Food and Agriculture.
+		 * The status of an accession with regards to the Multilateral System
+		 * (MLS) of the International Treaty on PlantGenetic Resources for Food
+		 * and Agriculture.
 		 */
-		public static final String MLSSTAT = "mlsStat";
+		public static final String MLSSTAT = "mlsStatus";
 
-		/** Is the accession “FAO In trust”. */
+		/**
+		 * Is the accession “FAO In trust”
+		 */
 		public static final String INTRUST = "inTrust";
 
 		/**
-		 * The general availability of the accession for distribution, but subject to current stock.
+		 * The general availability of the accession for distribution, but
+		 * subject to current stock.
 		 */
 		public static final String AVAILABLE = "available";
 
@@ -91,12 +94,14 @@ public interface Api1Constants {
 		 */
 		public static final String STORAGE = "storage";
 
-		/** MCPD Sample status. */
+		/**
+		 * MCPD Sample status
+		 */
 		public static final String SAMPSTAT = "sampStat";
 
 		/**
-		 * FAO Institute Code (WIEWS code) of the institute where a safety duplicate of the
-		 * accession is maintained.
+		 * FAO Institute Code (WIEWS code) of the institute where a safety
+		 * duplicate of the accession is maintained.
 		 */
 		public static final String DUPLSITE = "duplSite";
 
@@ -105,17 +110,14 @@ public interface Api1Constants {
 		 */
 		public static final String BREDCODE = "breederCode";
 
-		/**
-		 * Corresponds to BREDNAME.
-		 */
-		public static final String BREDNAME = "breederName";
-
 		/**
 		 * Corresponds to ANCEST.
 		 */
 		public static final String ANCEST = "ancest";
 
-		/** FAO WIEWS code of the donor institute. */
+		/**
+		 * FAO WIEWS code of the donor institute
+		 */
 		public static final String DONORCODE = "donorCode";
 
 		/**
@@ -124,61 +126,125 @@ public interface Api1Constants {
 		public static final String DONORNUMB = "donorNumb";
 
 		/**
-		 * Name of the donor institute (or person). Provide only when donorCode is not available.
+		 * Name of the donor institute (or person). Provide only when donorCode
+		 * is not available.
 		 */
 		public static final String DONORNAME = "donorName";
 
-		/** Object containing the collecting data. */
+		/**
+		 * Object containing the collecting data
+		 */
 		public static final String COLL = "coll";
 
-		/** Object containing georeference data. */
+		/**
+		 * Object containing georeference data
+		 */
 		public static final String GEO = "geo";
 
-		/** Object containing taxonomy data. */
+		/** 
+		 * Object containing taxonomy data.
+		 * */
 		public static final String TAXONOMY = "taxonomy";
 
-		/** MCPD Remarks. */
+		/**
+		 * MCPD Remarks
+		 */
 		public static final String REMARKS = "remarks";
 
 		/**
-		 * Marks if accession record is about a historic holding and the accession no longer exists.
+		 * Marks if accession record is about a historic holding and the
+		 * accession no longer exists.
 		 */
 		public static final String HISTORIC = "historic";
 
-		/** Accession name. */
+		/**
+		 * Accession name
+		 */
 		public static final String ACCENAME = "acceName";
 
-		/** Other numbers. */
+		/**
+		 * 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.
+		 * 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. */
+		/**
+		 * Gene bank provided MCPD#CROPNAME
+		 */
 		public static final String CROPNAME = "cropName";
+
+		/**
+		 * Corresponds to BREDNAME.
+		 */
+		public static final String BREDNAME = "breederName";
+
+	}
+
+	public static interface Taxonomy {
+
+		/**
+		 * Reported genus of accession.
+		 */
+		public static final String GENUS = "genus";
+
+		/**
+		 * May be used to assign a different genus.
+		 */
+		public static final String GENUS_NEW = "newGenus";
+
+		/**
+		 * Specific epithet portion of the scientific name, in latin, in
+		 * lowercase letters. Following abbreviation is allowed: ‘sp.’
+		 */
+		public static final String SPECIES = "species";
+
+		/**
+		 * Corresponds to MCPD SPAUTHOR
+		 */
+		public static final String SPAUTHOR = "spAuthor";
+
+		/**
+		 * Corresponds to MCPD SUBTAXA
+		 */
+		public static final String SUBTAXA = "subtaxa";
+
+		/**
+		 * Corresponds to MCPD SUBTAUTHOR
+		 */
+		public static final String SUBTAUTHOR = "subtAuthor";
+
 	}
 
-	/**
-	 * The Interface Collecting.
-	 */
 	public static interface Collecting {
 
-		/** Corresponds to COLLDATE. */
+		/**
+		 * Corresponds to COLLDATE
+		 */
 		public static final String COLLDATE = "collDate";
 
-		/** Corresponds to COLLSITE. */
+		/**
+		 * Corresponds to COLLSITE
+		 */
 		public static final String COLLSITE = "collSite";
 
-		/** Corresponds to MCPD COLLNUMB. */
+		/**
+		 * Corresponds to MCPD COLLNUMB
+		 */
 		public static final String COLLNUMB = "collNumb";
 
-		/** Corresponds to MCPD COLLSRC. */
+		/**
+		 * Corresponds to MCPD COLLSRC
+		 */
 		public static final String COLLSRC = "collSrc";
 
-		/** FAO WIEWS code of collecting institute. */
+		/**
+		 * FAO WIEWS code of collecting institute
+		 */
 		public static final String COLLCODE = "collCode";
 
 		/**
@@ -191,69 +257,43 @@ public interface Api1Constants {
 		 */
 		public static final String COLLINSTADDRESS = "collInstAddress";
 
-		/** Corresponds to COLLMISSID. */
+		/**
+		 * Corresponds to COLLMISSID
+		 */
 		public static final String COLLMISSID = "collMissId";
 	}
 
-	/**
-	 * The Interface Geo.
-	 */
 	public static interface Geo {
 
-		/** Latitude. */
-		public static final String LATITUDE = "latitude";
-
-		/** Longitude. */
-		public static final String LONGITUDE = "longitude";
-
-		/** Elevation. */
-		public static final String ELEVATION = "elevation";
-
-		/** COORDUNCERT (in meters). */
-		public static final String COORDUNCERT = "coordUncert";
-
-		/** Corresponds to COORDATUM. */
-		public static final String COORDDATUM = "coordDatum";
-
-		/** Corresponds to GEOREFMETH. */
-		public static final String GEOREFMETH = "georefMeth";
-	}
-
-	/**
-	 * The Interface Taxonomy.
-	 */
-	public static interface Taxonomy {
-
 		/**
-		 * Reported genus of accession.
+		 * Latitude
 		 */
-		public static final String GENUS = "genus";
+		public static final String LATITUDE = "latitude";
 
 		/**
-		 * May be used to assign a different genus.
+		 * Longitude
 		 */
-		public static final String GENUS_NEW = "newGenus";
+		public static final String LONGITUDE = "longitude";
 
 		/**
-		 * Specific epithet portion of the scientific name, in latin, in
-		 * lowercase letters. Following abbreviation is allowed: ‘sp.’
+		 * Elevation
 		 */
-		public static final String SPECIES = "species";
+		public static final String ELEVATION = "elevation";
 
 		/**
-		 * Corresponds to MCPD SPAUTHOR
+		 * COORDUNCERT (in meters)
 		 */
-		public static final String SPAUTHOR = "spAuthor";
+		public static final String COORDUNCERT = "uncertainty";
 
 		/**
-		 * Corresponds to MCPD SUBTAXA
+		 * Corresponds to COORDATUM
 		 */
-		public static final String SUBTAXA = "subtaxa";
+		public static final String COORDDATUM = "datum";
 
 		/**
-		 * Corresponds to MCPD SUBTAUTHOR
+		 * Corresponds to GEOREFMETH
 		 */
-		public static final String SUBTAUTHOR = "subtAuthor";
-
+		public static final String GEOREFMETH = "method";
 	}
+
 }