diff --git a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java index f6160ce..5645d44 100644 --- a/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java +++ b/concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java @@ -3,14 +3,14 @@ package org.gcube.application.cms.concessioni.plugins; import com.vdurmont.semver4j.Semver; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.gcube.application.cms.plugins.*; +import org.gcube.application.cms.custom.gna.concessioni.model.ProfiledConcessione; +import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.implementations.Default3PhaseManager; import org.gcube.application.cms.plugins.reports.EventExecutionReport; import org.gcube.application.cms.plugins.reports.Report; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.cms.custom.gna.concessioni.model.ProfiledConcessione; import org.gcube.application.geoportal.common.model.JSONPathWrapper; -import org.gcube.application.geoportal.common.model.document.*; +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.access.AccessPolicy; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; 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 070f9b1..9f4a593 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 @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.faults.InvalidRequestException; -import org.gcube.application.geoportal.common.model.document.Project; 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.*; @@ -22,7 +22,6 @@ import javax.ws.rs.core.MediaType; import java.io.IOException; import java.rmi.RemoteException; import java.util.Iterator; -import java.util.List; @RequiredArgsConstructor @Slf4j 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 eea5663..34ddaec 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 @@ -5,9 +5,9 @@ import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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; import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; -import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.rest.MongoConcessioni; 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 ec9099b..325bc35 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,8 +1,8 @@ package org.gcube.application.geoportal.client; +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.configuration.Configuration; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.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 c6ad730..b45f63e 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 @@ -4,8 +4,6 @@ import lombok.extern.slf4j.Slf4j; import org.gcube.application.geoportal.client.utils.Serialization; import javax.ws.rs.core.Response; -import java.io.IOException; -import java.rmi.RemoteException; @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 f4de3d4..48fbbc9 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 @@ -9,7 +9,6 @@ import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.rest.UseCaseDescriptorsI; -import org.gcube.common.clients.Call; import org.gcube.common.clients.delegates.ProxyDelegate; import javax.ws.rs.client.Entity; 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 8bdd18e..e9736d2 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,14 +1,5 @@ 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; @@ -16,8 +7,15 @@ 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 7668631..97c5eec 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,8 +1,8 @@ package org.gcube.application.geoportal.client.legacy; import org.gcube.application.geoportal.common.model.legacy.*; -import org.gcube.application.geoportal.common.rest.MongoConcessioni; import org.gcube.application.geoportal.common.model.rest.TempFile; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; public interface ConcessioniManagerI extends 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 f687a36..e7889a3 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,10 +1,5 @@ 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; @@ -14,6 +9,11 @@ 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 1bf3a42..0e6b3a4 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,14 @@ package org.gcube.application.geoportal.client.legacy; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; - +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 lombok.NonNull; -import lombok.RequiredArgsConstructor; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; @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 df435d5..d4c06db 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,10 +1,5 @@ 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; @@ -15,6 +10,11 @@ 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/StatefulMongoConcessioniPlugin.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/legacy/StatefulMongoConcessioniPlugin.java index e313c1f..2d2bcad 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,10 +1,5 @@ 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; @@ -13,6 +8,11 @@ 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 8935b4e..e8aea38 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,8 +1,6 @@ package org.gcube.application.geoportal.client.plugins; -import javax.ws.rs.client.WebTarget; - -import org.gcube.application.geoportal.client.DefaultDocumentsClient; +import lombok.AllArgsConstructor; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.legacy.ConcessioniPlugin; import org.gcube.application.geoportal.client.legacy.MongoConcessioniPlugin; @@ -14,7 +12,7 @@ import org.gcube.common.clients.ProxyBuilder; import org.gcube.common.clients.ProxyBuilderImpl; import org.gcube.common.clients.config.ProxyConfig; -import lombok.AllArgsConstructor; +import javax.ws.rs.client.WebTarget; @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 9408848..9e99fde 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,10 +1,5 @@ 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 com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -22,6 +17,11 @@ 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; + @Slf4j @RequiredArgsConstructor public class ProjectsInterfacePlugin extends GeoportalAbstractPlugin>{ 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 2928df0..c21353e 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 @@ -4,7 +4,6 @@ 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; 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 f564dbb..481ab7c 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,10 +1,5 @@ package org.gcube.application.geoportal.client.utils; -import java.io.IOException; -import java.io.InputStream; -import java.time.format.DateTimeFormatter; -import java.util.Iterator; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -15,6 +10,11 @@ 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; + public class Serialization { public static final DateTimeFormatter FULL_FORMATTER=DateTimeFormatter.ofPattern("uuuuMMdd_HH-mm-ss"); diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java index 8be06bb..0343578 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java @@ -1,7 +1,6 @@ package org.gcube.application.geoportal; import org.gcube.application.cms.tests.TokenSetter; - import org.gcube.application.geoportal.common.utils.StorageUtils; import java.io.IOException; diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java index 9a114a9..af8815e 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java @@ -2,19 +2,16 @@ package org.gcube.application.geoportal.clients; import com.fasterxml.jackson.core.JsonProcessingException; import org.bson.Document; -import org.gcube.application.cms.tests.TestDocuments; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; +import org.gcube.application.cms.tests.Tests; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.faults.InvalidRequestException; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.junit.Test; -import javax.jws.soap.SOAPBinding; import java.io.File; import java.io.FileNotFoundException; import java.rmi.RemoteException; @@ -55,7 +52,7 @@ public abstract class GenericUseCases extends BasicVreTests{ // Prepare request RegisterFileSetRequest fsRequest = FileSets. prepareRequest(new StorageUtils(), - parentPath,fieldName,fieldDefinition, new File(TestConcessioniModel.getBaseFolder(),"pos.shp")); + parentPath,fieldName,fieldDefinition, new File(Tests.BASE_FOLDER,"pos.shp")); project = client.registerFileSet(project.getId(),fsRequest); diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java index de1f633..8cec8d5 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java @@ -3,10 +3,8 @@ package org.gcube.application.geoportal.clients; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.gcube.application.geoportal.client.DefaultDocumentsClient; -import org.gcube.application.geoportal.client.utils.Serialization; -import org.gcube.application.geoportal.common.model.document.Project; 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.relationships.RelationshipNavigationObject; import org.gcube.application.geoportal.common.model.rest.CreateRelationshipRequest; import org.gcube.application.geoportal.common.model.rest.DeleteRelationshipRequest; @@ -14,15 +12,12 @@ import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import sun.net.www.content.text.Generic; import java.rmi.RemoteException; import java.time.LocalDateTime; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; -import static junit.framework.TestCase.assertTrue; -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.*; import static org.gcube.application.geoportal.client.utils.Serialization.write; import static org.junit.Assume.assumeTrue; diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java index adca966..5e9d949 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java @@ -2,13 +2,10 @@ package org.gcube.application.geoportal.clients; import org.bson.Document; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.geoportal.client.UseCaseDescriptors; -import org.gcube.application.geoportal.client.utils.Queries; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.UseCaseDescriptorsI; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import java.util.concurrent.atomic.AtomicLong; diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java index 3bec76c..5b9a16b 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java @@ -1,6 +1,5 @@ package org.gcube.application.geoportal.clients.serialization; -import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.gcube.application.geoportal.client.utils.Serialization; import org.junit.Test; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java index e626085..07f9386 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java @@ -2,16 +2,15 @@ package org.gcube.application.geoportal.common.model; import com.jayway.jsonpath.*; -import com.mongodb.util.JSON; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.bson.Document; import org.gcube.application.geoportal.common.JSONSerializationProvider; import org.reflections.Reflections; import org.reflections.util.ConfigurationBuilder; import org.reflections.util.FilterBuilder; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Configuration.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Configuration.java index bce9ff8..e5d8725 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Configuration.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Configuration.java @@ -2,11 +2,9 @@ package org.gcube.application.geoportal.common.model.configuration; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import jdk.nashorn.internal.runtime.regexp.joni.Config; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import javax.xml.bind.annotation.XmlRootElement; import java.time.LocalDateTime; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Lock.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Lock.java index bd99604..5373ca1 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Lock.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Lock.java @@ -3,9 +3,6 @@ package org.gcube.application.geoportal.common.model.document; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; import org.gcube.application.geoportal.common.model.document.accounting.AccountingInfo; -import org.gcube.application.geoportal.common.model.document.accounting.User; - -import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/Materialization.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/Materialization.java index 548ee5c..8e60d50 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/Materialization.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/Materialization.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportal.common.model.document.filesets; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.*; +import lombok.ToString; import org.bson.Document; @ToString (callSuper = true) diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFile.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFile.java index 6d40ed9..30e8a4e 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFile.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFile.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportal.common.model.document.filesets; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.Data; @Data public class RegisteredFile { diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFileSet.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFileSet.java index 4299986..e3273bd 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFileSet.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFileSet.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportal.common.model.document.filesets; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.*; +import lombok.ToString; import org.bson.Document; import java.util.List; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/TemporalReference.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/TemporalReference.java index 34e0580..9c35e31 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/TemporalReference.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/TemporalReference.java @@ -1,7 +1,6 @@ package org.gcube.application.geoportal.common.model.document.identification; -import lombok.*; -import org.bson.Document; +import lombok.ToString; @ToString (callSuper = true) public class TemporalReference extends IdentificationReference { diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/LifecycleInformation.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/LifecycleInformation.java index b3852b8..ef3b15d 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/LifecycleInformation.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/LifecycleInformation.java @@ -2,7 +2,7 @@ package org.gcube.application.geoportal.common.model.document.lifecycle; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.Data; import java.util.ArrayList; import java.util.List; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/AssociatedContent.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/AssociatedContent.java index 43fd773..14dcc12 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/AssociatedContent.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/AssociatedContent.java @@ -1,17 +1,15 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; - -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; -import org.gcube.application.geoportal.common.utils.CollectionsUtils; - import lombok.Getter; import lombok.Setter; +import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; +import org.gcube.application.geoportal.common.utils.CollectionsUtils; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; @Getter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/BBOX.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/BBOX.java index aa88773..9ce82ab 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/BBOX.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/BBOX.java @@ -1,13 +1,8 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.io.Serializable; +import lombok.*; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.ToString; +import java.io.Serializable; @RequiredArgsConstructor @Getter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java index 45c97b7..c5d6f5d 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java @@ -1,12 +1,8 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.gcube.application.geoportal.common.faults.InvalidRequestException; import org.gcube.application.geoportal.common.model.legacy.report.Check; import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck; @@ -14,9 +10,11 @@ import org.gcube.application.geoportal.common.model.legacy.report.ValidationRepo import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport.ValidationStatus; import org.gcube.application.geoportal.common.utils.CollectionsUtils; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; +import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; @Getter @Setter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/GeoServerContent.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/GeoServerContent.java index 88fd57a..5f50e17 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/GeoServerContent.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/GeoServerContent.java @@ -1,13 +1,13 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.util.ArrayList; -import java.util.List; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import java.util.ArrayList; +import java.util.List; + @Getter @Setter @ToString(callSuper=true) diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/InputStreamDescriptor.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/InputStreamDescriptor.java index 2b04ec7..facf3ff 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/InputStreamDescriptor.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/InputStreamDescriptor.java @@ -1,12 +1,12 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.io.InputStream; - import lombok.Data; import lombok.Getter; import lombok.NonNull; import lombok.Setter; +import java.io.InputStream; + @Data @Getter @Setter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java index fa3362a..7635fd1 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java @@ -1,12 +1,11 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.util.List; - -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; -import org.gcube.application.geoportal.common.utils.CollectionsUtils; - import lombok.Getter; import lombok.Setter; +import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; +import org.gcube.application.geoportal.common.utils.CollectionsUtils; + +import java.util.List; @Getter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/PersistedContent.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/PersistedContent.java index 9905d66..c125d98 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/PersistedContent.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/PersistedContent.java @@ -3,7 +3,6 @@ package org.gcube.application.geoportal.common.model.legacy; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Record.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Record.java index 4efecac..f3b1773 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Record.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Record.java @@ -1,14 +1,13 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.time.LocalDateTime; - -import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck; -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck; +import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; + +import java.time.LocalDateTime; @Getter @Setter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/RelazioneScavo.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/RelazioneScavo.java index 6cc5e88..e944813 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/RelazioneScavo.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/RelazioneScavo.java @@ -1,13 +1,12 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.util.List; - -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; -import org.gcube.application.geoportal.common.utils.CollectionsUtils; - import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; +import org.gcube.application.geoportal.common.utils.CollectionsUtils; + +import java.util.List; @Getter @Setter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/UploadedImage.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/UploadedImage.java index 3b5b413..635b4e8 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/UploadedImage.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/UploadedImage.java @@ -1,12 +1,11 @@ package org.gcube.application.geoportal.common.model.legacy; -import java.util.List; - -import org.gcube.application.geoportal.common.utils.CollectionsUtils; - import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.gcube.application.geoportal.common.utils.CollectionsUtils; + +import java.util.List; @Getter @Setter diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java index 211c73e..72d7470 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java @@ -1,14 +1,13 @@ package org.gcube.application.geoportal.common.model.legacy.report; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + @Getter @Setter @Slf4j diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/PublicationReport.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/PublicationReport.java index 1663091..d5440d1 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/PublicationReport.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/PublicationReport.java @@ -1,14 +1,12 @@ package org.gcube.application.geoportal.common.model.legacy.report; -import java.io.Serializable; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - -import org.gcube.application.geoportal.common.model.legacy.Record; - import lombok.Getter; import lombok.Setter; +import org.gcube.application.geoportal.common.model.legacy.Record; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import java.io.Serializable; @XmlAccessorType(XmlAccessType.NONE) public class PublicationReport extends ValidationReport implements Serializable{ diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ValidationReport.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ValidationReport.java index ed91409..d643446 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ValidationReport.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ValidationReport.java @@ -1,12 +1,12 @@ package org.gcube.application.geoportal.common.model.legacy.report; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import lombok.Data; -import lombok.NoArgsConstructor; - @Data @NoArgsConstructor public class ValidationReport implements Serializable{ diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/PluginDescriptor.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/PluginDescriptor.java index 46b88de..deb49fc 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/PluginDescriptor.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/PluginDescriptor.java @@ -1,11 +1,11 @@ package org.gcube.application.geoportal.common.model.plugins; import com.vdurmont.semver4j.Semver; -import lombok.*; -import lombok.extern.slf4j.Slf4j; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import javax.xml.bind.annotation.XmlRootElement; -import java.util.Map; @Data @NoArgsConstructor diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java index a864a21..2fa928d 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java @@ -1,9 +1,5 @@ package org.gcube.application.geoportal.common.model.rest; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,6 +7,9 @@ import org.bson.Document; import org.gcube.application.geoportal.common.faults.InvalidRequestException; import org.gcube.application.geoportal.common.model.legacy.Concessione; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; + @XmlRootElement @Data @AllArgsConstructor diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/StepExecutionRequest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/StepExecutionRequest.java index 198757e..6e3a1a7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/StepExecutionRequest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/StepExecutionRequest.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.bson.Document; - import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/Field.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/Field.java index 580b83e..63644a1 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/Field.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/Field.java @@ -1,14 +1,14 @@ package org.gcube.application.geoportal.common.model.useCaseDescriptor; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.bson.Document; -import org.bson.types.MaxKey; import javax.xml.bind.annotation.XmlRootElement; -import java.util.HashMap; import java.util.List; -import java.util.Map; @XmlRootElement @AllArgsConstructor diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java index a55601a..fb47c26 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java @@ -1,26 +1,23 @@ package org.gcube.application.geoportal.common.model.useCaseDescriptor; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.xml.bind.annotation.XmlRootElement; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.vdurmont.semver4j.Semver; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import lombok.extern.slf4j.XSlf4j; import org.bson.types.ObjectId; -import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.accounting.AccountingInfo; import org.gcube.application.geoportal.common.model.document.accounting.User; +import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Data @NoArgsConstructor @XmlRootElement diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java index 47ddfcb..4c37bf5 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java @@ -1,8 +1,8 @@ package org.gcube.application.geoportal.common.rest; +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.configuration.Configuration; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import java.util.Iterator; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java index c195ef1..10ff2bd 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java @@ -2,15 +2,14 @@ package org.gcube.application.geoportal.common.rest; import org.bson.Document; import org.gcube.application.geoportal.common.faults.InvalidRequestException; -import org.gcube.application.geoportal.common.model.document.Project; 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 java.rmi.RemoteException; import java.util.Iterator; -import java.util.List; public interface Projects

{ diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ContextUtils.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ContextUtils.java index fe15a18..6969202 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ContextUtils.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ContextUtils.java @@ -1,12 +1,11 @@ package org.gcube.application.geoportal.common.utils; -import static org.gcube.common.authorization.client.Constants.authorizationService; - +import lombok.extern.slf4j.Slf4j; import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; -import lombok.extern.slf4j.Slf4j; +import static org.gcube.common.authorization.client.Constants.authorizationService; @Slf4j public class ContextUtils { diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java index baff9aa..41d0aa7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java @@ -12,7 +12,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; public class FileSets { diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ISUtils.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ISUtils.java index 7b7476f..97777a7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ISUtils.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ISUtils.java @@ -1,23 +1,19 @@ package org.gcube.application.geoportal.common.utils; -import org.gcube.application.geoportal.common.model.configuration.MongoConnection; -import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.common.encryption.encrypter.StringEncrypter; import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.resources.gcore.Resource; -import org.gcube.common.resources.gcore.Resources; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; -import org.gcube.common.resources.gcore.ServiceEndpoint.Property; import org.gcube.informationsystem.publisher.RegistryPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import java.util.List; -import java.util.Map; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/StorageUtils.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/StorageUtils.java index 9424ada..60dd45b 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/StorageUtils.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/StorageUtils.java @@ -1,20 +1,19 @@ package org.gcube.application.geoportal.common.utils; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.UUID; - +import lombok.extern.slf4j.Slf4j; import org.gcube.application.geoportal.common.faults.StorageException; -import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.model.rest.TempFile; +import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.contentmanagement.blobstorage.service.IClient; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.gcube.contentmanager.storageclient.wrapper.AccessType; import org.gcube.contentmanager.storageclient.wrapper.MemoryType; import org.gcube.contentmanager.storageclient.wrapper.StorageClient; -import lombok.extern.slf4j.Slf4j; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.UUID; @Slf4j public class StorageUtils { diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index c757332..2b54862 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -1,8 +1,5 @@ package org.gcube.application.geoportal.common.utils.tests; -import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.rest.InterfaceConstants; - public class GCubeTest { public static String getContext() { diff --git a/geoportal-common/src/test/java/org/gcube/application/geoportal/common/StorageUtilsTest.java b/geoportal-common/src/test/java/org/gcube/application/geoportal/common/StorageUtilsTest.java index 8a04832..ad7f17d 100644 --- a/geoportal-common/src/test/java/org/gcube/application/geoportal/common/StorageUtilsTest.java +++ b/geoportal-common/src/test/java/org/gcube/application/geoportal/common/StorageUtilsTest.java @@ -1,7 +1,5 @@ package org.gcube.application.geoportal.common; -import com.mongodb.MongoWaitQueueFullException; -import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.utils.ContextUtils; diff --git a/geoportal-common/src/test/java/org/gcube/application/geoportal/common/model/JSONPathTests.java b/geoportal-common/src/test/java/org/gcube/application/geoportal/common/model/JSONPathTests.java index 692df7a..1d6c0fc 100644 --- a/geoportal-common/src/test/java/org/gcube/application/geoportal/common/model/JSONPathTests.java +++ b/geoportal-common/src/test/java/org/gcube/application/geoportal/common/model/JSONPathTests.java @@ -11,7 +11,9 @@ import org.junit.Test; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; import static junit.framework.TestCase.*; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java index b0a61fc..429e3ff 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/AbstractProfiledDocumentsTests.java @@ -4,11 +4,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.bson.Document; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.cms.tests.TestDocuments; import org.gcube.application.cms.tests.Tests; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.tests.model.BasicTests; - 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.lifecycle.LifecycleInformation;