From c6879cd59a10f6a371ec6b08b0a38ef34719b054 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 21 Nov 2017 14:05:53 -0500 Subject: [PATCH] [FLINK-8126] [build] Fix and update checkstyle Update to the latest checkstyle version and fix the errors not previously detected. This closes #5044. --- .../streaming/connectors/fs/RollingSink.java | 2 -- .../fs/bucketing/BucketingSink.java | 2 -- .../fs/bucketing/BucketingSinkTest.java | 1 - .../kafka/FlinkKafkaProducer08.java | 4 +-- .../internals/Kafka08PartitionDiscoverer.java | 1 - .../connectors/kafka/KafkaConsumer08Test.java | 1 - .../kafka/FlinkKafkaProducer09.java | 4 +-- .../kafka/FlinkKafkaConsumerBaseTest.java | 1 - .../kafka/KafkaAvroTableSourceTestBase.java | 1 - .../kafka/KafkaTestEnvironment.java | 1 - .../kinesis/FlinkKinesisProducer.java | 1 - .../kinesis/FlinkKinesisConsumerTest.java | 1 - .../kinesis/FlinkKinesisProducerTest.java | 2 -- .../kinesis/util/KinesisConfigUtilTest.java | 1 - .../benchmark/RocksDBPerformanceTest.java | 8 ++--- flink-core/pom.xml | 2 +- .../fs/hdfs/HadoopDataInputStreamTest.java | 1 - .../fs/s3hadoop/S3FileSystemFactory.java | 1 - .../fs/s3presto/S3FileSystemFactory.java | 1 - .../fs/s3presto/PrestoS3FileSystemTest.java | 2 -- .../typeutils/runtime/AvroSerializer.java | 2 -- .../apache/flink/api/java/io/CsvReader.java | 7 ++-- .../store/ZooKeeperMesosWorkerStore.java | 1 - flink-optimizer/pom.xml | 2 +- flink-runtime/pom.xml | 2 +- .../misc/KryoSerializerRegistrationsTest.java | 1 - .../networking/NetworkFailureHandler.java | 1 - .../test/checkpointing/SavepointITCase.java | 1 - .../TypeInfoTestCoverageTest.java | 1 - pom.xml | 2 +- tools/maven/checkstyle.xml | 32 +++++++++---------- 31 files changed, 31 insertions(+), 59 deletions(-) diff --git a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java index 9e547758dfaa1..4cd38a174e526 100644 --- a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java +++ b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java @@ -33,12 +33,10 @@ import org.apache.flink.util.Preconditions; import org.apache.commons.lang3.time.StopWatch; - import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DistributedFileSystem; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java index 55400c6ce19fa..bd2ace12098bc 100644 --- a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java +++ b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java @@ -42,12 +42,10 @@ import org.apache.flink.util.Preconditions; import org.apache.commons.lang3.time.StopWatch; - import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DistributedFileSystem; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connectors/flink-connector-filesystem/src/test/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkTest.java b/flink-connectors/flink-connector-filesystem/src/test/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkTest.java index 695b6962abdc2..d6852efad2200 100644 --- a/flink-connectors/flink-connector-filesystem/src/test/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkTest.java +++ b/flink-connectors/flink-connector-filesystem/src/test/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkTest.java @@ -52,7 +52,6 @@ import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer08.java b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer08.java index 2fce9f9655557..d2f17d22c68aa 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer08.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer08.java @@ -138,7 +138,7 @@ public FlinkKafkaProducer08(String topicId, KeyedSerializationSchema seriali * * @deprecated This is a deprecated constructor that does not correctly handle partitioning when * producing to multiple topics. Use - * {@link FlinkKafkaProducer08(String, SerializationSchema, Properties, FlinkKafkaPartitioner)} instead. + * {@link #FlinkKafkaProducer08(String, SerializationSchema, Properties, FlinkKafkaPartitioner)} instead. */ @Deprecated public FlinkKafkaProducer08(String topicId, SerializationSchema serializationSchema, Properties producerConfig, KafkaPartitioner customPartitioner) { @@ -155,7 +155,7 @@ public FlinkKafkaProducer08(String topicId, SerializationSchema serializatio * * @deprecated This is a deprecated constructor that does not correctly handle partitioning when * producing to multiple topics. Use - * {@link FlinkKafkaProducer08(String, KeyedSerializationSchema, Properties, FlinkKafkaPartitioner)} instead. + * {@link #FlinkKafkaProducer08(String, KeyedSerializationSchema, Properties, FlinkKafkaPartitioner)} instead. */ @Deprecated public FlinkKafkaProducer08(String topicId, KeyedSerializationSchema serializationSchema, Properties producerConfig, KafkaPartitioner customPartitioner) { diff --git a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/Kafka08PartitionDiscoverer.java b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/Kafka08PartitionDiscoverer.java index 9730114929f7b..5f7c370b3fe98 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/Kafka08PartitionDiscoverer.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/main/java/org/apache/flink/streaming/connectors/kafka/internals/Kafka08PartitionDiscoverer.java @@ -25,7 +25,6 @@ import kafka.javaapi.TopicMetadata; import kafka.javaapi.TopicMetadataRequest; import kafka.javaapi.consumer.SimpleConsumer; - import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.Node; import org.slf4j.Logger; diff --git a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaConsumer08Test.java b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaConsumer08Test.java index 8627ccbbcb957..3fd8beffa96fa 100644 --- a/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaConsumer08Test.java +++ b/flink-connectors/flink-connector-kafka-0.8/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaConsumer08Test.java @@ -27,7 +27,6 @@ import org.apache.flink.util.NetUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; diff --git a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer09.java b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer09.java index 946f7e95c7215..407bad5674341 100644 --- a/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer09.java +++ b/flink-connectors/flink-connector-kafka-0.9/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducer09.java @@ -142,7 +142,7 @@ public FlinkKafkaProducer09(String topicId, KeyedSerializationSchema seriali * * @deprecated This is a deprecated constructor that does not correctly handle partitioning when * producing to multiple topics. Use - * {@link FlinkKafkaProducer09(String, SerializationSchema, Properties, FlinkKafkaPartitioner)} instead. + * {@link #FlinkKafkaProducer09(String, SerializationSchema, Properties, FlinkKafkaPartitioner)} instead. */ @Deprecated public FlinkKafkaProducer09(String topicId, SerializationSchema serializationSchema, Properties producerConfig, KafkaPartitioner customPartitioner) { @@ -160,7 +160,7 @@ public FlinkKafkaProducer09(String topicId, SerializationSchema serializatio * * @deprecated This is a deprecated constructor that does not correctly handle partitioning when * producing to multiple topics. Use - * {@link FlinkKafkaProducer09(String, org.apache.flink.streaming.util.serialization.KeyedDeserializationSchema, Properties, FlinkKafkaPartitioner)} instead. + * {@link #FlinkKafkaProducer09(String, org.apache.flink.streaming.util.serialization.KeyedDeserializationSchema, Properties, FlinkKafkaPartitioner)} instead. */ @Deprecated public FlinkKafkaProducer09(String topicId, KeyedSerializationSchema serializationSchema, Properties producerConfig, KafkaPartitioner customPartitioner) { diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseTest.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseTest.java index 59ce6666b1527..168cfd5c94af8 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseTest.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseTest.java @@ -45,7 +45,6 @@ import org.apache.flink.util.SerializedValue; import org.apache.commons.collections.map.LinkedMap; - import org.junit.Assert; import org.junit.Test; import org.mockito.Matchers; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaAvroTableSourceTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaAvroTableSourceTestBase.java index 871a6f62520ec..557a20f40eaef 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaAvroTableSourceTestBase.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaAvroTableSourceTestBase.java @@ -25,7 +25,6 @@ import org.apache.avro.Schema; import org.apache.avro.specific.SpecificRecordBase; - import org.junit.Test; import java.sql.Timestamp; diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironment.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironment.java index 68514741aa10f..8a287d3766fa2 100644 --- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironment.java +++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironment.java @@ -28,7 +28,6 @@ import org.apache.flink.streaming.util.serialization.KeyedSerializationSchema; import kafka.server.KafkaServer; - import org.apache.kafka.clients.consumer.ConsumerRecord; import java.util.ArrayList; diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java index 28aa4b3dbd60a..225607396857d 100644 --- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java +++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java @@ -36,7 +36,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerTest.java index 78ca160f2f184..2b1fcf4caa3fd 100644 --- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerTest.java +++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerTest.java @@ -48,7 +48,6 @@ import com.amazonaws.services.kinesis.model.HashKeyRange; import com.amazonaws.services.kinesis.model.SequenceNumberRange; import com.amazonaws.services.kinesis.model.Shard; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducerTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducerTest.java index 2cd0c171f2452..702ab0b6226c6 100644 --- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducerTest.java +++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducerTest.java @@ -34,9 +34,7 @@ import com.amazonaws.services.kinesis.producer.KinesisProducer; import com.amazonaws.services.kinesis.producer.KinesisProducerConfiguration; import com.amazonaws.services.kinesis.producer.UserRecordResult; - import com.google.common.util.concurrent.SettableFuture; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java index ddb300e20e44c..b52dce2cb7bf6 100644 --- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java +++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java @@ -22,7 +22,6 @@ import org.apache.flink.streaming.connectors.kinesis.config.ProducerConfigConstants; import com.amazonaws.services.kinesis.producer.KinesisProducerConfiguration; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/benchmark/RocksDBPerformanceTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/benchmark/RocksDBPerformanceTest.java index 1667e55f31170..533196e6e7b02 100644 --- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/benchmark/RocksDBPerformanceTest.java +++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/benchmark/RocksDBPerformanceTest.java @@ -77,7 +77,7 @@ public void testRocksDbMergePerformance() throws Exception { .setCreateIfMissing(true) .setMergeOperatorName(RocksDBKeyedStateBackend.MERGE_OPERATOR_NAME); - final WriteOptions write_options = new WriteOptions() + final WriteOptions writeOptions = new WriteOptions() .setSync(false) .setDisableWAL(true); @@ -88,7 +88,7 @@ public void testRocksDbMergePerformance() throws Exception { final long beginInsert = System.nanoTime(); for (int i = 0; i < num; i++) { - rocksDB.merge(write_options, keyBytes, valueBytes); + rocksDB.merge(writeOptions, keyBytes, valueBytes); } final long endInsert = System.nanoTime(); log.info("end insert - duration: {} ms", (endInsert - beginInsert) / 1_000_000); @@ -154,7 +154,7 @@ public void testRocksDbRangeGetPerformance() throws Exception { .setCreateIfMissing(true) .setMergeOperatorName(RocksDBKeyedStateBackend.MERGE_OPERATOR_NAME); - final WriteOptions write_options = new WriteOptions() + final WriteOptions writeOptions = new WriteOptions() .setSync(false) .setDisableWAL(true); @@ -170,7 +170,7 @@ public void testRocksDbRangeGetPerformance() throws Exception { final long beginInsert = System.nanoTime(); for (int i = 0; i < num; i++) { unsafe.putInt(keyTemplate, offset, i); - rocksDB.put(write_options, keyTemplate, valueBytes); + rocksDB.put(writeOptions, keyTemplate, valueBytes); } final long endInsert = System.nanoTime(); log.info("end insert - duration: {} ms", (endInsert - beginInsert) / 1_000_000); diff --git a/flink-core/pom.xml b/flink-core/pom.xml index d100158563d93..18c84e882311c 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -168,7 +168,7 @@ under the License. com.puppycrawl.tools checkstyle - 6.19 + 8.4 diff --git a/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java b/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java index c6cf0ebd09f63..21c18bcc368df 100644 --- a/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java +++ b/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java @@ -23,7 +23,6 @@ import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.PositionedReadable; import org.apache.hadoop.fs.Seekable; - import org.junit.Assert; import org.junit.Test; diff --git a/flink-filesystems/flink-s3-fs-hadoop/src/main/java/org/apache/flink/fs/s3hadoop/S3FileSystemFactory.java b/flink-filesystems/flink-s3-fs-hadoop/src/main/java/org/apache/flink/fs/s3hadoop/S3FileSystemFactory.java index af0495214e99a..bd272e5701b73 100644 --- a/flink-filesystems/flink-s3-fs-hadoop/src/main/java/org/apache/flink/fs/s3hadoop/S3FileSystemFactory.java +++ b/flink-filesystems/flink-s3-fs-hadoop/src/main/java/org/apache/flink/fs/s3hadoop/S3FileSystemFactory.java @@ -25,7 +25,6 @@ import org.apache.flink.runtime.util.HadoopUtils; import org.apache.hadoop.fs.s3a.S3AFileSystem; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/java/org/apache/flink/fs/s3presto/S3FileSystemFactory.java b/flink-filesystems/flink-s3-fs-presto/src/main/java/org/apache/flink/fs/s3presto/S3FileSystemFactory.java index dabbfdabfe972..8847dc9cc2d45 100644 --- a/flink-filesystems/flink-s3-fs-presto/src/main/java/org/apache/flink/fs/s3presto/S3FileSystemFactory.java +++ b/flink-filesystems/flink-s3-fs-presto/src/main/java/org/apache/flink/fs/s3presto/S3FileSystemFactory.java @@ -25,7 +25,6 @@ import org.apache.flink.runtime.util.HadoopUtils; import com.facebook.presto.hive.PrestoS3FileSystem; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemTest.java b/flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemTest.java index 8b17ccff56ba1..7e2d12aebb0a6 100644 --- a/flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemTest.java +++ b/flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemTest.java @@ -25,9 +25,7 @@ import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.services.s3.AmazonS3Client; - import com.facebook.presto.hive.PrestoS3FileSystem; - import org.junit.Test; import java.lang.reflect.Field; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java index 228e67272f849..f3801991be6ae 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/api/java/typeutils/runtime/AvroSerializer.java @@ -32,12 +32,10 @@ import org.apache.flink.util.Preconditions; import com.esotericsoftware.kryo.Kryo; - import org.apache.avro.generic.GenericData; import org.apache.avro.reflect.ReflectDatumReader; import org.apache.avro.reflect.ReflectDatumWriter; import org.apache.avro.util.Utf8; - import org.objenesis.strategy.StdInstantiatorStrategy; import java.io.IOException; diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java index 684911a76a0ea..df90d54be3fc8 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvReader.java @@ -23,15 +23,16 @@ import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.Utils; import org.apache.flink.api.java.operators.DataSource; -//CHECKSTYLE.OFF: AvoidStarImport|ImportOrder -import org.apache.flink.api.java.tuple.*; -//CHECKSTYLE.ON: AvoidStarImport|ImportOrder import org.apache.flink.api.java.typeutils.PojoTypeInfo; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.core.fs.Path; import org.apache.flink.util.Preconditions; +//CHECKSTYLE.OFF: AvoidStarImport|ImportOrder +import org.apache.flink.api.java.tuple.*; +//CHECKSTYLE.ON: AvoidStarImport|ImportOrder + import java.util.ArrayList; import java.util.Arrays; diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/store/ZooKeeperMesosWorkerStore.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/store/ZooKeeperMesosWorkerStore.java index 9f2fa44d21502..d9ca18c6c205c 100644 --- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/store/ZooKeeperMesosWorkerStore.java +++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/store/ZooKeeperMesosWorkerStore.java @@ -28,7 +28,6 @@ import org.apache.flink.util.FlinkException; import org.apache.mesos.Protos; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml index 2341a962a127a..ec0e832ae2395 100644 --- a/flink-optimizer/pom.xml +++ b/flink-optimizer/pom.xml @@ -87,7 +87,7 @@ under the License. com.puppycrawl.tools checkstyle - 6.19 + 8.4 diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index ce264f3b3299d..4abf658e43610 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -264,7 +264,7 @@ under the License. com.puppycrawl.tools checkstyle - 6.19 + 8.4 diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/misc/KryoSerializerRegistrationsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/misc/KryoSerializerRegistrationsTest.java index cbe9394a379f2..a654012478a9a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/misc/KryoSerializerRegistrationsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/misc/KryoSerializerRegistrationsTest.java @@ -23,7 +23,6 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Registration; - import org.junit.Test; import java.io.BufferedReader; diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/networking/NetworkFailureHandler.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/networking/NetworkFailureHandler.java index 383961c829a5a..07d23412d0952 100644 --- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/networking/NetworkFailureHandler.java +++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/networking/NetworkFailureHandler.java @@ -30,7 +30,6 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.socket.ClientSocketChannelFactory; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java index 16e238b265b19..75f0aa463b741 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java @@ -80,7 +80,6 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.testkit.JavaTestKit; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeInfoTestCoverageTest.java b/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeInfoTestCoverageTest.java index 92ab01341f443..b52884c6aa9c4 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeInfoTestCoverageTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeInfoTestCoverageTest.java @@ -23,7 +23,6 @@ import org.apache.flink.util.TestLogger; import org.junit.Test; - import org.reflections.Reflections; import java.lang.reflect.Modifier; diff --git a/pom.xml b/pom.xml index b70389ad741ff..170de5926feb6 100644 --- a/pom.xml +++ b/pom.xml @@ -1061,7 +1061,7 @@ under the License. com.puppycrawl.tools checkstyle - 6.19 + 8.4 diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml index 514453ee5f403..a0168b001f917 100644 --- a/tools/maven/checkstyle.xml +++ b/tools/maven/checkstyle.xml @@ -64,12 +64,6 @@ This file is based on the checkstyle file of Apache Beam. - - - - - - @@ -90,6 +84,13 @@ This file is based on the checkstyle file of Apache Beam. + + + + + + + - + + @@ -484,15 +485,15 @@ This file is based on the checkstyle file of Apache Beam. --> - - - - + + + @@ -559,9 +560,6 @@ This file is based on the checkstyle file of Apache Beam. - - -