added spatial key

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@158854 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2017-11-28 10:31:27 +00:00
parent cbb14577ef
commit 2b0ac8c0a0
2 changed files with 15 additions and 7 deletions

View File

@ -3,12 +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="grsf-common-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="ckan-util-library-2.4.0-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>

View File

@ -103,6 +103,10 @@ public class Common extends Base{
@CustomField(key=Constants.MANAGEMENT_ENTITIES_CUSTOM_KEY)
private List<String> managementBodyAuthorities;
@JsonProperty(Constants.SPATIAL_GEOJSON_JSON_KEY)
@CustomField(key=Constants.SPATIAL_GEOJSON_CUSTOM_KEY)
private String spatial;
public Common() {
super();
}
@ -124,6 +128,7 @@ public class Common extends Base{
* @param domain
* @param uuid
* @param managementBodyAuthorities
* @param spatial
*/
public Common(List<String> dataOwner,
List<Resource<Sources>> databaseSources,
@ -134,7 +139,7 @@ public class Common extends Base{
List<TimeSeriesBean<String, String>> landings,
List<String> species, List<SimilarRecordBean> similarGRSFRecords,
List<SimilarRecordBean> similarSourceRecords, String domain,
String uuid, List<String> managementBodyAuthorities) {
String uuid, List<String> managementBodyAuthorities, String spatial) {
super();
this.dataOwner = dataOwner;
this.databaseSources = databaseSources;
@ -152,6 +157,7 @@ public class Common extends Base{
this.domain = domain;
this.uuid = uuid;
this.managementBodyAuthorities = managementBodyAuthorities;
this.spatial = spatial;
}
public List<String> getManagementBodyAuthorities() {
@ -285,6 +291,14 @@ public class Common extends Base{
this.similarSourceRecords = similarSourceRecords;
}
public String getSpatial() {
return spatial;
}
public void setSpatial(String spatial) {
this.spatial = spatial;
}
/**
* Clean the semantic id
* @param id