labels fixed

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151515 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -3,9 +3,6 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="ckan-util-library-2.3.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="grsf-publisher-ws"/>
         <property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
     </wb-module>

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java

@@ -44,9 +44,9 @@ public class Common extends Base{
 	@Valid
 	private List<RefersToBean> refersTo;
 
-	@JsonProperty("short_title")
+	@JsonProperty("short_name")
 	@CustomField(key="Short Name")
-	private String shortTitle;
+	private String shortName;
 
 	@JsonProperty("traceability_flag")
 	@CustomField(key="Traceability Flag")
@@ -96,7 +96,7 @@ public class Common extends Base{
 	 * @param databaseSources
 	 * @param sourceOfInformation
 	 * @param refersTo
-	 * @param shortTitle
+	 * @param shortName
 	 * @param traceabilityFlag
 	 * @param status
 	 * @param grsfType
@@ -109,7 +109,7 @@ public class Common extends Base{
 	public Common(List<String> dataOwner,
 			List<Resource<Sources>> databaseSources,
 			List<Resource<String>> sourceOfInformation,
-			List<RefersToBean> refersTo, String shortTitle,
+			List<RefersToBean> refersTo, String shortName,
 			Boolean traceabilityFlag, Status status, String grsfType,
 			List<TimeSeriesBean<String, String>> catches,
 			List<TimeSeriesBean<String, String>> landings,
@@ -120,7 +120,7 @@ public class Common extends Base{
 		this.databaseSources = databaseSources;
 		this.sourceOfInformation = sourceOfInformation;
 		this.refersTo = refersTo;
-		this.shortTitle = shortTitle;
+		this.shortName = shortName;
 		this.traceabilityFlag = traceabilityFlag;
 		this.status = status;
 		this.grsfType = grsfType;
@@ -166,12 +166,12 @@ public class Common extends Base{
 		this.sourceOfInformation = sourceOfInformation;
 	}
 
-	public String getShortTitle() {
-		return shortTitle;
+	public String getShortName() {
+		return shortName;
 	}
 
-	public void setShortTitle(String shortTitle) {
-		this.shortTitle = shortTitle;
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
 	}
 
 	public Boolean isTraceabilityFlag() {
@@ -243,7 +243,7 @@ public class Common extends Base{
 		return "Common [dataOwner=" + dataOwner + ", databaseSources="
 				+ databaseSources + ", sourceOfInformation="
 				+ sourceOfInformation + ", refersTo=" + refersTo
-				+ ", shortTitle=" + shortTitle + ", traceabilityFlag="
+				+ ", shortName=" + shortName + ", traceabilityFlag="
 				+ traceabilityFlag + ", status=" + status + ", grsfType="
 				+ grsfType + ", catches=" + catches + ", landings=" + landings
 				+ ", species=" + species + ", similarGRSFRecords="

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java

@@ -96,7 +96,7 @@ public class StockRecord extends Common{
 	@Tag
 	private String assessor;
 
-	@JsonProperty("type")
+	@JsonProperty("grsf_type")
 	@CustomField(key="GRSF Type")
 	@Group
 	private Stock_Type type;

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java

@@ -79,7 +79,7 @@ public class CommonServiceUtils {
 	public static void validateAggregatedRecord(Common record) throws Exception {
 
 		List<RefersToBean> refersToList = record.getRefersTo();
-		String shortTitle = record.getShortTitle();
+		String shortTitle = record.getShortName();
 		Boolean traceabilityFlag = record.isTraceabilityFlag();
 		Status status = record.getStatus();