Integrated the PATCH method [#24985]

geoportal-common/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog for org.gcube.application.geoportal-common
 
+## [v1.0.12-SNAPSHOT] - 2023-04-18
+- Integrated the PATCH method [#24985]
+
 ## [v1.0.11] - 2023-01-10
 - Pom updates
 

geoportal-common/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>geoportal-common</artifactId>
-	<version>1.0.11</version>
+	<version>1.0.12-SNAPSHOT</version>
 	<name>Geoportal Common</name>
 
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java

@@ -1,19 +1,25 @@
 package org.gcube.application.geoportal.common.model;
 
 
-import com.jayway.jsonpath.*;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.gcube.application.geoportal.common.JSONSerializationProvider;
-import org.reflections.Reflections;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.gcube.application.geoportal.common.JSONSerializationProvider;
+import org.reflections.Reflections;
+import org.reflections.util.ConfigurationBuilder;
+import org.reflections.util.FilterBuilder;
+
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.Option;
+import com.jayway.jsonpath.TypeRef;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class JSONPathWrapper {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Archive.java

@@ -1,8 +1,9 @@
 package org.gcube.application.geoportal.common.model.configuration;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.bson.Document;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class Archive extends Document {
     public static final String TYPE = "_type";
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Configuration.java

@@ -1,16 +1,18 @@
 package org.gcube.application.geoportal.common.model.configuration;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.xml.bind.annotation.XmlRootElement;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @XmlRootElement
 @Data
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/Index.java

@@ -1,8 +1,9 @@
 package org.gcube.application.geoportal.common.model.configuration;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.bson.Document;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class Index extends Document {
 
     public static class KnownTypes{

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/configuration/MongoConnection.java

@@ -1,10 +1,10 @@
 package org.gcube.application.geoportal.common.model.configuration;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+
 @Data
 public class MongoConnection {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Lock.java

@@ -1,9 +1,15 @@
 package org.gcube.application.geoportal.common.model.document;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
 import org.gcube.application.geoportal.common.model.document.accounting.AccountingInfo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/Project.java

@@ -1,21 +1,27 @@
 package org.gcube.application.geoportal.common.model.document;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.vdurmont.semver4j.Semver;
-import lombok.*;
-import org.bson.Document;
-import org.gcube.application.geoportal.common.model.document.accounting.PublicationInfo;
-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.relationships.Relationship;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.bson.Document;
+import org.gcube.application.geoportal.common.model.document.accounting.PublicationInfo;
+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.relationships.Relationship;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.vdurmont.semver4j.Semver;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/access/Access.java

@@ -1,7 +1,12 @@
 package org.gcube.application.geoportal.common.model.document.access;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/accounting/AccountingInfo.java

@@ -1,10 +1,15 @@
 package org.gcube.application.geoportal.common.model.document.accounting;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
-
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/accounting/Context.java

@@ -1,7 +1,12 @@
 package org.gcube.application.geoportal.common.model.document.accounting;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/accounting/PublicationInfo.java

@@ -1,9 +1,15 @@
 package org.gcube.application.geoportal.common.model.document.accounting;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
 import org.gcube.application.geoportal.common.model.document.access.Access;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/accounting/User.java

@@ -1,12 +1,17 @@
 package org.gcube.application.geoportal.common.model.document.accounting;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
-
 import java.util.Objects;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/Materialization.java

@@ -1,9 +1,11 @@
 package org.gcube.application.geoportal.common.model.document.filesets;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.ToString;
 import org.bson.Document;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.ToString;
+
 @ToString (callSuper = true)
 public class Materialization extends Document {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFile.java

@@ -1,6 +1,7 @@
 package org.gcube.application.geoportal.common.model.document.filesets;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/RegisteredFileSet.java

@@ -1,10 +1,12 @@
 package org.gcube.application.geoportal.common.model.document.filesets;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
-import lombok.ToString;
+
 import org.bson.Document;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.ToString;
 
 
 @ToString (callSuper = true)

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/sdi/GCubeSDILayer.java

@@ -1,14 +1,16 @@
 package org.gcube.application.geoportal.common.model.document.filesets.sdi;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.bson.Document;
-import org.gcube.application.geoportal.common.model.document.filesets.Materialization;
-
 import java.util.List;
 import java.util.Map;
 
+import org.bson.Document;
+import org.gcube.application.geoportal.common.model.document.filesets.Materialization;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 public class GCubeSDILayer extends Materialization {
 
     @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/sdi/GeoServerPlatform.java

@@ -1,10 +1,10 @@
 package org.gcube.application.geoportal.common.model.document.filesets.sdi;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class GeoServerPlatform extends PlatformInfo{
 
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/filesets/sdi/PlatformInfo.java

@@ -1,8 +1,9 @@
 package org.gcube.application.geoportal.common.model.document.filesets.sdi;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.bson.Document;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 
 public class PlatformInfo extends Document {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/IdentificationReference.java

@@ -1,9 +1,11 @@
 package org.gcube.application.geoportal.common.model.document.identification;
 
+import org.bson.Document;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.bson.Document;
 
 @ToString(callSuper = true)
 @NoArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/identification/SpatialReference.java

@@ -1,6 +1,7 @@
 package org.gcube.application.geoportal.common.model.document.identification;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/LifecycleInformation.java

@@ -1,12 +1,13 @@
 package org.gcube.application.geoportal.common.model.document.lifecycle;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
 @Data
 public class LifecycleInformation {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/lifecycle/TriggeredEvents.java

@@ -1,10 +1,10 @@
 package org.gcube.application.geoportal.common.model.document.lifecycle;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+
 @Data
 public class TriggeredEvents {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/relationships/Relationship.java

@@ -1,7 +1,12 @@
 package org.gcube.application.geoportal.common.model.document.relationships;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/document/relationships/RelationshipNavigationObject.java

@@ -1,10 +1,17 @@
 package org.gcube.application.geoportal.common.model.document.relationships;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
-import lombok.*;
+
 import org.gcube.application.geoportal.common.model.document.Project;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/AssociatedContent.java

@@ -1,16 +1,18 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
-import lombok.Getter;
-import lombok.Setter;
-import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
-import org.gcube.application.geoportal.common.utils.CollectionsUtils;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+
+import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
+import org.gcube.application.geoportal.common.utils.CollectionsUtils;
+
+import lombok.Getter;
+import lombok.Setter;
+
 
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/BBOX.java

@@ -1,9 +1,14 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
-import lombok.*;
-
 import java.io.Serializable;
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
 @RequiredArgsConstructor
 @Getter
 @NoArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java

@@ -1,8 +1,12 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
-import lombok.Getter;
+import java.time.LocalDateTime;
-import lombok.Setter;
+import java.util.ArrayList;
-import lombok.ToString;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
 import org.gcube.application.geoportal.common.faults.InvalidRequestException;
 import org.gcube.application.geoportal.common.model.legacy.report.Check;
 import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck;
@@ -10,11 +14,9 @@ import org.gcube.application.geoportal.common.model.legacy.report.ValidationRepo
 import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport.ValidationStatus;
 import org.gcube.application.geoportal.common.utils.CollectionsUtils;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import lombok.Getter;
-import java.time.LocalDateTime;
+import lombok.Setter;
-import java.util.ArrayList;
+import lombok.ToString;
-import java.util.Arrays;
-import java.util.List;
 
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/GeoServerContent.java

@@ -1,13 +1,13 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Getter
 @Setter
 @ToString(callSuper=true)

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/InputStreamDescriptor.java

@@ -1,12 +1,12 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
+import java.io.InputStream;
+
 import lombok.Data;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 
-import java.io.InputStream;
-
 @Data
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java

@@ -1,11 +1,12 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
-import lombok.Getter;
+import java.util.List;
-import lombok.Setter;
+
 import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
 import org.gcube.application.geoportal.common.utils.CollectionsUtils;
 
-import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 
 
 @Getter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/PersistedContent.java

@@ -3,6 +3,7 @@ package org.gcube.application.geoportal.common.model.legacy;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Record.java

@@ -1,13 +1,14 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
+import java.time.LocalDateTime;
+
+import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck;
+import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck;
-import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
-
-import java.time.LocalDateTime;
 
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/RelazioneScavo.java

@@ -1,12 +1,13 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
+import java.util.List;
+
+import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
+import org.gcube.application.geoportal.common.utils.CollectionsUtils;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
-import org.gcube.application.geoportal.common.utils.CollectionsUtils;
-
-import java.util.List;
 
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/UploadedImage.java

@@ -1,11 +1,12 @@
 package org.gcube.application.geoportal.common.model.legacy;
 
+import java.util.List;
+
+import org.gcube.application.geoportal.common.utils.CollectionsUtils;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.gcube.application.geoportal.common.utils.CollectionsUtils;
-
-import java.util.List;
 
 @Getter
 @Setter

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ConstraintCheck.java

@@ -1,13 +1,13 @@
 package org.gcube.application.geoportal.common.model.legacy.report;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
 @Getter
 @Setter
 @Slf4j

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/PublicationReport.java

@@ -1,12 +1,14 @@
 package org.gcube.application.geoportal.common.model.legacy.report;
 
-import lombok.Getter;
+import java.io.Serializable;
-import lombok.Setter;
-import org.gcube.application.geoportal.common.model.legacy.Record;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import java.io.Serializable;
+
+import org.gcube.application.geoportal.common.model.legacy.Record;
+
+import lombok.Getter;
+import lombok.Setter;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class PublicationReport extends ValidationReport implements Serializable{

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/report/ValidationReport.java

@@ -1,12 +1,12 @@
 package org.gcube.application.geoportal.common.model.legacy.report;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @NoArgsConstructor
 public class ValidationReport implements Serializable{

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/LifecycleManagerDescriptor.java

@@ -1,13 +1,14 @@
 package org.gcube.application.geoportal.common.model.plugins;
 
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Map;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/OperationDescriptor.java

@@ -1,13 +1,15 @@
 package org.gcube.application.geoportal.common.model.plugins;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.gcube.application.geoportal.common.model.useCaseDescriptor.Field;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-import java.util.Map;
 
 
 @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/plugins/PluginDescriptor.java

@@ -1,12 +1,13 @@
 package org.gcube.application.geoportal.common.model.plugins;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
 import com.vdurmont.semver4j.Semver;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/AddSectionToConcessioneRequest.java

@@ -1,14 +1,16 @@
 package org.gcube.application.geoportal.common.model.rest;
 
-import lombok.AllArgsConstructor;
+import java.util.List;
-import lombok.Data;
+
-import lombok.NoArgsConstructor;
+import javax.xml.bind.annotation.XmlRootElement;
+
 import org.bson.Document;
 import org.gcube.application.geoportal.common.faults.InvalidRequestException;
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import lombok.AllArgsConstructor;
-import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @XmlRootElement
 @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/QueryRequest.java

@@ -1,9 +1,10 @@
 package org.gcube.application.geoportal.common.model.rest;
 
-import lombok.Data;
+import java.util.List;
+
 import org.bson.Document;
 
-import java.util.List;
+import lombok.Data;
 
 @Data
 public class QueryRequest {

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/RegisterFileSetRequest.java

@@ -1,14 +1,16 @@
 package org.gcube.application.geoportal.common.model.rest;
 
-import lombok.AllArgsConstructor;
+import java.util.List;
-import lombok.Data;
+
-import lombok.NoArgsConstructor;
+import javax.xml.bind.annotation.XmlRootElement;
+
 import org.bson.Document;
 import org.gcube.application.geoportal.common.faults.InvalidRequestException;
 import org.gcube.application.geoportal.common.model.document.access.Access;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import lombok.AllArgsConstructor;
-import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @XmlRootElement
 @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/StepExecutionRequest.java

@@ -1,11 +1,12 @@
 package org.gcube.application.geoportal.common.model.rest;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.bson.Document;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.bson.Document;
-
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @Data

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/rest/TempFile.java

@@ -1,9 +1,10 @@
 package org.gcube.application.geoportal.common.model.rest;
 
+import org.gcube.application.geoportal.common.faults.InvalidRequestException;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.gcube.application.geoportal.common.faults.InvalidRequestException;
 
 @Data
 @NoArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/DataAccessPolicy.java

@@ -1,13 +1,19 @@
 package org.gcube.application.geoportal.common.model.useCaseDescriptor;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
-import com.fasterxml.jackson.annotation.JsonProperty;
+
-import lombok.*;
 import org.bson.Document;
 import org.gcube.application.geoportal.common.model.document.Project;
 import org.gcube.application.geoportal.common.model.document.accounting.User;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/Field.java

@@ -1,14 +1,17 @@
 package org.gcube.application.geoportal.common.model.useCaseDescriptor;
 
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.bson.Document;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.bson.Document;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
 
 @XmlRootElement
 @AllArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/HandlerDeclaration.java

@@ -1,9 +1,11 @@
 package org.gcube.application.geoportal.common.model.useCaseDescriptor;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
 import org.bson.Document;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
 @Data
 public class HandlerDeclaration {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/RelationshipDefinition.java

@@ -1,11 +1,9 @@
 package org.gcube.application.geoportal.common.model.useCaseDescriptor;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.xml.bind.annotation.XmlRootElement;
 
 @Data
 @NoArgsConstructor

geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/useCaseDescriptor/UseCaseDescriptor.java

@@ -1,16 +1,5 @@
 package org.gcube.application.geoportal.common.model.useCaseDescriptor;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.vdurmont.semver4j.Semver;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.bson.types.ObjectId;
-import org.gcube.application.geoportal.common.model.document.accounting.AccountingInfo;
-import org.gcube.application.geoportal.common.model.document.accounting.User;
-
-import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,6 +7,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.bson.types.ObjectId;
+import org.gcube.application.geoportal.common.model.document.accounting.AccountingInfo;
+import org.gcube.application.geoportal.common.model.document.accounting.User;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.vdurmont.semver4j.Semver;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 @Data
 @NoArgsConstructor
 @XmlRootElement

geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/MongoConcessioni.java

@@ -1,12 +1,12 @@
 package org.gcube.application.geoportal.common.rest;
 
+import java.util.Iterator;
+
 import org.gcube.application.geoportal.common.model.configuration.Configuration;
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest;
 import org.gcube.application.geoportal.common.model.rest.QueryRequest;
 
-import java.util.Iterator;
-
 public interface MongoConcessioni {
 
 	public Concessione createNew(Concessione c) throws Exception;

geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/Projects.java

@@ -1,15 +1,19 @@
 package org.gcube.application.geoportal.common.rest;
 
+import java.rmi.RemoteException;
+import java.util.Iterator;
+
 import org.bson.Document;
 import org.gcube.application.geoportal.common.faults.InvalidRequestException;
 import org.gcube.application.geoportal.common.model.configuration.Configuration;
 import org.gcube.application.geoportal.common.model.document.Project;
 import org.gcube.application.geoportal.common.model.document.access.Access;
 import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject;
-import org.gcube.application.geoportal.common.model.rest.*;
+import org.gcube.application.geoportal.common.model.rest.CreateRelationshipRequest;
-
+import org.gcube.application.geoportal.common.model.rest.DeleteRelationshipRequest;
-import java.rmi.RemoteException;
+import org.gcube.application.geoportal.common.model.rest.QueryRequest;
-import java.util.Iterator;
+import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
+import org.gcube.application.geoportal.common.model.rest.StepExecutionRequest;
 
 public interface Projects<P extends Project> {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/rest/UseCaseDescriptorsI.java

@@ -1,12 +1,12 @@
 package org.gcube.application.geoportal.common.rest;
 
+import java.rmi.RemoteException;
+import java.util.Iterator;
+
 import org.bson.Document;
 import org.gcube.application.geoportal.common.model.rest.QueryRequest;
 import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
 
-import java.rmi.RemoteException;
-import java.util.Iterator;
-
 
 public interface UseCaseDescriptorsI {
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ContextUtils.java

@@ -1,11 +1,11 @@
 package org.gcube.application.geoportal.common.utils;
 
-import lombok.extern.slf4j.Slf4j;
+import static org.gcube.common.authorization.client.Constants.authorizationService;
+
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.scope.api.ScopeProvider;
 
-import static org.gcube.common.authorization.client.Constants.authorizationService;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Deprecated

geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java

@@ -1,5 +1,11 @@
 package org.gcube.application.geoportal.common.utils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.bson.Document;
 import org.gcube.application.geoportal.common.model.document.access.Access;
 import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor;
@@ -7,12 +13,6 @@ import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
 import org.gcube.application.geoportal.common.model.rest.TempFile;
 import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collection;
-
 public class FileSets {
 
     public static class RequestBuilder {

geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/Files.java

@@ -1,17 +1,23 @@
 package org.gcube.application.geoportal.common.utils;
 
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayInputStream;
-import org.apache.commons.io.IOUtils;
+import java.io.File;
-import org.xml.sax.InputSource;
+import java.io.IOException;
-
+import java.io.InputStream;
-import java.io.*;
 import java.net.URL;
 import java.nio.charset.Charset;
-import java.nio.file.CopyOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class Files {

geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/ISUtils.java

@@ -1,6 +1,11 @@
 package org.gcube.application.geoportal.common.utils;
 
 
+import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
+import static org.gcube.resources.discovery.icclient.ICFactory.queryFor;
+
+import java.util.List;
+
 import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
 import org.gcube.application.geoportal.common.model.rest.DatabaseConnection;
 import org.gcube.common.encryption.encrypter.StringEncrypter;
@@ -13,11 +18,6 @@ import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 
-import java.util.List;
-
-import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
-import static org.gcube.resources.discovery.icclient.ICFactory.queryFor;
-
 public class ISUtils {
 
 

geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/StorageUtils.java

@@ -1,6 +1,14 @@
 package org.gcube.application.geoportal.common.utils;
 
-import lombok.extern.slf4j.Slf4j;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;
+
 import org.gcube.application.geoportal.common.faults.StorageException;
 import org.gcube.application.geoportal.common.model.rest.TempFile;
 import org.gcube.application.geoportal.common.rest.InterfaceConstants;
@@ -10,10 +18,7 @@ import org.gcube.contentmanager.storageclient.wrapper.AccessType;
 import org.gcube.contentmanager.storageclient.wrapper.MemoryType;
 import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
 
-import java.io.*;
+import lombok.extern.slf4j.Slf4j;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.UUID;
 
 @Slf4j
 public class StorageUtils {