Replace 101tec ZkClient with Helix ZkClient

build.gradle

@@ -141,7 +141,10 @@ project(':datastream-common') {
     compile "com.linkedin.pegasus:restli-server:$pegasusVersion"
     compile "com.intellij:annotations:$intellijAnnotationsVersion"
     compile "com.google.guava:guava:$guavaVersion"
-    compile "com.linkedin.kafka.clients:li-apache-kafka-clients:$LIKafkaVersion"
+    compile "com.linkedin.kafka:kafka-clients:$kafkaVersion"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
 }
@@ -150,17 +153,16 @@ project(':datastream-server-api') {
   dependencies {
     compile project(':datastream-common')
     compile project(':datastream-utils')
-    compile "com.linkedin.kafka.clients:li-apache-kafka-clients:$LIKafkaVersion"
   }
 }
 
 project(':datastream-utils') {
   dependencies {
     compile project(':datastream-common')
-    compile "com.101tec:zkclient:$zkclientVersion"
+    compile "org.apache.helix:zookeeper-api:$helixZkclientVersion"
     compile "com.google.guava:guava:$guavaVersion"
-    testCompile project(":datastream-kafka_$scalaSuffix")
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-kafka")
+    testCompile project(":datastream-testcommon")
   }
 }
 
@@ -170,7 +172,7 @@ project(':datastream-file-connector') {
     compile project(':datastream-common')
     compile project(':datastream-utils')
     testCompile project(':datastream-server')
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-testcommon")
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
 }
@@ -186,17 +188,16 @@ project(':datastream-directory') {
   }
 }
 
