From 45050d87d33a3139063d58a8530708d395335233 Mon Sep 17 00:00:00 2001 From: perkss Date: Thu, 11 Feb 2021 21:53:43 +0000 Subject: [PATCH] SAMZA-2620: Jackson upgrade. --- build.gradle | 25 ++++-- gradle/dependency-versions.gradle | 2 +- .../apache/samza/serializers/JsonSerdeV2.java | 4 +- .../apache/samza/sql/SamzaSqlRelRecord.java | 2 +- .../apache/samza/startpoint/Startpoint.java | 2 +- .../samza/system/EndOfStreamMessage.java | 4 +- .../apache/samza/system/WatermarkMessage.java | 4 +- .../consumer/KinesisSystemConsumerOffset.java | 4 +- ...ContainerPlacementMessageObjectMapper.java | 42 ++++----- .../ContainerPlacementMetadataStore.java | 2 +- .../container/ContainerHeartbeatClient.java | 2 +- .../container/ContainerHeartbeatResponse.java | 3 +- .../task/TaskPartitionAssignmentManager.java | 4 +- .../JobCoordinatorMetadataManager.java | 2 +- .../metadatastore/CoordinatorStreamStore.java | 4 +- .../coordinator/server/LocalityServlet.java | 2 +- .../apache/samza/execution/ExecutionPlan.java | 2 +- .../execution/JobGraphJsonGenerator.java | 4 +- .../apache/samza/job/model/JobModelUtil.java | 2 +- .../model/JsonContainerModelMixIn.java | 4 +- .../JsonJobCoordinatorMetadataMixIn.java | 6 +- .../serializers/model/JsonJobModelMixIn.java | 6 +- .../model/JsonLocalityModelMixIn.java | 6 +- .../model/JsonProcessorLocalityMixIn.java | 6 +- .../serializers/model/JsonTaskModelMixIn.java | 6 +- .../serializers/model/SamzaObjectMapper.java | 90 +++++++++---------- .../startpoint/StartpointFanOutPerTask.java | 4 +- .../samza/startpoint/StartpointManager.java | 2 +- .../startpoint/StartpointObjectMapper.java | 22 ++--- .../samza/storage/StorageManagerUtil.java | 10 +-- .../java/org/apache/samza/zk/ZkUtils.java | 2 +- .../diagnostics/DiagnosticsStreamMessage.java | 4 +- .../samza/serializers/CheckpointSerde.scala | 4 +- .../apache/samza/serializers/JsonSerde.scala | 2 +- .../serializers/MetricsSnapshotSerde.scala | 2 +- .../serializers/MetricsSnapshotSerdeV2.java | 2 +- .../TestContainerPlacementObjectMapper.java | 2 +- .../MockCoordinatorStreamWrappedConsumer.java | 2 +- .../TestCoordinatorStreamSystemProducer.java | 2 +- .../stream/TestCoordinatorStreamWriter.java | 2 +- .../execution/TestJobGraphJsonGenerator.java | 2 +- .../model/TestSamzaObjectMapper.java | 6 +- .../TestStartpointObjectMapper.java | 2 +- .../system/hdfs/PartitionDescriptorUtil.java | 2 +- .../kafka/KafkaCheckpointLogKeySerde.java | 2 +- .../org/apache/samza/monitor/JobsClient.java | 4 +- .../java/org/apache/samza/rest/model/Job.java | 2 +- .../apache/samza/rest/model/Partition.java | 2 +- .../org/apache/samza/rest/model/Task.java | 2 +- .../rest/model/yarn/YarnApplicationInfo.java | 6 +- .../proxy/job/YarnRestJobStatusProvider.java | 6 +- .../rest/resources/TestJobsResource.java | 4 +- .../rest/resources/TestTasksResource.java | 4 +- .../samza/sql/client/impl/SamzaExecutor.java | 2 +- .../samza/sql/data/SamzaSqlRelMessage.java | 2 +- .../sql/data/SamzaSqlRelMsgMetadata.java | 4 +- .../sql/runner/SamzaSqlApplicationConfig.java | 2 +- .../SamzaSqlRelMessageSerdeFactory.java | 5 +- .../SamzaSqlRelRecordSerdeFactory.java | 4 +- .../org/apache/samza/sql/util/JsonUtil.java | 8 +- .../samza/test/controlmessages/TestData.java | 8 +- .../operator/TestRepartitionWindowApp.java | 2 +- .../samza/test/operator/data/PageView.java | 2 +- .../test/operator/data/UserPageAdClick.java | 4 +- .../samza/test/table/TestTableData.java | 8 +- .../tools/ConsoleLoggingSystemFactory.java | 2 +- .../tools/json/JsonRelConverterFactory.java | 4 +- .../webapp/ApplicationMasterRestClient.java | 4 +- .../webapp/YarnContainerHeartbeatServlet.java | 2 +- .../webapp/ApplicationMasterRestServlet.scala | 2 +- .../TestApplicationMasterRestClient.java | 4 +- .../samza/webapp/TestLocalityServlet.java | 2 +- .../TestYarnContainerHeartbeatServlet.java | 2 +- 73 files changed, 210 insertions(+), 209 deletions(-) diff --git a/build.gradle b/build.gradle index 29311694bb..9c48b2382d 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,7 @@ project(':samza-api') { dependencies { compile "org.apache.commons:commons-lang3:$commonsLang3Version" - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "com.google.guava:guava:$guavaVersion" compile "com.google.code.gson:gson:$gsonVersion" compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -190,7 +190,7 @@ project(":samza-core_$scalaSuffix") { compile "org.apache.commons:commons-collections4:$apacheCommonsCollections4Version" compile "org.apache.commons:commons-lang3:$commonsLang3Version" compile "commons-io:commons-io:$commonsIoVersion" - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "org.eclipse.jetty:jetty-webapp:$jettyVersion" compile "org.scala-lang:scala-library:$scalaVersion" compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -222,7 +222,7 @@ project(":samza-azure_$scalaSuffix") { compile "com.azure:azure-storage-blob:12.0.1" compile "com.microsoft.azure:azure-storage:5.3.1" compile "com.microsoft.azure:azure-eventhubs:1.0.1" - compile "com.fasterxml.jackson.core:jackson-core:2.10.0" + compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" compile "io.dropwizard.metrics:metrics-core:3.1.2" compile "org.apache.avro:avro:$avroVersion" compile project(':samza-api') @@ -244,8 +244,7 @@ project(":samza-aws_$scalaSuffix") { compile "com.amazonaws:amazon-kinesis-client:1.7.5" compile "com.amazonaws:amazon-kinesis-producer:0.10.0" compile "io.dropwizard.metrics:metrics-core:3.1.2" - compile "org.codehaus.jackson:jackson-core-asl:1.9.7" - compile "org.codehaus.jackson:jackson-mapper-asl:1.9.7" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile project(':samza-api') compile project(":samza-core_$scalaSuffix") compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -393,7 +392,7 @@ project(":samza-kafka_$scalaSuffix") { compile "org.scala-lang:scala-library:$scalaVersion" compile "com.101tec:zkclient:$zkClientVersion" compile "org.apache.zookeeper:zookeeper:$zookeeperVersion" - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion" compile "org.apache.kafka:kafka-clients:$kafkaVersion" testCompile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion:test" @@ -405,6 +404,14 @@ project(":samza-kafka_$scalaSuffix") { // Logging in tests is good. testRuntime "org.slf4j:slf4j-simple:$slf4jVersion" + + constraints { + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" + compile "com.fasterxml.jackson.module:jackson-module-scala_$scalaSuffix:$jacksonVersion" + compile "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$jacksonVersion" + compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion" + } } test { @@ -428,7 +435,7 @@ project(":samza-log4j_$scalaSuffix") { compile "org.slf4j:slf4j-log4j12:$slf4jVersion" compile project(':samza-api') compile project(":samza-core_$scalaSuffix") - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" testCompile "junit:junit:$junitVersion" } } @@ -443,7 +450,7 @@ project(":samza-log4j2_$scalaSuffix") { compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version" compile project(':samza-api') compile project(":samza-core_$scalaSuffix") - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" testCompile "junit:junit:$junitVersion" } } @@ -467,7 +474,7 @@ project(":samza-yarn_$scalaSuffix") { compile "org.scala-lang:scala-library:$scalaVersion" compile "org.scala-lang:scala-compiler:$scalaVersion" compile "com.google.guava:guava:$guavaVersion" - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "commons-httpclient:commons-httpclient:$commonsHttpClientVersion" compile "org.apache.httpcomponents:httpclient:$httpClientVersion" compile("org.apache.hadoop:hadoop-yarn-api:$yarnVersion") { diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle index e10d09ee85..434c06ba0e 100644 --- a/gradle/dependency-versions.gradle +++ b/gradle/dependency-versions.gradle @@ -32,7 +32,7 @@ guavaVersion = "23.0" hamcrestVersion = "1.3" httpClientVersion = "4.4.1" - jacksonVersion = "1.9.13" + jacksonVersion = "2.12.2" jerseyVersion = "2.22.1" jettyVersion = "9.4.20.v20190813" jodaTimeVersion = "2.2" diff --git a/samza-api/src/main/java/org/apache/samza/serializers/JsonSerdeV2.java b/samza-api/src/main/java/org/apache/samza/serializers/JsonSerdeV2.java index d5b0022ecb..99adc862b6 100644 --- a/samza-api/src/main/java/org/apache/samza/serializers/JsonSerdeV2.java +++ b/samza-api/src/main/java/org/apache/samza/serializers/JsonSerdeV2.java @@ -19,9 +19,9 @@ package org.apache.samza.serializers; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.SamzaException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-api/src/main/java/org/apache/samza/sql/SamzaSqlRelRecord.java b/samza-api/src/main/java/org/apache/samza/sql/SamzaSqlRelRecord.java index 1dee734869..1a3566a7f1 100644 --- a/samza-api/src/main/java/org/apache/samza/sql/SamzaSqlRelRecord.java +++ b/samza-api/src/main/java/org/apache/samza/sql/SamzaSqlRelRecord.java @@ -26,7 +26,7 @@ import java.util.Objects; import java.util.Optional; import org.apache.samza.annotation.InterfaceStability; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-api/src/main/java/org/apache/samza/startpoint/Startpoint.java b/samza-api/src/main/java/org/apache/samza/startpoint/Startpoint.java index a48962b6fc..deb97711fd 100644 --- a/samza-api/src/main/java/org/apache/samza/startpoint/Startpoint.java +++ b/samza-api/src/main/java/org/apache/samza/startpoint/Startpoint.java @@ -22,7 +22,7 @@ import com.google.common.base.Objects; import java.time.Instant; import org.apache.samza.annotation.InterfaceStability; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * Startpoint represents a position in a stream partition. diff --git a/samza-api/src/main/java/org/apache/samza/system/EndOfStreamMessage.java b/samza-api/src/main/java/org/apache/samza/system/EndOfStreamMessage.java index 59d0356355..91bb5e086c 100644 --- a/samza-api/src/main/java/org/apache/samza/system/EndOfStreamMessage.java +++ b/samza-api/src/main/java/org/apache/samza/system/EndOfStreamMessage.java @@ -19,8 +19,8 @@ package org.apache.samza.system; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * The EndOfStreamMessage is a control message that is sent out to next stage diff --git a/samza-api/src/main/java/org/apache/samza/system/WatermarkMessage.java b/samza-api/src/main/java/org/apache/samza/system/WatermarkMessage.java index ba41724f93..73de38063c 100644 --- a/samza-api/src/main/java/org/apache/samza/system/WatermarkMessage.java +++ b/samza-api/src/main/java/org/apache/samza/system/WatermarkMessage.java @@ -19,8 +19,8 @@ package org.apache.samza.system; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * The WatermarkMessage is a control message that is sent out to next stage diff --git a/samza-aws/src/main/java/org/apache/samza/system/kinesis/consumer/KinesisSystemConsumerOffset.java b/samza-aws/src/main/java/org/apache/samza/system/kinesis/consumer/KinesisSystemConsumerOffset.java index 541c19cbdb..f57e9f315c 100644 --- a/samza-aws/src/main/java/org/apache/samza/system/kinesis/consumer/KinesisSystemConsumerOffset.java +++ b/samza-aws/src/main/java/org/apache/samza/system/kinesis/consumer/KinesisSystemConsumerOffset.java @@ -19,10 +19,10 @@ package org.apache.samza.system.kinesis.consumer; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.samza.SamzaException; import org.apache.samza.serializers.JsonSerdeV2; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; /** diff --git a/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMessageObjectMapper.java b/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMessageObjectMapper.java index e3294a29e2..ec33e98352 100644 --- a/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMessageObjectMapper.java +++ b/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMessageObjectMapper.java @@ -23,21 +23,21 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.samza.container.placement.ContainerPlacementMessage; import org.apache.samza.container.placement.ContainerPlacementRequestMessage; import org.apache.samza.container.placement.ContainerPlacementResponseMessage; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.ObjectCodec; -import org.codehaus.jackson.Version; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.jsontype.NamedType; -import org.codehaus.jackson.map.module.SimpleModule; /** * Object mapper for serializing and deserializing Container placement messages @@ -100,17 +100,17 @@ public ContainerPlacementMessage deserialize(JsonParser jsonParser, Deserializat throws IOException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - String subType = node.get("subType").getTextValue(); - String deploymentId = node.get("deploymentId").getTextValue(); - String processorId = node.get("processorId").getTextValue(); - String destinationHost = node.get("destinationHost").getTextValue(); - long timestamp = node.get("timestamp").getLongValue(); + String subType = node.get("subType").textValue(); + String deploymentId = node.get("deploymentId").textValue(); + String processorId = node.get("processorId").textValue(); + String destinationHost = node.get("destinationHost").textValue(); + long timestamp = node.get("timestamp").longValue(); Duration requestExpiry = - node.get("requestExpiry") == null ? null : Duration.ofMillis(node.get("requestExpiry").getLongValue()); + node.get("requestExpiry") == null ? null : Duration.ofMillis(node.get("requestExpiry").longValue()); ContainerPlacementMessage.StatusCode statusCode = null; - UUID uuid = UUID.fromString(node.get("uuid").getTextValue()); + UUID uuid = UUID.fromString(node.get("uuid").textValue()); for (ContainerPlacementMessage.StatusCode code : ContainerPlacementMessage.StatusCode.values()) { - if (code.name().equals(node.get("statusCode").getTextValue())) { + if (code.name().equals(node.get("statusCode").textValue())) { statusCode = code; } } @@ -118,7 +118,7 @@ public ContainerPlacementMessage deserialize(JsonParser jsonParser, Deserializat if (subType.equals(ContainerPlacementRequestMessage.class.getSimpleName())) { message = new ContainerPlacementRequestMessage(uuid, deploymentId, processorId, destinationHost, requestExpiry, timestamp); } else if (subType.equals(ContainerPlacementResponseMessage.class.getSimpleName())) { - String responseMessage = node.get("responseMessage").getTextValue(); + String responseMessage = node.get("responseMessage").textValue(); message = new ContainerPlacementResponseMessage(uuid, deploymentId, processorId, destinationHost, requestExpiry, statusCode, responseMessage, timestamp); } diff --git a/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMetadataStore.java b/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMetadataStore.java index 593cf3df04..64db5d9d8a 100644 --- a/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMetadataStore.java +++ b/samza-core/src/main/java/org/apache/samza/clustermanager/container/placement/ContainerPlacementMetadataStore.java @@ -18,6 +18,7 @@ */ package org.apache.samza.clustermanager.container.placement; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import java.io.IOException; @@ -36,7 +37,6 @@ import org.apache.samza.container.placement.ContainerPlacementResponseMessage; import org.apache.samza.coordinator.metadatastore.NamespaceAwareCoordinatorStreamStore; import org.apache.samza.metadatastore.MetadataStore; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java index 8a90549742..8d134bbb89 100644 --- a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java +++ b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatClient.java @@ -19,6 +19,7 @@ package org.apache.samza.container; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -27,7 +28,6 @@ import java.util.stream.Collectors; import org.apache.samza.coordinator.CoordinationConstants; import org.apache.samza.util.HttpUtil; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatResponse.java b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatResponse.java index d402ef13ca..7374ab8910 100644 --- a/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatResponse.java +++ b/samza-core/src/main/java/org/apache/samza/container/ContainerHeartbeatResponse.java @@ -19,8 +19,7 @@ package org.apache.samza.container; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonProperty; /** * Used to represent the heartbeat response between diff --git a/samza-core/src/main/java/org/apache/samza/container/grouper/task/TaskPartitionAssignmentManager.java b/samza-core/src/main/java/org/apache/samza/container/grouper/task/TaskPartitionAssignmentManager.java index 9b9c71e47a..bfa356b788 100644 --- a/samza-core/src/main/java/org/apache/samza/container/grouper/task/TaskPartitionAssignmentManager.java +++ b/samza-core/src/main/java/org/apache/samza/container/grouper/task/TaskPartitionAssignmentManager.java @@ -26,8 +26,8 @@ import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.model.SamzaObjectMapper; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; diff --git a/samza-core/src/main/java/org/apache/samza/coordinator/JobCoordinatorMetadataManager.java b/samza-core/src/main/java/org/apache/samza/coordinator/JobCoordinatorMetadataManager.java index cbc901468f..860c596a67 100644 --- a/samza-core/src/main/java/org/apache/samza/coordinator/JobCoordinatorMetadataManager.java +++ b/samza-core/src/main/java/org/apache/samza/coordinator/JobCoordinatorMetadataManager.java @@ -18,6 +18,7 @@ */ package org.apache.samza.coordinator; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSortedSet; @@ -40,7 +41,6 @@ import org.apache.samza.metrics.MetricsRegistry; import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.model.SamzaObjectMapper; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java b/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java index b72d231fc1..6bb638b070 100644 --- a/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java +++ b/samza-core/src/main/java/org/apache/samza/coordinator/metadatastore/CoordinatorStreamStore.java @@ -18,6 +18,8 @@ */ package org.apache.samza.coordinator.metadatastore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; @@ -49,8 +51,6 @@ import org.apache.samza.system.SystemStreamPartition; import org.apache.samza.system.SystemStreamPartitionIterator; import org.apache.samza.util.CoordinatorStreamUtil; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-core/src/main/java/org/apache/samza/coordinator/server/LocalityServlet.java b/samza-core/src/main/java/org/apache/samza/coordinator/server/LocalityServlet.java index 24e12ff694..68d0d57281 100644 --- a/samza-core/src/main/java/org/apache/samza/coordinator/server/LocalityServlet.java +++ b/samza-core/src/main/java/org/apache/samza/coordinator/server/LocalityServlet.java @@ -18,6 +18,7 @@ */ package org.apache.samza.coordinator.server; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Optional; import javax.servlet.http.HttpServlet; @@ -27,7 +28,6 @@ import org.apache.samza.job.model.ProcessorLocality; import org.apache.samza.job.model.LocalityModel; import org.apache.samza.serializers.model.SamzaObjectMapper; -import org.codehaus.jackson.map.ObjectMapper; /** diff --git a/samza-core/src/main/java/org/apache/samza/execution/ExecutionPlan.java b/samza-core/src/main/java/org/apache/samza/execution/ExecutionPlan.java index 3eb2e96ae0..d17daaea7e 100644 --- a/samza-core/src/main/java/org/apache/samza/execution/ExecutionPlan.java +++ b/samza-core/src/main/java/org/apache/samza/execution/ExecutionPlan.java @@ -55,7 +55,7 @@ public interface ExecutionPlan { * Returns the JSON representation of the plan. * @return JSON string * @throws Exception exception during JSON serialization, including {@link java.io.IOException} - * and {@link org.codehaus.jackson.JsonGenerationException} + * and {@link com.fasterxml.jackson.core.JsonGenerationException} */ String getPlanAsJson() throws Exception; } diff --git a/samza-core/src/main/java/org/apache/samza/execution/JobGraphJsonGenerator.java b/samza-core/src/main/java/org/apache/samza/execution/JobGraphJsonGenerator.java index e42b530f05..58641e4c82 100644 --- a/samza-core/src/main/java/org/apache/samza/execution/JobGraphJsonGenerator.java +++ b/samza-core/src/main/java/org/apache/samza/execution/JobGraphJsonGenerator.java @@ -19,6 +19,8 @@ package org.apache.samza.execution; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import java.io.ByteArrayOutputStream; import java.util.ArrayList; @@ -40,8 +42,6 @@ import org.apache.samza.operators.spec.StreamTableJoinOperatorSpec; import org.apache.samza.table.descriptors.BaseTableDescriptor; import org.apache.samza.table.descriptors.TableDescriptor; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; /** * This class generates the JSON representation of the {@link JobGraph}. diff --git a/samza-core/src/main/java/org/apache/samza/job/model/JobModelUtil.java b/samza-core/src/main/java/org/apache/samza/job/model/JobModelUtil.java index 377fa94e9f..f9438c3bdc 100644 --- a/samza-core/src/main/java/org/apache/samza/job/model/JobModelUtil.java +++ b/samza-core/src/main/java/org/apache/samza/job/model/JobModelUtil.java @@ -30,7 +30,7 @@ import org.apache.samza.serializers.model.SamzaObjectMapper; import org.apache.samza.system.SystemStream; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Utility class for the {@link JobModel} diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonContainerModelMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonContainerModelMixIn.java index f18c42af9e..2f8f3862bc 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonContainerModelMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonContainerModelMixIn.java @@ -19,16 +19,16 @@ package org.apache.samza.serializers.model; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import org.apache.samza.container.TaskName; import org.apache.samza.job.model.TaskModel; -import org.codehaus.jackson.annotate.JsonProperty; /** * A mix-in Jackson class to convert {@link org.apache.samza.job.model.ContainerModel} to JSON. * Notes: * 1) Constructor is not needed because this mixin is not used for deserialization. See {@link SamzaObjectMapper}. - * 2) It is unnecessary to use {@link org.codehaus.jackson.annotate.JsonIgnoreProperties#ignoreUnknown()} here since + * 2) It is unnecessary to use {@link com.fasterxml.jackson.annotation.JsonIgnoreProperties#ignoreUnknown()} here since * {@link SamzaObjectMapper} already uses custom deserialization code for the * {@link org.apache.samza.job.model.ContainerModel}. * 3) See {@link SamzaObjectMapper} for more context about why the JSON keys are named in this specified way. diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobCoordinatorMetadataMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobCoordinatorMetadataMixIn.java index 5aab8c188a..caa3b2178a 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobCoordinatorMetadataMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobCoordinatorMetadataMixIn.java @@ -18,9 +18,9 @@ */ package org.apache.samza.serializers.model; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * A mix-in Jackson class to convert {@link org.apache.samza.job.JobCoordinatorMetadata} to/from JSON diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobModelMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobModelMixIn.java index c40173a658..b1cdb4d5f4 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobModelMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonJobModelMixIn.java @@ -19,12 +19,12 @@ package org.apache.samza.serializers.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import org.apache.samza.config.Config; import org.apache.samza.job.model.ContainerModel; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; /** * A mix-in Jackson class to convert Samza's JobModel to/from JSON. diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonLocalityModelMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonLocalityModelMixIn.java index 79b1367d46..8119a102ed 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonLocalityModelMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonLocalityModelMixIn.java @@ -18,11 +18,11 @@ */ package org.apache.samza.serializers.model; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import org.apache.samza.job.model.ProcessorLocality; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; /** diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonProcessorLocalityMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonProcessorLocalityMixIn.java index cce573eca3..a3b161cff8 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonProcessorLocalityMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonProcessorLocalityMixIn.java @@ -18,9 +18,9 @@ */ package org.apache.samza.serializers.model; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonTaskModelMixIn.java b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonTaskModelMixIn.java index a812968669..4f92ee82b9 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/JsonTaskModelMixIn.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/JsonTaskModelMixIn.java @@ -21,12 +21,12 @@ import java.util.Set; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.samza.Partition; import org.apache.samza.container.TaskName; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; /** diff --git a/samza-core/src/main/java/org/apache/samza/serializers/model/SamzaObjectMapper.java b/samza-core/src/main/java/org/apache/samza/serializers/model/SamzaObjectMapper.java index 3a0205d7ce..5c5078f47b 100644 --- a/samza-core/src/main/java/org/apache/samza/serializers/model/SamzaObjectMapper.java +++ b/samza-core/src/main/java/org/apache/samza/serializers/model/SamzaObjectMapper.java @@ -19,9 +19,26 @@ package org.apache.samza.serializers.model; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.KeyDeserializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.cfg.MapperConfig; +import com.fasterxml.jackson.databind.introspect.AnnotatedField; +import com.fasterxml.jackson.databind.introspect.AnnotatedMethod; +import com.fasterxml.jackson.databind.module.SimpleModule; import org.apache.samza.Partition; import org.apache.samza.SamzaException; import org.apache.samza.config.Config; @@ -36,25 +53,9 @@ import org.apache.samza.job.model.TaskModel; import org.apache.samza.system.SystemStream; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonProcessingException; -import org.codehaus.jackson.ObjectCodec; -import org.codehaus.jackson.Version; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.KeyDeserializer; -import org.codehaus.jackson.map.MapperConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.PropertyNamingStrategy; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.introspect.AnnotatedField; -import org.codehaus.jackson.map.introspect.AnnotatedMethod; -import org.codehaus.jackson.map.module.SimpleModule; -import org.codehaus.jackson.type.TypeReference; - +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /** *

* A collection of utility classes and (de)serializers to make Samza's job model @@ -78,6 +79,8 @@ public class SamzaObjectMapper { */ public static ObjectMapper getObjectMapper() { ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.WRAP_EXCEPTIONS, false); + mapper.configure(SerializationFeature.WRAP_EXCEPTIONS, false); SimpleModule module = new SimpleModule("SamzaModule", new Version(1, 0, 0, "")); // Setup custom serdes for simple data types. @@ -94,11 +97,9 @@ public static ObjectMapper getObjectMapper() { module.addDeserializer(TaskMode.class, new TaskModeDeserializer()); // Setup mixins for data models. - mapper.getSerializationConfig().addMixInAnnotations(TaskModel.class, JsonTaskModelMixIn.class); - mapper.getDeserializationConfig().addMixInAnnotations(TaskModel.class, JsonTaskModelMixIn.class); - mapper.getSerializationConfig().addMixInAnnotations(ContainerModel.class, JsonContainerModelMixIn.class); - mapper.getSerializationConfig().addMixInAnnotations(JobModel.class, JsonJobModelMixIn.class); - mapper.getDeserializationConfig().addMixInAnnotations(JobModel.class, JsonJobModelMixIn.class); + mapper.addMixIn(TaskModel.class, JsonTaskModelMixIn.class); + mapper.addMixIn(ContainerModel.class, JsonContainerModelMixIn.class); + mapper.addMixIn(JobModel.class, JsonJobModelMixIn.class); module.addDeserializer(ContainerModel.class, new JsonDeserializer() { @Override @@ -122,27 +123,22 @@ public ContainerModel deserialize(JsonParser jp, DeserializationContext ctxt) th String.format("JobModel was missing %s and %s. This should never happen. JobModel corrupt!", JsonContainerModelMixIn.PROCESSOR_ID_KEY, JsonContainerModelMixIn.CONTAINER_ID_KEY)); } - id = String.valueOf(node.get(JsonContainerModelMixIn.CONTAINER_ID_KEY).getIntValue()); + id = String.valueOf(node.get(JsonContainerModelMixIn.CONTAINER_ID_KEY).intValue()); } else { - id = node.get(JsonContainerModelMixIn.PROCESSOR_ID_KEY).getTextValue(); + id = node.get(JsonContainerModelMixIn.PROCESSOR_ID_KEY).textValue(); } Map tasksMapping = - OBJECT_MAPPER.readValue(node.get(JsonContainerModelMixIn.TASKS_KEY), + OBJECT_MAPPER.readValue(OBJECT_MAPPER.treeAsTokens(node.get(JsonContainerModelMixIn.TASKS_KEY)), new TypeReference>() { }); return new ContainerModel(id, tasksMapping); } }); - mapper.getSerializationConfig().addMixInAnnotations(LocalityModel.class, JsonLocalityModelMixIn.class); - mapper.getDeserializationConfig().addMixInAnnotations(LocalityModel.class, JsonLocalityModelMixIn.class); - mapper.getSerializationConfig().addMixInAnnotations(ProcessorLocality.class, JsonProcessorLocalityMixIn.class); - mapper.getDeserializationConfig().addMixInAnnotations(ProcessorLocality.class, JsonProcessorLocalityMixIn.class); + mapper.addMixIn(LocalityModel.class, JsonLocalityModelMixIn.class); + mapper.addMixIn(ProcessorLocality.class, JsonProcessorLocalityMixIn.class); // Register mixins for job coordinator metadata model - mapper.getSerializationConfig() - .addMixInAnnotations(JobCoordinatorMetadata.class, JsonJobCoordinatorMetadataMixIn.class); - mapper.getDeserializationConfig() - .addMixInAnnotations(JobCoordinatorMetadata.class, JsonJobCoordinatorMetadataMixIn.class); + mapper.addMixIn(JobCoordinatorMetadata.class, JsonJobCoordinatorMetadataMixIn.class); // Convert camel case to hyphenated field names, and register the module. mapper.setPropertyNamingStrategy(new CamelCaseToDashesStrategy()); @@ -156,7 +152,7 @@ public static class ConfigDeserializer extends JsonDeserializer { public Config deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - return new MapConfig(OBJECT_MAPPER.>readValue(node, new TypeReference>() { + return new MapConfig(OBJECT_MAPPER.readValue(OBJECT_MAPPER.treeAsTokens(node), new TypeReference>() { })); } } @@ -164,7 +160,7 @@ public Config deserialize(JsonParser jsonParser, DeserializationContext context) public static class PartitionSerializer extends JsonSerializer { @Override public void serialize(Partition partition, JsonGenerator jsonGenerator, SerializerProvider provider) throws IOException, JsonProcessingException { - jsonGenerator.writeObject(Integer.valueOf(partition.getPartitionId())); + jsonGenerator.writeObject(partition.getPartitionId()); } } @@ -173,7 +169,7 @@ public static class PartitionDeserializer extends JsonDeserializer { public Partition deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - return new Partition(node.getIntValue()); + return new Partition(node.intValue()); } } @@ -189,7 +185,7 @@ public static class TaskNameDeserializer extends JsonDeserializer { public TaskName deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException, JsonProcessingException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - return new TaskName(node.getTextValue()); + return new TaskName(node.textValue()); } } @@ -206,10 +202,10 @@ public TaskMode deserialize(JsonParser jsonParser, DeserializationContext contex throws IOException, JsonProcessingException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - if (node == null || node.getTextValue().equals("")) { + if (node == null || node.textValue().equals("")) { return TaskMode.Active; } else { - return TaskMode.valueOf(node.getTextValue()); + return TaskMode.valueOf(node.textValue()); } } } @@ -252,9 +248,9 @@ public static class SystemStreamPartitionDeserializer extends JsonDeserializer Offset cannot be stored directly because diff --git a/samza-core/src/main/scala/org/apache/samza/serializers/JsonSerde.scala b/samza-core/src/main/scala/org/apache/samza/serializers/JsonSerde.scala index 5ea0f0de2a..e922cd2a53 100644 --- a/samza-core/src/main/scala/org/apache/samza/serializers/JsonSerde.scala +++ b/samza-core/src/main/scala/org/apache/samza/serializers/JsonSerde.scala @@ -19,10 +19,10 @@ package org.apache.samza.serializers +import com.fasterxml.jackson.core.`type`.TypeReference import org.apache.samza.SamzaException import org.apache.samza.config.Config import org.apache.samza.serializers.model.SamzaObjectMapper -import org.codehaus.jackson.`type`.TypeReference import org.slf4j.LoggerFactory diff --git a/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerde.scala b/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerde.scala index 8fe3c37f37..ca3ad24371 100644 --- a/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerde.scala +++ b/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerde.scala @@ -18,8 +18,8 @@ */ package org.apache.samza.serializers +import com.fasterxml.jackson.databind.ObjectMapper import org.apache.samza.config.Config -import org.codehaus.jackson.map.ObjectMapper import org.apache.samza.metrics.reporter.MetricsSnapshot class MetricsSnapshotSerde extends Serde[MetricsSnapshot] { diff --git a/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerdeV2.java b/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerdeV2.java index 6ab7ce8f4f..768d355048 100644 --- a/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerdeV2.java +++ b/samza-core/src/main/scala/org/apache/samza/serializers/MetricsSnapshotSerdeV2.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.metrics.reporter.MetricsSnapshot; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-core/src/test/java/org/apache/samza/clustermanager/container/placement/TestContainerPlacementObjectMapper.java b/samza-core/src/test/java/org/apache/samza/clustermanager/container/placement/TestContainerPlacementObjectMapper.java index e8e46e3f23..429811e894 100644 --- a/samza-core/src/test/java/org/apache/samza/clustermanager/container/placement/TestContainerPlacementObjectMapper.java +++ b/samza-core/src/test/java/org/apache/samza/clustermanager/container/placement/TestContainerPlacementObjectMapper.java @@ -23,10 +23,10 @@ import java.time.Duration; import java.util.Random; import java.util.UUID; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.container.placement.ContainerPlacementMessage; import org.apache.samza.container.placement.ContainerPlacementRequestMessage; import org.apache.samza.container.placement.ContainerPlacementResponseMessage; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java b/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java index 136fe5e36d..7000e29119 100644 --- a/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java +++ b/samza-core/src/test/java/org/apache/samza/coordinator/stream/MockCoordinatorStreamWrappedConsumer.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.SamzaException; import org.apache.samza.config.Config; import org.apache.samza.coordinator.stream.messages.SetChangelogMapping; @@ -32,7 +33,6 @@ import org.apache.samza.system.IncomingMessageEnvelope; import org.apache.samza.system.SystemStreamPartition; import org.apache.samza.util.BlockingEnvelopeMap; -import org.codehaus.jackson.map.ObjectMapper; /** * A mock SystemConsumer that pretends to be a coordinator stream. The mock will diff --git a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemProducer.java b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemProducer.java index d6ca2ca407..42b00b017c 100644 --- a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemProducer.java +++ b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamSystemProducer.java @@ -35,7 +35,7 @@ import org.apache.samza.system.OutgoingMessageEnvelope; import org.apache.samza.system.SystemStream; import org.apache.samza.util.SinglePartitionWithoutOffsetsSystemAdmin; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; public class TestCoordinatorStreamSystemProducer { diff --git a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamWriter.java b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamWriter.java index ee069fd52b..893e5e749a 100644 --- a/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamWriter.java +++ b/samza-core/src/test/java/org/apache/samza/coordinator/stream/TestCoordinatorStreamWriter.java @@ -25,7 +25,7 @@ import org.apache.samza.execution.JobPlanner; import org.apache.samza.serializers.model.SamzaObjectMapper; import org.apache.samza.system.OutgoingMessageEnvelope; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import java.lang.reflect.Field; diff --git a/samza-core/src/test/java/org/apache/samza/execution/TestJobGraphJsonGenerator.java b/samza-core/src/test/java/org/apache/samza/execution/TestJobGraphJsonGenerator.java index 665b70a8b7..ea0f477386 100644 --- a/samza-core/src/test/java/org/apache/samza/execution/TestJobGraphJsonGenerator.java +++ b/samza-core/src/test/java/org/apache/samza/execution/TestJobGraphJsonGenerator.java @@ -56,7 +56,7 @@ import org.apache.samza.table.descriptors.TableDescriptor; import org.apache.samza.table.descriptors.TestLocalTableDescriptor; import org.apache.samza.testUtils.StreamTestUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; diff --git a/samza-core/src/test/java/org/apache/samza/serializers/model/TestSamzaObjectMapper.java b/samza-core/src/test/java/org/apache/samza/serializers/model/TestSamzaObjectMapper.java index 305efcdf4e..532b674d47 100644 --- a/samza-core/src/test/java/org/apache/samza/serializers/model/TestSamzaObjectMapper.java +++ b/samza-core/src/test/java/org/apache/samza/serializers/model/TestSamzaObjectMapper.java @@ -19,6 +19,8 @@ package org.apache.samza.serializers.model; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.io.IOException; @@ -35,9 +37,7 @@ import org.apache.samza.job.model.TaskMode; import org.apache.samza.job.model.TaskModel; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ArrayNode; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; diff --git a/samza-core/src/test/java/org/apache/samza/startpoint/TestStartpointObjectMapper.java b/samza-core/src/test/java/org/apache/samza/startpoint/TestStartpointObjectMapper.java index 70a3bf775a..426f808d25 100644 --- a/samza-core/src/test/java/org/apache/samza/startpoint/TestStartpointObjectMapper.java +++ b/samza-core/src/test/java/org/apache/samza/startpoint/TestStartpointObjectMapper.java @@ -22,7 +22,7 @@ import java.time.Instant; import org.apache.samza.Partition; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/samza-hdfs/src/main/java/org/apache/samza/system/hdfs/PartitionDescriptorUtil.java b/samza-hdfs/src/main/java/org/apache/samza/system/hdfs/PartitionDescriptorUtil.java index 5abdbbc2a7..894d3eacdb 100644 --- a/samza-hdfs/src/main/java/org/apache/samza/system/hdfs/PartitionDescriptorUtil.java +++ b/samza-hdfs/src/main/java/org/apache/samza/system/hdfs/PartitionDescriptorUtil.java @@ -28,7 +28,7 @@ import org.apache.hadoop.fs.Path; import org.apache.samza.Partition; import org.apache.samza.SamzaException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/samza-kafka/src/main/java/org/apache/samza/checkpoint/kafka/KafkaCheckpointLogKeySerde.java b/samza-kafka/src/main/java/org/apache/samza/checkpoint/kafka/KafkaCheckpointLogKeySerde.java index cc771d30c7..b00f12e779 100644 --- a/samza-kafka/src/main/java/org/apache/samza/checkpoint/kafka/KafkaCheckpointLogKeySerde.java +++ b/samza-kafka/src/main/java/org/apache/samza/checkpoint/kafka/KafkaCheckpointLogKeySerde.java @@ -18,11 +18,11 @@ */ package org.apache.samza.checkpoint.kafka; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import org.apache.samza.SamzaException; import org.apache.samza.container.TaskName; import org.apache.samza.serializers.Serde; -import org.codehaus.jackson.map.ObjectMapper; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/samza-rest/src/main/java/org/apache/samza/monitor/JobsClient.java b/samza-rest/src/main/java/org/apache/samza/monitor/JobsClient.java index 4dc00b3bab..c4127eacfe 100644 --- a/samza-rest/src/main/java/org/apache/samza/monitor/JobsClient.java +++ b/samza-rest/src/main/java/org/apache/samza/monitor/JobsClient.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.function.Function; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.codec.binary.StringUtils; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; @@ -34,8 +36,6 @@ import org.apache.samza.rest.model.Task; import org.apache.samza.rest.proxy.job.JobInstance; import org.apache.samza.rest.resources.ResourceConstants; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-rest/src/main/java/org/apache/samza/rest/model/Job.java b/samza-rest/src/main/java/org/apache/samza/rest/model/Job.java index e540635f0e..fbd3c6e9f5 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/model/Job.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/model/Job.java @@ -18,7 +18,7 @@ */ package org.apache.samza.rest.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-rest/src/main/java/org/apache/samza/rest/model/Partition.java b/samza-rest/src/main/java/org/apache/samza/rest/model/Partition.java index 8911cb884b..c1ab3a37b6 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/model/Partition.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/model/Partition.java @@ -19,7 +19,7 @@ package org.apache.samza.rest.model; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-rest/src/main/java/org/apache/samza/rest/model/Task.java b/samza-rest/src/main/java/org/apache/samza/rest/model/Task.java index bb3c46cfff..3f47911f77 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/model/Task.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/model/Task.java @@ -19,7 +19,7 @@ package org.apache.samza.rest.model; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-rest/src/main/java/org/apache/samza/rest/model/yarn/YarnApplicationInfo.java b/samza-rest/src/main/java/org/apache/samza/rest/model/yarn/YarnApplicationInfo.java index a696999c14..085372beb8 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/model/yarn/YarnApplicationInfo.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/model/yarn/YarnApplicationInfo.java @@ -19,11 +19,11 @@ package org.apache.samza.rest.model.yarn; import java.util.Collections; +import com.fasterxml.jackson.annotation.JsonRootName; import org.apache.samza.rest.proxy.job.JobInstance; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; -import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("apps") diff --git a/samza-rest/src/main/java/org/apache/samza/rest/proxy/job/YarnRestJobStatusProvider.java b/samza-rest/src/main/java/org/apache/samza/rest/proxy/job/YarnRestJobStatusProvider.java index e0b79ef3d6..ea8380c309 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/proxy/job/YarnRestJobStatusProvider.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/proxy/job/YarnRestJobStatusProvider.java @@ -18,6 +18,8 @@ */ package org.apache.samza.rest.proxy.job; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.DeserializationFeature; import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -35,8 +37,6 @@ import org.apache.samza.rest.model.yarn.YarnApplicationInfo.YarnApplication; import org.apache.samza.rest.resources.JobsResourceConfig; import org.apache.samza.rest.resources.YarnJobResourceConfig; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public YarnRestJobStatusProvider(JobsResourceConfig config) { this.httpClient = new HttpClient(); this.apiEndpoint = String.format("http://%s/ws/v1/cluster/apps", yarnConfig.getYarnResourceManagerEndpoint()); - OBJECT_MAPPER.configure(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE, true); + OBJECT_MAPPER.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); } @Override diff --git a/samza-rest/src/test/java/org/apache/samza/rest/resources/TestJobsResource.java b/samza-rest/src/test/java/org/apache/samza/rest/resources/TestJobsResource.java index 6e53d846fc..17855c383c 100644 --- a/samza-rest/src/test/java/org/apache/samza/rest/resources/TestJobsResource.java +++ b/samza-rest/src/test/java/org/apache/samza/rest/resources/TestJobsResource.java @@ -34,8 +34,8 @@ import org.apache.samza.rest.resources.mock.MockJobProxyFactory; import org.apache.samza.rest.resources.mock.MockResourceFactory; import org.apache.samza.serializers.model.SamzaObjectMapper; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/samza-rest/src/test/java/org/apache/samza/rest/resources/TestTasksResource.java b/samza-rest/src/test/java/org/apache/samza/rest/resources/TestTasksResource.java index ecb54ad81a..4d9e62c63a 100644 --- a/samza-rest/src/test/java/org/apache/samza/rest/resources/TestTasksResource.java +++ b/samza-rest/src/test/java/org/apache/samza/rest/resources/TestTasksResource.java @@ -33,8 +33,8 @@ import org.apache.samza.rest.resources.mock.MockTaskProxy; import org.apache.samza.rest.resources.mock.MockTaskProxyFactory; import org.apache.samza.serializers.model.SamzaObjectMapper; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/samza-sql-shell/src/main/java/org/apache/samza/sql/client/impl/SamzaExecutor.java b/samza-sql-shell/src/main/java/org/apache/samza/sql/client/impl/SamzaExecutor.java index b062758db1..3e9126dd39 100755 --- a/samza-sql-shell/src/main/java/org/apache/samza/sql/client/impl/SamzaExecutor.java +++ b/samza-sql-shell/src/main/java/org/apache/samza/sql/client/impl/SamzaExecutor.java @@ -53,7 +53,7 @@ import org.apache.samza.tools.avro.AvroSerDeFactory; import org.apache.samza.tools.json.JsonRelConverterFactory; import org.apache.samza.tools.schemas.ProfileChangeEvent; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMessage.java b/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMessage.java index 2baa8afcd9..ce532169fc 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMessage.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMessage.java @@ -25,7 +25,7 @@ import java.util.Objects; import org.apache.commons.lang3.Validate; import org.apache.samza.sql.SamzaSqlRelRecord; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMsgMetadata.java b/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMsgMetadata.java index ee8264905a..0c275e5939 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMsgMetadata.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/data/SamzaSqlRelMsgMetadata.java @@ -20,8 +20,8 @@ package org.apache.samza.sql.data; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/samza-sql/src/main/java/org/apache/samza/sql/runner/SamzaSqlApplicationConfig.java b/samza-sql/src/main/java/org/apache/samza/sql/runner/SamzaSqlApplicationConfig.java index f98879ca9e..8d8722919b 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/runner/SamzaSqlApplicationConfig.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/runner/SamzaSqlApplicationConfig.java @@ -58,7 +58,7 @@ import org.apache.samza.sql.util.JsonUtil; import org.apache.samza.sql.util.SamzaSqlQueryParser; import org.apache.samza.util.ReflectionUtil; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelMessageSerdeFactory.java b/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelMessageSerdeFactory.java index dc016f1889..7fb90115c4 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelMessageSerdeFactory.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelMessageSerdeFactory.java @@ -19,14 +19,13 @@ package org.apache.samza.sql.serializers; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.SamzaException; import org.apache.samza.config.Config; import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.SerdeFactory; import org.apache.samza.sql.data.SamzaSqlRelMessage; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; - /** * A serializer for {@link SamzaSqlRelMessage}. This serializer preserves the type information as diff --git a/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelRecordSerdeFactory.java b/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelRecordSerdeFactory.java index dd62bfccb2..8da49505d5 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelRecordSerdeFactory.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/serializers/SamzaSqlRelRecordSerdeFactory.java @@ -19,13 +19,13 @@ package org.apache.samza.sql.serializers; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.samza.SamzaException; import org.apache.samza.config.Config; import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.SerdeFactory; import org.apache.samza.sql.SamzaSqlRelRecord; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; /** diff --git a/samza-sql/src/main/java/org/apache/samza/sql/util/JsonUtil.java b/samza-sql/src/main/java/org/apache/samza/sql/util/JsonUtil.java index 47c761aeb5..b117a18ed7 100644 --- a/samza-sql/src/main/java/org/apache/samza/sql/util/JsonUtil.java +++ b/samza-sql/src/main/java/org/apache/samza/sql/util/JsonUtil.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.io.StringWriter; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.lang3.Validate; import org.apache.samza.SamzaException; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public class JsonUtil { private static final Logger LOG = LoggerFactory.getLogger(JsonUtil.class.getName()); static { - MAPPER.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } private JsonUtil() { diff --git a/samza-test/src/test/java/org/apache/samza/test/controlmessages/TestData.java b/samza-test/src/test/java/org/apache/samza/test/controlmessages/TestData.java index 8541b55e3d..52d8380f36 100644 --- a/samza-test/src/test/java/org/apache/samza/test/controlmessages/TestData.java +++ b/samza-test/src/test/java/org/apache/samza/test/controlmessages/TestData.java @@ -24,10 +24,10 @@ import org.apache.samza.config.Config; import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.SerdeFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; public class TestData { diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/TestRepartitionWindowApp.java b/samza-test/src/test/java/org/apache/samza/test/operator/TestRepartitionWindowApp.java index f377b05037..77ada4a3f9 100644 --- a/samza-test/src/test/java/org/apache/samza/test/operator/TestRepartitionWindowApp.java +++ b/samza-test/src/test/java/org/apache/samza/test/operator/TestRepartitionWindowApp.java @@ -28,7 +28,7 @@ import org.apache.samza.config.TaskConfig; import org.apache.samza.test.framework.StreamApplicationIntegrationTestHarness; import org.apache.samza.test.operator.data.PageView; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/data/PageView.java b/samza-test/src/test/java/org/apache/samza/test/operator/data/PageView.java index e950366cda..17f1378dc9 100644 --- a/samza-test/src/test/java/org/apache/samza/test/operator/data/PageView.java +++ b/samza-test/src/test/java/org/apache/samza/test/operator/data/PageView.java @@ -20,7 +20,7 @@ import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class PageView implements Serializable { private String viewId; diff --git a/samza-test/src/test/java/org/apache/samza/test/operator/data/UserPageAdClick.java b/samza-test/src/test/java/org/apache/samza/test/operator/data/UserPageAdClick.java index e5f7b53849..c7f4958a4b 100644 --- a/samza-test/src/test/java/org/apache/samza/test/operator/data/UserPageAdClick.java +++ b/samza-test/src/test/java/org/apache/samza/test/operator/data/UserPageAdClick.java @@ -18,8 +18,8 @@ */ package org.apache.samza.test.operator.data; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; public class UserPageAdClick { private String userId; diff --git a/samza-test/src/test/java/org/apache/samza/test/table/TestTableData.java b/samza-test/src/test/java/org/apache/samza/test/table/TestTableData.java index 21e57a83ac..76c56b05c4 100644 --- a/samza-test/src/test/java/org/apache/samza/test/table/TestTableData.java +++ b/samza-test/src/test/java/org/apache/samza/test/table/TestTableData.java @@ -26,10 +26,10 @@ import org.apache.samza.config.Config; import org.apache.samza.serializers.Serde; import org.apache.samza.serializers.SerdeFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; public class TestTableData { diff --git a/samza-tools/src/main/java/org/apache/samza/tools/ConsoleLoggingSystemFactory.java b/samza-tools/src/main/java/org/apache/samza/tools/ConsoleLoggingSystemFactory.java index d544e12c15..6b0a8b0d07 100644 --- a/samza-tools/src/main/java/org/apache/samza/tools/ConsoleLoggingSystemFactory.java +++ b/samza-tools/src/main/java/org/apache/samza/tools/ConsoleLoggingSystemFactory.java @@ -19,6 +19,7 @@ package org.apache.samza.tools; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Collections; import java.util.Map; @@ -37,7 +38,6 @@ import org.apache.samza.system.SystemProducer; import org.apache.samza.system.SystemStreamMetadata; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-tools/src/main/java/org/apache/samza/tools/json/JsonRelConverterFactory.java b/samza-tools/src/main/java/org/apache/samza/tools/json/JsonRelConverterFactory.java index f2c3769086..37f858fa34 100644 --- a/samza-tools/src/main/java/org/apache/samza/tools/json/JsonRelConverterFactory.java +++ b/samza-tools/src/main/java/org/apache/samza/tools/json/JsonRelConverterFactory.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.util.List; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.NotImplementedException; import org.apache.samza.SamzaException; import org.apache.samza.config.Config; @@ -31,8 +33,6 @@ import org.apache.samza.sql.interfaces.SamzaRelConverter; import org.apache.samza.sql.interfaces.SamzaRelConverterFactory; import org.apache.samza.system.SystemStream; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; /** diff --git a/samza-yarn/src/main/java/org/apache/samza/webapp/ApplicationMasterRestClient.java b/samza-yarn/src/main/java/org/apache/samza/webapp/ApplicationMasterRestClient.java index 354e71e735..f890d2b6a1 100644 --- a/samza-yarn/src/main/java/org/apache/samza/webapp/ApplicationMasterRestClient.java +++ b/samza-yarn/src/main/java/org/apache/samza/webapp/ApplicationMasterRestClient.java @@ -18,6 +18,8 @@ */ package org.apache.samza.webapp; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import java.io.Closeable; import java.io.IOException; import java.util.Map; @@ -30,8 +32,6 @@ import org.apache.http.util.EntityUtils; import org.apache.samza.SamzaException; import org.apache.samza.serializers.model.SamzaObjectMapper; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; /** diff --git a/samza-yarn/src/main/java/org/apache/samza/webapp/YarnContainerHeartbeatServlet.java b/samza-yarn/src/main/java/org/apache/samza/webapp/YarnContainerHeartbeatServlet.java index b683d35a67..5b1f282291 100644 --- a/samza-yarn/src/main/java/org/apache/samza/webapp/YarnContainerHeartbeatServlet.java +++ b/samza-yarn/src/main/java/org/apache/samza/webapp/YarnContainerHeartbeatServlet.java @@ -33,7 +33,7 @@ import org.apache.samza.job.yarn.YarnContainer; import org.apache.samza.metrics.Counter; import org.apache.samza.metrics.ReadableMetricsRegistry; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala b/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala index 56017f146f..b7bd9fd99f 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala @@ -29,11 +29,11 @@ import org.apache.samza.job.yarn.{ClientHelper, YarnAppState} import org.apache.samza.metrics._ import scala.collection.JavaConverters._ +import com.fasterxml.jackson.databind.ObjectMapper import org.apache.hadoop.yarn.conf.YarnConfiguration import java.util.HashMap import org.apache.samza.serializers.model.SamzaObjectMapper -import org.codehaus.jackson.map.ObjectMapper object ApplicationMasterRestServlet { def getMetrics(jsonMapper: ObjectMapper, metricsRegistry: ReadableMetricsRegistry) = { diff --git a/samza-yarn/src/test/java/org/apache/samza/webapp/TestApplicationMasterRestClient.java b/samza-yarn/src/test/java/org/apache/samza/webapp/TestApplicationMasterRestClient.java index 3090d70b9c..f60f232e6a 100644 --- a/samza-yarn/src/test/java/org/apache/samza/webapp/TestApplicationMasterRestClient.java +++ b/samza-yarn/src/test/java/org/apache/samza/webapp/TestApplicationMasterRestClient.java @@ -58,8 +58,8 @@ import org.apache.samza.serializers.model.SamzaObjectMapper; import org.apache.samza.system.SystemStream; import org.apache.samza.system.SystemStreamPartition; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/samza-yarn/src/test/java/org/apache/samza/webapp/TestLocalityServlet.java b/samza-yarn/src/test/java/org/apache/samza/webapp/TestLocalityServlet.java index 56d7ae11e3..27cf784147 100644 --- a/samza-yarn/src/test/java/org/apache/samza/webapp/TestLocalityServlet.java +++ b/samza-yarn/src/test/java/org/apache/samza/webapp/TestLocalityServlet.java @@ -29,7 +29,7 @@ import org.apache.samza.serializers.model.SamzaObjectMapper; import org.apache.samza.util.ExponentialSleepStrategy; import org.apache.samza.util.HttpUtil; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; diff --git a/samza-yarn/src/test/java/org/apache/samza/webapp/TestYarnContainerHeartbeatServlet.java b/samza-yarn/src/test/java/org/apache/samza/webapp/TestYarnContainerHeartbeatServlet.java index 0901d85a83..b69c52a5a6 100644 --- a/samza-yarn/src/test/java/org/apache/samza/webapp/TestYarnContainerHeartbeatServlet.java +++ b/samza-yarn/src/test/java/org/apache/samza/webapp/TestYarnContainerHeartbeatServlet.java @@ -32,7 +32,7 @@ import org.apache.samza.metrics.ReadableMetricsRegistry; import org.apache.samza.util.ExponentialSleepStrategy; import org.apache.samza.util.HttpUtil; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After;