From e56aed85f8bb5bba1968c2b453adb94c1eca0e37 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Mon, 26 Sep 2022 16:11:20 +0200 Subject: [PATCH] JDK 11 --- cms-plugin-framework/pom.xml | 6 + .../cms/caches/AbstractScopedMap.java | 10 +- .../application/cms/caches/TimedMap.java | 3 - .../ImplementationProvider.java | 1 - .../cms/implementations/WorkspaceManager.java | 35 +- .../cms/plugins/IndexerPluginInterface.java | 2 - .../cms/plugins/LifecycleManager.java | 1 - .../cms/plugins/PluginManagerInterface.java | 1 - .../cms/plugins/PluginsReflections.java | 1 - .../implementations/Default3PhaseManager.java | 9 +- .../SimpleLifeCycleManager.java | 9 +- .../executions/GuardedStepExecution.java | 3 - .../cms/plugins/model/ComparableVersion.java | 9 +- .../reports/DocumentHandlingReport.java | 1 - .../plugins/reports/IndexDocumentReport.java | 9 - .../cms/plugins/reports/Report.java | 1 - .../plugins/reports/StepExecutionReport.java | 5 +- .../requests/BaseExecutionRequest.java | 6 +- .../cms/plugins/requests/BaseRequest.java | 3 - .../requests/EventExecutionRequest.java | 5 +- .../requests/StepExecutionRequest.java | 5 +- .../cms/plugins/SimpleLifecycleTests.java | 6 - .../gcube/application/cms/tests/Tests.java | 9 + .../cms/tests/model/BasicTests.java | 2 - .../cms/tests/model/DummyPlugin.java | 3 +- .../concessioni/TestConcessioniFilters.java | 29 -- .../concessioni/TestConcessioniModel.java | 135 ------ .../concessioni/TestConcessioniQueries.java | 24 - .../cms/commons/model/concessioni/Models.java | 25 -- .../commons/model/concessioni/PathsTest.java | 67 --- .../model/concessioni/SerializationTest.java | 72 --- geoportal-client/pom.xml | 7 + geoportal-common/pom.xml | 6 +- geoportal-service/pom.xml | 13 + .../geoportal/service/AppManager.java | 1 - .../service/engine/mongo/MongoManager.java | 4 +- .../service/engine/mongo/MongoManagerI.java | 2 +- .../engine/mongo/ProfiledMongoManager.java | 28 +- .../service/engine/mongo/UCDManagerI.java | 3 +- .../service/engine/mongo/UCDMongoManager.java | 2 +- .../engine/providers/ConfigurationCache.java | 5 - .../engine/providers/MongoClientProvider.java | 4 +- .../engine/providers/PluginManager.java | 1 - .../providers/StorageClientProvider.java | 3 +- .../ucd/LocalFolderProfileMapCache.java | 6 +- .../ucd/SingleISResourceUCDProvider.java | 2 +- .../geoportal/service/rest/GuardedMethod.java | 1 - .../service/rest/ProfiledDocuments.java | 8 +- .../geoportal/service/utils/UserUtils.java | 5 +- .../service/BasicServiceTestUnit.java | 7 +- .../InexistentUseCaseDescriptorTests.java | 3 - .../geoportal/service/StorageTests.java | 6 +- .../geoportal/service/UCDTests.java | 4 - .../service/engine/caches/Caches.java | 4 +- .../service/engine/mongo/LockTests.java | 6 +- .../engine/mongo/ManagementUseCases.java | 3 - .../service/engine/mongo/MongoTester.java | 1 - .../service/engine/mongo/MongoTests.java | 4 +- .../service/engine/profiles/UCDCalls.java | 2 - .../legacy/ConcessioniOverMongoTest.java | 424 ------------------ .../AbstractProfiledDocumentsTests.java | 10 +- .../profiledDocuments/DummyProjectTest.java | 5 +- .../ProfiledConcessioniTests.java | 5 +- .../service/profiledDocuments/RolesTests.java | 1 - .../service/ws/DescribeWSFolder.java | 4 +- .../geoportal/service/ws/MoveWSFolder.java | 2 +- .../service/ws/SetWSFolderVisibility.java | 2 +- pom.xml | 2 +- .../cms/sdi/engine/DBConstants.java | 4 +- .../cms/sdi/engine/PostgisDBManager.java | 9 +- .../cms/sdi/engine/PostgisDBManagerI.java | 5 - .../cms/sdi/engine/PostgisIndexer.java | 2 +- .../cms/sdi/engine/PostgisTable.java | 1 - .../cms/sdi/engine/SDIManager.java | 4 - .../cms/sdi/engine/SDIManagerWrapper.java | 9 +- .../engine/bboxes/BBOXByCoordinatePaths.java | 1 - .../cms/sdi/engine/bboxes/BBOXEvaluator.java | 3 - .../sdi/engine/bboxes/BBOXPathScanner.java | 1 - .../cms/sdi/model/GCubeSDILayerBuilder.java | 6 +- .../cms/sdi/model/SupportedFormat.java | 6 +- .../cms/sdi/plugins/SDIAbstractPlugin.java | 2 +- .../cms/sdi/plugins/SDIIndexerPlugin.java | 14 +- .../sdi/plugins/SDIMaterializerPlugin.java | 5 +- .../cms/sdi/plugins/GeoJSONTests.java | 2 - .../cms/sdi/plugins/IndexerTest.java | 4 +- .../cms/sdi/plugins/MaterializerTests.java | 4 - .../profiles/Concessioni.json | 60 ++- .../cms/usecases/CheckSchemas.java | 1 - .../cms/usecases/ClearConcessioni.java | 1 - .../cms/usecases/ClearProjects.java | 9 +- .../application/cms/usecases/EditFileSet.java | 3 - .../usecases/ExportConcessioniAsProjects.java | 5 - .../cms/usecases/ExportMongoConcessioni.java | 5 +- .../application/cms/usecases/Import.java | 14 +- .../cms/usecases/RepublishAll.java | 1 - .../cms/usecases/RepublishSingle.java | 3 - .../application/cms/usecases/StressTest.java | 71 ++- .../cms/usecases/UCDs/RegisterUCD.java | 4 - .../cms/usecases/mocks/MockFromFolder.java | 13 +- 99 files changed, 281 insertions(+), 1084 deletions(-) create mode 100644 cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java delete mode 100644 cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java delete mode 100644 cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniModel.java delete mode 100644 cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniQueries.java delete mode 100644 cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/Models.java delete mode 100644 cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/PathsTest.java delete mode 100644 cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/SerializationTest.java delete mode 100644 geoportal-service/src/test/java/org/gcube/application/geoportal/service/legacy/ConcessioniOverMongoTest.java diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml index bf3b4e2..d68f3d3 100644 --- a/cms-plugin-framework/pom.xml +++ b/cms-plugin-framework/pom.xml @@ -110,6 +110,12 @@ reflections + + javax.xml.bind + jaxb-api + + + \ No newline at end of file diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/AbstractScopedMap.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/AbstractScopedMap.java index 6e2e30c..1a1a8cd 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/AbstractScopedMap.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/AbstractScopedMap.java @@ -1,17 +1,9 @@ package org.gcube.application.cms.caches; import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.Synchronized; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.geoportal.common.utils.ContextUtils; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; - - -import java.time.LocalDateTime; -import java.time.temporal.TemporalAmount; -import java.util.concurrent.ConcurrentHashMap; +import org.gcube.application.geoportal.common.utils.ContextUtils; @Slf4j /** diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/TimedMap.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/TimedMap.java index fa17a6f..fdc0e66 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/TimedMap.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/caches/TimedMap.java @@ -6,12 +6,9 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.utils.ContextUtils; import java.time.LocalDateTime; import java.time.temporal.TemporalAmount; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @Slf4j diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java index d3fa662..bd63cc1 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/ImplementationProvider.java @@ -3,7 +3,6 @@ package org.gcube.application.cms.implementations; import lombok.Synchronized; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.cms.caches.Cache; import org.gcube.application.cms.caches.Engine; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.common.storagehub.client.dsl.StorageHubClient; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/WorkspaceManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/WorkspaceManager.java index 571494d..3698f58 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/WorkspaceManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/implementations/WorkspaceManager.java @@ -2,18 +2,15 @@ package org.gcube.application.cms.implementations; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.geoportal.common.model.configuration.Archive; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; -import org.gcube.application.geoportal.common.model.legacy.WorkspaceContent; -import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.utils.Files; import org.gcube.common.storagehub.client.dsl.FileContainer; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; -import java.io.FileNotFoundException; import java.io.InputStream; @Slf4j @@ -100,18 +97,18 @@ public class WorkspaceManager { } - public WorkspaceContent storeToWS(FileOptions opts) throws FileNotFoundException, StorageHubException { - FileContainer item=createFileRoutine(opts); - item=sgClient.open(item.getId()).asFile(); - - WorkspaceContent content=new WorkspaceContent(); - content.setLink(item.getPublicLink().toString()); - content.setMimetype(item.get().getContent().getMimeType()); - content.setStorageID(item.getId()); - content.setName(item.get().getName()); - return content; - - } +// public WorkspaceContent storeToWS(FileOptions opts) throws FileNotFoundException, StorageHubException { +// FileContainer item=createFileRoutine(opts); +// item=sgClient.open(item.getId()).asFile(); +// +// WorkspaceContent content=new WorkspaceContent(); +// content.setLink(item.getPublicLink().toString()); +// content.setMimetype(item.get().getContent().getMimeType()); +// content.setStorageID(item.getId()); +// content.setName(item.get().getName()); +// return content; +// +// } public RegisteredFile registerFile(FileOptions opts) throws StorageHubException { FileContainer item=createFileRoutine(opts); @@ -129,9 +126,9 @@ public class WorkspaceManager { } - public void deleteFromWS(WorkspaceContent toDelete) throws StorageHubException { - sgClient.open(toDelete.getStorageID()).asFile().forceDelete(); - } +// public void deleteFromWS(WorkspaceContent toDelete) throws StorageHubException { +// sgClient.open(toDelete.getStorageID()).asFile().forceDelete(); +// } public void deleteItem(String itemId)throws StorageHubException{ sgClient.open(itemId).asItem().forceDelete(); diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/IndexerPluginInterface.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/IndexerPluginInterface.java index 4ac15ea..60ee76b 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/IndexerPluginInterface.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/IndexerPluginInterface.java @@ -1,13 +1,11 @@ package org.gcube.application.cms.plugins; -import org.bson.Document; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.reports.IndexDocumentReport; import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; public interface IndexerPluginInterface extends InitializablePlugin{ diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/LifecycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/LifecycleManager.java index 6317e06..44a068e 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/LifecycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/LifecycleManager.java @@ -8,7 +8,6 @@ import org.gcube.application.cms.plugins.requests.EventExecutionRequest; import org.gcube.application.cms.plugins.requests.StepExecutionRequest; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; public interface LifecycleManager extends InitializablePlugin{ diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginManagerInterface.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginManagerInterface.java index d923303..4560093 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginManagerInterface.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginManagerInterface.java @@ -1,6 +1,5 @@ package org.gcube.application.cms.plugins; -import org.gcube.application.cms.plugins.Plugin; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import java.util.Map; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java index d9f6538..15e944d 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java @@ -8,7 +8,6 @@ import org.reflections.util.FilterBuilder; import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; -import java.util.Set; @Slf4j public class PluginsReflections { diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java index c91a8f3..4ff1efe 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java @@ -6,10 +6,13 @@ import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.MaterializationPlugin; -import org.gcube.application.cms.plugins.faults.*; +import org.gcube.application.cms.plugins.faults.EventException; +import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; +import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.implementations.executions.GuardedStepExecution; -import org.gcube.application.cms.plugins.reports.*; -import org.gcube.application.cms.plugins.requests.*; +import org.gcube.application.cms.plugins.reports.EventExecutionReport; +import org.gcube.application.cms.plugins.reports.StepExecutionReport; +import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index f0f5970..a5a4877 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -5,10 +5,15 @@ import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.MaterializationPlugin; -import org.gcube.application.cms.plugins.faults.*; +import org.gcube.application.cms.plugins.faults.EventException; +import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; +import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.implementations.executions.GuardedStepExecution; import org.gcube.application.cms.plugins.reports.*; -import org.gcube.application.cms.plugins.requests.*; +import org.gcube.application.cms.plugins.requests.BaseExecutionRequest; +import org.gcube.application.cms.plugins.requests.BaseRequest; +import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; +import org.gcube.application.cms.plugins.requests.MaterializationRequest; import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java index 9ccb714..208c9e0 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java @@ -7,9 +7,6 @@ import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.StepExecutionRequest; import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; - -import java.util.Map; public abstract class GuardedStepExecution extends GuardedExecution{ diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/model/ComparableVersion.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/model/ComparableVersion.java index 273412c..9682bd1 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/model/ComparableVersion.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/model/ComparableVersion.java @@ -22,14 +22,7 @@ package org.gcube.application.cms.plugins.model; import lombok.*; import java.math.BigInteger; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Deque; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Properties; +import java.util.*; /** *

diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java index 45e0499..6f1945a 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java @@ -11,7 +11,6 @@ import org.gcube.application.cms.plugins.requests.BaseExecutionRequest; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; -import org.gcube.application.geoportal.common.model.document.identification.TemporalReference; import java.util.ArrayList; import java.util.List; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java index 04019f7..b8c680f 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/IndexDocumentReport.java @@ -1,19 +1,10 @@ package org.gcube.application.cms.plugins.reports; -import com.fasterxml.jackson.core.JsonProcessingException; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import org.bson.Document; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; -import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; -import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference; -import org.gcube.application.geoportal.common.model.document.identification.TemporalReference; - -import java.util.ArrayList; -import java.util.List; @Getter @Setter diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java index 6bdbd7b..16b3f74 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/Report.java @@ -1,6 +1,5 @@ package org.gcube.application.cms.plugins.reports; -import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java index 3c84bb9..38cd2c5 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/StepExecutionReport.java @@ -1,7 +1,10 @@ package org.gcube.application.cms.plugins.reports; import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.*; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.requests.EventExecutionRequest; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java index 493242a..dfcf190 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseExecutionRequest.java @@ -1,7 +1,9 @@ package org.gcube.application.cms.plugins.requests; -import lombok.*; -import org.bson.Document; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.accounting.Context; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java index 12cb4a4..1e2191d 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/BaseRequest.java @@ -1,12 +1,9 @@ package org.gcube.application.cms.plugins.requests; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ser.Serializers; import lombok.*; import org.bson.Document; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.geoportal.common.faults.InvalidRequestException; import org.gcube.application.geoportal.common.model.document.accounting.Context; import org.gcube.application.geoportal.common.model.document.accounting.User; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java index 6c930be..25ec153 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/EventExecutionRequest.java @@ -1,6 +1,9 @@ package org.gcube.application.cms.plugins.requests; -import lombok.*; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.accounting.Context; import org.gcube.application.geoportal.common.model.document.accounting.User; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java index 80869ac..6cf8376 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/requests/StepExecutionRequest.java @@ -1,6 +1,9 @@ package org.gcube.application.cms.plugins.requests; -import lombok.*; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.accounting.Context; import org.gcube.application.geoportal.common.model.document.accounting.User; diff --git a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java index 1bd9c54..fa499a0 100644 --- a/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java +++ b/cms-plugin-framework/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java @@ -1,11 +1,5 @@ package org.gcube.application.cms.plugins; -import com.sun.org.apache.xpath.internal.axes.BasicTestIterator; -import org.gcube.application.cms.plugins.implementations.SimpleLifeCycleManager; -import org.gcube.application.cms.plugins.requests.EventExecutionRequest; -import org.gcube.application.cms.plugins.requests.StepExecutionRequest; -import org.gcube.application.geoportal.common.model.document.Project; - public class SimpleLifecycleTests{ // NB cannot use test commons, need to separate modules diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java new file mode 100644 index 0000000..d0987c4 --- /dev/null +++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/Tests.java @@ -0,0 +1,9 @@ +package org.gcube.application.cms.tests; + +import java.io.File; + +public class Tests { + + public static File BASE_FOLDER =new File("../test-data"); + public static File FOLDER_CONCESSIONI =new File("../test-data/concessioni"); +} diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java index 83c4742..06ca9fe 100644 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java +++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/BasicTests.java @@ -2,7 +2,6 @@ package org.gcube.application.cms.tests.model; import com.vdurmont.semver4j.Semver; import org.bson.Document; -import org.bson.types.ObjectId; 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; @@ -16,7 +15,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.DataAccess import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; -import javax.jws.soap.SOAPBinding; import java.time.LocalDateTime; import java.util.Collections; import java.util.UUID; diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java index 4291eda..3fab84a 100644 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java +++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/DummyPlugin.java @@ -6,12 +6,11 @@ import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.MaterializationPlugin; import org.gcube.application.cms.plugins.PluginManagerInterface; import org.gcube.application.cms.plugins.faults.*; -import org.gcube.application.cms.plugins.model.ComparableVersion; -import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.cms.plugins.reports.*; import org.gcube.application.cms.plugins.requests.*; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; +import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; public class DummyPlugin implements LifecycleManager, IndexerPluginInterface, MaterializationPlugin { diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java deleted file mode 100644 index b998b87..0000000 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniFilters.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.application.cms.tests.model.concessioni; - -import org.gcube.application.geoportal.common.utils.Files; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; - -import java.util.HashMap; - -public class TestConcessioniFilters { - - public static final HashMap filters=new HashMap<>(); - - static{ - - for(File f:new File(TestConcessioniModel.getBaseFolder(),"filters").listFiles()){ - try { - filters.put(f.getName(), Files.readFileAsString(f.getAbsolutePath(), Charset.defaultCharset())); - } catch (IOException e) { - throw new RuntimeException("Unable to read "+f.getAbsolutePath(),e); - } - } - } - - - - -} diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniModel.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniModel.java deleted file mode 100644 index 27ae3c5..0000000 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/model/concessioni/TestConcessioniModel.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.gcube.application.cms.tests.model.concessioni; - -import java.io.File; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; - -import org.bson.types.ObjectId; -import org.gcube.application.geoportal.common.model.legacy.*; - -public class TestConcessioniModel { - - public static File getBaseFolder(){ - File toReturn =new File("../test-data/concessioni"); - if(!toReturn.exists()) toReturn = new File("test-data/concessioni"); - if(!toReturn.exists()) throw new RuntimeException("Unable to find test data"); - return toReturn; - } - - - public static Concessione prepareEmptyConcessione() { - Concessione concessione=new Concessione(); - - // Generic fields - - // Concessione fields - concessione.setNome("MONGO Italia, forse, ma su "); - concessione.setIntroduzione("This is my MONGO project"); - concessione.setDescrizioneContenuto("It contains this and that"); - - concessione.setAuthors(Arrays.asList(new String[] {"Some one","Some, oneelse"})); - - concessione.setContributore("Contrib 1"); - concessione.setTitolari(Arrays.asList(new String[] {"Some one","Some, oneelse"})); - concessione.setResponsabile("Someone"); - concessione.setEditore("Editore"); - - concessione.setFontiFinanziamento(Arrays.asList(new String[] {"Big pharma","Pentagon"})); - - - concessione.setSoggetto(Arrays.asList(new String[] {"Research Excavation","Archeology"})); - - - concessione.setDataInizioProgetto(LocalDateTime.now()); - concessione.setDataFineProgetto(LocalDateTime.now()); - - concessione.setLicenzaID("CC-BY"); - - concessione.setTitolareLicenza(Arrays.asList(new String[] {"Qualcun altro"})); - concessione.setTitolareCopyright(Arrays.asList(new String[] {"Chiedilo in giro"})); - - concessione.setParoleChiaveLibere(Arrays.asList(new String[] {"Robba","Stuff"})); - concessione.setParoleChiaveICCD(Arrays.asList(new String[] {"vattelapesca","somthing something"})); - - -// concessione.setCentroidLat(43.0); //N-S -// concessione.setCentroidLong(9.0); //E-W -// - return concessione; - } - - public static final Concessione setIds(Concessione c) { -// c.setMongo_id(rnd()); - c.getRelazioneScavo().setMongo_id(rnd()); - c.getPosizionamentoScavo().setMongo_id(rnd()); - c.getPianteFineScavo().forEach((LayerConcessione l)->{l.setMongo_id(rnd());}); - c.getImmaginiRappresentative().forEach((UploadedImage i)->{i.setMongo_id(rnd());}); - return c; - } - - public static final String rnd() { - return new ObjectId().toHexString(); - } - - - public static Concessione prepareConcessione() { - return prepareConcessione(4,2); - } - - public static Concessione prepareConcessione(int pianteCount ,int imgsCount) { - - Concessione concessione=prepareEmptyConcessione(); - - - - // Attachments - // Relazione scavo - RelazioneScavo relScavo=new RelazioneScavo(); - relScavo.setResponsabili(concessione.getAuthors()); - concessione.setRelazioneScavo(relScavo); - - //Abstract - AbstractRelazione abstractRelazione=new AbstractRelazione(); - abstractRelazione.setAbstractIta("Il mio abstract"); - abstractRelazione.setAbstractEng("My abstract"); - concessione.setAbstractRelazione(abstractRelazione); - - - //Immagini rappresentative - ArrayList imgs=new ArrayList<>(); - for(int i=0;i piante=new ArrayList(); - for(int i=0;i queries =new HashMap<>(); - - static{ - - for(File f:new File(TestConcessioniModel.getBaseFolder(),"queries").listFiles()){ - try { - queries.put(f.getName(), Files.readFileAsString(f.getAbsolutePath(), Charset.defaultCharset())); - } catch (IOException e) { - throw new RuntimeException("Unable to read "+f.getAbsolutePath(),e); - } - } - } -} diff --git a/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/Models.java b/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/Models.java deleted file mode 100644 index d1694ca..0000000 --- a/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/Models.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.application.cms.commons.model.concessioni; - -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; -import org.gcube.application.geoportal.common.model.legacy.Concessione; -import org.junit.Test; - -import static org.junit.Assert.assertTrue; - -public class Models { - - @Test - public void checkFilters(){ - assertTrue(TestConcessioniFilters.filters.size()>0); - TestConcessioniFilters.filters.keySet().forEach(f -> { - System.out.println(f);}); - } - - @Test - public void checkConcessione(){ - Concessione c= TestConcessioniModel.prepareConcessione(3,5); - assertTrue(c.getPianteFineScavo().size()==3); - assertTrue(c.getImmaginiRappresentative().size()==5); - } -} diff --git a/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/PathsTest.java b/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/PathsTest.java deleted file mode 100644 index 203e8d1..0000000 --- a/cms-test-commons/src/test/java/org/gcube/application/cms/commons/model/concessioni/PathsTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.gcube.application.cms.commons.model.concessioni; - -import static org.junit.Assert.assertEquals; - -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; -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.LayerConcessione; -import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; -import org.gcube.application.geoportal.common.model.legacy.UploadedImage; -import org.junit.Assert; -import org.junit.Test; - - -public class PathsTest { - - - @Test - public void embeddedPaths() { - Concessione c= TestConcessioniModel.prepareConcessione(); - c= TestConcessioniModel.setIds(c); - - - - LayerConcessione p=(LayerConcessione) c.getContentByPath(Paths.POSIZIONAMENTO); - Assert.assertEquals(c.getPosizionamentoScavo(), p); - - RelazioneScavo rel=(RelazioneScavo) c.getContentByPath(Paths.RELAZIONE); - Assert.assertEquals(c.getRelazioneScavo(), rel); - - for(int i=0;i0); -// -// } - - @Test - public void readConcessione() throws JsonProcessingException, IOException { - Concessione concessione=mapper.readerFor(Concessione.class).readValue(new File(TestConcessioniModel.getBaseFolder(),"Concessione.json")); - System.out.println("Concessione is "+concessione.toString()); - - concessione.getRelazioneScavo().setPolicy(AccessPolicy.EMBARGOED); - assertEquals(AccessPolicy.EMBARGOED,concessione.getRelazioneScavo().getPolicy()); - - concessione=mapper.readerFor(Concessione.class).readValue(mapper.writeValueAsString(concessione)); - assertEquals(AccessPolicy.EMBARGOED,concessione.getRelazioneScavo().getPolicy()); - - } - - @Test - public void generic() throws JsonProcessingException, IOException { - Concessione conc= TestConcessioniModel.prepareConcessione(); - conc.validate(); - full(conc); - } - - - public void full(Object obj) throws JsonProcessingException, IOException { - String asString=mapper.writeValueAsString(obj); - Object other=mapper.readerFor(obj.getClass()).readValue(asString); - - } -} diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index c4e4040..05db30e 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -47,6 +47,13 @@ + + com.sun.xml.ws + jaxws-ri + 2.3.2 + pom + + org.gcube.common common-jaxrs-client diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml index 404e742..a0fedf0 100644 --- a/geoportal-common/pom.xml +++ b/geoportal-common/pom.xml @@ -108,7 +108,11 @@ registry-publisher - + + javax.xml.bind + jaxb-api + + \ No newline at end of file diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 2d5052f..1db28f1 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -153,6 +153,19 @@ test + + + org.gcube.data.transfer + data-transfer-library + 1.3.0 + test + + + + javax.xml.bind + jaxb-api + + diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/AppManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/AppManager.java index 5753bcb..e84915c 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/AppManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/AppManager.java @@ -1,7 +1,6 @@ package org.gcube.application.geoportal.service; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.cms.implementations.ImplementationProvider; @Slf4j diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java index 5efb2c9..858cf33 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java @@ -9,10 +9,10 @@ import com.mongodb.client.model.ReturnDocument; import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.bson.types.ObjectId; -import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.geoportal.service.model.internal.db.Mongo; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.service.model.internal.db.Mongo; import static com.mongodb.client.model.Filters.eq; import static com.mongodb.client.model.Sorts.ascending; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java index 2590473..0b8394e 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java @@ -8,9 +8,9 @@ import org.gcube.application.cms.plugins.faults.StepException; import org.gcube.application.geoportal.common.faults.StorageException; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.document.access.Access; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; 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.ConfigurationException; import org.gcube.application.geoportal.service.model.internal.faults.*; import org.gcube.common.storagehub.model.exceptions.StorageHubException; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java index fb0d5f5..ffb268b 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java @@ -11,22 +11,26 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.bson.Document; import org.bson.types.ObjectId; +import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.application.cms.plugins.LifecycleManager; import org.gcube.application.cms.plugins.faults.EventException; import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; import org.gcube.application.cms.plugins.faults.StepException; import org.gcube.application.cms.plugins.faults.UnrecognizedStepException; -import org.gcube.application.geoportal.common.model.document.relationships.Relationship; -import org.gcube.application.geoportal.common.model.plugins.LifecycleManagerDescriptor; import org.gcube.application.cms.plugins.reports.DocumentHandlingReport; import org.gcube.application.cms.plugins.reports.StepExecutionReport; import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.EventExecutionRequest; import org.gcube.application.cms.plugins.requests.StepExecutionRequest; +import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.faults.StorageException; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.configuration.Archive; +import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.configuration.Index; -import org.gcube.application.geoportal.common.model.document.*; +import org.gcube.application.geoportal.common.model.document.Lock; +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.accounting.AccountingInfo; @@ -35,23 +39,20 @@ import org.gcube.application.geoportal.common.model.document.accounting.User; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; +import org.gcube.application.geoportal.common.model.document.relationships.Relationship; +import org.gcube.application.geoportal.common.model.plugins.LifecycleManagerDescriptor; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +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.TempFile; import org.gcube.application.geoportal.common.model.useCaseDescriptor.DataAccessPolicy; import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; -import org.gcube.application.geoportal.common.model.configuration.Configuration; -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.TempFile; -import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.utils.ContextUtils; import org.gcube.application.geoportal.common.utils.StorageUtils; -import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.cms.implementations.WorkspaceManager; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.service.engine.providers.PluginManager; import org.gcube.application.geoportal.service.model.internal.faults.*; -import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.service.utils.UserUtils; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.model.exceptions.StorageHubException; @@ -68,7 +69,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Consumer; import java.util.stream.Collectors; -import static org.gcube.application.cms.serialization.Serialization.*; +import static org.gcube.application.cms.serialization.Serialization.asDocumentWithId; +import static org.gcube.application.cms.serialization.Serialization.convert; @Slf4j public class ProfiledMongoManager extends MongoManager implements MongoManagerI{ diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDManagerI.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDManagerI.java index 7aee624..6281c4f 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDManagerI.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDManagerI.java @@ -1,9 +1,8 @@ package org.gcube.application.geoportal.service.engine.mongo; -import org.bson.Document; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.service.model.internal.faults.RegistrationException; public interface UCDManagerI { diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDMongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDMongoManager.java index 68c2a19..0920a3d 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDMongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/UCDMongoManager.java @@ -8,9 +8,9 @@ import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.bson.types.ObjectId; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.QueryRequest; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.ContextUtils; import org.gcube.application.geoportal.service.model.internal.faults.RegistrationException; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ConfigurationCache.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ConfigurationCache.java index 7f03fdc..e939540 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ConfigurationCache.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ConfigurationCache.java @@ -1,21 +1,16 @@ package org.gcube.application.geoportal.service.engine.providers; -import jdk.nashorn.internal.runtime.regexp.joni.Config; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.caches.AbstractScopedMap; -import org.gcube.application.cms.caches.Cache; import org.gcube.application.cms.caches.TimedMap; -import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.geoportal.common.model.configuration.Configuration; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.service.engine.mongo.ProfiledMongoManager; -import org.gcube.application.geoportal.service.model.internal.faults.RegistrationException; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAmount; -import java.time.temporal.TemporalUnit; @Slf4j public class ConfigurationCache extends AbstractScopedMap { diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java index 6dde4cd..6626ae4 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/MongoClientProvider.java @@ -3,11 +3,11 @@ package org.gcube.application.geoportal.service.engine.providers; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.caches.AbstractScopedMap; import org.gcube.application.cms.implementations.ISInterface; -import org.gcube.application.geoportal.service.ServiceConstants; import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.geoportal.service.model.internal.db.Mongo; import org.gcube.application.geoportal.common.model.configuration.MongoConnection; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.service.ServiceConstants; +import org.gcube.application.geoportal.service.model.internal.db.Mongo; import org.gcube.common.resources.gcore.ServiceEndpoint; import java.util.List; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PluginManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PluginManager.java index 300088b..e2d0215 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PluginManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PluginManager.java @@ -7,7 +7,6 @@ import org.gcube.application.cms.plugins.faults.InitializationException; import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.faults.ShutDownException; import org.gcube.application.cms.plugins.reports.InitializationReport; -import org.gcube.application.geoportal.common.utils.ContextUtils; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import java.util.HashMap; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java index 320728b..0bc9f64 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/StorageClientProvider.java @@ -1,10 +1,9 @@ package org.gcube.application.geoportal.service.engine.providers; import lombok.extern.slf4j.Slf4j; - import org.gcube.application.cms.caches.AbstractScopedMap; -import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.utils.StorageUtils; @Slf4j public class StorageClientProvider extends AbstractScopedMap { diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/LocalFolderProfileMapCache.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/LocalFolderProfileMapCache.java index 67c5bc5..5d37ce4 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/LocalFolderProfileMapCache.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/LocalFolderProfileMapCache.java @@ -1,16 +1,14 @@ package org.gcube.application.geoportal.service.engine.providers.ucd; import com.fasterxml.jackson.core.JsonProcessingException; -import com.mongodb.util.JSON; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.caches.AbstractScopedMap; +import org.gcube.application.cms.serialization.Serialization; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.Files; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.cms.serialization.Serialization; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.nio.charset.Charset; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/SingleISResourceUCDProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/SingleISResourceUCDProvider.java index bd0666b..9843d91 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/SingleISResourceUCDProvider.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/ucd/SingleISResourceUCDProvider.java @@ -6,11 +6,11 @@ import org.gcube.application.cms.caches.AbstractScopedMap; import org.gcube.application.cms.caches.ObjectManager; import org.gcube.application.cms.implementations.ISInterface; import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; -import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.storagehub.client.dsl.FolderContainer; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/GuardedMethod.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/GuardedMethod.java index 6293f5c..1ae830c 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/GuardedMethod.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/GuardedMethod.java @@ -3,7 +3,6 @@ package org.gcube.application.geoportal.service.rest; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; import org.gcube.application.cms.plugins.faults.UnrecognizedStepException; -import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.service.model.internal.faults.InvalidLockException; import org.gcube.application.geoportal.service.model.internal.faults.InvalidUserRoleException; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/ProfiledDocuments.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/ProfiledDocuments.java index d4ca7c3..5a32787 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/ProfiledDocuments.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/rest/ProfiledDocuments.java @@ -5,18 +5,18 @@ import com.webcohesion.enunciate.metadata.rs.RequestHeaders; import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.geoportal.common.model.document.Project; +import org.gcube.application.cms.serialization.Serialization; 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.Relationship; import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.QueryRequest; -import org.gcube.application.geoportal.common.rest.InterfaceConstants; 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.service.engine.mongo.ProfiledMongoManager; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.service.engine.providers.ConfigurationCache; import javax.ws.rs.*; diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java index 8f91642..6a1dc71 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/utils/UserUtils.java @@ -13,7 +13,10 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; @Slf4j public class UserUtils { diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java index dcdff2f..e6d5217 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java @@ -1,29 +1,24 @@ package org.gcube.application.geoportal.service; -import com.fasterxml.jackson.databind.cfg.ContextAttributes; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.caches.Engine; import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.cms.tests.TestProfiles; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.engine.providers.ucd.LocalFolderProfileMapCache; import org.gcube.application.geoportal.service.engine.providers.ucd.ProfileMap; import org.gcube.application.geoportal.service.rest.GuardedMethod; -import org.gcube.application.cms.serialization.Serialization; import org.glassfish.jersey.test.JerseyTest; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.opengis.annotation.Profile; import javax.ws.rs.core.Application; import javax.ws.rs.core.Response; - import java.util.Collections; import java.util.Map; -import static org.junit.Assume.assumeTrue; - @Slf4j public class BasicServiceTestUnit extends JerseyTest { diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java index 32cbd92..e04d7c0 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/InexistentUseCaseDescriptorTests.java @@ -5,11 +5,8 @@ import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.profiledDocuments.AbstractProfiledDocumentsTests; import org.junit.Test; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; - import java.util.UUID; import static org.junit.Assert.assertEquals; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/StorageTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/StorageTests.java index 7ecb367..c520ab8 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/StorageTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/StorageTests.java @@ -1,10 +1,10 @@ package org.gcube.application.geoportal.service; -import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.geoportal.service.engine.providers.StorageClientProvider; +import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.common.utils.StorageUtils; +import org.gcube.application.geoportal.service.engine.providers.StorageClientProvider; import java.io.IOException; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java index 8bc9d12..08d75ea 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/UCDTests.java @@ -3,10 +3,7 @@ package org.gcube.application.geoportal.service; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.cms.tests.TestProfiles; -import org.gcube.application.cms.tests.TestSchemas; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.BasicTests; -import org.gcube.application.geoportal.common.model.document.Project; 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; @@ -17,7 +14,6 @@ import org.junit.Test; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; - import java.util.Iterator; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java index 2437eb8..a29ac51 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java @@ -3,8 +3,8 @@ package org.gcube.application.geoportal.service.engine.caches; import com.mongodb.MongoWaitQueueFullException; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.tests.Tests; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; @@ -113,7 +113,7 @@ public class Caches extends BasicServiceTestUnit { final StorageUtils storage=ImplementationProvider.get().getProvidedObjectByClass(StorageUtils.class); - String id =storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"))[0].getId(); + String id =storage.putOntoStorage(new File(Tests.FOLDER_CONCESSIONI,"relazione.pdf"))[0].getId(); //for 100 secs while(Duration.between(start,LocalDateTime.now()). diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java index c9891cc..73312b5 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java @@ -4,13 +4,12 @@ import org.bson.Document; import org.gcube.application.cms.plugins.faults.EventException; import org.gcube.application.cms.plugins.faults.InsufficientPrivileges; import org.gcube.application.cms.plugins.faults.StepException; +import org.gcube.application.cms.tests.Tests; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.common.faults.StorageException; import org.gcube.application.geoportal.common.model.document.Lock; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; @@ -19,7 +18,6 @@ import org.gcube.application.geoportal.service.BasicServiceTestUnit; import org.gcube.application.geoportal.service.model.internal.faults.*; import org.gcube.application.geoportal.service.utils.UserUtils; import org.gcube.common.storagehub.model.exceptions.StorageHubException; -import org.geotoolkit.referencing.operation.provider.PolarStereographic; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -105,7 +103,7 @@ public class LockTests extends BasicServiceTestUnit { "$.relazioneScavo","fileset","relazioneScavo."+ Field.CHILDREN+"[?(@.fileset)]"); StorageUtils s= new StorageUtils(); builder.add( - s.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"pos.shp"),"pos.shp")); + s.putOntoStorage(new File(Tests.FOLDER_CONCESSIONI,"pos.shp"),"pos.shp")); p= managerInterface.registerFileSet(p.getId(),builder.getTheRequest()); checkIsLockCleaned(p.getId()); diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java index 29d8f8b..1592aaa 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java @@ -1,12 +1,9 @@ package org.gcube.application.geoportal.service.engine.mongo; -import com.mongodb.client.model.Projections; import org.bson.BsonType; -import org.bson.Document; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.junit.Test; -import static com.mongodb.client.model.Filters.exists; import static com.mongodb.client.model.Filters.type; public class ManagementUseCases extends MongoTests { diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java index 7d7be3a..c7d41a4 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java @@ -1,7 +1,6 @@ package org.gcube.application.geoportal.service.engine.mongo; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.service.model.internal.db.Mongo; public class MongoTester extends MongoManager { diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java index 7d7f61d..da7b436 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java @@ -4,12 +4,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.mongodb.Block; import com.mongodb.client.model.Projections; import org.bson.Document; -import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.engine.providers.MongoClientProvider; import org.gcube.application.geoportal.service.model.internal.db.Mongo; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.junit.BeforeClass; import org.junit.Test; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/profiles/UCDCalls.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/profiles/UCDCalls.java index 1047114..1932b38 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/profiles/UCDCalls.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/profiles/UCDCalls.java @@ -1,6 +1,5 @@ package org.gcube.application.geoportal.service.engine.profiles; -import com.fasterxml.jackson.core.JsonProcessingException; import org.bson.Document; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.cms.tests.TokenSetter; @@ -9,7 +8,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDes import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.BasicServiceTestUnit; -import org.gcube.common.storagehub.model.query.Queries; import org.junit.Before; import org.junit.Test; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/legacy/ConcessioniOverMongoTest.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/legacy/ConcessioniOverMongoTest.java deleted file mode 100644 index ecda221..0000000 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/legacy/ConcessioniOverMongoTest.java +++ /dev/null @@ -1,424 +0,0 @@ -package org.gcube.application.geoportal.service.legacy; - -import org.bson.Document; -import org.gcube.application.cms.tests.TokenSetter; - -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniQueries; -import org.gcube.application.geoportal.common.model.legacy.AccessPolicy; -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.LayerConcessione; -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport.ValidationStatus; -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.InterfaceConstants; -import org.gcube.application.geoportal.common.utils.FileSets; -import org.gcube.application.geoportal.common.utils.Files; -import org.gcube.application.geoportal.common.utils.StorageUtils; -import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.geoportal.common.utils.tests.GCubeTest; -import org.gcube.application.geoportal.service.BasicServiceTestUnit; -import org.geotoolkit.referencing.operation.provider.PolarStereographic; -import org.json.JSONObject; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -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.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - -import static org.junit.Assert.*; -import static org.junit.Assume.assumeTrue; - -public class ConcessioniOverMongoTest extends BasicServiceTestUnit { - - - private static final String PATH=InterfaceConstants.Methods.MONGO_CONCESSIONI; - - private static final String PUBLISH_PATH=InterfaceConstants.Methods.PUBLISH_PATH; - private static final String FILES_PATH=InterfaceConstants.Methods.REGISTER_FILES_PATH; - - @Before - public void setContext(){ - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - TokenSetter.set(GCubeTest.getContext()); - } - - //Used for local test data - private static Concessione upload(StorageUtils storage, WebTarget target,String id, String path, String ...files) throws Exception { - AddSectionToConcessioneRequest request = new AddSectionToConcessioneRequest(); - request.setDestinationPath(path); - request.setStreams(new ArrayList<>()); - - - for(String file:files) - request.getStreams() - .add(storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),file),file)); - - return check(target.path(FILES_PATH).path(id).request(MediaType.APPLICATION_JSON). - post(Entity.entity(Serialization.write(request), - MediaType.APPLICATION_JSON)),Concessione.class); - } - - //generic - private static Concessione upload(StorageUtils storage, WebTarget target,String id, String path, File ...files) throws Exception { - AddSectionToConcessioneRequest request = new AddSectionToConcessioneRequest(); - request.setDestinationPath(path); - request.setStreams(new ArrayList<>()); - for(File file:files) - request.getStreams().add(storage.putOntoStorage(file,file.getName())); - - return check(target.path(FILES_PATH).path(id).request(MediaType.APPLICATION_JSON). - post(Entity.entity(Serialization.write(request), - MediaType.APPLICATION_JSON)),Concessione.class); - } - - private static Concessione update(Concessione c, WebTarget target) throws Exception { - - return check(target.path(c.getMongo_id()).request(MediaType.APPLICATION_JSON). - put(Entity.entity(Serialization.write(c), - MediaType.APPLICATION_JSON)),Concessione.class); - } - - private static Concessione publish(WebTarget target, String id) throws Exception { - Response resp=target.path(PUBLISH_PATH).path(id).request(MediaType.APPLICATION_JSON). - put(Entity.entity(Serialization.write(id), MediaType.APPLICATION_JSON)); - return check(resp,Concessione.class); - } - - - private static Concessione unpublish(WebTarget target, String id) throws Exception { - Response resp=target.path(PUBLISH_PATH).path(id).request(MediaType.APPLICATION_JSON). - delete(); - return check(resp,Concessione.class); - } - - - private static Concessione register(WebTarget target, Concessione c) throws Exception { - Response resp=target.request(MediaType.APPLICATION_JSON).post(Entity.entity(Serialization.write(c), MediaType.APPLICATION_JSON)); - return check(resp,Concessione.class); - } - - private static Concessione get(WebTarget target) throws Exception { - return register(target, TestConcessioniModel.prepareConcessione()); - } - - private static Concessione getById(WebTarget target ,String id) throws Exception { - return check(target.path(id).request(MediaType.APPLICATION_JSON).get(),Concessione.class); - } - - private static Iterator search(String query, WebTarget target) throws Exception { - String result= check(target.path(InterfaceConstants.Methods.SEARCH_PATH).request(MediaType.APPLICATION_JSON_TYPE).post( - Entity.entity(query,MediaType.APPLICATION_JSON)),String.class); - - return Serialization.readCollection(result,Concessione.class); - } - - - - private static Iterator queryFile(String filename, WebTarget target, Class clazz) throws Exception { - QueryRequest req= Serialization.parseQuery(TestConcessioniQueries.queries.get(filename)); - - String result = check(target.path(InterfaceConstants.Methods.QUERY_PATH).request(MediaType.APPLICATION_JSON_TYPE).post( - Entity.entity(Serialization.write(req),MediaType.APPLICATION_JSON)),String.class); - return Serialization.readCollection(result,clazz); - } - - private static Iterator queryFile(String filename, WebTarget target) throws Exception { - return queryFile(filename,target,Concessione.class); - } - - // ********** TESTS - - @Test - public void list() { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - System.out.println(target.request(MediaType.APPLICATION_JSON).get(List.class)); - } - - @Test - public void search() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - AtomicLong validatedCount= new AtomicLong(0); - Iterator it=search(TestConcessioniFilters.filters.get("validated.json"),target); - it.forEachRemaining(concessione -> {validatedCount.incrementAndGet();}); - System.out.println("Validated : "+ validatedCount.get()); - } - - @Test - public void query() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - - Iterator it; - - - assertEquals(1, count( queryFile("lastRegistered.json", target))); - assertEquals(0, count( queryFile("emptyresult.json",target))); - - it=queryFile("firstRegistered.json", target); - assertEquals(1, count(it)); - - System.out.println("Last Names by Fabio : "); - queryFile("lastNameRegisteredByFabio.json", target, JSONObject.class).forEachRemaining(c -> {System.out.println(c);}); - System.out.println("Publication warning messages : "); - queryFile("publicationWarningMessages.json", target, JSONObject.class).forEachRemaining(c -> {System.out.println(c);}); - - } - - @Test - public void getConfiguration() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - System.out.println(check(target.path(InterfaceConstants.Methods.CONFIGURATION_PATH).request(MediaType.APPLICATION_JSON).get(),String.class)); - } - - - @Test - public void createNew() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione c=register(target,TestConcessioniModel.prepareConcessione()); - Assert.assertTrue(c.getMongo_id()!=null&&!c.getMongo_id().isEmpty()); - } - - - @Test - public void delete() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione c = get(target); - - check(target.path(c.getMongo_id()).request(MediaType.APPLICATION_JSON).delete(),null); - - Concessione published=getFullPublished(target); - - check(target.path(published.getMongo_id()).request(MediaType.APPLICATION_JSON).delete(),null); - } - - - - - @Test - public void republish() throws Exception{ - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione published=getFullPublished(target); - //Concessione published=getById(target,"6155ba6002ad3d2c23b72b5a"); - published = unpublish(target,published.getMongo_id()); - System.out.println("Republishing.."); - published=publish(target,published.getMongo_id()); - Assert.assertEquals(published.getReport().getStatus(),ValidationStatus.PASSED); - } - - - @Test - public void handlePrecise() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - //Republishing - WebTarget target=target(PATH); - //String id="61e6d5212f7b172ac9874879"; - - // Query & delete - QueryRequest req = new QueryRequest(); -// req.setFilter(Document.parse("{ \"report.objectName\" : { \"$eq\" : \"Unpublish report\" },\n" + -// " \"report.status\" : { \"$eq\" : \"PASSED\" } }")); - - req.setFilter(Document.parse("{ \"creationUser\" : { \"$eq\" : \"francesco.mangiacrapa\" }}")); - Iterator it= Serialization.readCollection(check(target.path(InterfaceConstants.Methods.QUERY_PATH).request(MediaType.APPLICATION_JSON_TYPE).post( - Entity.entity(Serialization.write(req),MediaType.APPLICATION_JSON)),String.class),Concessione.class); - - AtomicLong totCount=new AtomicLong(0); - List errMessages=new ArrayList<>(); - it.forEachRemaining(c->{ - try { - totCount.incrementAndGet(); - check(target.path(c.getMongo_id()). - queryParam(InterfaceConstants.Parameters.FORCE,false).request(MediaType.APPLICATION_JSON).delete(),String.class); - } catch (Exception e) { - errMessages.add("ERROR with "+c.getMongo_id()+" folder : "+c.getFolderId()+" author : "+c.getCreationUser()+". Message : "+e.getMessage()); - } - }); - System.out.println(errMessages.size()+" errors out of "+totCount.get()+" found items"); - errMessages.forEach(s -> { System.err.println(s); }); - //publish(target,unpublish(target,id).getMongo_id()); - } - - - - @Test - public void getById() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione c = get(target); - Response resp=target.path(c.getMongo_id()).request(MediaType.APPLICATION_JSON).get(); - Concessione loaded=check(resp,Concessione.class); - Assert.assertTrue(loaded.getMongo_id()!=null&&!loaded.getMongo_id().isEmpty()); - System.out.println("Got by ID "+loaded); - } - - - @Test - public void update() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione c = get(target); - String newTitle="Questo titolo l'ho modificato mo nel test quello proprio apposta pewr questa cosa'"; - c.setNome(newTitle); - Response resp=target.request(MediaType.APPLICATION_JSON).put(Entity.entity(Serialization.write(c), MediaType.APPLICATION_JSON)); - Assert.assertTrue(check(resp,Concessione.class).getNome().equals(newTitle)); - } - - @Test - public void uploadFile() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Response resp=target.request(MediaType.APPLICATION_JSON).post(Entity.entity(Serialization.write(TestConcessioniModel.prepareEmptyConcessione()), MediaType.APPLICATION_JSON)); - Concessione c=check(resp,Concessione.class); - Assert.assertTrue(c.getMongo_id()!=null&&!c.getMongo_id().isEmpty()); - System.out.println("ID IS "+c.getMongo_id()); - - // Insert section - c.setRelazioneScavo(TestConcessioniModel.prepareConcessione().getRelazioneScavo()); - // c.getRelazioneScavo().setMongo_id(TestConcessioniModel.rnd()); - - resp=target.request(MediaType.APPLICATION_JSON).put(Entity.entity(Serialization.write(c), MediaType.APPLICATION_JSON)); - - - - - c=upload(new StorageUtils(),target,c.getMongo_id(),Paths.RELAZIONE,"relazione.pdf"); - assertNotNull(c.getRelazioneScavo().getActualContent()); - assertTrue(c.getRelazioneScavo().getActualContent().size()>0); - - System.out.println("File is "+c.getRelazioneScavo().getActualContent().get(0)); - } - - @Test - public void testClearFileSet() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione published=getFullPublished(target); - - - String path=Paths.POSIZIONAMENTO; - Response resp= - target.path(InterfaceConstants.Methods.DELETE_FILES_PATH).path(published.getMongo_id()). - request(MediaType.APPLICATION_JSON).put(Entity.entity(path, MediaType.APPLICATION_JSON)); - //Expecting error for deletion - assertTrue(resp.getStatus()>=300); - System.out.println("Error for deletion is "+resp.readEntity(String.class)); - - //unpublish - - unpublish(target,published.getMongo_id()); - - //Actually cleaning posizionamento - published=check( - target.path(InterfaceConstants.Methods.DELETE_FILES_PATH).path(published.getMongo_id()). - request(MediaType.APPLICATION_JSON).post(Entity.entity(path, MediaType.APPLICATION_JSON)),Concessione.class); - - assertTrue(published.getPosizionamentoScavo().getActualContent().isEmpty()); - - path=Paths.piantaByIndex(0); - published=check( - target.path(InterfaceConstants.Methods.DELETE_FILES_PATH).path(published.getMongo_id()). - request(MediaType.APPLICATION_JSON).post(Entity.entity(path, MediaType.APPLICATION_JSON)),Concessione.class); - - assertTrue(published.getPianteFineScavo().get(0).getActualContent().isEmpty()); - } - - @Test - public void publish() throws Exception { - assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - WebTarget target=target(PATH); - Concessione published=getFullPublished(target); - - System.out.println("Published : "+published); - System.out.println("Report is : "+published.getReport()); - assertNotNull(published.getReport()); - assertEquals(ValidationStatus.PASSED,published.getReport().getStatus()); - - - assertNotNull(published.getPosizionamentoScavo().getWmsLink()); - for(LayerConcessione l : published.getPianteFineScavo()) { - assertNotNull(l.getWmsLink()); - } - assertNotNull(published.getCentroidLat()); - assertNotNull(published.getCentroidLong()); - } - - private Concessione getFullPublished(WebTarget target) throws Exception { - - File layerFolder=TestConcessioniModel.getBaseFolder(); - Map> layers = Files.getAllShapeSet(layerFolder,true); - - Concessione c=TestConcessioniModel.prepareConcessione(layers.size(),1); - - c.getRelazioneScavo().setPolicy(AccessPolicy.EMBARGOED); - assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); - - c.setNome("Concessione : publish test "); - StorageUtils storage=new StorageUtils(); - - - // Register new - c=register(target,c); - - assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); - - //Upload files - c=upload(storage,target,c.getMongo_id(),Paths.RELAZIONE,"relazione.pdf"); - assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); - - c=upload(storage,target,c.getMongo_id(),Paths.ABSTRACT_RELAZIONE,"relazione.pdf"); - - - String[] keys=layers.keySet().toArray(new String [0]); - c=upload(storage,target,c.getMongo_id(),Paths.POSIZIONAMENTO, -// TestConcessioniModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta.shp");})); - layers.get(keys[0]).toArray(new File[0])); - assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); - - // Clash on workspaces - for(int i=0;i{return name.startsWith("pianta.shp");})); - layers.get(key).toArray(new File[0])); - } - assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); - - // Immagini - for (int i = 0; i iterator){ - AtomicLong l=new AtomicLong(0); - iterator.forEachRemaining(el->{l.incrementAndGet();}); - return l.get(); - } -} 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 5abd184..b0a61fc 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,12 +4,14 @@ 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.cms.tests.model.concessioni.TestConcessioniModel; + +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; -import org.gcube.application.geoportal.common.model.configuration.Configuration; 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; @@ -20,7 +22,6 @@ import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.BasicServiceTestUnit; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import javax.ws.rs.client.Entity; @@ -29,7 +30,6 @@ import javax.ws.rs.core.MediaType; import java.io.File; import java.util.List; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -136,7 +136,7 @@ public abstract class AbstractProfiledDocumentsTests extends BasicServiceTestUni builder.setClashPolicy(clashPolicy).setAttributes(attributes); for(String file:files) - builder.add(storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),file),file)); + builder.add(storage.putOntoStorage(new File(Tests.BASE_FOLDER,file),file)); Project doc = check(baseTarget().path(InterfaceConstants.Methods.REGISTER_FILES_PATH).path(id).request(MediaType.APPLICATION_JSON). post(Entity.entity(Serialization.write(builder.getTheRequest()), diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java index 3419508..cc3a14a 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/DummyProjectTest.java @@ -2,24 +2,21 @@ package org.gcube.application.geoportal.service.profiledDocuments; import org.bson.Document; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.BasicServiceTestUnit; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; - import java.time.LocalDateTime; import static org.junit.Assert.assertNull; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java index 60c52d9..c7527a8 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java @@ -6,19 +6,16 @@ import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; 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.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.service.utils.UserUtils; import org.junit.Test; import javax.ws.rs.client.WebTarget; - import java.time.LocalDateTime; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @Slf4j diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/RolesTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/RolesTests.java index f1f8d66..8afc107 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/RolesTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/RolesTests.java @@ -1,7 +1,6 @@ package org.gcube.application.geoportal.service.profiledDocuments; import org.gcube.application.cms.tests.TestProfiles; -import org.gcube.application.geoportal.common.model.document.accounting.User; import org.gcube.application.geoportal.common.model.useCaseDescriptor.DataAccessPolicy; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.rest.InterfaceConstants; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/DescribeWSFolder.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/DescribeWSFolder.java index cf95775..eaebce7 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/DescribeWSFolder.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/DescribeWSFolder.java @@ -4,7 +4,9 @@ import org.gcube.application.cms.tests.TokenSetter; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; -import org.gcube.common.storagehub.model.items.*; +import org.gcube.common.storagehub.model.items.AbstractFileItem; +import org.gcube.common.storagehub.model.items.FolderItem; +import org.gcube.common.storagehub.model.items.Item; import java.text.CharacterIterator; import java.text.StringCharacterIterator; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/MoveWSFolder.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/MoveWSFolder.java index cb3ad29..505556c 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/MoveWSFolder.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/MoveWSFolder.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportal.service.ws; -import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.implementations.WorkspaceManager; +import org.gcube.application.cms.tests.TokenSetter; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/SetWSFolderVisibility.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/SetWSFolderVisibility.java index 50e561d..f21c831 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/SetWSFolderVisibility.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ws/SetWSFolderVisibility.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportal.service.ws; -import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.implementations.WorkspaceManager; +import org.gcube.application.cms.tests.TokenSetter; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; diff --git a/pom.xml b/pom.xml index 7250df3..514345b 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.4 diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/DBConstants.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/DBConstants.java index ca73ce1..36cb0af 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/DBConstants.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/DBConstants.java @@ -1,9 +1,9 @@ package org.gcube.application.cms.sdi.engine; -import static org.gcube.application.cms.sdi.engine.PostgisTable.*; - import java.util.ArrayList; +import static org.gcube.application.cms.sdi.engine.PostgisTable.*; + public class DBConstants { public static enum TYPE{ diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java index 0e7b3d2..0cc80d3 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java @@ -1,12 +1,13 @@ package org.gcube.application.cms.sdi.engine; -import lombok.Synchronized; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.sdi.faults.DataParsingException; import org.gcube.application.geoportal.common.model.legacy.BBOX; -import org.gcube.application.geoportal.common.model.rest.ConfigurationException; -import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; -import java.sql.*; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java index 7fecb74..af1f623 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java @@ -1,10 +1,5 @@ package org.gcube.application.cms.sdi.engine; -import org.gcube.application.cms.sdi.faults.DataParsingException; -import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; - - - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisIndexer.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisIndexer.java index 6e71d3d..32606d4 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisIndexer.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisIndexer.java @@ -7,8 +7,8 @@ import org.gcube.application.cms.sdi.faults.SDIInteractionException; import org.gcube.application.cms.sdi.model.CrossReferencedLayer; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; -import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; +import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import java.sql.DriverManager; import java.sql.PreparedStatement; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java index 4cf50c5..f3279b0 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java @@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.sdi.faults.DataParsingException; import org.gcube.application.geoportal.common.model.legacy.BBOX; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.text.DecimalFormat; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManager.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManager.java index 466525c..62a4228 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManager.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManager.java @@ -5,11 +5,7 @@ import it.geosolutions.geoserver.rest.encoder.datastore.GSPostGISDatastoreEncode import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.sdi.faults.SDIInteractionException; -import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; -import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; -import org.gcube.application.geoportal.common.utils.Files; import org.gcube.data.transfer.library.DataTransferClient; import org.gcube.spatial.data.gis.GISInterface; import org.gcube.spatial.data.gis.is.AbstractGeoServerDescriptor; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java index bfbde05..9dcc047 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/SDIManagerWrapper.java @@ -2,29 +2,22 @@ package org.gcube.application.cms.sdi.engine; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher; import it.geosolutions.geoserver.rest.GeoServerRESTReader; -import it.geosolutions.geoserver.rest.decoder.RESTFeatureType; -import it.geosolutions.geoserver.rest.decoder.RESTLayer; import it.geosolutions.geoserver.rest.encoder.GSLayerEncoder; -import it.geosolutions.geoserver.rest.encoder.coverage.GSCoverageEncoder; import it.geosolutions.geoserver.rest.encoder.feature.GSFeatureTypeEncoder; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.application.cms.plugins.requests.BaseExecutionRequest; import org.gcube.application.cms.sdi.faults.SDIInteractionException; import org.gcube.application.cms.sdi.model.GCubeSDILayerBuilder; import org.gcube.application.cms.sdi.model.SupportedFormat; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; +import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GeoServerPlatform; import org.gcube.application.geoportal.common.model.document.filesets.sdi.PlatformInfo; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.application.geoportal.common.utils.Files; -import org.gcube.application.geoportal.common.utils.StorageUtils; -import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.data.transfer.library.TransferResult; import org.gcube.data.transfer.library.faults.*; import org.gcube.data.transfer.model.Destination; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java index 8c1b593..efb037c 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java @@ -1,7 +1,6 @@ package org.gcube.application.cms.sdi.engine.bboxes; import lombok.Data; -import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.bson.Document; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXEvaluator.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXEvaluator.java index 068c0f9..bdc8d0f 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXEvaluator.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXEvaluator.java @@ -5,13 +5,10 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.bson.Document; -import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; -import java.util.List; - @RequiredArgsConstructor @ToString @Slf4j diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXPathScanner.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXPathScanner.java index 88f3cd4..ef92b9c 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXPathScanner.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXPathScanner.java @@ -1,6 +1,5 @@ package org.gcube.application.cms.sdi.engine.bboxes; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.gcube.application.cms.serialization.Serialization; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/GCubeSDILayerBuilder.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/GCubeSDILayerBuilder.java index 68b802b..0243f6d 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/GCubeSDILayerBuilder.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/GCubeSDILayerBuilder.java @@ -3,11 +3,13 @@ package org.gcube.application.cms.sdi.model; import lombok.Getter; import org.bson.Document; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; -import org.gcube.application.geoportal.common.model.document.filesets.Materialization; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GeoServerPlatform; import org.gcube.application.geoportal.common.model.document.filesets.sdi.PlatformInfo; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class GCubeSDILayerBuilder { diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/SupportedFormat.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/SupportedFormat.java index 9ae1324..38eef40 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/SupportedFormat.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/model/SupportedFormat.java @@ -1,9 +1,9 @@ package org.gcube.application.cms.sdi.model; -import lombok.*; -import lombok.extern.slf4j.Slf4j; +import lombok.Getter; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFile; -import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import java.util.ArrayList; @Getter diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIAbstractPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIAbstractPlugin.java index 8ee59d0..00c6c1d 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIAbstractPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIAbstractPlugin.java @@ -5,10 +5,10 @@ import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.caches.AbstractScopedMap; import org.gcube.application.cms.implementations.ISInterface; import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.cms.plugins.implementations.AbstractPlugin; import org.gcube.application.cms.plugins.InitializablePlugin; import org.gcube.application.cms.plugins.faults.InitializationException; import org.gcube.application.cms.plugins.faults.ShutDownException; +import org.gcube.application.cms.plugins.implementations.AbstractPlugin; import org.gcube.application.cms.plugins.reports.InitializationReport; import org.gcube.application.cms.plugins.reports.Report; import org.gcube.application.cms.sdi.engine.PostgisIndexer; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java index 3669cbe..8d2d43a 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java @@ -9,13 +9,6 @@ import org.gcube.application.cms.plugins.faults.IndexingException; import org.gcube.application.cms.plugins.faults.InitializationException; import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.faults.InvalidProfileException; -import org.gcube.application.cms.sdi.engine.bboxes.BBOXByCoordinatePaths; -import org.gcube.application.cms.sdi.engine.bboxes.BBOXEvaluator; -import org.gcube.application.cms.sdi.engine.bboxes.BBOXPathScanner; -import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference; -import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; -import org.gcube.application.geoportal.common.model.plugins.IndexerPluginDescriptor; -import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.cms.plugins.reports.IndexDocumentReport; import org.gcube.application.cms.plugins.reports.InitializationReport; import org.gcube.application.cms.plugins.reports.Report; @@ -23,12 +16,19 @@ import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; import org.gcube.application.cms.sdi.engine.PostgisIndexer; import org.gcube.application.cms.sdi.engine.PostgisTable; +import org.gcube.application.cms.sdi.engine.bboxes.BBOXByCoordinatePaths; +import org.gcube.application.cms.sdi.engine.bboxes.BBOXEvaluator; +import org.gcube.application.cms.sdi.engine.bboxes.BBOXPathScanner; import org.gcube.application.cms.sdi.faults.SDIInteractionException; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; +import org.gcube.application.geoportal.common.model.document.identification.IdentificationReference; +import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; +import org.gcube.application.geoportal.common.model.plugins.IndexerPluginDescriptor; +import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.geojson.Crs; diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java index ee8ca9f..300cc69 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java @@ -11,9 +11,6 @@ import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.faults.ShutDownException; import org.gcube.application.cms.plugins.implementations.AbstractPlugin; -import org.gcube.application.cms.plugins.model.ComparableVersion; -import org.gcube.application.geoportal.common.model.plugins.MaterializerPluginDescriptor; -import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.cms.plugins.reports.InitializationReport; import org.gcube.application.cms.plugins.reports.MaterializationReport; import org.gcube.application.cms.plugins.reports.Report; @@ -26,6 +23,8 @@ import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.filesets.Materialization; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; +import org.gcube.application.geoportal.common.model.plugins.MaterializerPluginDescriptor; +import org.gcube.application.geoportal.common.model.plugins.PluginDescriptor; import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.ContextUtils; diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java index 7151447..9df7895 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java @@ -1,6 +1,5 @@ package org.gcube.application.cms.sdi.plugins; -import com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; @@ -8,7 +7,6 @@ import org.geojson.Crs; import org.geojson.GeoJsonObject; import org.geojson.LngLatAlt; import org.geojson.Point; -import org.geotoolkit.referencing.CRS; import org.junit.Test; import java.io.IOException; diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java index 6aacfb9..b6dd694 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java @@ -10,13 +10,13 @@ import org.gcube.application.cms.plugins.requests.BaseRequest; import org.gcube.application.cms.plugins.requests.IndexDocumentRequest; import org.gcube.application.cms.sdi.engine.PostgisIndexer; import org.gcube.application.cms.serialization.Serialization; -import org.gcube.application.cms.tests.plugins.BasicPluginTest; import org.gcube.application.cms.tests.TestDocuments; import org.gcube.application.cms.tests.TestProfiles; +import org.gcube.application.cms.tests.plugins.BasicPluginTest; import org.gcube.application.geoportal.common.model.configuration.Index; import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.filesets.Materialization; +import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GeoServerPlatform; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java index 0b3e88f..99c96cc 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java @@ -2,9 +2,6 @@ package org.gcube.application.cms.sdi.plugins; import com.fasterxml.jackson.core.JsonProcessingException; import org.bson.Document; -import org.gcube.application.cms.implementations.ImplementationProvider; -import org.gcube.application.cms.plugins.faults.InvalidPluginRequestException; -import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.reports.MaterializationReport; import org.gcube.application.cms.plugins.reports.Report; @@ -20,7 +17,6 @@ import org.gcube.application.geoportal.common.model.document.filesets.Registered import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.utils.Files; -import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; diff --git a/test-data/profiledDocuments/profiles/Concessioni.json b/test-data/profiledDocuments/profiles/Concessioni.json index 13b14fb..7b7c232 100644 --- a/test-data/profiledDocuments/profiles/Concessioni.json +++ b/test-data/profiledDocuments/profiles/Concessioni.json @@ -195,7 +195,6 @@ "_id": "org.gcube.portlets.user.geoportal-data-list", "_type": "DATA_LIST_GUI", "_configuration": { - "projection": "{\"_theDocument\" : 1, \"lifecycleInformation.phase\" : 1}", "itemFields": [ { "label": "Name", @@ -292,6 +291,65 @@ "sortable": true, "asResult": false } + ], + "actionsDefinition": [ + { + "id": "submit_for_review", + "title": "Submit for Review", + "call_STEPS": [ + "SUBMIT-FOR-REVIEW" + ], + "description": "Submit the Project (for review)", + "display_on_phase": [ + "REJECTED", + "DRAFT" + ] + }, + { + "id": "reject", + "title": "Reject", + "call_STEPS": [ + "REJECT-DRAFT" + ], + "description": "Reject the Project", + "display_on_phase": [ + "DRAFT" + ] + }, + { + "id": "approve", + "title": "Approve", + "call_STEPS": [ + "APPROVE-SUBMITTED" + ], + "description": "Approve the Project", + "display_on_phase": [ + "DRAFT" + ] + }, + { + "id": "publish", + "title": "Publish", + "call_STEPS": [ + "PUBLISH" + ], + "description": "Publish the Project", + "display_on_phase": [ + "DRAFT", + "APPROVED" + ] + }, + { + "id": "unpublish", + "title": "Unpublish", + "call_STEPS": [ + "UNPUBLISH" + ], + "description": "Unpublish the Project", + "display_on_phase": [ + "PUBLISHED" + ] + } ] } } diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/CheckSchemas.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/CheckSchemas.java index 06054b6..1355be5 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/CheckSchemas.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/CheckSchemas.java @@ -1,7 +1,6 @@ package org.gcube.application.cms.usecases; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.cms.tests.TestProfiles; import org.gcube.application.cms.tests.TestSchemas; import org.junit.Test; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearConcessioni.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearConcessioni.java index ad88e4b..2687c6e 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearConcessioni.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearConcessioni.java @@ -3,7 +3,6 @@ package org.gcube.application.cms.usecases; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; - import org.gcube.application.geoportal.common.model.legacy.Concessione; import java.util.ArrayList; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java index 8677405..8a3321c 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java @@ -2,21 +2,20 @@ package org.gcube.application.cms.usecases; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.rest.Projects; import java.rmi.RemoteException; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.projects; -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.statefulMongoConcessioni; @Slf4j public class ClearProjects { diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/EditFileSet.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/EditFileSet.java index 632658f..fbd4872 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/EditFileSet.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/EditFileSet.java @@ -2,10 +2,7 @@ package org.gcube.application.cms.usecases; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.usecases.mocks.ConcessionPublisherThread; - - import org.gcube.application.geoportal.common.model.legacy.Concessione; - 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; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java index 8778cd1..8637b08 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportConcessioniAsProjects.java @@ -17,12 +17,8 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field; import org.gcube.application.geoportal.common.rest.Projects; import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.Files; -import org.gcube.application.geoportal.common.utils.StorageUtils; -import org.gcube.common.storagehub.client.dsl.StorageHubClient; import java.io.File; -import java.io.IOException; -import java.net.URL; import java.nio.charset.Charset; import java.rmi.RemoteException; import java.util.ArrayList; @@ -30,7 +26,6 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportMongoConcessioni.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportMongoConcessioni.java index 26f8549..97d1f93 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportMongoConcessioni.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ExportMongoConcessioni.java @@ -5,9 +5,7 @@ import org.bson.Document; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.utils.Serialization; - -import org.gcube.application.geoportal.common.model.legacy.*; -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; +import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.rest.TempFile; import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.StorageUtils; @@ -20,7 +18,6 @@ import java.nio.charset.Charset; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.List; import java.util.concurrent.atomic.AtomicLong; import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.statefulMongoConcessioni; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/Import.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/Import.java index 2c9cbc1..8fb2efd 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/Import.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/Import.java @@ -1,20 +1,22 @@ package org.gcube.application.cms.usecases; -import ch.qos.logback.core.helpers.ThrowableToStringArray; -import ch.qos.logback.core.net.SyslogOutputStream; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.geoportal.client.legacy.ConcessioniManager; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.utils.Serialization; - -import org.gcube.application.geoportal.common.model.legacy.*; +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.PersistedContent; +import org.gcube.application.geoportal.common.model.legacy.WorkspaceContent; import org.gcube.common.storagehub.client.dsl.FileContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishAll.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishAll.java index b2cbf00..b968d32 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishAll.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishAll.java @@ -2,7 +2,6 @@ package org.gcube.application.cms.usecases; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; - import org.gcube.application.geoportal.common.model.legacy.Concessione; import java.util.ArrayList; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishSingle.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishSingle.java index 52ef90f..0186cad 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishSingle.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/RepublishSingle.java @@ -1,11 +1,8 @@ package org.gcube.application.cms.usecases; -import jdk.nashorn.internal.parser.Token; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.rest.MongoConcessioni; -import org.gcube.application.geoportal.common.utils.tests.GCubeTest; - import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.mongoConcessioni; diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java index 2862784..d02f61e 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java @@ -3,22 +3,11 @@ package org.gcube.application.cms.usecases; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; -import org.gcube.application.cms.usecases.mocks.ConcessionPublisherThread; -import org.gcube.application.geoportal.common.model.legacy.Concessione; -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.File; import java.io.FileNotFoundException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.mongoConcessioni; - @Slf4j public class StressTest { @@ -29,39 +18,39 @@ public class StressTest { TokenSetter.set("/pred4s/preprod/preVRE"); AtomicLong executed=new AtomicLong(0); - AddSectionToConcessioneRequest request= ConcessionPublisherThread.prepareRequest( - new StorageUtils(), Concessione.Paths.RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf")); + // AddSectionToConcessioneRequest request= ConcessionPublisherThread.prepareRequest( + // new StorageUtils(), Concessione.Paths.RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf")); - int numRequests=100000; - for(int i=0;i base folder Map configurations=new HashMap<>();