Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Checkstyle checks for AvoidStaticImport, UnusedImports. (#3660) 

Excludes tests from AvoidStaticImport, since those are used often there and
I didn't want to make this changeset too large. Production code use was minimal
and I switched those to non-static imports.
This commit is contained in:
Gian Merlino 2016-11-05 11:34:36 -07:00 committed by GitHub
parent 22b57ddd60
commit 657e4512d2
25 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/io/druid/guice/LazySingleton.java
View File

@ -23,14 +23,13 @@ import com.google.inject.ScopeAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RUNTIME)
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@ScopeAnnotation
public @interface LazySingleton
{

5
api/src/main/java/io/druid/guice/ManageLifecycle.java
View File

@ -23,17 +23,16 @@ import com.google.inject.ScopeAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* 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}
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RUNTIME)
@Retention(RetentionPolicy.RUNTIME)
@ScopeAnnotation
public @interface ManageLifecycle
{

5
api/src/main/java/io/druid/guice/ManageLifecycleLast.java
View File

@ -23,17 +23,16 @@ import com.google.inject.ScopeAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* 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}
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RUNTIME)
@Retention(RetentionPolicy.RUNTIME)
@ScopeAnnotation
public @interface ManageLifecycleLast
{

6
codestyle/checkstyle-suppressions.xml
View File

@ -25,4 +25,10 @@
<suppressions>
<!-- See http://checkstyle.sourceforge.net/config_filters.html#SuppressionFilter for examples -->
<!-- Code copied from TestNG to apply a bugfix -->
<suppress checks="AvoidStaticImport" files="[\\/]org[\\/]testng[\\/]" />
<!-- Our tests have many legacy usages of static imports; enforcement is impratical until those are removed. -->
<suppress checks="AvoidStaticImport" files="[\\/]src[\\/]test[\\/]" />
</suppressions>

2
codestyle/checkstyle.xml
View File

@ -33,7 +33,9 @@
<!--<property name="max" value="120"/>-->
<!--</module>-->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports" />
<module name="NeedBraces"/>
</module>
</module>

1
common/src/main/java/io/druid/math/expr/Expr.java
View File

@ -19,7 +19,6 @@
package io.druid.math.expr;
import com.google.common.base.Strings;
import com.google.common.math.LongMath;
import io.druid.java.util.common.IAE;

4
examples/src/main/java/io/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
View File

@ -55,8 +55,6 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static java.lang.Thread.sleep;
/**
* Twitter "spritzer" Firehose Factory named "twitzer".
* Builds a Firehose that emits a stream of
@ -263,7 +261,7 @@ public class TwitterSpritzerFirehoseFactory implements FirehoseFactory<InputRowP
// sleep a long time instead of terminating
try {
log.info("reached limit, sleeping a long time...");
sleep(2000000000L);
Thread.sleep(2000000000L);
}
catch (InterruptedException e) {
throw new RuntimeException("InterruptedException", e);

9
extensions-core/lookups-cached-single/src/main/java/io/druid/server/lookup/cache/loading/LookupCacheStats.java vendored
View File

@ -19,8 +19,7 @@
package io.druid.server.lookup.cache.loading;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.base.Preconditions;
/**
* Statistics about the performance of a {@link LoadingCache}. Instances of this class are immutable.
@ -45,9 +44,9 @@ public class LookupCacheStats
long evictionCount
)
{
checkArgument(hitCount >= 0);
checkArgument(missCount >= 0);
checkArgument(evictionCount >= 0);
Preconditions.checkArgument(hitCount >= 0);
Preconditions.checkArgument(missCount >= 0);
Preconditions.checkArgument(evictionCount >= 0);
this.hitCount = hitCount;
this.missCount = missCount;

1
integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
View File

@ -27,7 +27,6 @@ import com.metamx.http.client.HttpClient;
import com.metamx.http.client.Request;
import com.metamx.http.client.response.StatusResponseHandler;
import com.metamx.http.client.response.StatusResponseHolder;
import io.druid.guice.annotations.Global;
import io.druid.java.util.common.lifecycle.Lifecycle;
import io.druid.java.util.common.logger.Logger;
import io.druid.testing.IntegrationTestingConfig;

1
integration-tests/src/test/java/io/druid/tests/indexer/ITUnionQueryTest.java
View File

@ -25,7 +25,6 @@ import com.google.inject.Inject;
import com.metamx.http.client.HttpClient;
import io.druid.curator.discovery.ServerDiscoveryFactory;
import io.druid.curator.discovery.ServerDiscoverySelector;
import io.druid.guice.annotations.Global;
import io.druid.java.util.common.logger.Logger;
import io.druid.testing.IntegrationTestingConfig;
import io.druid.testing.clients.EventReceiverFirehoseTestClient;

4
java-util/src/main/java/io/druid/java/util/common/MappedByteBufferHandler.java
View File

@ -19,14 +19,14 @@
package io.druid.java.util.common;
import java.io.File;
import java.nio.MappedByteBuffer;
/**
* Facilitates using try-with-resources with {@link MappedByteBuffer}s which don't implement {@link AutoCloseable}.
*
* <p>This interface is a specialization of {@code io.druid.collections.ResourceHandler}.
* @see FileUtils#map(File)
*
* @see FileUtils#map
*/
public final class MappedByteBufferHandler implements AutoCloseable
{

1
java-util/src/main/java/io/druid/java/util/common/StringUtils.java
View File

@ -21,7 +21,6 @@ package io.druid.java.util.common;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
import io.druid.java.util.common.logger.Logger;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;

1
java-util/src/main/java/io/druid/java/util/common/parsers/CSVParser.java
View File

@ -25,7 +25,6 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import io.druid.java.util.common.collect.Utils;
import io.druid.java.util.common.logger.Logger;
import java.util.ArrayList;
import java.util.Arrays;

1
java-util/src/main/java/io/druid/java/util/common/parsers/DelimitedParser.java
View File

@ -27,7 +27,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import io.druid.java.util.common.collect.Utils;
import io.druid.java.util.common.logger.Logger;
import java.util.ArrayList;
import java.util.List;

1
java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java
View File

@ -22,7 +22,6 @@ package io.druid.java.util.common.parsers;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.IAE;
import io.druid.java.util.common.logger.Logger;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

7
pom.xml
View File

@ -684,6 +684,13 @@
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>validate</id>

15
processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
View File

@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos;
import com.google.protobuf.Descriptors;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.InvalidProtocolBufferException;
@ -36,10 +37,6 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Map;
import static com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import static com.google.protobuf.Descriptors.Descriptor;
import static com.google.protobuf.Descriptors.FileDescriptor;
@JsonTypeName("protobuf")
public class ProtoBufInputRowParser implements ByteBufferInputRowParser
{
@ -84,7 +81,7 @@ public class ProtoBufInputRowParser implements ByteBufferInputRowParser
private Map<String, Object> buildStringKeyMap(ByteBuffer input)
{
final Descriptor descriptor = getDescriptor(descriptorFileInClasspath);
final Descriptors.Descriptor descriptor = getDescriptor(descriptorFileInClasspath);
final Map<String, Object> theMap = Maps.newHashMap();
try {
@ -114,13 +111,13 @@ public class ProtoBufInputRowParser implements ByteBufferInputRowParser
return theMap;
}
private Descriptor getDescriptor(String descriptorFileInClassPath)
private Descriptors.Descriptor getDescriptor(String descriptorFileInClassPath)
{
try {
InputStream fin = this.getClass().getClassLoader().getResourceAsStream(descriptorFileInClassPath);
FileDescriptorSet set = FileDescriptorSet.parseFrom(fin);
FileDescriptor file = FileDescriptor.buildFrom(
set.getFile(0), new FileDescriptor[]
DescriptorProtos.FileDescriptorSet set = DescriptorProtos.FileDescriptorSet.parseFrom(fin);
Descriptors.FileDescriptor file = Descriptors.FileDescriptor.buildFrom(
set.getFile(0), new Descriptors.FileDescriptor[]
{}
);
return file.getMessageTypes().get(0);

2
processing/src/main/java/io/druid/query/QueryRunnerHelper.java
View File

@ -27,8 +27,6 @@ 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.logger.Logger;
import io.druid.query.aggregation.Aggregator;
import io.druid.query.aggregation.AggregatorFactory;
import io.druid.query.filter.Filter;
import io.druid.segment.Cursor;
import io.druid.segment.StorageAdapter;

1
processing/src/main/java/io/druid/query/filter/BoundDimFilter.java
View File

@ -22,7 +22,6 @@ package io.druid.query.filter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Supplier;
import com.google.common.collect.BoundType;
import com.google.common.collect.Range;

7
processing/src/main/java/io/druid/query/search/search/SearchHit.java
View File

@ -21,8 +21,7 @@ package io.druid.query.search.search;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Preconditions;
/**
*/
@ -39,8 +38,8 @@ public class SearchHit implements Comparable<SearchHit>
@JsonProperty("count") Integer count
)
{
this.dimension = checkNotNull(dimension);
this.value = checkNotNull(value);
this.dimension = Preconditions.checkNotNull(dimension);
this.value = Preconditions.checkNotNull(value);
this.count = count;
}

1
processing/src/main/java/io/druid/query/timeseries/TimeseriesResultBuilder.java
View File

@ -21,7 +21,6 @@ package io.druid.query.timeseries;
import io.druid.query.Result;
import io.druid.query.aggregation.Aggregator;
import io.druid.query.aggregation.PostAggregator;
import org.joda.time.DateTime;
import java.util.HashMap;

1
processing/src/main/java/io/druid/segment/ColumnSelectorBitmapIndexSelector.java
View File

@ -23,7 +23,6 @@ import com.google.common.base.Strings;
import com.metamx.collections.bitmap.BitmapFactory;
import com.metamx.collections.bitmap.ImmutableBitmap;
import com.metamx.collections.spatial.ImmutableRTree;
import io.druid.java.util.common.guava.CloseQuietly;
import io.druid.query.filter.BitmapIndexSelector;
import io.druid.segment.column.BitmapIndex;
import io.druid.segment.column.Column;

2
processing/src/main/java/io/druid/segment/IndexSpec.java
View File

@ -76,7 +76,7 @@ public class IndexSpec
*
* @param bitmapSerdeFactory type of bitmap to use (e.g. roaring or concise), null to use the default.
* Defaults to the bitmap type specified by the (deprecated) "druid.processing.bitmap.type"
* setting, or, if none was set, uses the default {@link BitmapSerde.DefaultBitmapSerdeFactory}
* setting, or, if none was set, uses the default defined in {@link BitmapSerde}
*
* @param dimensionCompression compression format for dimension columns, null to use the default.
* Defaults to {@link CompressedObjectStrategy#DEFAULT_COMPRESSION_STRATEGY}

2
processing/src/main/java/io/druid/segment/column/IndexedComplexColumn.java
View File

@ -21,8 +21,6 @@ package io.druid.segment.column;
import io.druid.segment.data.Indexed;
import java.io.IOException;
/**
*/
public class IndexedComplexColumn implements ComplexColumn

2
server/src/main/java/io/druid/guice/http/HttpClientModule.java
View File

@ -19,7 +19,6 @@
package io.druid.guice.http;
import com.google.common.base.Throwables;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.metamx.http.client.HttpClient;
@ -28,7 +27,6 @@ import com.metamx.http.client.HttpClientInit;
import io.druid.guice.JsonConfigProvider;
import io.druid.guice.LazySingleton;
import io.druid.guice.annotations.Global;
import io.druid.java.util.common.lifecycle.Lifecycle;
import java.lang.annotation.Annotation;