Repository: atlas Updated Branches: refs/heads/master a5dbd157e -> a74f1b335
http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/instance/Referenceable.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/instance/Referenceable.java b/intg/src/main/java/org/apache/atlas/v1/model/instance/Referenceable.java index da397a9..083db5f 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/instance/Referenceable.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/instance/Referenceable.java @@ -19,14 +19,13 @@ package org.apache.atlas.v1.model.instance; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.atlas.model.typedef.AtlasBaseTypeDef; import org.apache.commons.collections.MapUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonFilter; -import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -38,8 +37,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/instance/Struct.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/instance/Struct.java b/intg/src/main/java/org/apache/atlas/v1/model/instance/Struct.java index 7934be8..9f0be5f 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/instance/Struct.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/instance/Struct.java @@ -18,13 +18,13 @@ package org.apache.atlas.v1.model.instance; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.atlas.model.typedef.AtlasBaseTypeDef; import org.apache.commons.collections.MapUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -32,8 +32,8 @@ import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.*; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/lineage/DataSetLineageResponse.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/lineage/DataSetLineageResponse.java b/intg/src/main/java/org/apache/atlas/v1/model/lineage/DataSetLineageResponse.java index b073bac..5c035f3 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/lineage/DataSetLineageResponse.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/lineage/DataSetLineageResponse.java @@ -17,14 +17,15 @@ */ package org.apache.atlas.v1.model.lineage; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility = PUBLIC_ONLY, setterVisibility = PUBLIC_ONLY, fieldVisibility = NONE) @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/lineage/LineageResponse.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/lineage/LineageResponse.java b/intg/src/main/java/org/apache/atlas/v1/model/lineage/LineageResponse.java index aadbba1..78e07ad 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/lineage/LineageResponse.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/lineage/LineageResponse.java @@ -17,15 +17,16 @@ */ package org.apache.atlas.v1.model.lineage; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.v1.model.instance.Struct; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility = PUBLIC_ONLY, setterVisibility = PUBLIC_ONLY, fieldVisibility = NONE) @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/lineage/SchemaResponse.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/lineage/SchemaResponse.java b/intg/src/main/java/org/apache/atlas/v1/model/lineage/SchemaResponse.java index e17553e..46498c8 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/lineage/SchemaResponse.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/lineage/SchemaResponse.java @@ -17,17 +17,19 @@ */ package org.apache.atlas.v1.model.lineage; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.v1.model.typedef.ClassTypeDefinition; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import java.util.List; import java.util.Map; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility = PUBLIC_ONLY, setterVisibility = PUBLIC_ONLY, fieldVisibility = NONE) @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/notification/EntityNotificationV1.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/notification/EntityNotificationV1.java b/intg/src/main/java/org/apache/atlas/v1/model/notification/EntityNotificationV1.java index 40bff0e..35fd7a6 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/notification/EntityNotificationV1.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/notification/EntityNotificationV1.java @@ -17,6 +17,12 @@ */ package org.apache.atlas.v1.model.notification; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.model.notification.EntityNotification; import org.apache.atlas.model.typedef.AtlasBaseTypeDef; import org.apache.atlas.v1.model.instance.Referenceable; @@ -25,10 +31,6 @@ import org.apache.atlas.type.AtlasClassificationType; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -41,8 +43,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; /** * Entity notification http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/notification/HookNotificationV1.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/notification/HookNotificationV1.java b/intg/src/main/java/org/apache/atlas/v1/model/notification/HookNotificationV1.java index 0d8050a..b3aedf0 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/notification/HookNotificationV1.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/notification/HookNotificationV1.java @@ -17,13 +17,14 @@ */ package org.apache.atlas.v1.model.notification; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.model.notification.HookNotification; import org.apache.atlas.model.typedef.AtlasBaseTypeDef; import org.apache.atlas.v1.model.instance.Referenceable; import org.apache.atlas.v1.model.typedef.TypesDef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -32,8 +33,8 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; /** * Contains the structure of messages transferred from hooks to atlas. http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/AttributeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/AttributeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/AttributeDefinition.java index a64425c..53a008a 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/AttributeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/AttributeDefinition.java @@ -18,10 +18,9 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; - +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -29,8 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/ClassTypeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/ClassTypeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/ClassTypeDefinition.java index 9e7e03c..b754b48 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/ClassTypeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/ClassTypeDefinition.java @@ -18,9 +18,9 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +29,8 @@ import java.io.Serializable; import java.util.List; import java.util.Set; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/EnumTypeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/EnumTypeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/EnumTypeDefinition.java index d2fdaf8..1943176 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/EnumTypeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/EnumTypeDefinition.java @@ -18,9 +18,10 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +30,8 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/HierarchicalTypeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/HierarchicalTypeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/HierarchicalTypeDefinition.java index 65d63a7..6cdeb75 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/HierarchicalTypeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/HierarchicalTypeDefinition.java @@ -18,9 +18,9 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -30,8 +30,8 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/Multiplicity.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/Multiplicity.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/Multiplicity.java index 653151b..6da4ce5 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/Multiplicity.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/Multiplicity.java @@ -18,16 +18,16 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.annotate.JsonDeserialize; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -37,8 +37,8 @@ import java.io.IOException; import java.io.Serializable; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/StructTypeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/StructTypeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/StructTypeDefinition.java index 842439d..13ba6a3 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/StructTypeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/StructTypeDefinition.java @@ -18,9 +18,9 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +29,8 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/TraitTypeDefinition.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/TraitTypeDefinition.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/TraitTypeDefinition.java index 9caf62a..c1af0fe 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/TraitTypeDefinition.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/TraitTypeDefinition.java @@ -18,9 +18,9 @@ package org.apache.atlas.v1.model.typedef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +29,8 @@ import java.io.Serializable; import java.util.List; import java.util.Set; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/intg/src/main/java/org/apache/atlas/v1/model/typedef/TypesDef.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/v1/model/typedef/TypesDef.java b/intg/src/main/java/org/apache/atlas/v1/model/typedef/TypesDef.java index 6a8bcb4..5477ee8 100644 --- a/intg/src/main/java/org/apache/atlas/v1/model/typedef/TypesDef.java +++ b/intg/src/main/java/org/apache/atlas/v1/model/typedef/TypesDef.java @@ -18,10 +18,12 @@ package org.apache.atlas.v1.model.typedef; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.model.typedef.AtlasBaseTypeDef; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +31,8 @@ import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.List; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java b/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java index 4d6b444..152144b 100644 --- a/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java +++ b/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java @@ -23,7 +23,6 @@ import kafka.server.KafkaServer; import kafka.utils.Time; import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; -import org.apache.atlas.model.notification.AtlasNotificationMessage; import org.apache.atlas.notification.AbstractNotification; import org.apache.atlas.notification.NotificationConsumer; import org.apache.atlas.notification.NotificationException; @@ -41,7 +40,6 @@ import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.zookeeper.server.NIOServerCnxnFactory; import org.apache.zookeeper.server.ServerCnxnFactory; import org.apache.zookeeper.server.ZooKeeperServer; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/main/java/org/apache/atlas/notification/AbstractMessageDeserializer.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/notification/AbstractMessageDeserializer.java b/notification/src/main/java/org/apache/atlas/notification/AbstractMessageDeserializer.java index a787141..fa7f488 100644 --- a/notification/src/main/java/org/apache/atlas/notification/AbstractMessageDeserializer.java +++ b/notification/src/main/java/org/apache/atlas/notification/AbstractMessageDeserializer.java @@ -18,9 +18,9 @@ package org.apache.atlas.notification; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.atlas.model.notification.AtlasNotificationMessage; import org.apache.atlas.model.notification.MessageVersion; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; /** http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/main/java/org/apache/atlas/notification/AtlasNotificationMessageDeserializer.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/notification/AtlasNotificationMessageDeserializer.java b/notification/src/main/java/org/apache/atlas/notification/AtlasNotificationMessageDeserializer.java index d6e6878..47f72c5 100644 --- a/notification/src/main/java/org/apache/atlas/notification/AtlasNotificationMessageDeserializer.java +++ b/notification/src/main/java/org/apache/atlas/notification/AtlasNotificationMessageDeserializer.java @@ -18,6 +18,7 @@ package org.apache.atlas.notification; +import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.annotations.VisibleForTesting; import org.apache.atlas.model.notification.AtlasNotificationBaseMessage; import org.apache.atlas.model.notification.AtlasNotificationBaseMessage.CompressionKind; @@ -26,7 +27,6 @@ import org.apache.atlas.model.notification.AtlasNotificationStringMessage; import org.apache.atlas.type.AtlasType; import org.apache.atlas.model.notification.MessageVersion; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +50,7 @@ public abstract class AtlasNotificationMessageDeserializer<T> implements Message public static final String VERSION_MISMATCH_MSG = "Notification message version mismatch. Expected %s but recieved %s. Message %s"; - private final TypeReference<T> messageType; + private final TypeReference<T> messageType; private final TypeReference<AtlasNotificationMessage<T>> notificationMessageType; private final MessageVersion expectedVersion; private final Logger notificationLogger; http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/main/java/org/apache/atlas/notification/entity/EntityMessageDeserializer.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/notification/entity/EntityMessageDeserializer.java b/notification/src/main/java/org/apache/atlas/notification/entity/EntityMessageDeserializer.java index fa160cf..4dd5ea2 100644 --- a/notification/src/main/java/org/apache/atlas/notification/entity/EntityMessageDeserializer.java +++ b/notification/src/main/java/org/apache/atlas/notification/entity/EntityMessageDeserializer.java @@ -18,11 +18,11 @@ package org.apache.atlas.notification.entity; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.atlas.model.notification.AtlasNotificationMessage; import org.apache.atlas.model.notification.EntityNotification; import org.apache.atlas.notification.AbstractMessageDeserializer; import org.apache.atlas.notification.AbstractNotification; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/main/java/org/apache/atlas/notification/hook/HookMessageDeserializer.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/notification/hook/HookMessageDeserializer.java b/notification/src/main/java/org/apache/atlas/notification/hook/HookMessageDeserializer.java index cab442f..e83824a 100644 --- a/notification/src/main/java/org/apache/atlas/notification/hook/HookMessageDeserializer.java +++ b/notification/src/main/java/org/apache/atlas/notification/hook/HookMessageDeserializer.java @@ -18,11 +18,11 @@ package org.apache.atlas.notification.hook; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.atlas.model.notification.AtlasNotificationMessage; import org.apache.atlas.model.notification.HookNotification; import org.apache.atlas.notification.AbstractMessageDeserializer; import org.apache.atlas.notification.AbstractNotification; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationConsumerTest.java ---------------------------------------------------------------------- diff --git a/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationConsumerTest.java b/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationConsumerTest.java index caa72ce..c963830 100644 --- a/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationConsumerTest.java +++ b/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationConsumerTest.java @@ -18,11 +18,11 @@ package org.apache.atlas.notification; +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.atlas.kafka.AtlasKafkaMessage; import org.apache.atlas.model.notification.AtlasNotificationMessage; import org.apache.atlas.type.AtlasType; import org.apache.atlas.model.notification.MessageVersion; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d47421e..0fd07e2 100644 --- a/pom.xml +++ b/pom.xml @@ -554,7 +554,7 @@ <!-- Needed for hooks --> <aopalliance.version>1.0</aopalliance.version> - <codehaus.jackson.version>1.9.13</codehaus.jackson.version> + <jackson.version>2.9.2</jackson.version> <commons-conf.version>1.10</commons-conf.version> <commons-collections.version>3.2.2</commons-collections.version> <commons-logging.version>1.1.3</commons-logging.version> @@ -907,6 +907,10 @@ <artifactId>*</artifactId> </exclusion> <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> <groupId>org.htrace</groupId> <artifactId>*</artifactId> </exclusion> @@ -946,6 +950,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency> @@ -1108,18 +1116,6 @@ <!-- JSON --> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</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>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <version>${jettison.version}</version> http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java index 5f07623..6676200 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java @@ -17,6 +17,11 @@ */ package org.apache.atlas.repository.store.bootstrap; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.AtlasException; import org.apache.atlas.exception.AtlasBaseException; @@ -39,9 +44,6 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -59,8 +61,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; /** http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/shaded/hbase-client-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/shaded/hbase-client-shaded/pom.xml b/shaded/hbase-client-shaded/pom.xml index 180ff03..8d95a5b 100644 --- a/shaded/hbase-client-shaded/pom.xml +++ b/shaded/hbase-client-shaded/pom.xml @@ -63,6 +63,7 @@ <excludes> <!-- these are bundled with Atlas --> <exclude>org.slf4j:*</exclude> + <exclude>org.codehaus.jackson:*</exclude> </excludes> </artifactSet> <relocations> http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/shaded/hbase-server-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/shaded/hbase-server-shaded/pom.xml b/shaded/hbase-server-shaded/pom.xml index 1630763..19bf73c 100644 --- a/shaded/hbase-server-shaded/pom.xml +++ b/shaded/hbase-server-shaded/pom.xml @@ -89,6 +89,7 @@ <excludes> <!-- these are bundled with Atlas --> <exclude>org.slf4j:*</exclude> + <exclude>org.codehaus.jackson:*</exclude> </excludes> </artifactSet> <relocations> http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index d40ed51..bcb5a16 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -279,11 +279,6 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/atlas/blob/a74f1b33/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java index 658be49..06931b3 100644 --- a/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java @@ -17,6 +17,11 @@ */ package org.apache.atlas.web.integration; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import org.apache.atlas.AtlasServiceException; import org.apache.atlas.model.discovery.AtlasSearchResult; import org.apache.atlas.model.discovery.SearchParameters; @@ -28,9 +33,6 @@ import org.apache.atlas.model.typedef.AtlasClassificationDef; import org.apache.atlas.model.typedef.AtlasTypesDef; import org.apache.atlas.type.AtlasTypeUtil; import org.apache.atlas.utils.TestResourceFileUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonSerialize; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -41,8 +43,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.fail;
