[EAGLE-782] Upgrade org.codehaus.jackson to com.fasterxml.jackson http://issues.apache.org/jira/browse/EAGLE-782 Upgrade org.codehaus.jackson to com.fasterxml.jackson
Author: chang chen <[email protected]> Closes #650 from baibaichen/feature/remove-codehaus. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/0a429976 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/0a429976 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/0a429976 Branch: refs/heads/master Commit: 0a4299766b852b82e33b02b5194a106998f9f4d8 Parents: 3523480 Author: chang chen <[email protected]> Authored: Fri Jan 13 17:12:30 2017 +0800 Committer: Hao Chen <[email protected]> Committed: Fri Jan 13 17:12:30 2017 +0800 ---------------------------------------------------------------------- .../model/internal/StreamWorkSlotQueue.java | 6 - .../eagle/alert/engine/scheme/JsonScheme.java | 2 +- .../alert/engine/utils/MetadataSerDeser.java | 6 +- .../engine/evaluator/PoilcyExtendedTest.java | 8 +- .../engine/statecheck/TestStateCheckPolicy.java | 8 +- .../MockMetadataChangeNotifyService.java | 2 +- .../topology/TestMetadataSpecSerDeser.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../eagle-alert-parent/eagle-alert/pom.xml | 15 - eagle-core/eagle-common/pom.xml | 4 + .../eagle/common/metric/AlertContext.java | 2 +- .../eagle/metadata/model/AlertEntity.java | 3 +- .../eagle/metadata/model/ApplicationEntity.java | 2 +- .../metadata/model/MetricSchemaEntity.java | 3 +- .../eagle/audit/entity/GenericAuditEntity.java | 4 +- .../ListQueryAPIResponseConvertHelper.java | 6 +- .../ListTimeSeriesQueryAPIResponseEntity.java | 2 +- .../RowkeyQueryAPIResponseConvertHelper.java | 6 +- .../TimeSeriesGroupByAPIResponseEntity.java | 4 +- .../org/apache/eagle/service/client/Base.java | 4 +- .../org/apache/eagle/service/client/ClassA.java | 2 +- .../org/apache/eagle/service/client/ClassB.java | 2 +- .../eagle/service/client/TestJackson.java | 6 +- .../service/jackson/TestJacksonMarshalling.java | 4 +- .../entity/GenericCreateAPIResponseEntity.java | 4 +- .../eagle/log/entity/GenericMetricEntity.java | 2 +- .../log/entity/ListQueryAPIResponseEntity.java | 4 +- .../eagle/log/entity/MetricMetadataEntity.java | 2 +- .../entity/RowkeyQueryAPIResponseEntity.java | 2 +- .../apache/eagle/log/entity/meta/Qualifier.java | 2 +- .../eagle/log/entity/test/TestEntity.java | 2 +- .../eagle/log/entity/test/TestLogAPIEntity.java | 2 +- .../entity/test/TestTimeSeriesAPIEntity.java | 2 +- .../base/taggedlog/TestTaggedLogAPIEntity.java | 2 +- .../query/aggregate/AggregateAPIEntity.java | 4 +- .../aggregate/AggregateResultAPIEntity.java | 2 +- .../timeseries/HierarchicalAggregateEntity.java | 2 +- .../query/aggregate/test/TestAggregator.java | 6 +- .../query/aggregate/test/TestBucketQuery2.java | 4 +- .../test/TestHierarchicalAggregator.java | 4 +- .../test/TestPostFlatAggregateSort.java | 4 +- .../eagle-query/eagle-service-base/pom.xml | 4 - .../generic/GenericEntityServiceResource.java | 4 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../eagle/storage/operation/RawQuery.java | 2 +- .../schema/serializer/JsonJdbcSerDeser.java | 2 +- .../queue/common/HadoopYarnResourceUtils.java | 4 +- .../hadoop/queue/model/applications/App.java | 4 +- .../hadoop/queue/model/applications/Apps.java | 4 +- .../queue/model/applications/AppsWrapper.java | 4 +- .../queue/model/cluster/ClusterMetrics.java | 4 +- .../model/cluster/ClusterMetricsWrapper.java | 4 +- .../hadoop/queue/model/scheduler/Queue.java | 4 +- .../hadoop/queue/model/scheduler/Queues.java | 4 +- .../queue/model/scheduler/ResourcesUsed.java | 4 +- .../model/scheduler/RunningQueueAPIEntity.java | 2 +- .../hadoop/queue/model/scheduler/Scheduler.java | 4 +- .../queue/model/scheduler/SchedulerInfo.java | 4 +- .../queue/model/scheduler/SchedulerWrapper.java | 4 +- .../hadoop/queue/model/scheduler/User.java | 4 +- .../hadoop/queue/model/scheduler/Users.java | 4 +- .../JobConfigurationAPIEntity.java | 2 +- .../jpm/mr/historyentity/JobCountEntity.java | 2 +- .../jpm/mr/historyentity/JobEventAPIEntity.java | 2 +- .../mr/historyentity/JobExecutionAPIEntity.java | 2 +- .../JobProcessTimeStampEntity.java | 2 +- .../TaskAttemptCounterAPIEntity.java | 2 +- .../TaskAttemptErrorCategoryEntity.java | 2 +- .../TaskAttemptExecutionAPIEntity.java | 2 +- .../historyentity/TaskExecutionAPIEntity.java | 2 +- .../TaskFailureCountAPIEntity.java | 2 +- .../mr/runningentity/JobExecutionAPIEntity.java | 2 +- .../TaskAttemptExecutionAPIEntity.java | 2 +- .../runningentity/TaskExecutionAPIEntity.java | 2 +- .../apache/eagle/jpm/spark/entity/SparkApp.java | 2 +- .../eagle/jpm/spark/entity/SparkExecutor.java | 2 +- .../apache/eagle/jpm/spark/entity/SparkJob.java | 2 +- .../eagle/jpm/spark/entity/SparkStage.java | 2 +- .../eagle/jpm/spark/entity/SparkTask.java | 2 +- .../spark/running/entities/SparkAppEntity.java | 2 +- .../running/entities/SparkExecutorEntity.java | 2 +- .../spark/running/entities/SparkJobEntity.java | 2 +- .../running/entities/SparkStageEntity.java | 2 +- .../spark/running/entities/SparkTaskEntity.java | 2 +- .../jpm/mr/running/parser/MRJobParser.java | 4 +- .../mr/running/MRRunningJobApplicationTest.java | 4 +- .../parser/MRJobEntityCreationHandlerTest.java | 4 +- .../jpm/mr/running/parser/MRJobParserTest.java | 4 +- .../running/parser/SparkApplicationParser.java | 4 +- .../util/resourcefetch/RMResourceFetcher.java | 4 +- .../SparkHistoryServerResourceFetcher.java | 4 +- .../jpm/util/resourcefetch/model/AppInfo.java | 4 +- .../util/resourcefetch/model/Applications.java | 4 +- .../util/resourcefetch/model/AppsWrapper.java | 4 +- .../util/resourcefetch/model/ClusterInfo.java | 4 +- .../resourcefetch/model/ClusterInfoWrapper.java | 4 +- .../resourcefetch/model/JobCounterGroup.java | 4 +- .../resourcefetch/model/JobCounterItem.java | 4 +- .../util/resourcefetch/model/JobCounters.java | 4 +- .../resourcefetch/model/JobCountersWrapper.java | 4 +- .../jpm/util/resourcefetch/model/MRJob.java | 4 +- .../util/resourcefetch/model/MRJobsWrapper.java | 4 +- .../jpm/util/resourcefetch/model/MRTask.java | 4 +- .../util/resourcefetch/model/MRTaskAttempt.java | 4 +- .../model/MRTaskAttemptWrapper.java | 4 +- .../resourcefetch/model/MRTaskAttempts.java | 4 +- .../jpm/util/resourcefetch/model/MRTasks.java | 4 +- .../resourcefetch/model/MRTasksWrapper.java | 4 +- .../jpm/util/resourcefetch/model/MrJobs.java | 4 +- .../resourcefetch/model/SparkApplication.java | 4 +- .../model/SparkApplicationAttempt.java | 4 +- .../model/SparkApplicationWrapper.java | 4 +- .../util/resourcefetch/model/SparkExecutor.java | 4 +- .../jpm/util/resourcefetch/model/SparkJob.java | 4 +- .../util/resourcefetch/model/SparkStage.java | 4 +- .../jpm/util/resourcefetch/model/SparkTask.java | 4 +- .../model/SparkTaskInputMetrics.java | 4 +- .../resourcefetch/model/SparkTaskMetrics.java | 4 +- .../model/SparkTaskShuffleReadMetrics.java | 4 +- .../model/SparkTaskShuffleWriteMetrics.java | 4 +- .../resourcefetch/model/TaskCounterGroup.java | 4 +- .../resourcefetch/model/TaskCounterItem.java | 4 +- .../util/resourcefetch/model/TaskCounters.java | 4 +- .../model/TaskCountersWrapper.java | 4 +- .../OozieResourceSensitivityAPIEntity.java | 2 +- .../SecurityDataEnrichServiceClientImpl.java | 2 +- .../HdfsUserCommandPatternByFileImpl.java | 4 +- .../hive/jobrunning/HiveJobFetchSpout.java | 4 +- .../org/apache/eagle/server/ServerConfig.java | 2 +- .../config/AuthenticationSettings.java | 2 +- .../authentication/config/LdapSettings.java | 2 +- .../authentication/config/SimpleSettings.java | 2 +- eagle-server/src/main/webapp/WEB-INF/web.xml | 2 +- .../extractor/mr/MRTopologyEntityParser.java | 444 +++++++++---------- .../topology/extractor/mr/YarnNodeInfo.java | 4 +- .../extractor/mr/YarnNodeInfoWrapper.java | 4 +- .../topology/extractor/mr/YarnNodeInfos.java | 4 +- .../entity/HBaseServiceTopologyAPIEntity.java | 2 +- .../entity/HdfsServiceTopologyAPIEntity.java | 247 ++++++----- .../entity/JournalNodeServiceAPIEntity.java | 2 +- .../entity/MRServiceTopologyAPIEntity.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 0 pom.xml | 1 - 143 files changed, 573 insertions(+), 592 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/internal/StreamWorkSlotQueue.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/internal/StreamWorkSlotQueue.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/internal/StreamWorkSlotQueue.java index 86b150c..6c526cb 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/internal/StreamWorkSlotQueue.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/internal/StreamWorkSlotQueue.java @@ -79,12 +79,6 @@ public class StreamWorkSlotQueue { return workingSlots.size(); } - // @org.codehaus.jackson.annotate.JsonIgnore - // @JsonIgnore - // public void placePolicy(PolicyDefinition pd) { - // policies.add(pd.getName()); - // } - public int getNumberOfGroupBolts() { return numberOfGroupBolts; } http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java index 43df203..db461d8 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java @@ -21,7 +21,7 @@ package org.apache.eagle.alert.engine.scheme; import backtype.storm.spout.Scheme; import backtype.storm.tuple.Fields; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/utils/MetadataSerDeser.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/utils/MetadataSerDeser.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/utils/MetadataSerDeser.java index f6da4a9..2229219 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/utils/MetadataSerDeser.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/utils/MetadataSerDeser.java @@ -19,9 +19,9 @@ package org.apache.eagle.alert.engine.utils; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/PoilcyExtendedTest.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/PoilcyExtendedTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/PoilcyExtendedTest.java index b9e3385..1e65edd 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/PoilcyExtendedTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/PoilcyExtendedTest.java @@ -17,9 +17,9 @@ package org.apache.eagle.alert.engine.evaluator; import org.apache.eagle.alert.engine.coordinator.PolicyDefinition; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ArrayNode; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; import org.junit.Assert; import org.junit.Test; @@ -39,7 +39,7 @@ public class PoilcyExtendedTest { mapper.readTree(PoilcyExtendedTest.class.getResourceAsStream("/extend_policy.json")); Assert.assertEquals(1, arrayNode.size()); for (JsonNode node : arrayNode) { - PolicyDefinition definition = mapper.readValue(node, PolicyDefinition.class); + PolicyDefinition definition = mapper.treeToValue(node, PolicyDefinition.class); Assert.assertNotNull(definition); Assert.assertNotNull(definition.getName()); http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java index 4c56630..f4d8303 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java @@ -33,9 +33,9 @@ import org.apache.eagle.alert.engine.model.StreamEvent; import org.apache.eagle.alert.engine.router.TestAlertBolt; import org.apache.eagle.alert.engine.runner.AlertBolt; import org.apache.eagle.alert.utils.AlertConstants; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; @@ -141,7 +141,7 @@ public class TestStateCheckPolicy { private static ObjectMapper mapper = new ObjectMapper(); static { - mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } private AlertBoltSpec createAlertSpec() throws Exception { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/MockMetadataChangeNotifyService.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/MockMetadataChangeNotifyService.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/MockMetadataChangeNotifyService.java index 1494313..b7d32ab 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/MockMetadataChangeNotifyService.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/MockMetadataChangeNotifyService.java @@ -28,7 +28,7 @@ import org.apache.eagle.alert.engine.coordinator.MetadataType; import org.apache.eagle.alert.engine.coordinator.StreamDefinition; import org.apache.eagle.alert.engine.coordinator.impl.AbstractMetadataChangeNotifyService; import org.apache.eagle.alert.engine.utils.MetadataSerDeser; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestMetadataSpecSerDeser.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestMetadataSpecSerDeser.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestMetadataSpecSerDeser.java index 6804805..03db0c3 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestMetadataSpecSerDeser.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestMetadataSpecSerDeser.java @@ -23,7 +23,7 @@ import org.apache.eagle.alert.coordination.model.*; import org.apache.eagle.alert.engine.coordinator.*; import org.apache.eagle.alert.engine.evaluator.PolicyStreamHandlers; import org.apache.eagle.alert.engine.utils.MetadataSerDeser; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/webapp/WEB-INF/web.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/webapp/WEB-INF/web.xml index 5e10197..956d724 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/webapp/WEB-INF/web.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/webapp/WEB-INF/web.xml @@ -33,7 +33,7 @@ <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> <init-param> <param-name>com.sun.jersey.config.property.packages</param-name> - <param-value>io.swagger.jaxrs.json,io.swagger.jaxrs.listing,org.apache.eagle,org.codehaus.jackson.jaxrs + <param-value>io.swagger.jaxrs.json,io.swagger.jaxrs.listing,org.apache.eagle,org.fasterxml.jackson.jaxrs </param-value> </init-param> <init-param> http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-alert-parent/eagle-alert/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml index 5726b7d..e1156ef 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml @@ -146,21 +146,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>${codehaus-jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>${codehaus-jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${codehaus-jackson.version}</version> - </dependency> - <dependency> <groupId>com.typesafe</groupId> <artifactId>config</artifactId> <version>${typesafe.config.version}</version> http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-common/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-common/pom.xml b/eagle-core/eagle-common/pom.xml index 6e94fb2..6ab250e 100644 --- a/eagle-core/eagle-common/pom.xml +++ b/eagle-core/eagle-common/pom.xml @@ -101,6 +101,10 @@ <artifactId>guice</artifactId> <version>${guice.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/metric/AlertContext.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/metric/AlertContext.java b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/metric/AlertContext.java index bf719fc..965d6b9 100644 --- a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/metric/AlertContext.java +++ b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/metric/AlertContext.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.common.metric; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/AlertEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/AlertEntity.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/AlertEntity.java index 1a09a2d..5a79d11 100644 --- a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/AlertEntity.java +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/AlertEntity.java @@ -17,10 +17,11 @@ package org.apache.eagle.metadata.model; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.eagle.alert.utils.AlertConstants; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; + import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationEntity.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationEntity.java index 75f0774..a5705d4 100644 --- a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationEntity.java +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/ApplicationEntity.java @@ -19,7 +19,7 @@ package org.apache.eagle.metadata.model; import com.google.common.base.Preconditions; import org.apache.eagle.metadata.persistence.PersistenceEntity; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.HashMap; import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/MetricSchemaEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/MetricSchemaEntity.java b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/MetricSchemaEntity.java index b64b1f6..f18932c 100644 --- a/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/MetricSchemaEntity.java +++ b/eagle-core/eagle-metadata/eagle-metadata-base/src/main/java/org/apache/eagle/metadata/model/MetricSchemaEntity.java @@ -16,10 +16,11 @@ */ package org.apache.eagle.metadata.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.eagle.common.DateTimeUtil; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-audit-base/src/main/java/org/apache/eagle/audit/entity/GenericAuditEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-audit-base/src/main/java/org/apache/eagle/audit/entity/GenericAuditEntity.java b/eagle-core/eagle-query/eagle-audit-base/src/main/java/org/apache/eagle/audit/entity/GenericAuditEntity.java index 1a365ff..2a8893f 100644 --- a/eagle-core/eagle-query/eagle-audit-base/src/main/java/org/apache/eagle/audit/entity/GenericAuditEntity.java +++ b/eagle-core/eagle-query/eagle-audit-base/src/main/java/org/apache/eagle/audit/entity/GenericAuditEntity.java @@ -25,8 +25,8 @@ import org.apache.eagle.log.entity.meta.Service; import org.apache.eagle.log.entity.meta.Table; import org.apache.eagle.log.entity.meta.Tags; import org.apache.eagle.log.entity.meta.TimeSeries; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import static org.apache.eagle.audit.common.AuditConstants.AUDIT_COLUMN_OPERATION; import static org.apache.eagle.audit.common.AuditConstants.AUDIT_COLUMN_SERVICE_NAME; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java index 3e71f4e..09c423c 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java +++ b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListQueryAPIResponseConvertHelper.java @@ -27,9 +27,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.ListQueryAPIResponseEntity; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java index 80c6aeb..2a820f4 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java +++ b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/ListTimeSeriesQueryAPIResponseEntity.java @@ -19,7 +19,7 @@ package org.apache.eagle.service.client; import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonPropertyOrder({ "success", "exception", "elapsems", "totalResults", "elapsedms", "obj" }) public class ListTimeSeriesQueryAPIResponseEntity { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java index 7dc39f0..0c1adc5 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java +++ b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/RowkeyQueryAPIResponseConvertHelper.java @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.RowkeyQueryAPIResponseEntity; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java index e1d6618..7e6f091 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java +++ b/eagle-core/eagle-query/eagle-client-base/src/main/java/org/apache/eagle/service/client/TimeSeriesGroupByAPIResponseEntity.java @@ -22,8 +22,8 @@ package org.apache.eagle.service.client; import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; //@JsonPropertyOrder({ "success", "exception", "elapsems", "totalResults", "elapsedms", "obj", "lastTimestamp" }) @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/Base.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/Base.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/Base.java index 1f54f00..b269786 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/Base.java +++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/Base.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.service.client; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; //@JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassA.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassA.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassA.java index 60158fc..c33be38 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassA.java +++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassA.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.service.client; -import org.codehaus.jackson.annotate.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ClassA") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassB.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassB.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassB.java index faa20ba..107954a 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassB.java +++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/ClassB.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.service.client; -import org.codehaus.jackson.annotate.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ClassB") public class ClassB extends Base { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java index bc0ca57..9f24d57 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java +++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java index b5689c7..54fce28 100644 --- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java +++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java @@ -23,8 +23,8 @@ import java.util.Map; import org.junit.Assert; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericCreateAPIResponseEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericCreateAPIResponseEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericCreateAPIResponseEntity.java index 6ffa621..e308bc3 100644 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericCreateAPIResponseEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericCreateAPIResponseEntity.java @@ -23,8 +23,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericMetricEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericMetricEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericMetricEntity.java index b7260f8..9f6937b 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericMetricEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/GenericMetricEntity.java @@ -18,7 +18,7 @@ package org.apache.eagle.log.entity; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * GenericMetricEntity should use prefix field which is extended from TaggedLogAPIEntity as metric name http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/ListQueryAPIResponseEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/ListQueryAPIResponseEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/ListQueryAPIResponseEntity.java index 15de946..3f748d6 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/ListQueryAPIResponseEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/ListQueryAPIResponseEntity.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.log.entity; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * TODO: (hchen9) currently we disable firstTimestamp in response avoid breaking older client implementation, but we may need to remove "firstTimestamp" from @JsonIgnoreProperties(ignoreUnknown = true,value={"firstTimestamp"}) to enable the feature later http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/MetricMetadataEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/MetricMetadataEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/MetricMetadataEntity.java index 9a58d35..a430393 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/MetricMetadataEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/MetricMetadataEntity.java @@ -21,7 +21,7 @@ import org.apache.eagle.log.entity.meta.ColumnFamily; import org.apache.eagle.log.entity.meta.Indexes; import org.apache.eagle.log.entity.meta.Service; import org.apache.eagle.log.entity.meta.Index; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.Prefix; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/RowkeyQueryAPIResponseEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/RowkeyQueryAPIResponseEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/RowkeyQueryAPIResponseEntity.java index 1745f74..953d12b 100644 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/RowkeyQueryAPIResponseEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/RowkeyQueryAPIResponseEntity.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.log.entity; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) public class RowkeyQueryAPIResponseEntity { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/meta/Qualifier.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/meta/Qualifier.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/meta/Qualifier.java index a8fc8d2..64d73dd 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/meta/Qualifier.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/meta/Qualifier.java @@ -17,7 +17,7 @@ package org.apache.eagle.log.entity.meta; import org.apache.hadoop.io.Writable; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestEntity.java index af635ec..7aeffa8 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestEntity.java @@ -20,7 +20,7 @@ import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.Column; import org.apache.eagle.log.entity.meta.ColumnFamily; import org.apache.eagle.log.entity.meta.TimeSeries; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.eagle.log.entity.meta.Prefix; import org.apache.eagle.log.entity.meta.Table; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestLogAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestLogAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestLogAPIEntity.java index d126421..99d6620 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestLogAPIEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestLogAPIEntity.java @@ -18,7 +18,7 @@ package org.apache.eagle.log.entity.test; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @Table("unittest") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestTimeSeriesAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestTimeSeriesAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestTimeSeriesAPIEntity.java index eaa9fd2..72cf5a2 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestTimeSeriesAPIEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/test/TestTimeSeriesAPIEntity.java @@ -17,7 +17,7 @@ package org.apache.eagle.log.entity.test; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java index d6db6a2..2b59831 100755 --- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java +++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java @@ -30,7 +30,7 @@ import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.Column; import org.junit.Assert; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateAPIEntity.java b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateAPIEntity.java index 1f3214f..8081c88 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateAPIEntity.java +++ b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateAPIEntity.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) public class AggregateAPIEntity { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateResultAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateResultAPIEntity.java b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateResultAPIEntity.java index c1c87d3..1015c2a 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateResultAPIEntity.java +++ b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/AggregateResultAPIEntity.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.query.aggregate; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) public class AggregateResultAPIEntity { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/timeseries/HierarchicalAggregateEntity.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/timeseries/HierarchicalAggregateEntity.java b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/timeseries/HierarchicalAggregateEntity.java index 9e78233..341fa00 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/timeseries/HierarchicalAggregateEntity.java +++ b/eagle-core/eagle-query/eagle-query-base/src/main/java/org/apache/eagle/query/aggregate/timeseries/HierarchicalAggregateEntity.java @@ -23,7 +23,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) public class HierarchicalAggregateEntity { http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java index 7b1932a..4ae4b56 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java +++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java @@ -24,9 +24,9 @@ import java.util.List; import org.junit.Assert; import org.apache.eagle.query.aggregate.*; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java index a35ab72..2ecb9d0 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java +++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java @@ -18,8 +18,8 @@ package org.apache.eagle.query.aggregate.test; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.query.aggregate.BucketQuery; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestHierarchicalAggregator.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestHierarchicalAggregator.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestHierarchicalAggregator.java index 96b36e9..b6c9212 100755 --- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestHierarchicalAggregator.java +++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestHierarchicalAggregator.java @@ -30,8 +30,8 @@ import org.apache.eagle.query.aggregate.AggregateFunctionType; import org.junit.Assert; import org.apache.eagle.query.aggregate.timeseries.SortOption; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestPostFlatAggregateSort.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestPostFlatAggregateSort.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestPostFlatAggregateSort.java index 6850d2c..91b3738 100644 --- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestPostFlatAggregateSort.java +++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestPostFlatAggregateSort.java @@ -25,8 +25,8 @@ import java.util.Map; import org.apache.eagle.query.aggregate.timeseries.PostFlatAggregateSort; import org.apache.log4j.Logger; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-service-base/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-service-base/pom.xml b/eagle-core/eagle-query/eagle-service-base/pom.xml index 91cb3a9..d8e75d1 100755 --- a/eagle-core/eagle-query/eagle-service-base/pom.xml +++ b/eagle-core/eagle-query/eagle-service-base/pom.xml @@ -150,9 +150,5 @@ <version>${powermock.version}</version> <scope>test</scope> </dependency> - <!--<dependency>--> - <!--<groupId>org.codehaus.jackson</groupId>--> - <!--<artifactId>jackson-mapper-asl</artifactId>--> - <!--</dependency>--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-service-base/src/main/java/org/apache/eagle/service/generic/GenericEntityServiceResource.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-service-base/src/main/java/org/apache/eagle/service/generic/GenericEntityServiceResource.java b/eagle-core/eagle-query/eagle-service-base/src/main/java/org/apache/eagle/service/generic/GenericEntityServiceResource.java index a0d8143..cd1c150 100644 --- a/eagle-core/eagle-query/eagle-service-base/src/main/java/org/apache/eagle/service/generic/GenericEntityServiceResource.java +++ b/eagle-core/eagle-query/eagle-service-base/src/main/java/org/apache/eagle/service/generic/GenericEntityServiceResource.java @@ -30,8 +30,8 @@ import org.apache.eagle.storage.result.ModifyResult; import org.apache.eagle.storage.result.QueryResult; import com.sun.jersey.api.json.JSONWithPadding; import org.apache.commons.lang.time.StopWatch; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.type.TypeFactory; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-service-base/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-service-base/src/main/webapp/WEB-INF/web.xml b/eagle-core/eagle-query/eagle-service-base/src/main/webapp/WEB-INF/web.xml index c6c7a8e..450be9b 100644 --- a/eagle-core/eagle-query/eagle-service-base/src/main/webapp/WEB-INF/web.xml +++ b/eagle-core/eagle-query/eagle-service-base/src/main/webapp/WEB-INF/web.xml @@ -24,7 +24,7 @@ <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> <init-param> <param-name>com.sun.jersey.config.property.packages</param-name> - <param-value>org.apache.eagle.service;org.codehaus.jackson.jaxrs</param-value> + <param-value>org.apache.eagle.service;org.fasterxml.jackson.jaxrs</param-value> </init-param> <!--init-param> <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name> http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java index 21d7c2f..9741638 100755 --- a/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java +++ b/eagle-core/eagle-query/eagle-storage-base/src/main/java/org/apache/eagle/storage/operation/RawQuery.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.storage.operation; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/serializer/JsonJdbcSerDeser.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/serializer/JsonJdbcSerDeser.java b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/serializer/JsonJdbcSerDeser.java index 5a934b8..e7b36b5 100644 --- a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/serializer/JsonJdbcSerDeser.java +++ b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/serializer/JsonJdbcSerDeser.java @@ -18,7 +18,7 @@ package org.apache.eagle.storage.jdbc.schema.serializer; import org.apache.eagle.log.entity.meta.Qualifier; import org.apache.torque.util.JdbcTypedValue; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.sql.ResultSet; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/common/HadoopYarnResourceUtils.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/common/HadoopYarnResourceUtils.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/common/HadoopYarnResourceUtils.java index 3f6606a..59bd535 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/common/HadoopYarnResourceUtils.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/common/HadoopYarnResourceUtils.java @@ -21,8 +21,8 @@ package org.apache.eagle.hadoop.queue.common; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.jpm.util.resourcefetch.connection.InputStreamUtils; import com.typesafe.config.Config; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/App.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/App.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/App.java index b741086..b1cbb42 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/App.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/App.java @@ -21,8 +21,8 @@ */ package org.apache.eagle.hadoop.queue.model.applications; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * App model for Yarn Resource http://[rm http address:port]/ws/v1/cluster/apps. http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/Apps.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/Apps.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/Apps.java index ecd1836..e5ea6cd 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/Apps.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/Apps.java @@ -21,8 +21,8 @@ */ package org.apache.eagle.hadoop.queue.model.applications; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/AppsWrapper.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/AppsWrapper.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/AppsWrapper.java index 5584226..8247383 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/AppsWrapper.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/applications/AppsWrapper.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.applications; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetrics.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetrics.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetrics.java index aca67dc..817cb4c 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetrics.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetrics.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.cluster; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetricsWrapper.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetricsWrapper.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetricsWrapper.java index bbefd99..2bd7134 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetricsWrapper.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/cluster/ClusterMetricsWrapper.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.cluster; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java index 8fa57e4..2e82a3d 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queues.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queues.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queues.java index fdf0f99..9846914 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queues.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queues.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/ResourcesUsed.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/ResourcesUsed.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/ResourcesUsed.java index 49e6a8c..fe02c12 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/ResourcesUsed.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/ResourcesUsed.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/RunningQueueAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/RunningQueueAPIEntity.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/RunningQueueAPIEntity.java index 38e8043..5b63981 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/RunningQueueAPIEntity.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/RunningQueueAPIEntity.java @@ -21,7 +21,7 @@ package org.apache.eagle.hadoop.queue.model.scheduler; import org.apache.eagle.hadoop.queue.common.HadoopClusterConstants; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Scheduler.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Scheduler.java index 09164ca..9fb890c 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Scheduler.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Scheduler.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerInfo.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerInfo.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerInfo.java index 8c51600..bfa56df 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerInfo.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerInfo.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerWrapper.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerWrapper.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerWrapper.java index 61b3685..afd0772 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerWrapper.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/SchedulerWrapper.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/User.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/User.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/User.java index 7bddf71..a90f1fb 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/User.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/User.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Users.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Users.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Users.java index fa851d1..8c0762a 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Users.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Users.java @@ -18,8 +18,8 @@ package org.apache.eagle.hadoop.queue.model.scheduler; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobConfigurationAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobConfigurationAPIEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobConfigurationAPIEntity.java index bd40c48..6298fe8 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobConfigurationAPIEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobConfigurationAPIEntity.java @@ -20,7 +20,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejpa") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobCountEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobCountEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobCountEntity.java index f18188a..5b4163a 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobCountEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobCountEntity.java @@ -21,7 +21,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejcount") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobEventAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobEventAPIEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobEventAPIEntity.java index aa2c3af..aef3750 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobEventAPIEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobEventAPIEntity.java @@ -20,7 +20,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejpa") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobExecutionAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobExecutionAPIEntity.java index 55233aa..df7b271 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobExecutionAPIEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobExecutionAPIEntity.java @@ -21,7 +21,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.jpm.util.jobcounter.JobCounters; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Map; http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobProcessTimeStampEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobProcessTimeStampEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobProcessTimeStampEntity.java index d887698..ee632f4 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobProcessTimeStampEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/JobProcessTimeStampEntity.java @@ -21,7 +21,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejpa_process") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptCounterAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptCounterAPIEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptCounterAPIEntity.java index 1bc9ca0..04fe7d7 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptCounterAPIEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptCounterAPIEntity.java @@ -20,7 +20,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejpa_anomaly") http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptErrorCategoryEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptErrorCategoryEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptErrorCategoryEntity.java index 51254c8..37f6451 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptErrorCategoryEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptErrorCategoryEntity.java @@ -19,9 +19,9 @@ package org.apache.eagle.jpm.mr.historyentity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/eagle/blob/0a429976/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptExecutionAPIEntity.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptExecutionAPIEntity.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptExecutionAPIEntity.java index c284341..8db7f5c 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptExecutionAPIEntity.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/mr/historyentity/TaskAttemptExecutionAPIEntity.java @@ -21,7 +21,7 @@ package org.apache.eagle.jpm.mr.historyentity; import org.apache.eagle.jpm.util.Constants; import org.apache.eagle.jpm.util.jobcounter.JobCounters; import org.apache.eagle.log.entity.meta.*; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @Table("eaglejpa_task")
