From bcb5ae8c1564e217df0256c865747d7801ab76c3 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 1 Sep 2021 17:44:52 +0200 Subject: [PATCH] Excluded storage manager snapshot --- CHANGELOG.md | 3 ++- .../rest/AddSectionToConcessioneRequest.java | 3 ++- .../common/model/rest/Configuration.java | 15 +++++++++++ .../common/model/rest/DatabaseConnection.java | 12 +++++++++ .../model/rest/PostgisIndexDescriptor.java | 13 +++++++++ .../common/model/rest/QueryRequest.java | 27 +++++++++++++++++++ .../common/rest/InterfaceConstants.java | 12 ++++++--- .../common/rest/MongoConcessioni.java | 10 ++++++- 8 files changed, 88 insertions(+), 7 deletions(-) rename src/main/java/org/gcube/application/geoportal/common/{ => model}/rest/AddSectionToConcessioneRequest.java (73%) create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/rest/Configuration.java create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/rest/DatabaseConnection.java create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/rest/PostgisIndexDescriptor.java create mode 100644 src/main/java/org/gcube/application/geoportal/common/model/rest/QueryRequest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c318e1..29e4ae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-common # [v1.0.6-SNAPSHOT] - 2021-08-3 -Interface parameter "force" +Forced Deletion +Search & query Interfaces return iterator instead of iterable # [v1.0.5] - 2020-12-9 diff --git a/src/main/java/org/gcube/application/geoportal/common/rest/AddSectionToConcessioneRequest.java b/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java similarity index 73% rename from src/main/java/org/gcube/application/geoportal/common/rest/AddSectionToConcessioneRequest.java rename to src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java index b935f69..2f18109 100644 --- a/src/main/java/org/gcube/application/geoportal/common/rest/AddSectionToConcessioneRequest.java +++ b/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java @@ -1,4 +1,4 @@ -package org.gcube.application.geoportal.common.rest; +package org.gcube.application.geoportal.common.model.rest; import java.util.List; @@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.gcube.application.geoportal.common.rest.TempFile; @XmlRootElement @Data diff --git a/src/main/java/org/gcube/application/geoportal/common/model/rest/Configuration.java b/src/main/java/org/gcube/application/geoportal/common/model/rest/Configuration.java new file mode 100644 index 0000000..029618a --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/common/model/rest/Configuration.java @@ -0,0 +1,15 @@ +package org.gcube.application.geoportal.common.model.rest; + +import lombok.Data; + +@Data +public class Configuration { + + // Index (postgis + layer) Configuration + public PostgisIndexDescriptor index; + + + + // Mongo DB Configuration + // TBD +} diff --git a/src/main/java/org/gcube/application/geoportal/common/model/rest/DatabaseConnection.java b/src/main/java/org/gcube/application/geoportal/common/model/rest/DatabaseConnection.java new file mode 100644 index 0000000..7702ea8 --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/common/model/rest/DatabaseConnection.java @@ -0,0 +1,12 @@ +package org.gcube.application.geoportal.common.model.rest; + +import lombok.Data; + +@Data +public class DatabaseConnection { + + private String user; + private String pwd; + private String url; + +} \ No newline at end of file diff --git a/src/main/java/org/gcube/application/geoportal/common/model/rest/PostgisIndexDescriptor.java b/src/main/java/org/gcube/application/geoportal/common/model/rest/PostgisIndexDescriptor.java new file mode 100644 index 0000000..9156f2f --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/common/model/rest/PostgisIndexDescriptor.java @@ -0,0 +1,13 @@ +package org.gcube.application.geoportal.common.model.rest; + +import lombok.AllArgsConstructor; +import lombok.Data; + + +@Data +@AllArgsConstructor +public class PostgisIndexDescriptor { + + public DatabaseConnection postgisDBIndex; + public String wmsLink; +} diff --git a/src/main/java/org/gcube/application/geoportal/common/model/rest/QueryRequest.java b/src/main/java/org/gcube/application/geoportal/common/model/rest/QueryRequest.java new file mode 100644 index 0000000..8a58311 --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/common/model/rest/QueryRequest.java @@ -0,0 +1,27 @@ +package org.gcube.application.geoportal.common.model.rest; + +import lombok.Data; + +import java.util.List; + +@Data +public class QueryRequest { + + @Data + public static class PagedRequest{ + private int offset; + private int Limit; + } + + @Data + public static class OrderedRequest { + public static enum Direction {ASCENDING,DESCENDING} + private Direction direction; + private String json; + private List fields; + } + private String filter; + private String transformation; + private OrderedRequest ordering; + private PagedRequest paging; +} diff --git a/src/main/java/org/gcube/application/geoportal/common/rest/InterfaceConstants.java b/src/main/java/org/gcube/application/geoportal/common/rest/InterfaceConstants.java index 095255d..0c92e95 100644 --- a/src/main/java/org/gcube/application/geoportal/common/rest/InterfaceConstants.java +++ b/src/main/java/org/gcube/application/geoportal/common/rest/InterfaceConstants.java @@ -20,6 +20,9 @@ public class InterfaceConstants { public static final String PUBLISH_PATH="publish"; public static final String REGISTER_FILES_PATH="registerFiles"; + public static final String CONFIGURATION_PATH="configuration"; + public static final String SEARCH_PATH="search"; + public static final String QUERY_PATH="query"; } @@ -28,11 +31,12 @@ public class InterfaceConstants { public static final String SECTION_ID="section_id"; public static final String PROFILE_ID="profile_id"; - //INVESTIGATE CAPABILITIES - public static final String ORDER_BY="order_by"; - public static final String LIMIT="limit"; - public static final String OFFSET="offset"; +// //INVESTIGATE CAPABILITIES +// public static final String ORDER_BY="order_by"; +// public static final String LIMIT="limit"; +// public static final String OFFSET="offset"; public static final String FORCE="force"; + } diff --git a/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java b/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java index cff206c..e6aad5a 100644 --- a/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java +++ b/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java @@ -1,6 +1,9 @@ package org.gcube.application.geoportal.common.rest; import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; +import org.gcube.application.geoportal.common.model.rest.Configuration; +import org.gcube.application.geoportal.common.model.rest.QueryRequest; import java.util.Iterator; @@ -17,5 +20,10 @@ public interface MongoConcessioni { public Concessione replace(Concessione replacement) throws Exception; public void unpublish(String id)throws Exception; - + + + public Configuration getCurrentConfiguration()throws Exception; + public Iterator search(String filter)throws Exception; + public Iterator query(QueryRequest request) throws Exception; + public Iterator queryforType(QueryRequest request,Class clazz) throws Exception; }