From 456e587aa0c93e94a71f305309ecb35435f7e4c2 Mon Sep 17 00:00:00 2001 From: "lucio.lelii" Date: Fri, 16 Apr 2021 11:46:29 +0200 Subject: [PATCH] ported to jackson 2.8.11 --- pom.xml | 22 ++++++++++++++----- .../model/items/ExternalFolder.java | 1 + .../model/items/nodes/Accounting.java | 7 +++--- .../storagehub/model/service/ItemList.java | 7 +++--- .../storagehub/model/service/ItemWrapper.java | 8 +++---- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 41f384f..b798255 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.gcube.distribution gcube-bom - 1.3.1 + 2.0.1 pom import @@ -39,19 +39,29 @@ lombok 1.14.8 + + com.fasterxml.jackson.core jackson-core + 2.8.11 + + com.fasterxml.jackson.core + jackson-annotations + 2.8.11 + + + + + org.gcube.core common-clients - - - com.fasterxml.jackson.core - jackson-annotations - + org.slf4j slf4j-api diff --git a/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java b/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java index 6f3c572..44b73f0 100644 --- a/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java +++ b/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java @@ -8,6 +8,7 @@ import org.gcube.common.storagehub.model.annotations.NodeAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; + public class ExternalFolder extends FolderItem { @Attribute("hl:pluginName") diff --git a/src/main/java/org/gcube/common/storagehub/model/items/nodes/Accounting.java b/src/main/java/org/gcube/common/storagehub/model/items/nodes/Accounting.java index 7b539f4..74faca0 100644 --- a/src/main/java/org/gcube/common/storagehub/model/items/nodes/Accounting.java +++ b/src/main/java/org/gcube/common/storagehub/model/items/nodes/Accounting.java @@ -3,15 +3,16 @@ package org.gcube.common.storagehub.model.items.nodes; import java.util.ArrayList; import java.util.List; -import lombok.Data; -import lombok.NoArgsConstructor; - import org.gcube.common.storagehub.model.annotations.AttributeRootNode; import org.gcube.common.storagehub.model.annotations.ListNodes; import org.gcube.common.storagehub.model.items.nodes.accounting.AccountEntry; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.Data; +import lombok.NoArgsConstructor; + + @NoArgsConstructor @Data @AttributeRootNode("nthl:accountingSet") diff --git a/src/main/java/org/gcube/common/storagehub/model/service/ItemList.java b/src/main/java/org/gcube/common/storagehub/model/service/ItemList.java index 20ca11b..2310e12 100644 --- a/src/main/java/org/gcube/common/storagehub/model/service/ItemList.java +++ b/src/main/java/org/gcube/common/storagehub/model/service/ItemList.java @@ -3,13 +3,14 @@ package org.gcube.common.storagehub.model.service; import java.util.ArrayList; import java.util.List; +import org.gcube.common.storagehub.model.items.Item; + +import com.fasterxml.jackson.annotation.JsonTypeInfo; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.gcube.common.storagehub.model.items.Item; - -import com.fasterxml.jackson.annotation.JsonTypeInfo; @Data @AllArgsConstructor diff --git a/src/main/java/org/gcube/common/storagehub/model/service/ItemWrapper.java b/src/main/java/org/gcube/common/storagehub/model/service/ItemWrapper.java index 5ea1bbd..c347809 100644 --- a/src/main/java/org/gcube/common/storagehub/model/service/ItemWrapper.java +++ b/src/main/java/org/gcube/common/storagehub/model/service/ItemWrapper.java @@ -1,13 +1,13 @@ package org.gcube.common.storagehub.model.service; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - import org.gcube.common.storagehub.model.items.Item; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + @Data @AllArgsConstructor @NoArgsConstructor