This is an automated email from the ASF dual-hosted git repository. xtsong pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-agents.git
commit 11cd4ee6721c559576fa27929d7c45329f5eb062 Author: youjin <[email protected]> AuthorDate: Thu Dec 25 16:42:24 2025 +0800 [build] Use Unified Jackson in Flink Agents --- api/pom.xml | 1 - .../java/org/apache/flink/agents/api/Event.java | 7 ++++-- .../org/apache/flink/agents/api/EventContext.java | 4 ++-- .../org/apache/flink/agents/api/InputEvent.java | 4 ++-- .../org/apache/flink/agents/api/OutputEvent.java | 4 ++-- .../apache/flink/agents/api/agents/ReActAgent.java | 26 +++++++++++----------- .../agents/api/chat/messages/ChatMessage.java | 2 +- .../flink/agents/api/context/MemoryUpdate.java | 4 ++-- .../org/apache/flink/agents/api/prompt/Prompt.java | 8 +++---- .../agents/api/resource/ResourceDescriptor.java | 4 ++-- .../flink/agents/api/tools/ToolMetadata.java | 6 ++--- .../flink/agents/api/agents/ReActAgentTest.java | 4 ++-- .../apache/flink/agents/api/prompt/PromptTest.java | 4 ++-- .../api/resource/ResourceDescriptorTest.java | 4 ++-- plan/pom.xml | 5 ----- .../org/apache/flink/agents/plan/AgentPlan.java | 6 ++--- .../org/apache/flink/agents/plan/JavaFunction.java | 4 ++-- .../apache/flink/agents/plan/actions/Action.java | 4 ++-- .../agents/plan/resource/python/PythonTool.java | 4 ++-- .../JavaSerializableResourceProvider.java | 6 ++--- .../plan/resourceprovider/ResourceProvider.java | 4 ++-- .../plan/serializer/ActionJsonDeserializer.java | 12 +++++----- .../plan/serializer/ActionJsonSerializer.java | 6 ++--- .../plan/serializer/AgentPlanJsonDeserializer.java | 18 +++++++-------- .../plan/serializer/AgentPlanJsonSerializer.java | 6 ++--- .../ResourceProviderJsonDeserializer.java | 12 +++++----- .../serializer/ResourceProviderJsonSerializer.java | 6 ++--- .../flink/agents/plan/tools/FunctionTool.java | 4 ++-- .../flink/agents/plan/tools/SchemaUtils.java | 4 ++-- .../agents/plan/tools/ToolMetadataFactory.java | 2 +- .../serializer/FunctionToolJsonDeserializer.java | 10 ++++----- .../serializer/FunctionToolJsonSerializer.java | 6 ++--- .../apache/flink/agents/plan/utils/JsonUtils.java | 4 ++-- .../agents/plan/AgentPlanDeclareChatModelTest.java | 2 +- .../plan/AgentPlanDeclareToolMethodTest.java | 2 +- .../flink/agents/plan/FunctionToolPlanTest.java | 4 ++-- .../flink/agents/plan/TestEventSerializable.java | 2 +- .../org/apache/flink/agents/plan/TestFunction.java | 2 +- .../compatibility/CreateJavaAgentPlanFromJson.java | 2 +- .../plan/compatibility/GenerateAgentPlanJson.java | 2 +- .../plan/resource/python/PythonToolTest.java | 2 +- .../serializer/ActionJsonDeserializerTest.java | 2 +- .../plan/serializer/ActionJsonSerializerTest.java | 2 +- .../serializer/AgentPlanJsonDeserializerTest.java | 2 +- .../serializer/AgentPlanJsonSerializerTest.java | 2 +- .../ResourceProviderDeserializerTest.java | 2 +- .../serializer/ResourceProviderSerializerTest.java | 4 ++-- .../flink/agents/plan/tools/FunctionToolTest.java | 2 +- pom.xml | 16 +++++++++++-- .../apache/flink/agents/runtime/CompileUtils.java | 4 ++-- .../actionstate/ActionStateKafkaDeserializer.java | 12 +++++----- .../runtime/actionstate/ActionStateKafkaSeder.java | 12 +++++----- .../actionstate/ActionStateKafkaSerializer.java | 12 +++++----- .../runtime/actionstate/ActionStateUtil.java | 2 +- .../agents/runtime/context/RunnerContextImpl.java | 2 +- .../agents/runtime/eventlog/EventLogRecord.java | 4 ++-- .../eventlog/EventLogRecordJsonDeserializer.java | 10 ++++----- .../eventlog/EventLogRecordJsonSerializer.java | 6 ++--- .../agents/runtime/eventlog/FileEventLogger.java | 2 +- .../runtime/operator/ActionExecutionOperator.java | 2 +- .../agents/runtime/python/event/PythonEvent.java | 6 ++--- .../eventlog/EventLogRecordJsonSerdeTest.java | 4 ++-- .../runtime/eventlog/FileEventLoggerTest.java | 4 ++-- .../runtime/python/event/PythonEventTest.java | 4 ++-- 64 files changed, 175 insertions(+), 166 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a540361..8cf08d0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -37,7 +37,6 @@ under the License. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.15.2</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> diff --git a/api/src/main/java/org/apache/flink/agents/api/Event.java b/api/src/main/java/org/apache/flink/agents/api/Event.java index 868447a..5bb8043 100644 --- a/api/src/main/java/org/apache/flink/agents/api/Event.java +++ b/api/src/main/java/org/apache/flink/agents/api/Event.java @@ -18,7 +18,8 @@ package org.apache.flink.agents.api; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -37,7 +38,9 @@ public abstract class Event { } @JsonCreator - public Event(UUID id, Map<String, Object> attributes) { + public Event( + @JsonProperty("id") UUID id, + @JsonProperty("attributes") Map<String, Object> attributes) { this.id = id; this.attributes = attributes; } diff --git a/api/src/main/java/org/apache/flink/agents/api/EventContext.java b/api/src/main/java/org/apache/flink/agents/api/EventContext.java index 9e7b819..a49e736 100644 --- a/api/src/main/java/org/apache/flink/agents/api/EventContext.java +++ b/api/src/main/java/org/apache/flink/agents/api/EventContext.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.api; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.time.Instant; diff --git a/api/src/main/java/org/apache/flink/agents/api/InputEvent.java b/api/src/main/java/org/apache/flink/agents/api/InputEvent.java index 0a627f8..92dc0f7 100644 --- a/api/src/main/java/org/apache/flink/agents/api/InputEvent.java +++ b/api/src/main/java/org/apache/flink/agents/api/InputEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.api; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import java.util.UUID; diff --git a/api/src/main/java/org/apache/flink/agents/api/OutputEvent.java b/api/src/main/java/org/apache/flink/agents/api/OutputEvent.java index d9c116c..96ac3c5 100644 --- a/api/src/main/java/org/apache/flink/agents/api/OutputEvent.java +++ b/api/src/main/java/org/apache/flink/agents/api/OutputEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.api; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import java.util.UUID; diff --git a/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java b/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java index 37a5d53..e307456 100644 --- a/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java +++ b/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java @@ -18,6 +18,19 @@ package org.apache.flink.agents.api.agents; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.commons.lang3.ClassUtils; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; @@ -35,19 +48,6 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.RowTypeInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JacksonException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonMappingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.flink.types.Row; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api/src/main/java/org/apache/flink/agents/api/chat/messages/ChatMessage.java b/api/src/main/java/org/apache/flink/agents/api/chat/messages/ChatMessage.java index 6e844e7..ef12dd2 100644 --- a/api/src/main/java/org/apache/flink/agents/api/chat/messages/ChatMessage.java +++ b/api/src/main/java/org/apache/flink/agents/api/chat/messages/ChatMessage.java @@ -18,7 +18,7 @@ package org.apache.flink.agents.api.chat.messages; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.ArrayList; import java.util.HashMap; diff --git a/api/src/main/java/org/apache/flink/agents/api/context/MemoryUpdate.java b/api/src/main/java/org/apache/flink/agents/api/context/MemoryUpdate.java index f150c9d..e3c5582 100644 --- a/api/src/main/java/org/apache/flink/agents/api/context/MemoryUpdate.java +++ b/api/src/main/java/org/apache/flink/agents/api/context/MemoryUpdate.java @@ -17,10 +17,10 @@ */ package org.apache.flink.agents.api.context; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.Objects; diff --git a/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java b/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java index bb0be8b..95c1406 100644 --- a/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java +++ b/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java @@ -18,14 +18,14 @@ package org.apache.flink.agents.api.prompt; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.apache.flink.agents.api.chat.messages.ChatMessage; import org.apache.flink.agents.api.chat.messages.MessageRole; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.api.resource.SerializableResource; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/main/java/org/apache/flink/agents/api/resource/ResourceDescriptor.java b/api/src/main/java/org/apache/flink/agents/api/resource/ResourceDescriptor.java index 1de8955..140fee4 100644 --- a/api/src/main/java/org/apache/flink/agents/api/resource/ResourceDescriptor.java +++ b/api/src/main/java/org/apache/flink/agents/api/resource/ResourceDescriptor.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.api.resource; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/org/apache/flink/agents/api/tools/ToolMetadata.java b/api/src/main/java/org/apache/flink/agents/api/tools/ToolMetadata.java index 343c25f..6505bd2 100644 --- a/api/src/main/java/org/apache/flink/agents/api/tools/ToolMetadata.java +++ b/api/src/main/java/org/apache/flink/agents/api/tools/ToolMetadata.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.api.tools; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/api/src/test/java/org/apache/flink/agents/api/agents/ReActAgentTest.java b/api/src/test/java/org/apache/flink/agents/api/agents/ReActAgentTest.java index d559a9c..f5851e1 100644 --- a/api/src/test/java/org/apache/flink/agents/api/agents/ReActAgentTest.java +++ b/api/src/test/java/org/apache/flink/agents/api/agents/ReActAgentTest.java @@ -18,11 +18,11 @@ package org.apache.flink.agents.api.agents; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.RowTypeInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/api/src/test/java/org/apache/flink/agents/api/prompt/PromptTest.java b/api/src/test/java/org/apache/flink/agents/api/prompt/PromptTest.java index 454c496..b97b691 100644 --- a/api/src/test/java/org/apache/flink/agents/api/prompt/PromptTest.java +++ b/api/src/test/java/org/apache/flink/agents/api/prompt/PromptTest.java @@ -20,11 +20,11 @@ package org.apache.flink.agents.api.prompt; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.chat.messages.ChatMessage; import org.apache.flink.agents.api.chat.messages.MessageRole; import org.apache.flink.agents.api.resource.ResourceType; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java b/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java index e8fe3ac..85a5473 100644 --- a/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java +++ b/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java @@ -18,10 +18,10 @@ package org.apache.flink.agents.api.resource; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/plan/pom.xml b/plan/pom.xml index 917a358..56e4af9 100644 --- a/plan/pom.xml +++ b/plan/pom.xml @@ -40,11 +40,6 @@ under the License. <artifactId>flink-agents-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-jackson</artifactId> - <version>${flink.shaded.jackson.version}-${flink.shaded.version}</version> - </dependency> <dependency> <groupId>com.alibaba</groupId> <artifactId>pemja</artifactId> diff --git a/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java b/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java index 88ec9bd..49d8a6b 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java @@ -18,6 +18,9 @@ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.annotation.*; @@ -41,9 +44,6 @@ import org.apache.flink.agents.plan.serializer.AgentPlanJsonSerializer; import org.apache.flink.agents.plan.tools.FunctionTool; import org.apache.flink.agents.plan.tools.ToolMetadataFactory; import org.apache.flink.api.java.tuple.Tuple3; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/JavaFunction.java b/plan/src/main/java/org/apache/flink/agents/plan/JavaFunction.java index ad5279c..b99e432 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/JavaFunction.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/JavaFunction.java @@ -17,8 +17,8 @@ */ package org.apache.flink.agents.plan; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/actions/Action.java b/plan/src/main/java/org/apache/flink/agents/plan/actions/Action.java index 771e278..859795a 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/actions/Action.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/actions/Action.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.plan.actions; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.Function; import org.apache.flink.agents.plan.serializer.ActionJsonDeserializer; import org.apache.flink.agents.plan.serializer.ActionJsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.annotation.Nullable; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/resource/python/PythonTool.java b/plan/src/main/java/org/apache/flink/agents/plan/resource/python/PythonTool.java index 64eea7e..de2eeeb 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/resource/python/PythonTool.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/resource/python/PythonTool.java @@ -17,13 +17,13 @@ */ package org.apache.flink.agents.plan.resource.python; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.tools.Tool; import org.apache.flink.agents.api.tools.ToolMetadata; import org.apache.flink.agents.api.tools.ToolParameters; import org.apache.flink.agents.api.tools.ToolResponse; import org.apache.flink.agents.api.tools.ToolType; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.util.Map; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/JavaSerializableResourceProvider.java b/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/JavaSerializableResourceProvider.java index 9200cfe..7ebc656 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/JavaSerializableResourceProvider.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/JavaSerializableResourceProvider.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.resourceprovider; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.resource.Resource; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.api.resource.SerializableResource; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.util.function.BiFunction; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/ResourceProvider.java b/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/ResourceProvider.java index 2e819d2..e574444 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/ResourceProvider.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/ResourceProvider.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.resourceprovider; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.flink.agents.api.resource.Resource; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.serializer.ResourceProviderJsonDeserializer; import org.apache.flink.agents.plan.serializer.ResourceProviderJsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.function.BiFunction; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializer.java index 0ae8b8a..974dc9e 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializer.java @@ -18,16 +18,16 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.databind.node.NullNode; import org.apache.flink.agents.plan.Function; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.NullNode; import java.io.IOException; import java.util.ArrayList; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializer.java index defdf69..837be92 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializer.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.Map; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializer.java index a45ed3e..a39503e 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializer.java @@ -18,20 +18,20 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.AgentConfiguration; import org.apache.flink.agents.plan.AgentPlan; import org.apache.flink.agents.plan.actions.Action; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JacksonException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.ObjectCodec; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JavaType; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonDeserializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.util.ArrayList; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializer.java index 6fe5584..6b887f0 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializer.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.AgentPlan; import org.apache.flink.agents.plan.actions.Action; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.Map; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java index 2caf154..c64f860 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java @@ -18,6 +18,12 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.resourceprovider.JavaResourceProvider; @@ -25,12 +31,6 @@ import org.apache.flink.agents.plan.resourceprovider.JavaSerializableResourcePro import org.apache.flink.agents.plan.resourceprovider.PythonResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonSerializableResourceProvider; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.util.HashMap; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java index e876f37..fe04d5d 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java @@ -18,14 +18,14 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.flink.agents.plan.resourceprovider.JavaResourceProvider; import org.apache.flink.agents.plan.resourceprovider.JavaSerializableResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonSerializableResourceProvider; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/tools/FunctionTool.java b/plan/src/main/java/org/apache/flink/agents/plan/tools/FunctionTool.java index d6bec60..66ef21a 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/tools/FunctionTool.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/tools/FunctionTool.java @@ -20,6 +20,8 @@ package org.apache.flink.agents.plan.tools; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.flink.agents.api.annotation.ToolParam; import org.apache.flink.agents.api.tools.Tool; import org.apache.flink.agents.api.tools.ToolMetadata; @@ -30,8 +32,6 @@ import org.apache.flink.agents.plan.Function; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.tools.serializer.FunctionToolJsonDeserializer; import org.apache.flink.agents.plan.tools.serializer.FunctionToolJsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/tools/SchemaUtils.java b/plan/src/main/java/org/apache/flink/agents/plan/tools/SchemaUtils.java index 6829dfa..95394a5 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/tools/SchemaUtils.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/tools/SchemaUtils.java @@ -20,9 +20,9 @@ package org.apache.flink.agents.plan.tools; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.annotation.ToolParam; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.lang.reflect.Method; import java.lang.reflect.Parameter; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/tools/ToolMetadataFactory.java b/plan/src/main/java/org/apache/flink/agents/plan/tools/ToolMetadataFactory.java index 0b3e8da..24cfbcf 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/tools/ToolMetadataFactory.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/tools/ToolMetadataFactory.java @@ -20,9 +20,9 @@ package org.apache.flink.agents.plan.tools; +import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.agents.api.annotation.Tool; import org.apache.flink.agents.api.tools.ToolMetadata; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonDeserializer.java b/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonDeserializer.java index c75b163..c8b3282 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonDeserializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonDeserializer.java @@ -18,16 +18,16 @@ package org.apache.flink.agents.plan.tools.serializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import org.apache.flink.agents.api.tools.ToolMetadata; import org.apache.flink.agents.plan.Function; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.tools.FunctionTool; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonSerializer.java b/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonSerializer.java index ad6461d..4d2d6e8 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonSerializer.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/tools/serializer/FunctionToolJsonSerializer.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.tools.serializer; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.tools.FunctionTool; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; diff --git a/plan/src/main/java/org/apache/flink/agents/plan/utils/JsonUtils.java b/plan/src/main/java/org/apache/flink/agents/plan/utils/JsonUtils.java index e46e9e4..0229b5e 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/utils/JsonUtils.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/utils/JsonUtils.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.plan.utils; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; /** Util class for json. */ public final class JsonUtils { diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java index c8c22b9..79ef866 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java @@ -20,6 +20,7 @@ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; @@ -34,7 +35,6 @@ import org.apache.flink.agents.api.resource.Resource; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java index d74d3ce..b9cf481 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java @@ -20,6 +20,7 @@ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; @@ -32,7 +33,6 @@ import org.apache.flink.agents.api.tools.ToolMetadata; import org.apache.flink.agents.api.tools.ToolParameters; import org.apache.flink.agents.api.tools.ToolResponse; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java b/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java index 5b0b3ff..9d78a58 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java @@ -20,6 +20,8 @@ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.annotation.Tool; import org.apache.flink.agents.api.annotation.ToolParam; @@ -28,8 +30,6 @@ import org.apache.flink.agents.api.tools.ToolMetadata; import org.apache.flink.agents.api.tools.ToolParameters; import org.apache.flink.agents.api.tools.ToolResponse; import org.apache.flink.agents.plan.tools.FunctionTool; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/TestEventSerializable.java b/plan/src/test/java/org/apache/flink/agents/plan/TestEventSerializable.java index 39154b1..4d5ea51 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/TestEventSerializable.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/TestEventSerializable.java @@ -18,10 +18,10 @@ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.plan.utils.JsonUtils; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/TestFunction.java b/plan/src/test/java/org/apache/flink/agents/plan/TestFunction.java index f173b22..578d5b6 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/TestFunction.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/TestFunction.java @@ -17,10 +17,10 @@ */ package org.apache.flink.agents.plan; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/CreateJavaAgentPlanFromJson.java b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/CreateJavaAgentPlanFromJson.java index e0e576e..229c60e 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/CreateJavaAgentPlanFromJson.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/CreateJavaAgentPlanFromJson.java @@ -18,6 +18,7 @@ package org.apache.flink.agents.plan.compatibility; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.AgentPlan; @@ -26,7 +27,6 @@ import org.apache.flink.agents.plan.actions.Action; import org.apache.flink.agents.plan.resourceprovider.PythonResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonSerializableResourceProvider; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.nio.file.Files; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java index fa93bc1..a8d4b63 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.plan.compatibility; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.AgentPlan; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/resource/python/PythonToolTest.java b/plan/src/test/java/org/apache/flink/agents/plan/resource/python/PythonToolTest.java index fe8cd91..23ca721 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/resource/python/PythonToolTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/resource/python/PythonToolTest.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.plan.resource.python; +import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.agents.api.tools.ToolParameters; import org.apache.flink.agents.api.tools.ToolType; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializerTest.java index 94f903b..e38948c 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonDeserializerTest.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializerTest.java index 56fe2dd..7f7c62e 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ActionJsonSerializerTest.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.PythonFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializerTest.java index 492575f..af2b99e 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonDeserializerTest.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.AgentPlan; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java index ced31d6..f928173 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java @@ -18,6 +18,7 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; @@ -27,7 +28,6 @@ import org.apache.flink.agents.plan.AgentConfiguration; import org.apache.flink.agents.plan.AgentPlan; import org.apache.flink.agents.plan.JavaFunction; import org.apache.flink.agents.plan.actions.Action; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderDeserializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderDeserializerTest.java index 30bfbaa..ed2291a 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderDeserializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderDeserializerTest.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.resourceprovider.PythonResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonSerializableResourceProvider; import org.apache.flink.agents.plan.resourceprovider.ResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderSerializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderSerializerTest.java index c7424c9..2851580 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderSerializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/ResourceProviderSerializerTest.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.plan.serializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.resourceprovider.PythonResourceProvider; import org.apache.flink.agents.plan.resourceprovider.PythonSerializableResourceProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializationFeature; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/tools/FunctionToolTest.java b/plan/src/test/java/org/apache/flink/agents/plan/tools/FunctionToolTest.java index 0b3e9d5..1b33601 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/tools/FunctionToolTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/tools/FunctionToolTest.java @@ -18,11 +18,11 @@ package org.apache.flink.agents.plan.tools; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.annotation.Tool; import org.apache.flink.agents.api.annotation.ToolParam; import org.apache.flink.agents.api.tools.ToolMetadata; import org.apache.flink.agents.plan.JavaFunction; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index baa903d..b8b4225 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,7 @@ under the License. <flink.version>1.20.3</flink.version> <kafka.version>4.0.0</kafka.version> <junit5.version>5.10.1</junit5.version> - <flink.shaded.version>17.0</flink.shaded.version> - <flink.shaded.jackson.version>2.14.2</flink.shaded.jackson.version> + <jackson.version>2.18.2</jackson.version> <pemja.version>0.5.5</pemja.version> <log4j2.version>2.23.1</log4j2.version> <slf4j.version>1.7.36</slf4j.version> @@ -65,6 +64,19 @@ under the License. <module>dist</module> </modules> + <dependencyManagement> + <dependencies> + <!-- Jackson BOM (Bill of Materials) Unified management of all Jackson module versions --> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>${jackson.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/CompileUtils.java b/runtime/src/main/java/org/apache/flink/agents/runtime/CompileUtils.java index 5914a8a..753fd7e 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/CompileUtils.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/CompileUtils.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.runtime; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.plan.AgentPlan; import org.apache.flink.agents.runtime.operator.ActionExecutionOperatorFactory; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.functions.KeySelector; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.KeyedStream; import org.apache.flink.types.Row; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaDeserializer.java b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaDeserializer.java index a70e2a3..38e7b6a 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaDeserializer.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaDeserializer.java @@ -17,16 +17,16 @@ */ package org.apache.flink.agents.runtime.actionstate; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; import org.apache.flink.agents.runtime.operator.ActionTask; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonDeserializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.kafka.common.serialization.Deserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSeder.java b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSeder.java index 2597728..b225eb0 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSeder.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSeder.java @@ -17,16 +17,16 @@ */ package org.apache.flink.agents.runtime.actionstate; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; import org.apache.flink.agents.runtime.operator.ActionTask; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; import org.slf4j.Logger; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSerializer.java b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSerializer.java index f258157..881c529 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSerializer.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateKafkaSerializer.java @@ -17,16 +17,16 @@ */ package org.apache.flink.agents.runtime.actionstate; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; import org.apache.flink.agents.runtime.operator.ActionTask; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.kafka.common.serialization.Serializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateUtil.java b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateUtil.java index bd9429a..fc3f259 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateUtil.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/actionstate/ActionStateUtil.java @@ -17,12 +17,12 @@ */ package org.apache.flink.agents.runtime.actionstate; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.plan.actions.Action; import org.apache.flink.agents.runtime.python.event.PythonEvent; import org.apache.flink.shaded.guava31.com.google.common.base.Preconditions; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import javax.annotation.Nonnull; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/context/RunnerContextImpl.java b/runtime/src/main/java/org/apache/flink/agents/runtime/context/RunnerContextImpl.java index 4d534bd..3367398 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/context/RunnerContextImpl.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/context/RunnerContextImpl.java @@ -17,6 +17,7 @@ */ package org.apache.flink.agents.runtime.context; +import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.configuration.ReadableConfiguration; import org.apache.flink.agents.api.context.MemoryObject; @@ -29,7 +30,6 @@ import org.apache.flink.agents.plan.utils.JsonUtils; import org.apache.flink.agents.runtime.memory.CachedMemoryStore; import org.apache.flink.agents.runtime.memory.MemoryObjectImpl; import org.apache.flink.agents.runtime.metrics.FlinkAgentsMetricGroupImpl; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.util.Preconditions; import java.util.ArrayList; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecord.java b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecord.java index 149c02c..5b83452 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecord.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecord.java @@ -18,10 +18,10 @@ package org.apache.flink.agents.runtime.eventlog; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * Represents a record in the event log, containing the event context and the event itself. diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonDeserializer.java b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonDeserializer.java index 1e9ca88..f2b89d3 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonDeserializer.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonDeserializer.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.runtime.eventlog; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParser; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonDeserializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerializer.java b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerializer.java index 22c370b..89a4e0f 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerializer.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerializer.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.runtime.eventlog; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/FileEventLogger.java b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/FileEventLogger.java index 07be819..a4d0ed6 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/FileEventLogger.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/eventlog/FileEventLogger.java @@ -18,13 +18,13 @@ package org.apache.flink.agents.runtime.eventlog; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; import org.apache.flink.agents.api.EventFilter; import org.apache.flink.agents.api.logger.EventLogger; import org.apache.flink.agents.api.logger.EventLoggerConfig; import org.apache.flink.agents.api.logger.EventLoggerOpenParams; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/operator/ActionExecutionOperator.java b/runtime/src/main/java/org/apache/flink/agents/runtime/operator/ActionExecutionOperator.java index d827eb6..d69808f 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/operator/ActionExecutionOperator.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/operator/ActionExecutionOperator.java @@ -17,6 +17,7 @@ */ package org.apache.flink.agents.runtime.operator; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; import org.apache.flink.agents.api.InputEvent; @@ -65,7 +66,6 @@ import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.runtime.state.StateSnapshotContext; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.VoidNamespaceSerializer; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.streaming.api.operators.AbstractStreamOperator; import org.apache.flink.streaming.api.operators.BoundedOneInput; import org.apache.flink.streaming.api.operators.ChainingStrategy; diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/python/event/PythonEvent.java b/runtime/src/main/java/org/apache/flink/agents/runtime/python/event/PythonEvent.java index 225e3e9..8f5248d 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/python/event/PythonEvent.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/python/event/PythonEvent.java @@ -19,10 +19,10 @@ package org.apache.flink.agents.runtime.python.event; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.flink.agents.api.Event; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; import java.util.Map; diff --git a/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerdeTest.java b/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerdeTest.java index 93e2d74..6f695bd 100644 --- a/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerdeTest.java +++ b/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/EventLogRecordJsonSerdeTest.java @@ -18,12 +18,12 @@ package org.apache.flink.agents.runtime.eventlog; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/FileEventLoggerTest.java b/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/FileEventLoggerTest.java index 048883d..1a77ccf 100644 --- a/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/FileEventLoggerTest.java +++ b/runtime/src/test/java/org/apache/flink/agents/runtime/eventlog/FileEventLoggerTest.java @@ -18,6 +18,8 @@ package org.apache.flink.agents.runtime.eventlog; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.EventContext; import org.apache.flink.agents.api.EventFilter; @@ -28,8 +30,6 @@ import org.apache.flink.agents.api.logger.EventLoggerOpenParams; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobInfo; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.streaming.api.operators.StreamingRuntimeContext; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/runtime/src/test/java/org/apache/flink/agents/runtime/python/event/PythonEventTest.java b/runtime/src/test/java/org/apache/flink/agents/runtime/python/event/PythonEventTest.java index 600583e..e3a21c5 100644 --- a/runtime/src/test/java/org/apache/flink/agents/runtime/python/event/PythonEventTest.java +++ b/runtime/src/test/java/org/apache/flink/agents/runtime/python/event/PythonEventTest.java @@ -19,10 +19,10 @@ package org.apache.flink.agents.runtime.python.event; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.agents.api.EventContext; import org.apache.flink.agents.runtime.eventlog.EventLogRecord; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;
