Dependency updates and test refactoring for 3.0 branch

common/pom.xml

@@ -96,13 +96,8 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito</artifactId>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4</artifactId>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-inline</artifactId>
         <scope>test</scope>
       </dependency>
 
@@ -123,7 +118,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>${maven.plugin.jar.version}</version>
           <configuration>
             <archive>
               <manifestEntries>
@@ -144,13 +139,17 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>1.2.1</version>
+          <version>1.6.0</version>
           <executions>
             <execution>
               <id>create-plugin-test-jar</id>
               <!-- TODO: Put the jar in the target dir and fix surefire conf. -->
               <configuration>
-                <executable>jar</executable>
+                <!-- Resolve the JDK 'jar' tool via JAVA_HOME; it lives in
+                     $JAVA_HOME/bin but is not always on the CI runner's PATH.
+                     $JAVA_HOME/bin/jar is correct on JDK 8 and 9+ alike,
+                     whereas java.home differs between them ($JDK/jre vs $JDK). -->
+                <executable>${env.JAVA_HOME}/bin/jar</executable>
                   <arguments>
                   <argument>cvfm</argument>
                   <argument>plugin_test.jar</argument>

common/src/main/java/net/opentsdb/collections/LongIntHashTable.java

@@ -14,18 +14,19 @@
 // limitations under the License.
 package net.opentsdb.collections;
 
+import java.io.Closeable;
+import java.math.BigInteger;
+
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sun.misc.Unsafe;
 
-import java.io.Closeable;
-import java.math.BigInteger;
-
 /**
  * A linear probing Map for long keys and int values. Stores data off heap.
  *
-// * NOTE: There is now a hacky, ugly way to rehash the map without resizing when
-// * deletes start to result in too many scans for missed entries. If the average
+ // * NOTE: There is now a hacky, ugly way to rehash the map without resizing when
+ // * deletes start to result in too many scans for missed entries. If the average
  * number of scans per operation (any operation) exceeds the scan rehash threshold
  * then we'll pick the next prime number from the primes set to hash with. It will
  * roll over but by that time the key set should hopefully be fairly new.

common/src/main/java/net/opentsdb/collections/LongLongHashTable.java

@@ -14,13 +14,14 @@
 // limitations under the License.
 package net.opentsdb.collections;
 
+import java.io.Closeable;
+import java.math.BigInteger;
+
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sun.misc.Unsafe;
 
-import java.io.Closeable;
-import java.math.BigInteger;
-
 /**
  * A linear probing primitive Map for long keys and long values. Stores data off heap.
  *

common/src/main/java/net/opentsdb/collections/UnsafeHelper.java

@@ -14,10 +14,11 @@
 // limitations under the License.
 package net.opentsdb.collections;
 
-import sun.misc.Unsafe;
-
 import java.lang.reflect.Field;
 
+
+import sun.misc.Unsafe;
+
 /**
  * An internal helper class to access {@link Unsafe}.
  */

common/src/main/java/net/opentsdb/configuration/ConfigArgP.java