-project(":datastream-kafka_$scalaSuffix") {
+project(":datastream-kafka") {
   dependencies {
     compile "com.linkedin.kafka:kafka_$scalaSuffix:$kafkaVersion"
-    compile "com.linkedin.kafka.clients:li-apache-kafka-clients:$LIKafkaVersion"
     compile "commons-httpclient:commons-httpclient:$commonsHttpClientVersion"
 
     compile project(':datastream-server')
     compile project(':datastream-server-api')
     compile project(':datastream-utils')
 
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-testcommon")
     testCompile "org.mockito:mockito-core:$mockitoVersion"
 
     tasks.create(name: "copyDependentLibs", type: Copy) {
@@ -214,34 +215,32 @@ project(":datastream-kafka_$scalaSuffix") {
 project(':datastream-kafka-factory-impl') {
   dependencies {
     compile project(':datastream-kafka-connector')
-    compile "com.linkedin.kafka.clients:li-apache-kafka-clients:$LIKafkaVersion"
 
-    testCompile project(":datastream-kafka_$scalaSuffix")
+    testCompile project(":datastream-kafka")
   }
 }
 
 project(':datastream-kafka-connector') {
   dependencies {
     compile project(':datastream-server-api')
     compile project(':datastream-common')
-    compile project(":datastream-kafka_$scalaSuffix")
-    compile "com.linkedin.kafka.clients:li-apache-kafka-clients:$LIKafkaVersion"
+    compile project(":datastream-kafka")
     compile "org.apache.httpcomponents:httpclient:$apacheHttpClientVersion"
     compile "commons-validator:commons-validator:$commonsValidatorVersion"
     compile "org.apache.commons:commons-lang3:$commonslang3Version"
     compile "javax.xml.bind:jaxb-api:2.3.1"
 
-    testCompile project(":datastream-kafka_$scalaSuffix")
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-kafka")
+    testCompile project(":datastream-testcommon")
     testCompile project(':datastream-kafka-factory-impl')
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
 }
 
-project(":datastream-testcommon_$scalaSuffix") {
+project(":datastream-testcommon") {
   dependencies {
     compile project(':datastream-server-api')
-    compile project(":datastream-kafka_$scalaSuffix")
+    compile project(":datastream-kafka")
     compile project(':datastream-common')
     compile project(':datastream-utils')
     compile project(':datastream-server')
@@ -262,7 +261,7 @@ project(':datastream-tools') {
     compile project(':datastream-common')
     compile project(':datastream-client')
     compile project(':datastream-server')
-    compile project(":datastream-testcommon_$scalaSuffix")
+    compile project(":datastream-testcommon")
     compile "commons-cli:commons-cli:$commonsCliVersion"
   }
 
@@ -285,12 +284,12 @@ project(':datastream-tools') {
     from(project(':datastream-file-connector').configurations.runtime) { into("libs/") }
     from(project(':datastream-directory').jar) { into("libs/") }
     from(project(':datastream-directory').configurations.runtime) { into("libs/") }
-    from(project(":datastream-testcommon_$scalaSuffix").jar) { into("libs/") }
-    from(project(":datastream-testcommon_$scalaSuffix").configurations.runtime) { into("libs/") }
+    from(project(":datastream-testcommon").jar) { into("libs/") }
+    from(project(":datastream-testcommon").configurations.runtime) { into("libs/") }
     from(project(':datastream-common').jar) { into("libs/") }
     from(project(':datastream-common').configurations.runtime) { into("libs/") }
-    from(project(":datastream-kafka_$scalaSuffix").jar) { into("libs/") }
-    from(project(":datastream-kafka_$scalaSuffix").configurations.runtime) { into("libs/") }
+    from(project(":datastream-kafka").jar) { into("libs/") }
+    from(project(":datastream-kafka").configurations.runtime) { into("libs/") }
     from(project(':datastream-kafka-connector').jar) { into("libs/") }
     from(project(':datastream-kafka-connector').configurations.runtime) { into("libs/") }
     duplicatesStrategy 'exclude'
@@ -309,8 +308,8 @@ project(':datastream-client') {
     compile project(':datastream-common')
     compile project(':datastream-utils')
 
-    testCompile project(":datastream-testcommon_$scalaSuffix")
-    testCompile project(":datastream-kafka_$scalaSuffix")
+    testCompile project(":datastream-testcommon")
+    testCompile project(":datastream-kafka")
     testCompile project(':datastream-server')
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
@@ -319,19 +318,19 @@ project(':datastream-client') {
 project(':datastream-server') {
 
   dependencies {
-    compile "com.101tec:zkclient:$zkclientVersion"
-    compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
-    compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
 
     compile project(':datastream-server-api')
     compile project(':datastream-common')
     compile project(':datastream-utils')
     compile project(':datastream-client')
 
-    testCompile project(":datastream-kafka_$scalaSuffix")
+    testCompile project(":datastream-kafka")
     testCompile "com.linkedin.kafka:kafka_$scalaSuffix:$kafkaVersion"
     testCompile project(':datastream-client')
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-testcommon")
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
 
@@ -355,19 +354,19 @@ project(':datastream-server-restli') {
     compile "com.linkedin.pegasus:restli-netty-standalone:$pegasusVersion"
     compile "com.linkedin.pegasus:r2-jetty:$pegasusVersion"
     compile "com.linkedin.parseq:parseq:$parseqVersion"
-    compile "com.101tec:zkclient:$zkclientVersion"
-    compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
-    compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
     compile "org.apache.commons:commons-lang3:$commonslang3Version"
 
     compile project(':datastream-server')
     compile project(':datastream-common')
 
-    testCompile project(":datastream-kafka_$scalaSuffix")
+    testCompile project(":datastream-kafka")
     testCompile "com.linkedin.kafka:kafka_$scalaSuffix:$kafkaVersion"
     testCompile project(':datastream-client')
     testCompile project(':datastream-file-connector')
-    testCompile project(":datastream-testcommon_$scalaSuffix")
+    testCompile project(":datastream-testcommon")
     testCompile "org.mockito:mockito-core:$mockitoVersion"
   }
 

datastream-common/src/main/java/com/linkedin/datastream/avrogenerator/AvroJson.java

@@ -13,9 +13,10 @@
 import java.util.Map;
 
 import org.apache.avro.Schema;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.ObjectMapper;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.google.common.base.CaseFormat;
 

datastream-common/src/main/java/com/linkedin/datastream/common/DatastreamEvent.java

@@ -6,12 +6,12 @@
 // CHECKSTYLE:OFF
 /**
  * Autogenerated by Avro
- * 
+ *
  * DO NOT EDIT DIRECTLY
  */
 package com.linkedin.datastream.common;
 
-@SuppressWarnings("all")
+@SuppressWarnings("serial")
 public class DatastreamEvent extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
   public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse("{\"type\":\"record\",\"name\":\"DatastreamEvent\",\"namespace\":\"com.linkedin.datastream.common\",\"fields\":[{\"name\":\"metadata\",\"type\":{\"type\":\"map\",\"values\":\"string\"},\"doc\":\"Event metadata.\"},{\"name\":\"key\",\"type\":\"bytes\",\"doc\":\"serialized key.\"},{\"name\":\"payload\",\"type\":\"bytes\",\"doc\":\"serialized payload data.\"},{\"name\":\"previous_payload\",\"type\":\"bytes\",\"doc\":\"serialized previous payload data.\"}]}");
   /** Event metadata. */
@@ -23,7 +23,7 @@ public class DatastreamEvent extends org.apache.avro.specific.SpecificRecordBase
   /** serialized previous payload data. */
   public java.nio.ByteBuffer previous_payload;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
-  // Used by DatumWriter.  Applications should not call. 
+  // Used by DatumWriter.  Applications should not call.
   public java.lang.Object get(int field$) {
     switch (field$) {
     case 0: return metadata;
@@ -33,7 +33,7 @@ public java.lang.Object get(int field$) {
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
-  // Used by DatumReader.  Applications should not call. 
+  // Used by DatumReader.  Applications should not call.
   @SuppressWarnings(value="unchecked")
   public void put(int field$, java.lang.Object value$) {
     switch (field$) {

datastream-common/src/main/java/com/linkedin/datastream/common/JsonUtils.java

@@ -5,24 +5,26 @@
  */
 package com.linkedin.datastream.common;
 
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.time.Instant;
 
 import org.apache.commons.lang.Validate;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.codehaus.jackson.type.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
 
 /**
  * Utility class for converting objects and JSON strings.
@@ -34,12 +36,11 @@ public final class JsonUtils {
 
   private static final ObjectMapper MAPPER = new ObjectMapper();
   static {
-    MAPPER.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-    final DeserializationConfig config = MAPPER.getDeserializationConfig();
-    config.addMixInAnnotations(Datastream.class, IgnoreDatastreamSetPausedMixIn.class);
-    config.addMixInAnnotations(DatastreamSource.class, IgnoreDatastreamSourceSetPartitionsMixIn.class);
-    config.addMixInAnnotations(DatastreamDestination.class, IgnoreDatastreamDestinationSetPartitionsMixIn.class);
+    MAPPER.addMixIn(Datastream.class, IgnoreDatastreamSetPausedMixIn.class);
+    MAPPER.addMixIn(DatastreamSource.class, IgnoreDatastreamSourceSetPartitionsMixIn.class);
+    MAPPER.addMixIn(DatastreamDestination.class, IgnoreDatastreamDestinationSetPartitionsMixIn.class);
   }
 
   /**