From ac5d2a5c635c13cd959633ae1cac814d819fdac0 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 2 May 2023 12:03:47 +0200 Subject: [PATCH] Re-organized imports --- .../client/DefaultDocumentsClient.java | 29 +++++++++++-------- .../client/DefaultMongoConcessioni.java | 27 +++++++++-------- .../client/DefaultProfiledConcessioni.java | 4 +-- .../geoportal/client/ResponseCommons.java | 5 ++-- .../geoportal/client/UseCaseDescriptors.java | 18 +++++++----- .../client/legacy/ConcessioniManager.java | 18 +++++++----- .../client/legacy/ConcessioniManagerI.java | 7 ++++- .../client/legacy/ConcessioniPlugin.java | 10 +++---- .../client/legacy/DefaultConcessioni.java | 13 +++++---- .../client/legacy/MongoConcessioniPlugin.java | 10 +++---- .../legacy/StatefulMongoConcessioni.java | 19 ++++++++---- .../StatefulMongoConcessioniPlugin.java | 10 +++---- .../plugins/GeoportalAbstractPlugin.java | 11 +++++-- .../plugins/ProjectsInterfacePlugin.java | 22 +++++++------- .../geoportal/client/plugins/UCDPlugin.java | 10 +++---- .../client/utils/ConcessioniUtils.java | 19 ++++++++---- .../geoportal/client/utils/Queries.java | 10 +++---- .../geoportal/client/utils/Serialization.java | 27 ++++++++++------- 18 files changed, 158 insertions(+), 111 deletions(-) diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java index 242f8f7..11d1ddb 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultDocumentsClient.java @@ -1,8 +1,14 @@ package org.gcube.application.geoportal.client; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import java.io.IOException; +import java.rmi.RemoteException; +import java.util.Iterator; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + import org.bson.Document; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.faults.InvalidRequestException; @@ -10,21 +16,20 @@ import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.access.Access; import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject; -import org.gcube.application.geoportal.common.model.rest.*; +import org.gcube.application.geoportal.common.model.rest.CreateRelationshipRequest; +import org.gcube.application.geoportal.common.model.rest.DeleteRelationshipRequest; +import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; +import org.gcube.application.geoportal.common.model.rest.StepExecutionRequest; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.common.clients.Call; import org.gcube.common.clients.delegates.ProxyDelegate; import org.glassfish.jersey.client.HttpUrlConnectorProvider; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import java.io.IOException; -import java.rmi.RemoteException; -import java.util.Iterator; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; /** * Instantiates a new default documents client. diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java index 34ddaec..156c522 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java @@ -1,9 +1,15 @@ package org.gcube.application.geoportal.client; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import java.io.IOException; +import java.io.InputStream; +import java.rmi.RemoteException; +import java.util.Iterator; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.legacy.Concessione; @@ -14,14 +20,11 @@ import org.gcube.application.geoportal.common.rest.MongoConcessioni; import org.gcube.common.clients.Call; import org.gcube.common.clients.delegates.ProxyDelegate; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.io.IOException; -import java.io.InputStream; -import java.rmi.RemoteException; -import java.util.Iterator; +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor @Slf4j diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultProfiledConcessioni.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultProfiledConcessioni.java index 325bc35..6ec1996 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultProfiledConcessioni.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultProfiledConcessioni.java @@ -1,13 +1,13 @@ package org.gcube.application.geoportal.client; +import java.util.Iterator; + import org.gcube.application.geoportal.common.model.configuration.Configuration; 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.QueryRequest; import org.gcube.application.geoportal.common.rest.MongoConcessioni; -import java.util.Iterator; - public class DefaultProfiledConcessioni implements MongoConcessioni { diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/ResponseCommons.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/ResponseCommons.java index 9acc260..02c4f00 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/ResponseCommons.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/ResponseCommons.java @@ -1,9 +1,10 @@ package org.gcube.application.geoportal.client; -import lombok.extern.slf4j.Slf4j; +import javax.ws.rs.core.Response; + import org.gcube.application.geoportal.client.utils.Serialization; -import javax.ws.rs.core.Response; +import lombok.extern.slf4j.Slf4j; @Slf4j public class ResponseCommons { diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/UseCaseDescriptors.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/UseCaseDescriptors.java index 48fbbc9..1e7808c 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/UseCaseDescriptors.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/UseCaseDescriptors.java @@ -1,8 +1,12 @@ package org.gcube.application.geoportal.client; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import java.rmi.RemoteException; +import java.util.Iterator; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; + import org.bson.Document; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.rest.QueryRequest; @@ -11,11 +15,9 @@ import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.rest.UseCaseDescriptorsI; import org.gcube.common.clients.delegates.ProxyDelegate; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import java.rmi.RemoteException; -import java.util.Iterator; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor @Slf4j diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java index e9736d2..16d6497 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java @@ -1,5 +1,14 @@ package org.gcube.application.geoportal.client.legacy; +import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.concessioni; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; + +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.rest.ConcessioniI; + import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -7,15 +16,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + import lombok.extern.slf4j.Slf4j; -import org.gcube.application.geoportal.common.model.legacy.Concessione; -import org.gcube.application.geoportal.common.rest.ConcessioniI; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; - -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.concessioni; @Slf4j public class ConcessioniManager{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManagerI.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManagerI.java index 97c5eec..8a5cfa0 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManagerI.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManagerI.java @@ -1,6 +1,11 @@ package org.gcube.application.geoportal.client.legacy; -import org.gcube.application.geoportal.common.model.legacy.*; +import org.gcube.application.geoportal.common.model.legacy.AbstractRelazione; +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor; +import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; +import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; +import org.gcube.application.geoportal.common.model.legacy.UploadedImage; import org.gcube.application.geoportal.common.model.rest.TempFile; import org.gcube.application.geoportal.common.rest.MongoConcessioni; diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniPlugin.java index e7889a3..f687a36 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniPlugin.java @@ -1,5 +1,10 @@ package org.gcube.application.geoportal.client.legacy; +import javax.ws.rs.client.WebTarget; +import javax.xml.namespace.QName; +import javax.xml.transform.dom.DOMResult; +import javax.xml.ws.EndpointReference; + import org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin; import org.gcube.application.geoportal.common.rest.ConcessioniI; import org.gcube.application.geoportal.common.rest.InterfaceConstants; @@ -9,11 +14,6 @@ import org.gcube.common.clients.config.ProxyConfig; import org.gcube.common.clients.delegates.ProxyDelegate; import org.w3c.dom.Node; -import javax.ws.rs.client.WebTarget; -import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMResult; -import javax.xml.ws.EndpointReference; - public class ConcessioniPlugin extends GeoportalAbstractPlugin{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java index 0e6b3a4..1bf3a42 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java @@ -1,15 +1,16 @@ package org.gcube.application.geoportal.client.legacy; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import org.gcube.application.geoportal.common.rest.ConcessioniI; -import org.gcube.common.clients.Call; -import org.gcube.common.clients.delegates.ProxyDelegate; - import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; +import org.gcube.application.geoportal.common.rest.ConcessioniI; +import org.gcube.common.clients.Call; +import org.gcube.common.clients.delegates.ProxyDelegate; + +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + @RequiredArgsConstructor public class DefaultConcessioni implements ConcessioniI{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/MongoConcessioniPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/MongoConcessioniPlugin.java index d4c06db..df435d5 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/MongoConcessioniPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/MongoConcessioniPlugin.java @@ -1,5 +1,10 @@ package org.gcube.application.geoportal.client.legacy; +import javax.ws.rs.client.WebTarget; +import javax.xml.namespace.QName; +import javax.xml.transform.dom.DOMResult; +import javax.xml.ws.EndpointReference; + import org.gcube.application.geoportal.client.DefaultMongoConcessioni; import org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin; import org.gcube.application.geoportal.common.rest.InterfaceConstants; @@ -10,11 +15,6 @@ import org.gcube.common.clients.config.ProxyConfig; import org.gcube.common.clients.delegates.ProxyDelegate; import org.w3c.dom.Node; -import javax.ws.rs.client.WebTarget; -import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMResult; -import javax.xml.ws.EndpointReference; - public class MongoConcessioniPlugin extends GeoportalAbstractPlugin{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioni.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioni.java index cf7cfd3..389cb22 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioni.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioni.java @@ -1,19 +1,26 @@ package org.gcube.application.geoportal.client.legacy; -import lombok.Getter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + +import javax.ws.rs.client.WebTarget; + import org.gcube.application.geoportal.client.DefaultMongoConcessioni; -import org.gcube.application.geoportal.common.model.legacy.*; +import org.gcube.application.geoportal.common.model.legacy.AbstractRelazione; +import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.legacy.Concessione.Paths; +import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor; +import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; +import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; +import org.gcube.application.geoportal.common.model.legacy.UploadedImage; import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; import org.gcube.application.geoportal.common.model.rest.TempFile; import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.common.clients.delegates.ProxyDelegate; -import javax.ws.rs.client.WebTarget; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; +import lombok.Getter; public class StatefulMongoConcessioni extends DefaultMongoConcessioni implements ConcessioniManagerI{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioniPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioniPlugin.java index 2d2bcad..e313c1f 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioniPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioniPlugin.java @@ -1,5 +1,10 @@ package org.gcube.application.geoportal.client.legacy; +import javax.ws.rs.client.WebTarget; +import javax.xml.namespace.QName; +import javax.xml.transform.dom.DOMResult; +import javax.xml.ws.EndpointReference; + import org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.common.calls.jaxrs.GcubeService; @@ -8,11 +13,6 @@ import org.gcube.common.clients.config.ProxyConfig; import org.gcube.common.clients.delegates.ProxyDelegate; import org.w3c.dom.Node; -import javax.ws.rs.client.WebTarget; -import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMResult; -import javax.xml.ws.EndpointReference; - public class StatefulMongoConcessioniPlugin extends GeoportalAbstractPlugin{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java index e8aea38..862d73d 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/GeoportalAbstractPlugin.java @@ -1,18 +1,23 @@ package org.gcube.application.geoportal.client.plugins; -import lombok.AllArgsConstructor; +import javax.ws.rs.client.WebTarget; + import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.legacy.ConcessioniPlugin; import org.gcube.application.geoportal.client.legacy.MongoConcessioniPlugin; import org.gcube.application.geoportal.client.legacy.StatefulMongoConcessioniPlugin; import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.rest.*; +import org.gcube.application.geoportal.common.rest.ConcessioniI; +import org.gcube.application.geoportal.common.rest.InterfaceConstants; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; +import org.gcube.application.geoportal.common.rest.Projects; +import org.gcube.application.geoportal.common.rest.UseCaseDescriptorsI; import org.gcube.common.clients.Plugin; import org.gcube.common.clients.ProxyBuilder; import org.gcube.common.clients.ProxyBuilderImpl; import org.gcube.common.clients.config.ProxyConfig; -import javax.ws.rs.client.WebTarget; +import lombok.AllArgsConstructor; @AllArgsConstructor public abstract class GeoportalAbstractPlugin implements Plugin{ diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java index 9e99fde..a5a856a 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/ProjectsInterfacePlugin.java @@ -1,11 +1,10 @@ package org.gcube.application.geoportal.client.plugins; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import javax.ws.rs.client.WebTarget; +import javax.xml.namespace.QName; +import javax.xml.transform.dom.DOMResult; +import javax.xml.ws.EndpointReference; + import org.gcube.application.geoportal.client.DefaultDocumentsClient; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.document.Project; @@ -17,10 +16,13 @@ import org.gcube.common.clients.config.ProxyConfig; import org.gcube.common.clients.delegates.ProxyDelegate; import org.w3c.dom.Node; -import javax.ws.rs.client.WebTarget; -import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMResult; -import javax.xml.ws.EndpointReference; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; @Slf4j @RequiredArgsConstructor diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/UCDPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/UCDPlugin.java index c75b214..5a374dc 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/UCDPlugin.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/plugins/UCDPlugin.java @@ -1,5 +1,10 @@ package org.gcube.application.geoportal.client.plugins; +import javax.ws.rs.client.WebTarget; +import javax.xml.namespace.QName; +import javax.xml.transform.dom.DOMResult; +import javax.xml.ws.EndpointReference; + import org.gcube.application.geoportal.client.UseCaseDescriptors; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.rest.UseCaseDescriptorsI; @@ -9,11 +14,6 @@ import org.gcube.common.clients.config.ProxyConfig; import org.gcube.common.clients.delegates.ProxyDelegate; import org.w3c.dom.Node; -import javax.ws.rs.client.WebTarget; -import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMResult; -import javax.xml.ws.EndpointReference; - public class UCDPlugin extends GeoportalAbstractPlugin{ @Override diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java index c21353e..3acb9ea 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java @@ -1,15 +1,22 @@ package org.gcube.application.geoportal.client.utils; -import lombok.extern.slf4j.Slf4j; -import org.gcube.application.geoportal.common.model.legacy.*; -import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; -import org.gcube.application.geoportal.common.rest.MongoConcessioni; -import org.gcube.application.geoportal.common.utils.StorageUtils; - import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import org.gcube.application.geoportal.common.model.legacy.AbstractRelazione; +import org.gcube.application.geoportal.common.model.legacy.AssociatedContent; +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; +import org.gcube.application.geoportal.common.model.legacy.PersistedContent; +import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; +import org.gcube.application.geoportal.common.model.legacy.WorkspaceContent; +import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; +import org.gcube.application.geoportal.common.utils.StorageUtils; + +import lombok.extern.slf4j.Slf4j; + @Slf4j public class ConcessioniUtils { diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Queries.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Queries.java index 6dafe08..79d1c70 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Queries.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Queries.java @@ -1,15 +1,15 @@ package org.gcube.application.geoportal.client.utils; -import org.apache.commons.io.IOUtils; -import org.bson.Document; -import org.gcube.application.geoportal.common.model.rest.QueryRequest; -import org.gcube.application.geoportal.common.utils.Files; - import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import org.apache.commons.io.IOUtils; +import org.bson.Document; +import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.common.utils.Files; + public class Queries { diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Serialization.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Serialization.java index 481ab7c..dc5447b 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Serialization.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/Serialization.java @@ -1,20 +1,27 @@ package org.gcube.application.geoportal.client.utils; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.vdurmont.semver4j.Semver; -import org.bson.Document; -import org.bson.types.ObjectId; - import java.io.IOException; import java.io.InputStream; import java.time.format.DateTimeFormatter; import java.util.Iterator; +import org.bson.Document; +import org.bson.types.ObjectId; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.vdurmont.semver4j.Semver; + public class Serialization { public static final DateTimeFormatter FULL_FORMATTER=DateTimeFormatter.ofPattern("uuuuMMdd_HH-mm-ss");