@@ -34,17 +34,17 @@
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.script.Bindings;
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
-import net.opentsdb.utils.Config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.opentsdb.utils.Config;
+
 /**
  * <p>Title: ConfigArgP</p>
  * <p>Description: Wraps {@link Config} and {@link ArgP} instances for a consolidated configuration and command line handler</p> 

common/src/main/java/net/opentsdb/configuration/ConfigurationEntrySchema.java

@@ -202,6 +202,13 @@ public ValidationResult validate(final Object value) {
     if (value == null && nullable) {
       return ConfigurationValueValidator.OK;
     }
+
+    // If the given value already has the expected type, then we need no round
+    // trip. By skipping convertValue() below, we avoid problems with classes
+    // that do not round-trip successfully through serde.
+    if (type != null && value.getClass().equals(type)) {
+      return ConfigurationValueValidator.OK;
+    }
 
     try {
       if (type_reference != null) {

common/src/main/java/net/opentsdb/configuration/provider/PropertiesFileProvider.java

@@ -21,13 +21,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Properties;
-import java.util.Set;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;

common/src/main/java/net/opentsdb/configuration/provider/Provider.java

@@ -14,13 +14,12 @@
 // limitations under the License.
 package net.opentsdb.configuration.provider;
 
-import net.opentsdb.configuration.Configuration;
-import net.opentsdb.configuration.ConfigurationOverride;
-
 import java.io.Closeable;
 import java.util.Map;
 
 import io.netty.util.TimerTask;
+import net.opentsdb.configuration.Configuration;
+import net.opentsdb.configuration.ConfigurationOverride;
 
 /**
  * The base class for a {@link Configuration} provider. It maintains a reference

common/src/main/java/net/opentsdb/configuration/provider/YamlJsonBaseProvider.java

@@ -18,8 +18,8 @@
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;

common/src/main/java/net/opentsdb/core/Registry.java

@@ -18,14 +18,15 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import com.google.common.reflect.TypeToken;
 import com.stumbleupon.async.Deferred;
 
+import com.google.common.reflect.TypeToken;
+
 import net.opentsdb.data.TimeSeriesDataType;
 import net.opentsdb.pools.ObjectPool;
 import net.opentsdb.query.QueryIteratorFactory;
-import net.opentsdb.query.interpolation.QueryInterpolatorFactory;
 import net.opentsdb.query.QueryNodeFactory;
+import net.opentsdb.query.interpolation.QueryInterpolatorFactory;
 
 /**
  * A shared location for registering context, mergers, plugins, etc.

common/src/main/java/net/opentsdb/core/TSDB.java

@@ -17,6 +17,7 @@
 import java.util.concurrent.ExecutorService;
 
 import com.stumbleupon.async.Deferred;
+
 import io.netty.util.Timer;
 import net.opentsdb.configuration.Configuration;
 import net.opentsdb.query.QueryContext;

common/src/main/java/net/opentsdb/data/DefaultHashedLowLevelMetricDataWrapper.java

@@ -14,15 +14,15 @@
 // limitations under the License.
 package net.opentsdb.data;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 import net.opentsdb.data.LowLevelMetricData.HashedLowLevelMetricData;
 import net.opentsdb.pools.CloseablePooledObject;
 import net.opentsdb.pools.PooledObject;
 import net.opentsdb.storage.TimeSeriesDataConsumer.WriteCallback;
 import net.opentsdb.storage.WriteStatus;
 
-import java.io.IOException;
-import java.util.Arrays;
-
 /**
  * A wrapper used when forwarding data to another consumer but some of that
  * data needs to be skipped.

common/src/main/java/net/opentsdb/data/LowLevelMetricDataStringIdWrapper.java

@@ -14,13 +14,14 @@
 // limitations under the License.
  package net.opentsdb.data;
 
+import java.util.Map;
+
 import com.google.common.collect.Maps;
 import com.google.common.reflect.TypeToken;
-import net.opentsdb.common.Const;
 
-import java.util.Map;
+import net.opentsdb.common.Const;
 
-public class LowLevelMetricDataStringIdWrapper implements TimeSeriesDatumStringId {
+ public class LowLevelMetricDataStringIdWrapper implements TimeSeriesDatumStringId {
 
   private LowLevelMetricData data;
   private Map<String, String> tags;

common/src/main/java/net/opentsdb/data/TimeSeriesDataSourceFactory.java

@@ -16,9 +16,10 @@
 
 import java.util.List;
 
-import com.google.common.reflect.TypeToken;
 import com.stumbleupon.async.Deferred;
 
+import com.google.common.reflect.TypeToken;
+
 import net.opentsdb.core.TSDBPlugin;
 import net.opentsdb.query.QueryNodeConfig;
 import net.opentsdb.query.QueryNodeFactory;

common/src/main/java/net/opentsdb/data/TypedTimeSeriesIterator.java

@@ -14,18 +14,18 @@
 // limitations under the License.
 package net.opentsdb.data;
 
-import com.google.common.reflect.TypeToken;
-
 import java.io.Closeable;
 import java.util.Iterator;
 
+import com.google.common.reflect.TypeToken;
+
 /**
  * An iterator for {@link TimeSeriesValue}s that lets us determine the
  * type of the underlying data without having to resolve the types.
  * 
  * @since 3.0
  */
