labels fixed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151515 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
6fd75bd8bc
commit
3bc921785d
|
@ -3,9 +3,6 @@
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<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="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<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="context-root" value="grsf-publisher-ws"/>
|
||||||
<property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
|
<property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
|
@ -44,9 +44,9 @@ public class Common extends Base{
|
||||||
@Valid
|
@Valid
|
||||||
private List<RefersToBean> refersTo;
|
private List<RefersToBean> refersTo;
|
||||||
|
|
||||||
@JsonProperty("short_title")
|
@JsonProperty("short_name")
|
||||||
@CustomField(key="Short Name")
|
@CustomField(key="Short Name")
|
||||||
private String shortTitle;
|
private String shortName;
|
||||||
|
|
||||||
@JsonProperty("traceability_flag")
|
@JsonProperty("traceability_flag")
|
||||||
@CustomField(key="Traceability Flag")
|
@CustomField(key="Traceability Flag")
|
||||||
|
@ -96,7 +96,7 @@ public class Common extends Base{
|
||||||
* @param databaseSources
|
* @param databaseSources
|
||||||
* @param sourceOfInformation
|
* @param sourceOfInformation
|
||||||
* @param refersTo
|
* @param refersTo
|
||||||
* @param shortTitle
|
* @param shortName
|
||||||
* @param traceabilityFlag
|
* @param traceabilityFlag
|
||||||
* @param status
|
* @param status
|
||||||
* @param grsfType
|
* @param grsfType
|
||||||
|
@ -109,7 +109,7 @@ public class Common extends Base{
|
||||||
public Common(List<String> dataOwner,
|
public Common(List<String> dataOwner,
|
||||||
List<Resource<Sources>> databaseSources,
|
List<Resource<Sources>> databaseSources,
|
||||||
List<Resource<String>> sourceOfInformation,
|
List<Resource<String>> sourceOfInformation,
|
||||||
List<RefersToBean> refersTo, String shortTitle,
|
List<RefersToBean> refersTo, String shortName,
|
||||||
Boolean traceabilityFlag, Status status, String grsfType,
|
Boolean traceabilityFlag, Status status, String grsfType,
|
||||||
List<TimeSeriesBean<String, String>> catches,
|
List<TimeSeriesBean<String, String>> catches,
|
||||||
List<TimeSeriesBean<String, String>> landings,
|
List<TimeSeriesBean<String, String>> landings,
|
||||||
|
@ -120,7 +120,7 @@ public class Common extends Base{
|
||||||
this.databaseSources = databaseSources;
|
this.databaseSources = databaseSources;
|
||||||
this.sourceOfInformation = sourceOfInformation;
|
this.sourceOfInformation = sourceOfInformation;
|
||||||
this.refersTo = refersTo;
|
this.refersTo = refersTo;
|
||||||
this.shortTitle = shortTitle;
|
this.shortName = shortName;
|
||||||
this.traceabilityFlag = traceabilityFlag;
|
this.traceabilityFlag = traceabilityFlag;
|
||||||
this.status = status;
|
this.status = status;
|
||||||
this.grsfType = grsfType;
|
this.grsfType = grsfType;
|
||||||
|
@ -166,12 +166,12 @@ public class Common extends Base{
|
||||||
this.sourceOfInformation = sourceOfInformation;
|
this.sourceOfInformation = sourceOfInformation;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getShortTitle() {
|
public String getShortName() {
|
||||||
return shortTitle;
|
return shortName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setShortTitle(String shortTitle) {
|
public void setShortName(String shortName) {
|
||||||
this.shortTitle = shortTitle;
|
this.shortName = shortName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Boolean isTraceabilityFlag() {
|
public Boolean isTraceabilityFlag() {
|
||||||
|
@ -243,7 +243,7 @@ public class Common extends Base{
|
||||||
return "Common [dataOwner=" + dataOwner + ", databaseSources="
|
return "Common [dataOwner=" + dataOwner + ", databaseSources="
|
||||||
+ databaseSources + ", sourceOfInformation="
|
+ databaseSources + ", sourceOfInformation="
|
||||||
+ sourceOfInformation + ", refersTo=" + refersTo
|
+ sourceOfInformation + ", refersTo=" + refersTo
|
||||||
+ ", shortTitle=" + shortTitle + ", traceabilityFlag="
|
+ ", shortName=" + shortName + ", traceabilityFlag="
|
||||||
+ traceabilityFlag + ", status=" + status + ", grsfType="
|
+ traceabilityFlag + ", status=" + status + ", grsfType="
|
||||||
+ grsfType + ", catches=" + catches + ", landings=" + landings
|
+ grsfType + ", catches=" + catches + ", landings=" + landings
|
||||||
+ ", species=" + species + ", similarGRSFRecords="
|
+ ", species=" + species + ", similarGRSFRecords="
|
||||||
|
|
|
@ -96,7 +96,7 @@ public class StockRecord extends Common{
|
||||||
@Tag
|
@Tag
|
||||||
private String assessor;
|
private String assessor;
|
||||||
|
|
||||||
@JsonProperty("type")
|
@JsonProperty("grsf_type")
|
||||||
@CustomField(key="GRSF Type")
|
@CustomField(key="GRSF Type")
|
||||||
@Group
|
@Group
|
||||||
private Stock_Type type;
|
private Stock_Type type;
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class CommonServiceUtils {
|
||||||
public static void validateAggregatedRecord(Common record) throws Exception {
|
public static void validateAggregatedRecord(Common record) throws Exception {
|
||||||
|
|
||||||
List<RefersToBean> refersToList = record.getRefersTo();
|
List<RefersToBean> refersToList = record.getRefersTo();
|
||||||
String shortTitle = record.getShortTitle();
|
String shortTitle = record.getShortName();
|
||||||
Boolean traceabilityFlag = record.isTraceabilityFlag();
|
Boolean traceabilityFlag = record.isTraceabilityFlag();
|
||||||
Status status = record.getStatus();
|
Status status = record.getStatus();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue