Migrating java-util from Metamarkets. (#3585)

* Migrating java-util from Metamarkets.

* checkstyle and updated license on java-util files.

* Removed unused imports from whole project.

* cherry pick metamx/java-util@826021f.

* Copyright changes on java-util pom, address review comments.

NOTICE

@@ -22,3 +22,11 @@ This product contains variable length long deserialization code adapted from Apa
     * https://github.com/apache/lucene-solr/blob/master/lucene/LICENSE.txt (Apache License, Version 2.0)
   * HOMEPAGE:
     * https://github.com/apache/lucene-solr
+
+This product contains a modified version of Metamarkets java-util library
+  * LICENSE:
+    * https://github.com/metamx/java-util/blob/master/LICENSE (Apache License, Version 2.0)
+  * HOMEPAGE:
+    * https://github.com/metamx/java-util
+  * COMMIT TAG:
+    * https://github.com/metamx/java-util/commit/826021f

api/pom.xml

@@ -33,8 +33,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.metamx</groupId>
+            <groupId>io.druid</groupId>
             <artifactId>java-util</artifactId>
+            <version>${project.parent.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>

api/src/main/java/io/druid/data/input/FirehoseFactory.java

@@ -20,8 +20,9 @@
 package io.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.common.parsers.ParseException;
+
 import io.druid.data.input.impl.InputRowParser;
+import io.druid.java.util.common.parsers.ParseException;
 
 import java.io.IOException;
 

api/src/main/java/io/druid/data/input/FirehoseFactoryV2.java

@@ -20,8 +20,9 @@
 package io.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.common.parsers.ParseException;
+
 import io.druid.data.input.impl.InputRowParser;
+import io.druid.java.util.common.parsers.ParseException;
 
 import java.io.IOException;
 /**

api/src/main/java/io/druid/data/input/MapBasedRow.java

@@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-import com.metamx.common.IAE;
-import com.metamx.common.logger.Logger;
-import com.metamx.common.parsers.ParseException;
+
+import io.druid.java.util.common.logger.Logger;
+import io.druid.java.util.common.parsers.ParseException;
+
 import org.joda.time.DateTime;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

api/src/main/java/io/druid/data/input/Row.java

@@ -21,7 +21,6 @@ package io.druid.data.input;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.common.parsers.ParseException;
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/Rows.java

@@ -22,7 +22,8 @@ package io.druid.data.input;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Maps;
-import com.metamx.common.ISE;
+
+import io.druid.java.util.common.ISE;
 
 import java.util.List;
 import java.util.Map;

api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java

@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.metamx.common.parsers.CSVParser;
-import com.metamx.common.parsers.ParseException;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.CSVParser;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java

@@ -21,10 +21,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.metamx.common.parsers.DelimitedParser;
-import com.metamx.common.parsers.ParseException;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.DelimitedParser;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/impl/DimensionSchema.java

@@ -25,12 +25,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.base.Preconditions;
 
-import java.util.List;
-
 /**
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = StringDimensionSchema.class)

api/src/main/java/io/druid/data/input/impl/DimensionsSpec.java

@@ -26,7 +26,8 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.metamx.common.parsers.ParserUtils;
+
+import io.druid.java.util.common.parsers.ParserUtils;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;

api/src/main/java/io/druid/data/input/impl/InputRowParser.java

@@ -19,7 +19,6 @@ package io.druid.data.input.impl;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.common.parsers.ParseException;
 import io.druid.data.input.InputRow;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = StringInputRowParser.class)

api/src/main/java/io/druid/data/input/impl/JSONLowercaseParseSpec.java

@@ -20,8 +20,9 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.metamx.common.parsers.JSONToLowerParser;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.JSONToLowerParser;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/impl/JSONParseSpec.java

@@ -21,8 +21,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.metamx.common.parsers.JSONPathParser;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.JSONPathParser;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;

api/src/main/java/io/druid/data/input/impl/JavaScriptParseSpec.java

@@ -22,9 +22,10 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.common.ISE;
-import com.metamx.common.parsers.JavaScriptParser;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.ISE;
+import io.druid.java.util.common.parsers.JavaScriptParser;
+import io.druid.java.util.common.parsers.Parser;
 import io.druid.js.JavaScriptConfig;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/impl/MapInputRowParser.java

@@ -21,10 +21,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.metamx.common.logger.Logger;
-import com.metamx.common.parsers.ParseException;
+
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
+import io.druid.java.util.common.parsers.ParseException;
+
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/impl/ParseSpec.java

@@ -20,7 +20,8 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/impl/RegexParseSpec.java

@@ -23,8 +23,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.metamx.common.parsers.Parser;
-import com.metamx.common.parsers.RegexParser;
+
+import io.druid.java.util.common.parsers.Parser;
+import io.druid.java.util.common.parsers.RegexParser;
 
 import java.util.List;
 

api/src/main/java/io/druid/data/input/impl/SpatialDimensionSchema.java

@@ -18,7 +18,6 @@
 package io.druid.data.input.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;

api/src/main/java/io/druid/data/input/impl/StringInputRowParser.java

@@ -20,10 +20,11 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Charsets;
-import com.metamx.common.parsers.ParseException;
-import com.metamx.common.parsers.Parser;
+
 import io.druid.data.input.ByteBufferInputRowParser;
 import io.druid.data.input.InputRow;
+import io.druid.java.util.common.parsers.ParseException;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

api/src/main/java/io/druid/data/input/impl/TimeAndDimsParseSpec.java

@@ -21,7 +21,8 @@ package io.druid.data.input.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.List;
 import java.util.Map;

api/src/main/java/io/druid/data/input/impl/TimestampSpec.java

@@ -20,7 +20,9 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
-import com.metamx.common.parsers.TimestampParser;
+
+import io.druid.java.util.common.parsers.TimestampParser;
+
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/main/java/io/druid/guice/JsonConfigurator.java

@@ -33,7 +33,8 @@ import com.google.common.collect.Maps;
 import com.google.inject.Inject;
 import com.google.inject.ProvisionException;
 import com.google.inject.spi.Message;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.ElementKind;

api/src/main/java/io/druid/guice/LifecycleModule.java

@@ -27,7 +27,8 @@ import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
-import com.metamx.common.lifecycle.Lifecycle;
+
+import io.druid.java.util.common.lifecycle.Lifecycle;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
@@ -48,8 +49,8 @@ public class LifecycleModule implements Module
    * scope.  That is, they are generally eagerly loaded because the loading operation will produce some beneficial
    * side-effect even if nothing actually directly depends on the instance.
    *
-   * This mechanism exists to allow the {@link com.metamx.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
-   * auto-register things with the {@link com.metamx.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
+   * This mechanism exists to allow the {@link io.druid.java.util.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
+   * auto-register things with the {@link io.druid.java.util.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
    * it is not clear which is actually the best approach.  This is more explicit, but eager bindings inside of modules
    * is less error-prone.
    *
@@ -69,8 +70,8 @@ public class LifecycleModule implements Module
    * scope.  That is, they are generally eagerly loaded because the loading operation will produce some beneficial
    * side-effect even if nothing actually directly depends on the instance.
    *
-   * This mechanism exists to allow the {@link com.metamx.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
-   * auto-register things with the {@link com.metamx.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
+   * This mechanism exists to allow the {@link io.druid.java.util.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
+   * auto-register things with the {@link io.druid.java.util.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
    * it is not clear which is actually the best approach.  This is more explicit, but eager bindings inside of modules
    * is less error-prone.
    *
@@ -91,8 +92,8 @@ public class LifecycleModule implements Module
    * scope.  That is, they are generally eagerly loaded because the loading operation will produce some beneficial
    * side-effect even if nothing actually directly depends on the instance.
    *
-   * This mechanism exists to allow the {@link com.metamx.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
-   * auto-register things with the {@link com.metamx.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
+   * This mechanism exists to allow the {@link io.druid.java.util.common.lifecycle.Lifecycle} to be the primary entry point from the injector, not to
+   * auto-register things with the {@link io.druid.java.util.common.lifecycle.Lifecycle}.  It is also possible to just bind things eagerly with Guice,
    * it is not clear which is actually the best approach.  This is more explicit, but eager bindings inside of modules
    * is less error-prone.
    *
@@ -113,8 +114,8 @@ public class LifecycleModule implements Module
    * scope.  That is, they are generally eagerly loaded because the loading operation will produce some beneficial
    * side-effect even if nothing actually directly depends on the instance.
    *
-   * This mechanism exists to allow the {@link com.metamx.common.lifecycle.Lifecycle} to be the primary entry point
-   * from the injector, not to auto-register things with the {@link com.metamx.common.lifecycle.Lifecycle}.  It is
+   * This mechanism exists to allow the {@link io.druid.java.util.common.lifecycle.Lifecycle} to be the primary entry point
+   * from the injector, not to auto-register things with the {@link io.druid.java.util.common.lifecycle.Lifecycle}.  It is
    * also possible to just bind things eagerly with Guice, it is not clear which is actually the best approach.
    * This is more explicit, but eager bindings inside of modules is less error-prone.
    *

api/src/main/java/io/druid/guice/LifecycleScope.java

@@ -23,8 +23,9 @@ import com.google.common.collect.Lists;
 import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.Scope;
-import com.metamx.common.lifecycle.Lifecycle;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.lifecycle.Lifecycle;
+import io.druid.java.util.common.logger.Logger;
 
 import java.util.List;
 

api/src/main/java/io/druid/guice/ManageLifecycle.java

@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * Marks the object to be managed by {@link com.metamx.common.lifecycle.Lifecycle}
+ * Marks the object to be managed by {@link io.druid.java.util.common.lifecycle.Lifecycle}
  *
  * This Scope gets defined by {@link io.druid.guice.LifecycleModule}
  */

api/src/main/java/io/druid/guice/ManageLifecycleLast.java

@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * Marks the object to be managed by {@link com.metamx.common.lifecycle.Lifecycle} and set to be on Stage.LAST
+ * Marks the object to be managed by {@link io.druid.java.util.common.lifecycle.Lifecycle} and set to be on Stage.LAST
  *
  * This Scope gets defined by {@link io.druid.guice.LifecycleModule}
  */

api/src/main/java/io/druid/tasklogs/NoopTaskLogs.java

@@ -21,12 +21,11 @@ package io.druid.tasklogs;
 
 import com.google.common.base.Optional;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 
 public class NoopTaskLogs implements TaskLogs
 {

api/src/main/java/io/druid/tasklogs/TaskLogStreamer.java

@@ -21,10 +21,8 @@ package io.druid.tasklogs;
 
 import com.google.common.base.Optional;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
 
 import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * Something that knows how to stream logs for tasks.

api/src/main/java/io/druid/timeline/DataSegment.java

@@ -31,9 +31,10 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import com.google.common.collect.Iterables;
-import com.metamx.common.Granularity;
+
 import io.druid.jackson.CommaListJoinDeserializer;
 import io.druid.jackson.CommaListJoinSerializer;
+import io.druid.java.util.common.Granularity;
 import io.druid.query.SegmentDescriptor;
 import io.druid.timeline.partition.NoneShardSpec;
 import io.druid.timeline.partition.ShardSpec;

api/src/main/java/io/druid/timeline/DataSegmentUtils.java

@@ -20,7 +20,9 @@
 package io.druid.timeline;
 
 import com.google.common.base.Function;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.format.DateTimeFormatter;

api/src/main/java/io/druid/utils/CompressionUtils.java

@@ -19,13 +19,14 @@
 
 package io.druid.utils;
 
-import com.metamx.common.logger.Logger;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import io.druid.java.util.common.logger.Logger;
+
 /**
  */
 public class CompressionUtils
@@ -36,26 +37,26 @@ public class CompressionUtils
   @Deprecated // Use com.metamx.common.CompressionUtils.zip
   public static long zip(File directory, File outputZipFile) throws IOException
   {
-    return com.metamx.common.CompressionUtils.zip(directory, outputZipFile);
+    return io.druid.java.util.common.CompressionUtils.zip(directory, outputZipFile);
   }
 
 
   @Deprecated // Use com.metamx.common.CompressionUtils.zip
   public static long zip(File directory, OutputStream out) throws IOException
   {
-    return com.metamx.common.CompressionUtils.zip(directory, out);
+    return io.druid.java.util.common.CompressionUtils.zip(directory, out);
   }
 
   @Deprecated // Use com.metamx.common.CompressionUtils.unzip
   public static void unzip(File pulledFile, File outDir) throws IOException
   {
-    com.metamx.common.CompressionUtils.unzip(pulledFile, outDir);
+    io.druid.java.util.common.CompressionUtils.unzip(pulledFile, outDir);
   }
 
   @Deprecated // Use com.metamx.common.CompressionUtils.unzip
   public static void unzip(InputStream in, File outDir) throws IOException
   {
-    com.metamx.common.CompressionUtils.unzip(in, outDir);
+    io.druid.java.util.common.CompressionUtils.unzip(in, outDir);
   }
 
   /**
@@ -71,8 +72,8 @@ public class CompressionUtils
   @Deprecated // See description for alternative
   public static void gunzip(File pulledFile, File outDir) throws IOException
   {
-    final File outFile = new File(outDir, com.metamx.common.CompressionUtils.getGzBaseName(pulledFile.getName()));
-    com.metamx.common.CompressionUtils.gunzip(pulledFile, outFile);
+    final File outFile = new File(outDir, io.druid.java.util.common.CompressionUtils.getGzBaseName(pulledFile.getName()));
+    io.druid.java.util.common.CompressionUtils.gunzip(pulledFile, outFile);
     if (!pulledFile.delete()) {
       log.error("Could not delete tmpFile[%s].", pulledFile);
     }

api/src/test/java/io/druid/data/input/impl/CSVParseSpecTest.java

@@ -20,7 +20,6 @@
 package io.druid.data.input.impl;
 
 import com.google.common.collect.Lists;
-import com.metamx.common.parsers.ParseException;
 import org.junit.Test;
 
 import java.util.Arrays;

api/src/test/java/io/druid/data/input/impl/DelimitedParseSpecTest.java

@@ -25,7 +25,6 @@ import io.druid.TestObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.validation.constraints.Null;
 import java.io.IOException;
 import java.util.Arrays;
 

api/src/test/java/io/druid/data/input/impl/FileIteratingFirehoseTest.java

@@ -23,8 +23,10 @@ import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.metamx.common.Pair;
+
+import io.druid.java.util.common.Pair;
 import junit.framework.Assert;
+
 import org.apache.commons.io.LineIterator;
 import org.junit.Test;
 

api/src/test/java/io/druid/data/input/impl/JSONLowercaseParseSpecTest.java

@@ -20,8 +20,8 @@
 package io.druid.data.input.impl;
 
 import com.google.common.collect.Lists;
-import com.metamx.common.parsers.JSONToLowerParser;
-import com.metamx.common.parsers.Parser;
+
+import io.druid.java.util.common.parsers.Parser;
 import junit.framework.Assert;
 import org.junit.Test;
 

api/src/test/java/io/druid/data/input/impl/JSONPathSpecTest.java

@@ -20,14 +20,12 @@
 package io.druid.data.input.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
 import io.druid.TestObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class JSONPathSpecTest

api/src/test/java/io/druid/data/input/impl/JavaScriptParseSpecTest.java

@@ -22,8 +22,9 @@ package io.druid.data.input.impl;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.common.parsers.Parser;
+
 import io.druid.TestObjectMapper;
+import io.druid.java.util.common.parsers.Parser;
 import io.druid.js.JavaScriptConfig;
 import org.junit.Assert;
 import org.junit.Rule;

api/src/test/java/io/druid/data/input/impl/ParseSpecTest.java

@@ -20,7 +20,9 @@
 package io.druid.data.input.impl;
 
 import com.google.common.collect.Lists;
-import com.metamx.common.parsers.ParseException;
+
+import io.druid.java.util.common.parsers.ParseException;
+
 import org.junit.Test;
 
 import java.util.Arrays;

api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java

@@ -1,6 +1,5 @@
 package io.druid.timeline.partition;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.druid.TestObjectMapper;
 import org.junit.Assert;

benchmarks/src/main/java/io/druid/benchmark/BoundFilterBenchmark.java

@@ -22,10 +22,7 @@ package io.druid.benchmark;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.FluentIterable;
-import com.google.common.io.BaseEncoding;
-import com.google.common.primitives.Ints;
 import com.metamx.collections.bitmap.BitmapFactory;
-import com.metamx.collections.bitmap.ConciseBitmapFactory;
 import com.metamx.collections.bitmap.ImmutableBitmap;
 import com.metamx.collections.bitmap.MutableBitmap;
 import com.metamx.collections.bitmap.RoaringBitmapFactory;
@@ -35,7 +32,6 @@ import io.druid.query.filter.BoundDimFilter;
 import io.druid.query.ordering.StringComparators;
 import io.druid.segment.column.BitmapIndex;
 import io.druid.segment.data.BitmapSerdeFactory;
-import io.druid.segment.data.ConciseBitmapSerdeFactory;
 import io.druid.segment.data.GenericIndexed;
 import io.druid.segment.data.Indexed;
 import io.druid.segment.data.RoaringBitmapSerdeFactory;

benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java

@@ -26,9 +26,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -36,6 +34,9 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.js.JavaScriptConfig;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import io.druid.query.dimension.DefaultDimensionSpec;

benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java

@@ -20,16 +20,11 @@
 package io.druid.benchmark;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -38,6 +33,9 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.js.JavaScriptConfig;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
@@ -50,20 +48,15 @@ import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.query.aggregation.FilteredAggregatorFactory;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
-import io.druid.query.dimension.DefaultDimensionSpec;
 import io.druid.query.extraction.ExtractionFn;
 import io.druid.query.extraction.JavaScriptExtractionFn;
-import io.druid.query.filter.AndDimFilter;
-import io.druid.query.filter.BitmapIndexSelector;
 import io.druid.query.filter.BoundDimFilter;
 import io.druid.query.filter.DimFilter;
-import io.druid.query.filter.Filter;
 import io.druid.query.filter.InDimFilter;
 import io.druid.query.filter.JavaScriptDimFilter;
 import io.druid.query.filter.OrDimFilter;
 import io.druid.query.filter.RegexDimFilter;
 import io.druid.query.filter.SearchQueryDimFilter;
-import io.druid.query.filter.SelectorDimFilter;
 import io.druid.query.ordering.StringComparators;
 import io.druid.query.search.search.ContainsSearchQuerySpec;
 import io.druid.query.spec.MultipleIntervalSegmentSpec;
@@ -73,27 +66,15 @@ import io.druid.query.timeseries.TimeseriesQueryEngine;
 import io.druid.query.timeseries.TimeseriesQueryQueryToolChest;
 import io.druid.query.timeseries.TimeseriesQueryRunnerFactory;
 import io.druid.query.timeseries.TimeseriesResultValue;
-import io.druid.segment.Cursor;
-import io.druid.segment.DimensionSelector;
 import io.druid.segment.IncrementalIndexSegment;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMergerV9;
 import io.druid.segment.IndexSpec;
-import io.druid.segment.LongColumnSelector;
 import io.druid.segment.QueryableIndex;
 import io.druid.segment.QueryableIndexSegment;
-import io.druid.segment.QueryableIndexStorageAdapter;
-import io.druid.segment.StorageAdapter;
 import io.druid.segment.column.ColumnConfig;
-import io.druid.segment.data.IndexedInts;
-import io.druid.segment.filter.AndFilter;
-import io.druid.segment.filter.DimensionPredicateFilter;
-import io.druid.segment.filter.Filters;
-import io.druid.segment.filter.OrFilter;
-import io.druid.segment.filter.SelectorFilter;
 import io.druid.segment.incremental.IncrementalIndex;
 import io.druid.segment.incremental.IncrementalIndexSchema;
-import io.druid.segment.incremental.IncrementalIndexStorageAdapter;
 import io.druid.segment.incremental.OnheapIncrementalIndex;
 import io.druid.segment.serde.ComplexMetrics;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -114,7 +95,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 @State(Scope.Benchmark)

benchmarks/src/main/java/io/druid/benchmark/FlattenJSONBenchmark.java

@@ -19,7 +19,6 @@
 
 package io.druid.benchmark;
 
-import com.metamx.common.parsers.Parser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -32,6 +31,8 @@ import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
+import io.druid.java.util.common.parsers.Parser;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

benchmarks/src/main/java/io/druid/benchmark/FlattenJSONBenchmarkUtil.java

@@ -7,13 +7,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wnameless.json.flattener.JsonFlattener;
-import com.metamx.common.parsers.Parser;
+
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.data.input.impl.JSONParseSpec;
 import io.druid.data.input.impl.JSONPathFieldSpec;
 import io.druid.data.input.impl.JSONPathSpec;
 import io.druid.data.input.impl.TimestampSpec;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.parsers.Parser;
 
 import java.util.ArrayList;
 import java.util.List;

benchmarks/src/main/java/io/druid/benchmark/FlattenJSONProfile.java

@@ -19,24 +19,7 @@
 
 package io.druid.benchmark;
 
-import com.metamx.common.parsers.JSONPathParser;
-import com.metamx.common.parsers.Parser;
 //import com.yourkit.api.Controller;
-import io.druid.data.input.InputRow;
-import io.druid.data.input.impl.DimensionsSpec;
-import io.druid.data.input.impl.JSONParseSpec;
-import io.druid.data.input.impl.JSONPathFieldSpec;
-import io.druid.data.input.impl.JSONPathSpec;
-import io.druid.data.input.impl.StringInputRowParser;
-import io.druid.data.input.impl.TimestampSpec;
-import org.openjdk.jmh.runner.Runner;
-import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.Options;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Test app for profiling JSON parsing behavior. Uses the proprietary YourKit API, so this file

benchmarks/src/main/java/io/druid/benchmark/FloatCompressionBenchmark.java

@@ -40,7 +40,6 @@ import org.openjdk.jmh.infra.Blackhole;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Random;

benchmarks/src/main/java/io/druid/benchmark/FloatCompressionBenchmarkFileGenerator.java

@@ -41,7 +41,6 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;

benchmarks/src/main/java/io/druid/benchmark/LongCompressionBenchmarkFileGenerator.java

@@ -41,7 +41,6 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;

benchmarks/src/main/java/io/druid/benchmark/MergeSequenceBenchmark.java

@@ -22,10 +22,12 @@ package io.druid.benchmark;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Ints;
-import com.metamx.common.guava.Accumulator;
-import com.metamx.common.guava.MergeSequence;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
+
+import io.druid.java.util.common.guava.Accumulator;
+import io.druid.java.util.common.guava.MergeSequence;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;

benchmarks/src/main/java/io/druid/benchmark/StupidPoolConcurrencyBenchmark.java

@@ -20,9 +20,11 @@
 package io.druid.benchmark;
 
 import com.google.common.base.Supplier;
-import com.metamx.common.logger.Logger;
+
 import io.druid.collections.ResourceHolder;
 import io.druid.collections.StupidPool;
+import io.druid.java.util.common.logger.Logger;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;

benchmarks/src/main/java/io/druid/benchmark/TimeParseBenchmark.java

@@ -19,7 +19,9 @@
 package io.druid.benchmark;
 
 import com.google.common.base.Function;
-import com.metamx.common.parsers.TimestampParser;
+
+import io.druid.java.util.common.parsers.TimestampParser;
+
 import org.joda.time.DateTime;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;

benchmarks/src/main/java/io/druid/benchmark/datagen/RealRoundingDistribution.java

@@ -21,11 +21,6 @@ package io.druid.benchmark.datagen;
 
 import org.apache.commons.math3.distribution.AbstractIntegerDistribution;
 import org.apache.commons.math3.distribution.AbstractRealDistribution;
-import org.apache.commons.math3.distribution.EnumeratedDistribution;
-import org.apache.commons.math3.util.Pair;
-
-import java.util.List;
-import java.util.TreeMap;
 
 /*
  * Rounds the output values from the sample() function of an AbstractRealDistribution.

benchmarks/src/main/java/io/druid/benchmark/datagen/SequentialDistribution.java

@@ -22,10 +22,8 @@ package io.druid.benchmark.datagen;
 import org.apache.commons.math3.distribution.EnumeratedDistribution;
 import org.apache.commons.math3.util.Pair;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.TreeMap;
 
 public class SequentialDistribution extends EnumeratedDistribution
 {

benchmarks/src/main/java/io/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java

@@ -21,19 +21,19 @@ package io.druid.benchmark.indexing;
 
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.js.JavaScriptConfig;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import io.druid.query.dimension.DefaultDimensionSpec;
-import io.druid.query.filter.AndDimFilter;
 import io.druid.query.filter.BoundDimFilter;
 import io.druid.query.filter.DimFilter;
 import io.druid.query.filter.InDimFilter;

benchmarks/src/main/java/io/druid/benchmark/indexing/IndexIngestionBenchmark.java

@@ -20,14 +20,14 @@
 package io.druid.benchmark.indexing;
 
 import com.google.common.hash.Hashing;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
-
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import io.druid.segment.incremental.IncrementalIndex;
 import io.druid.segment.incremental.IncrementalIndexSchema;

benchmarks/src/main/java/io/druid/benchmark/indexing/IndexMergeBenchmark.java

@@ -22,7 +22,7 @@ package io.druid.benchmark.indexing;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -30,6 +30,7 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMerger;

benchmarks/src/main/java/io/druid/benchmark/indexing/IndexPersistBenchmark.java

@@ -22,7 +22,7 @@ package io.druid.benchmark.indexing;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -30,6 +30,7 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMerger;

benchmarks/src/main/java/io/druid/benchmark/query/GroupByBenchmark.java

@@ -28,9 +28,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -42,6 +40,9 @@ import io.druid.data.input.Row;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.offheap.OffheapBufferGenerator;
 import io.druid.query.DruidProcessingConfig;
 import io.druid.query.FinalizeResultsQueryRunner;

benchmarks/src/main/java/io/druid/benchmark/query/QueryBenchmarkUtil.java

@@ -20,7 +20,8 @@
 package io.druid.benchmark.query;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import com.metamx.common.guava.Sequence;
+
+import io.druid.java.util.common.guava.Sequence;
 import io.druid.query.BySegmentQueryRunner;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.IntervalChunkingQueryRunnerDecorator;

benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java

@@ -24,9 +24,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -36,6 +34,9 @@ import io.druid.data.input.Row;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.Query;

benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java

@@ -24,9 +24,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -36,6 +34,9 @@ import io.druid.data.input.Row;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.Query;

benchmarks/src/main/java/io/druid/benchmark/query/TimeseriesBenchmark.java

@@ -24,9 +24,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -35,6 +33,9 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.query.Druids;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.Query;

benchmarks/src/main/java/io/druid/benchmark/query/TopNBenchmark.java

@@ -24,9 +24,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.logger.Logger;
+
 import io.druid.benchmark.datagen.BenchmarkDataGenerator;
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
@@ -36,6 +34,9 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.impl.DimensionsSpec;
 import io.druid.granularity.QueryGranularities;
 import io.druid.jackson.DefaultObjectMapper;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.offheap.OffheapBufferGenerator;
 import io.druid.query.FinalizeResultsQueryRunner;
 import io.druid.query.Query;

benchmarks/src/test/java/io/druid/benchmark/FlattenJSONBenchmarkUtilTest.java

@@ -1,9 +1,10 @@
 package io.druid.benchmark;
 
-import com.metamx.common.parsers.Parser;
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.druid.java.util.common.parsers.Parser;
+
 import java.util.Map;
 
 public class FlattenJSONBenchmarkUtilTest

common/pom.xml

@@ -31,8 +31,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.metamx</groupId>
+            <groupId>io.druid</groupId>
             <artifactId>java-util</artifactId>
+            <version>${project.parent.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>io.druid</groupId>
@@ -178,8 +185,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.metamx</groupId>
+            <groupId>io.druid</groupId>
             <artifactId>java-util</artifactId>
+            <version>${project.parent.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

common/src/main/java/io/druid/collections/BlockingPool.java

@@ -21,7 +21,8 @@ package io.druid.collections;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
 
 import java.io.Closeable;
 import java.io.IOException;

common/src/main/java/io/druid/collections/CombiningIterable.java

@@ -19,12 +19,12 @@
 
 package io.druid.collections;
 
-import com.metamx.common.guava.MergeIterable;
-import com.metamx.common.guava.nary.BinaryFn;
-
 import java.util.Comparator;
 import java.util.Iterator;
 
+import io.druid.java.util.common.guava.MergeIterable;
+import io.druid.java.util.common.guava.nary.BinaryFn;
+
 /**
  */
 public class CombiningIterable<InType> implements Iterable<InType>

common/src/main/java/io/druid/collections/CombiningIterator.java

@@ -21,7 +21,8 @@ package io.druid.collections;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
-import com.metamx.common.guava.nary.BinaryFn;
+
+import io.druid.java.util.common.guava.nary.BinaryFn;
 
 import java.util.Comparator;
 import java.util.Iterator;

common/src/main/java/io/druid/collections/CountingMap.java

@@ -21,7 +21,8 @@ package io.druid.collections;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
-import com.metamx.common.guava.DefaultingHashMap;
+
+import io.druid.java.util.common.guava.DefaultingHashMap;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;

common/src/main/java/io/druid/collections/LoadBalancingPool.java

@@ -22,9 +22,9 @@ package io.druid.collections;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
-import com.metamx.common.logger.Logger;
 
-import java.io.IOException;
+import io.druid.java.util.common.logger.Logger;
+
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 

common/src/main/java/io/druid/collections/OrderedMergeIterator.java

@@ -23,7 +23,8 @@ import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
-import com.metamx.common.guava.FunctionalIterator;
+
+import io.druid.java.util.common.guava.FunctionalIterator;
 
 import java.util.Comparator;
 import java.util.Iterator;

common/src/main/java/io/druid/collections/OrderedMergeSequence.java

@@ -22,13 +22,14 @@ package io.druid.collections;
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Ordering;
-import com.metamx.common.guava.Accumulator;
-import com.metamx.common.guava.CloseQuietly;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Yielder;
-import com.metamx.common.guava.Yielders;
-import com.metamx.common.guava.YieldingAccumulator;
-import com.metamx.common.guava.YieldingAccumulators;
+
+import io.druid.java.util.common.guava.Accumulator;
+import io.druid.java.util.common.guava.CloseQuietly;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Yielder;
+import io.druid.java.util.common.guava.Yielders;
+import io.druid.java.util.common.guava.YieldingAccumulator;
+import io.druid.java.util.common.guava.YieldingAccumulators;
 
 import java.io.IOException;
 import java.util.PriorityQueue;

common/src/main/java/io/druid/collections/ReferenceCountingResourceHolder.java

@@ -19,12 +19,12 @@
 
 package io.druid.collections;
 
-import com.metamx.common.ISE;
-import com.metamx.common.logger.Logger;
-
 import java.io.Closeable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.druid.java.util.common.ISE;
+import io.druid.java.util.common.logger.Logger;
+
 public class ReferenceCountingResourceHolder<T> implements ResourceHolder<T>
 {
   private static final Logger log = new Logger(ReferenceCountingResourceHolder.class);

common/src/main/java/io/druid/collections/StupidPool.java

@@ -20,10 +20,10 @@
 package io.druid.collections;
 
 import com.google.common.base.Supplier;
-import com.metamx.common.ISE;
-import com.metamx.common.logger.Logger;
 
-import java.io.IOException;
+import io.druid.java.util.common.ISE;
+import io.druid.java.util.common.logger.Logger;
+
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;

common/src/main/java/io/druid/collections/StupidResourceHolder.java

@@ -19,8 +19,6 @@
 
 package io.druid.collections;
 
-import java.io.IOException;
-
 /**
  */
 public class StupidResourceHolder<T> implements ResourceHolder<T>

common/src/main/java/io/druid/common/config/ConfigManager.java

@@ -23,12 +23,14 @@ import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
-import com.metamx.common.concurrent.ScheduledExecutors;
-import com.metamx.common.lifecycle.LifecycleStart;
-import com.metamx.common.lifecycle.LifecycleStop;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.concurrent.ScheduledExecutors;
+import io.druid.java.util.common.lifecycle.LifecycleStart;
+import io.druid.java.util.common.lifecycle.LifecycleStop;
+import io.druid.java.util.common.logger.Logger;
 import io.druid.metadata.MetadataStorageConnector;
 import io.druid.metadata.MetadataStorageTablesConfig;
+
 import org.joda.time.Duration;
 
 import java.util.Arrays;

common/src/main/java/io/druid/common/guava/CombiningSequence.java

@@ -20,12 +20,13 @@
 package io.druid.common.guava;
 
 import com.google.common.collect.Ordering;
-import com.metamx.common.guava.Accumulator;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Yielder;
-import com.metamx.common.guava.Yielders;
-import com.metamx.common.guava.YieldingAccumulator;
-import com.metamx.common.guava.nary.BinaryFn;
+
+import io.druid.java.util.common.guava.Accumulator;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Yielder;
+import io.druid.java.util.common.guava.Yielders;
+import io.druid.java.util.common.guava.YieldingAccumulator;
+import io.druid.java.util.common.guava.nary.BinaryFn;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicReference;

common/src/main/java/io/druid/common/utils/JodaUtils.java

@@ -23,7 +23,9 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.metamx.common.guava.Comparators;
+
+import io.druid.java.util.common.guava.Comparators;
+
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

common/src/main/java/io/druid/common/utils/PropUtils.java

@@ -19,10 +19,10 @@
 
 package io.druid.common.utils;
 
-import com.metamx.common.ISE;
-
 import java.util.Properties;
 
+import io.druid.java.util.common.ISE;
+
 /**
  */
 public class PropUtils

common/src/main/java/io/druid/common/utils/SerializerUtils.java

@@ -22,7 +22,7 @@ package io.druid.common.utils;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.OutputSupplier;
 import com.google.common.primitives.Ints;
-import com.metamx.common.StringUtils;
+
 import io.druid.collections.IntList;
 
 import java.io.IOException;

common/src/main/java/io/druid/common/utils/ServletResourceUtils.java

@@ -22,7 +22,6 @@ package io.druid.common.utils;
 import com.google.common.collect.ImmutableMap;
 
 import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 public class ServletResourceUtils

common/src/main/java/io/druid/common/utils/SocketUtil.java

@@ -19,11 +19,11 @@
 
 package io.druid.common.utils;
 
-import com.metamx.common.ISE;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 
+import io.druid.java.util.common.ISE;
+
 /**
  */
 public class SocketUtil

common/src/main/java/io/druid/common/utils/StringUtils.java

@@ -21,7 +21,7 @@ package io.druid.common.utils;
 
 /**
  */
-public class StringUtils extends com.metamx.common.StringUtils
+public class StringUtils extends io.druid.java.util.common.StringUtils
 {
   private static final byte[] EMPTY_BYTES = new byte[0];
 

common/src/main/java/io/druid/guice/ConfigProvider.java

@@ -23,7 +23,9 @@ import com.google.common.base.Preconditions;
 import com.google.inject.Binder;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
+
 import org.skife.config.ConfigurationObjectFactory;
 
 import java.util.Map;

common/src/main/java/io/druid/guice/GuiceAnnotationIntrospector.java

@@ -25,7 +25,8 @@ import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector;
 import com.google.inject.BindingAnnotation;
 import com.google.inject.Key;
-import com.metamx.common.IAE;
+
+import io.druid.java.util.common.IAE;
 
 import java.lang.annotation.Annotation;
 

common/src/main/java/io/druid/guice/GuiceInjectableValues.java

@@ -24,7 +24,8 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.metamx.common.IAE;
+
+import io.druid.java.util.common.IAE;
 
 /**
  */

common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java

@@ -23,10 +23,10 @@ import com.google.common.base.Supplier;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
-import com.metamx.common.lifecycle.Lifecycle;
 import io.druid.common.config.ConfigManager;
 import io.druid.common.config.ConfigManagerConfig;
 import io.druid.common.config.JacksonConfigManager;
+import io.druid.java.util.common.lifecycle.Lifecycle;
 import io.druid.metadata.MetadataStorageConnector;
 import io.druid.metadata.MetadataStorageTablesConfig;
 

common/src/main/java/io/druid/math/expr/Parser.java

@@ -24,8 +24,9 @@ import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.metamx.common.logger.Logger;
 import com.google.common.collect.Lists;
+
+import io.druid.java.util.common.logger.Logger;
 import io.druid.math.expr.antlr.ExprLexer;
 import io.druid.math.expr.antlr.ExprParser;
 import org.antlr.v4.runtime.ANTLRInputStream;

common/src/main/java/io/druid/metadata/MetadataStorageActionHandler.java

@@ -20,7 +20,9 @@
 package io.druid.metadata;
 
 import com.google.common.base.Optional;
-import com.metamx.common.Pair;
+
+import io.druid.java.util.common.Pair;
+
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;

common/src/main/java/io/druid/timeline/VersionedIntervalTimeline.java

@@ -23,8 +23,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
-import com.metamx.common.guava.Comparators;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.guava.Comparators;
 import io.druid.timeline.partition.ImmutablePartitionHolder;
 import io.druid.timeline.partition.PartitionChunk;
 import io.druid.timeline.partition.PartitionHolder;

common/src/test/java/io/druid/collections/CombiningIteratorTest.java

@@ -20,7 +20,9 @@
 package io.druid.collections;
 
 import com.google.common.collect.PeekingIterator;
-import com.metamx.common.guava.nary.BinaryFn;
+
+import io.druid.java.util.common.guava.nary.BinaryFn;
+
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;

common/src/test/java/io/druid/collections/OrderedMergeSequenceTest.java

@@ -23,12 +23,14 @@ import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import com.metamx.common.guava.BaseSequence;
-import com.metamx.common.guava.MergeSequence;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.SequenceTestHelper;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.guava.TestSequence;
+
+import io.druid.java.util.common.guava.BaseSequence;
+import io.druid.java.util.common.guava.MergeSequence;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.SequenceTestHelper;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.guava.TestSequence;
+
 import org.junit.Assert;
 import org.junit.Test;
 

common/src/test/java/io/druid/collections/StupidPoolTest.java

@@ -20,7 +20,9 @@
 package io.druid.collections;
 
 import com.google.common.base.Supplier;
-import com.metamx.common.ISE;
+
+import io.druid.java.util.common.ISE;
+
 import org.easymock.EasyMock;
 import org.hamcrest.core.IsInstanceOf;
 import org.junit.After;

common/src/test/java/io/druid/common/guava/CombiningSequenceTest.java

@@ -24,13 +24,15 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import com.metamx.common.Pair;
-import com.metamx.common.guava.ResourceClosingSequence;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.guava.Yielder;
-import com.metamx.common.guava.YieldingAccumulator;
-import com.metamx.common.guava.nary.BinaryFn;
+
+import io.druid.java.util.common.Pair;
+import io.druid.java.util.common.guava.ResourceClosingSequence;
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.guava.Yielder;
+import io.druid.java.util.common.guava.YieldingAccumulator;
+import io.druid.java.util.common.guava.nary.BinaryFn;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

common/src/test/java/io/druid/common/guava/ComplexSequenceTest.java

@@ -21,11 +21,13 @@ package io.druid.common.guava;
 
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Ints;
-import com.metamx.common.guava.Sequence;
-import com.metamx.common.guava.Sequences;
-import com.metamx.common.guava.Yielder;
-import com.metamx.common.guava.YieldingAccumulator;
-import com.metamx.common.guava.nary.BinaryFn;
+
+import io.druid.java.util.common.guava.Sequence;
+import io.druid.java.util.common.guava.Sequences;
+import io.druid.java.util.common.guava.Yielder;
+import io.druid.java.util.common.guava.YieldingAccumulator;
+import io.druid.java.util.common.guava.nary.BinaryFn;
+
 import org.junit.Assert;
 import org.junit.Test;
 

common/src/test/java/io/druid/common/utils/LogTest.java

@@ -19,13 +19,14 @@
 
 package io.druid.common.utils;
 
-import com.metamx.common.ISE;
-import com.metamx.common.logger.Logger;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import io.druid.java.util.common.ISE;
+import io.druid.java.util.common.logger.Logger;
+
 // The issue here is that parameters to the logging system are evaluated eagerly
 // So CPU or resource heavy clauses in the log parameters get evaluated even if there is no debug logging
 public class LogTest

common/src/test/java/io/druid/common/utils/PropUtilsTest.java

@@ -19,10 +19,11 @@
 
 package io.druid.common.utils;
 
-import com.metamx.common.ISE;
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.druid.java.util.common.ISE;
+
 import java.util.Properties;
 
 public class PropUtilsTest

common/src/test/java/io/druid/common/utils/SocketUtilTest.java

@@ -19,11 +19,12 @@
 
 package io.druid.common.utils;
 
-import com.metamx.common.ISE;
 import org.hamcrest.number.OrderingComparison;
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.druid.java.util.common.ISE;
+
 public class SocketUtilTest
 {
   private final int MAX_PORT = 0xffff;

common/src/test/java/io/druid/concurrent/ExecsTest.java

@@ -21,7 +21,9 @@ package io.druid.concurrent;
 
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.metamx.common.logger.Logger;
+
+import io.druid.java.util.common.logger.Logger;
+
 import org.junit.Assert;
 import org.junit.Test;