-public interface TypedTimeSeriesIterator<T extends TimeSeriesDataType> 
+public interface TypedTimeSeriesIterator<T extends TimeSeriesDataType>
     extends Iterator<TimeSeriesValue<T>>, Closeable {
 
   /**

common/src/main/java/net/opentsdb/meta/BatchMetaQuery.java

@@ -14,12 +14,13 @@
 // limitations under the License.
 package net.opentsdb.meta;
 
-import com.google.common.hash.HashCode;
-import net.opentsdb.data.TimeStamp;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.hash.HashCode;
+
+import net.opentsdb.data.TimeStamp;
+
 public interface BatchMetaQuery {
 
   public static enum QueryType {

common/src/main/java/net/opentsdb/meta/MetaDataStorageResult.java

@@ -17,10 +17,10 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.google.common.reflect.TypeToken;
 
-import java.util.Set;
 import net.opentsdb.data.TimeSeriesId;
 import net.opentsdb.utils.Pair;
 import net.opentsdb.utils.UniqueKeyPair;

common/src/main/java/net/opentsdb/meta/MetaQuery.java

@@ -15,6 +15,7 @@
 package net.opentsdb.meta;
 
 import com.google.common.hash.HashCode;
+
 import net.opentsdb.query.filter.QueryFilter;
 
 /**

common/src/main/java/net/opentsdb/query/ChainedQueryContextFilter.java

@@ -14,29 +14,32 @@
 // limitations under the License.
 package net.opentsdb.query;
 
+import java.util.List;
+import java.util.Map;
+
+
+import com.stumbleupon.async.Deferred;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import com.stumbleupon.async.Deferred;
+
 import net.opentsdb.auth.AuthState;
 import net.opentsdb.configuration.ConfigurationEntrySchema;
 import net.opentsdb.core.BaseTSDBPlugin;
 import net.opentsdb.core.TSDB;
 import net.opentsdb.meta.BatchMetaQuery;
 import net.opentsdb.meta.MetaQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * A chain of query context filters processed in the order of definition.
  *
  * @since 3.0
  */
 public class ChainedQueryContextFilter extends BaseTSDBPlugin
-        implements QueryContextFilter {
+    implements QueryContextFilter {
   private static final Logger LOG = LoggerFactory.getLogger(
           ChainedQueryContextFilter.class);
 

common/src/main/java/net/opentsdb/query/QueryContext.java

@@ -18,9 +18,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.reflect.TypeToken;
 import com.stumbleupon.async.Deferred;
 
+import com.google.common.reflect.TypeToken;
+
 import net.opentsdb.auth.AuthState;
 import net.opentsdb.core.TSDB;
 import net.opentsdb.data.TimeSeriesId;

common/src/main/java/net/opentsdb/query/QueryNodeConfig.java

@@ -14,12 +14,13 @@
 // limitations under the License.
 package net.opentsdb.query;
 
-import com.google.common.hash.HashCode;
-import net.opentsdb.configuration.Configuration;
-
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.hash.HashCode;
+
+import net.opentsdb.configuration.Configuration;
+
 /**
  * The configuration interface for a particular query node. Queries will populate
  * the configs when instantiating a DAG.

common/src/main/java/net/opentsdb/query/QueryPipelineContext.java

@@ -16,9 +16,10 @@
 
 import java.util.Collection;
 
-import com.google.common.reflect.TypeToken;
 import com.stumbleupon.async.Deferred;
 
+import com.google.common.reflect.TypeToken;
+
 import net.opentsdb.core.TSDB;
 import net.opentsdb.data.TimeSeriesDataSource;
 import net.opentsdb.data.TimeSeriesId;