aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAditya Kishore <aditya@maprtech.com>2014-06-11 20:09:10 -0700
committerAditya Kishore <aditya@maprtech.com>2014-06-12 13:02:26 -0700
commit5da52cb510b58f9f9022608cbdb4f7d9e2d5d368 (patch)
tree19fa0ab867044dbb29f50a2bb804467385d5b8e5 /common
parent4198a17a8b8ba9fd109e7f8a55c66d466a895c18 (diff)
DRILL-968: Use checkstyle plugin to prevent inadvertent use of shaded Guava classes
+ Disallow non-static '*' imports in handwritten code. + Updated the current code to be in compliance. + Run 'rat' plugin in 'validate' phase.
Diffstat (limited to 'common')
-rw-r--r--common/src/main/java/org/apache/drill/common/config/DrillConfig.java1
-rw-r--r--common/src/main/java/org/apache/drill/common/config/NestedConfig.java10
-rw-r--r--common/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java11
-rw-r--r--common/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java18
-rw-r--r--common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java7
-rw-r--r--common/src/main/java/org/apache/drill/common/util/DecimalUtility.java5
6 files changed, 38 insertions, 14 deletions
diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
index 1c83040d8..2455dd968 100644
--- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
@@ -54,7 +54,6 @@ public final class DrillConfig extends NestedConfig{
@SuppressWarnings("unchecked")
private volatile List<Queue<Object>> sinkQueues = new CopyOnWriteArrayList<Queue<Object>>(new Queue[1]);
- @SuppressWarnings("restriction")
@VisibleForTesting
public DrillConfig(Config config, boolean enableServer) {
super(config);
diff --git a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
index f063addbe..3fd885f0e 100644
--- a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java
@@ -17,12 +17,18 @@
*/
package org.apache.drill.common.config;
-import com.typesafe.config.*;
-
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigList;
+import com.typesafe.config.ConfigMergeable;
+import com.typesafe.config.ConfigObject;
+import com.typesafe.config.ConfigOrigin;
+import com.typesafe.config.ConfigResolveOptions;
+import com.typesafe.config.ConfigValue;
+
abstract class NestedConfig implements Config {
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NestedConfig.class);
diff --git a/common/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java b/common/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java
index 531e6a624..3343d4ef4 100644
--- a/common/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java
+++ b/common/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java
@@ -20,14 +20,17 @@ package org.apache.drill.common.logical.data;
import java.util.Collection;
import java.util.List;
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.drill.common.graph.GraphValue;
import org.apache.drill.common.logical.ValidationError;
-
import org.apache.drill.common.logical.data.visitors.LogicalVisitor;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
@JsonPropertyOrder({"@id", "memo", "input"}) // op will always be first since it is wrapped.
@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class, property = "@id")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "op")
diff --git a/common/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java b/common/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java
index 0099bb9a8..87584449f 100644
--- a/common/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java
+++ b/common/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java
@@ -17,7 +17,23 @@
*/
package org.apache.drill.common.logical.data.visitors;
-import org.apache.drill.common.logical.data.*;
+import org.apache.drill.common.logical.data.Constant;
+import org.apache.drill.common.logical.data.Filter;
+import org.apache.drill.common.logical.data.Flatten;
+import org.apache.drill.common.logical.data.GroupingAggregate;
+import org.apache.drill.common.logical.data.Join;
+import org.apache.drill.common.logical.data.Limit;
+import org.apache.drill.common.logical.data.LogicalOperator;
+import org.apache.drill.common.logical.data.Order;
+import org.apache.drill.common.logical.data.Project;
+import org.apache.drill.common.logical.data.RunningAggregate;
+import org.apache.drill.common.logical.data.Scan;
+import org.apache.drill.common.logical.data.Sequence;
+import org.apache.drill.common.logical.data.Store;
+import org.apache.drill.common.logical.data.Transform;
+import org.apache.drill.common.logical.data.Union;
+import org.apache.drill.common.logical.data.WindowFrame;
+import org.apache.drill.common.logical.data.Writer;
public abstract class AbstractLogicalVisitor<T, X, E extends Throwable> implements LogicalVisitor<T, X, E> {
diff --git a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
index f61b301d0..60d37e33b 100644
--- a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
+++ b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java
@@ -18,9 +18,12 @@
package org.apache.drill.common.util;
-import org.apache.commons.lang3.exception.ExceptionUtils;
+import java.io.DataInput;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
-import java.io.*;
+import org.apache.commons.lang3.exception.ExceptionUtils;
public class DataInputInputStream extends InputStream {
diff --git a/common/src/main/java/org/apache/drill/common/util/DecimalUtility.java b/common/src/main/java/org/apache/drill/common/util/DecimalUtility.java
index ae2af54dd..4cc80eaad 100644
--- a/common/src/main/java/org/apache/drill/common/util/DecimalUtility.java
+++ b/common/src/main/java/org/apache/drill/common/util/DecimalUtility.java
@@ -17,11 +17,8 @@
*/
package org.apache.drill.common.util;
-import java.math.*;
-
-
-import io.netty.buffer.Unpooled;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
import java.math.BigDecimal;
import java.math.BigInteger;