From e5aae5b8948ee947ebe90181f74256de60c9d676 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 10 Jul 2020 18:12:37 +0200 Subject: [PATCH] Switching to gcube-jackson --- pom.xml | 23 +++++++------------ .../executor/api/types/LaunchParameter.java | 5 ++-- .../executor/api/types/Scheduling.java | 8 ++----- .../executor/exception/ExecutorException.java | 3 +-- .../SmartExecutorExceptionMapper.java | 13 +++++------ .../vremanagement/executor/json/SEMapper.java | 15 ++++++------ .../executor/plugin/PluginDeclaration.java | 9 ++++---- .../executor/plugin/PluginStateEvolution.java | 5 ++-- .../vremanagement/executor/plugin/Ref.java | 7 +++--- .../vremanagement/executor/plugin/RunOn.java | 9 ++++---- .../executor/plugin/ScheduledTask.java | 5 ++-- .../executor/api/types/SerializationTest.java | 5 ++-- 12 files changed, 43 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index d4e3f51..4b15aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.vremanagement smart-executor-api - 2.0.0 + 3.0.0-SNAPSHOT Smart Executor Service API Library @@ -29,14 +29,7 @@ org.gcube.distribution gcube-bom - 1.4.0 - pom - import - - - org.gcube.information-system - information-system-bom - LATEST + 2.0.0-SNAPSHOT pom import @@ -59,16 +52,16 @@ 2.2.1 - com.fasterxml.jackson.core - jackson-databind + org.gcube.common + gcube-jackson-databind - com.fasterxml.jackson.core - jackson-annotations + org.gcube.common + gcube-jackson-annotations - com.fasterxml.jackson.core - jackson-core + org.gcube.common + gcube-jackson-core diff --git a/src/main/java/org/gcube/vremanagement/executor/api/types/LaunchParameter.java b/src/main/java/org/gcube/vremanagement/executor/api/types/LaunchParameter.java index a2bf264..d24b935 100644 --- a/src/main/java/org/gcube/vremanagement/executor/api/types/LaunchParameter.java +++ b/src/main/java/org/gcube/vremanagement/executor/api/types/LaunchParameter.java @@ -6,14 +6,13 @@ package org.gcube.vremanagement.executor.api.types; import java.util.HashMap; import java.util.Map; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; import org.gcube.vremanagement.executor.json.SEMapper; import org.gcube.vremanagement.executor.plugin.PluginStateNotification; import org.gcube.vremanagement.executor.utils.MapCompare; import org.gcube.vremanagement.executor.utils.ObjectCompare; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/vremanagement/executor/api/types/Scheduling.java b/src/main/java/org/gcube/vremanagement/executor/api/types/Scheduling.java index ad8aa40..7ee95af 100644 --- a/src/main/java/org/gcube/vremanagement/executor/api/types/Scheduling.java +++ b/src/main/java/org/gcube/vremanagement/executor/api/types/Scheduling.java @@ -10,13 +10,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; import org.gcube.vremanagement.executor.json.SEMapper; import org.gcube.vremanagement.executor.utils.ObjectCompare; import org.quartz.CronExpression; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - /** * @author Luca Frosini (ISTI - CNR) */ @@ -25,9 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property=SEMapper.CLASS_PROPERTY) public class Scheduling implements Comparable { - @Deprecated - public static final String CLASS_PROPERTY = "@class"; - /** * CRON like expression for a repetitive task. * This field is not valid when using delay diff --git a/src/main/java/org/gcube/vremanagement/executor/exception/ExecutorException.java b/src/main/java/org/gcube/vremanagement/executor/exception/ExecutorException.java index e1f921c..28e095c 100644 --- a/src/main/java/org/gcube/vremanagement/executor/exception/ExecutorException.java +++ b/src/main/java/org/gcube/vremanagement/executor/exception/ExecutorException.java @@ -3,10 +3,9 @@ */ package org.gcube.vremanagement.executor.exception; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - /** * @author Luca Frosini (ISTI - CNR) * diff --git a/src/main/java/org/gcube/vremanagement/executor/exception/SmartExecutorExceptionMapper.java b/src/main/java/org/gcube/vremanagement/executor/exception/SmartExecutorExceptionMapper.java index d6a9c30..b1bc161 100644 --- a/src/main/java/org/gcube/vremanagement/executor/exception/SmartExecutorExceptionMapper.java +++ b/src/main/java/org/gcube/vremanagement/executor/exception/SmartExecutorExceptionMapper.java @@ -7,17 +7,16 @@ import java.io.Reader; import java.io.Writer; import java.util.List; +import org.gcube.com.fasterxml.jackson.core.JsonGenerationException; +import org.gcube.com.fasterxml.jackson.core.JsonParseException; +import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; +import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature; +import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; +import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.vremanagement.executor.utils.ReflectionUtility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonGenerationException; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/vremanagement/executor/json/SEMapper.java b/src/main/java/org/gcube/vremanagement/executor/json/SEMapper.java index 8b97cc3..2f50183 100644 --- a/src/main/java/org/gcube/vremanagement/executor/json/SEMapper.java +++ b/src/main/java/org/gcube/vremanagement/executor/json/SEMapper.java @@ -11,6 +11,13 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; +import org.gcube.com.fasterxml.jackson.core.JsonGenerationException; +import org.gcube.com.fasterxml.jackson.core.JsonParseException; +import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; +import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature; +import org.gcube.com.fasterxml.jackson.databind.JavaType; +import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; +import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.plugin.PluginDeclaration; @@ -19,14 +26,6 @@ import org.gcube.vremanagement.executor.plugin.Ref; import org.gcube.vremanagement.executor.plugin.RunOn; import org.gcube.vremanagement.executor.plugin.ScheduledTask; -import com.fasterxml.jackson.core.JsonGenerationException; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * @author Luca Frosini (ISTI - CNR) * diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/PluginDeclaration.java b/src/main/java/org/gcube/vremanagement/executor/plugin/PluginDeclaration.java index 7c77977..6ebce32 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/PluginDeclaration.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/PluginDeclaration.java @@ -5,13 +5,12 @@ package org.gcube.vremanagement.executor.plugin; import java.util.Map; +import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; +import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - /** * @author Luca Frosini (ISTI - CNR) * diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/PluginStateEvolution.java b/src/main/java/org/gcube/vremanagement/executor/plugin/PluginStateEvolution.java index 40563a5..87d2069 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/PluginStateEvolution.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/PluginStateEvolution.java @@ -7,12 +7,11 @@ import java.util.UUID; import javax.xml.bind.annotation.XmlElement; +import org.gcube.com.fasterxml.jackson.annotation.JsonGetter; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - /** * @author Luca Frosini (ISTI - CNR) * diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/Ref.java b/src/main/java/org/gcube/vremanagement/executor/plugin/Ref.java index 95a59b3..e4c5bb5 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/Ref.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/Ref.java @@ -3,12 +3,11 @@ */ package org.gcube.vremanagement.executor.plugin; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property=SEMapper.CLASS_PROPERTY) @JsonTypeName(value="Ref") /** diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/RunOn.java b/src/main/java/org/gcube/vremanagement/executor/plugin/RunOn.java index f5d4f35..c9774a6 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/RunOn.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/RunOn.java @@ -3,13 +3,12 @@ */ package org.gcube.vremanagement.executor.plugin; +import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/vremanagement/executor/plugin/ScheduledTask.java b/src/main/java/org/gcube/vremanagement/executor/plugin/ScheduledTask.java index 3f3f503..17514e7 100644 --- a/src/main/java/org/gcube/vremanagement/executor/plugin/ScheduledTask.java +++ b/src/main/java/org/gcube/vremanagement/executor/plugin/ScheduledTask.java @@ -5,12 +5,11 @@ package org.gcube.vremanagement.executor.plugin; import java.util.UUID; +import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; +import org.gcube.com.fasterxml.jackson.annotation.JsonTypeInfo; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.json.SEMapper; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/test/java/org/gcube/vremanagement/executor/api/types/SerializationTest.java b/src/test/java/org/gcube/vremanagement/executor/api/types/SerializationTest.java index 58f0749..ee4f1bd 100644 --- a/src/test/java/org/gcube/vremanagement/executor/api/types/SerializationTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/api/types/SerializationTest.java @@ -19,6 +19,8 @@ import javax.xml.bind.Unmarshaller; import javax.xml.bind.util.JAXBSource; import javax.xml.namespace.QName; +import org.gcube.com.fasterxml.jackson.core.JsonParseException; +import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException; import org.gcube.vremanagement.executor.json.SEMapper; import org.gcube.vremanagement.executor.plugin.Plugin; @@ -29,9 +31,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.databind.JsonMappingException; - /** * @author Luca Frosini (ISTI - CNR) *