You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2017/05/22 21:50:29 UTC

[10/10] flink git commit: [FLINK-6603] [streaming] Enable checkstyle on test sources

[FLINK-6603] [streaming] Enable checkstyle on test sources

Updates / reverts the import order by sections:
- org.apache.flink.*
- all other imports
- javax.*
- java.*
- static imports

Adds EmptyLineSeparator to enforce an extra newline (not enforced
between field or local variable declarations).

This closes #3941


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/12b4185c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/12b4185c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/12b4185c

Branch: refs/heads/master
Commit: 12b4185c6c09101b64e12a84c33dc4d28f95cff9
Parents: 7efa8ad
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed May 17 08:01:04 2017 -0400
Committer: Greg Hogan <co...@greghogan.com>
Committed: Mon May 22 16:22:24 2017 -0400

----------------------------------------------------------------------
 flink-streaming-java/pom.xml                    |   1 +
 .../api/graph/StreamGraphHasherV1.java          |  24 +-
 .../MultiplexingStreamRecordSerializer.java     |   9 +-
 .../streamrecord/StreamRecordSerializer.java    |   3 +-
 .../flink/streaming/api/SimpleTimerService.java |   1 +
 .../flink/streaming/api/TimeCharacteristic.java |   1 -
 .../apache/flink/streaming/api/TimeDomain.java  |   1 +
 .../flink/streaming/api/TimerService.java       |   1 +
 .../streaming/api/checkpoint/Checkpointed.java  |   3 +-
 .../checkpoint/CheckpointedAsynchronously.java  |   3 +-
 .../api/checkpoint/CheckpointedRestoring.java   |   3 +-
 .../api/checkpoint/ListCheckpointed.java        |   5 +-
 .../selector/CopyingDirectedOutput.java         |   7 +-
 .../api/collector/selector/DirectedOutput.java  |  21 +-
 .../api/collector/selector/OutputSelector.java  |   4 +-
 .../api/datastream/AllWindowedStream.java       |   6 +-
 .../api/datastream/AsyncDataStream.java         |   3 +-
 .../api/datastream/CoGroupedStreams.java        |  11 +-
 .../api/datastream/ConnectedStreams.java        |   4 +-
 .../streaming/api/datastream/DataStream.java    |   5 +-
 .../api/datastream/IterativeStream.java         |   3 +-
 .../streaming/api/datastream/JoinedStreams.java |   4 +-
 .../streaming/api/datastream/KeyedStream.java   |  12 +-
 .../datastream/SingleOutputStreamOperator.java  |   9 +-
 .../streaming/api/datastream/SplitStream.java   |   3 +-
 .../api/datastream/WindowedStream.java          |   8 +-
 .../api/environment/CheckpointConfig.java       |   6 +-
 .../api/environment/LocalStreamEnvironment.java |   2 +-
 .../environment/RemoteStreamEnvironment.java    |  21 +-
 .../environment/StreamContextEnvironment.java   |   1 -
 .../environment/StreamExecutionEnvironment.java |  22 +-
 .../AssignerWithPeriodicWatermarks.java         |   3 +-
 .../AssignerWithPunctuatedWatermarks.java       |   3 +-
 .../aggregation/ComparableAggregator.java       |   1 -
 .../api/functions/aggregation/Comparator.java   |   4 +-
 .../api/functions/aggregation/SumFunction.java  |   3 +-
 .../api/functions/async/AsyncFunction.java      |   3 +-
 .../api/functions/async/RichAsyncFunction.java  |   8 +-
 .../async/collector/AsyncCollector.java         |   3 +-
 .../api/functions/co/CoFlatMapFunction.java     |   4 +-
 .../api/functions/co/CoMapFunction.java         |   4 +-
 .../sink/OutputFormatSinkFunction.java          |   4 +-
 .../api/functions/sink/PrintSinkFunction.java   |   4 +-
 .../api/functions/sink/SinkFunction.java        |   4 +-
 .../api/functions/sink/SocketClientSink.java    |  14 +-
 .../api/functions/sink/WriteFormat.java         |   3 +-
 .../api/functions/sink/WriteFormatAsCsv.java    |   3 +-
 .../api/functions/sink/WriteFormatAsText.java   |   3 +-
 .../api/functions/sink/WriteSinkFunction.java   |   3 +-
 .../ContinuousFileMonitoringFunction.java       |  19 +-
 .../source/ContinuousFileReaderOperator.java    |  25 +-
 .../source/FileMonitoringFunction.java          |  14 +-
 .../functions/source/FileProcessingMode.java    |   1 +
 .../api/functions/source/FileReadFunction.java  |   8 +-
 .../functions/source/FromElementsFunction.java  |  15 +-
 .../functions/source/FromIteratorFunction.java  |   3 +-
 .../source/FromSplittableIteratorFunction.java  |   3 +-
 .../source/InputFormatSourceFunction.java       |   5 +-
 .../source/MessageAcknowledgingSourceBase.java  |  15 +-
 ...ltipleIdsMessageAcknowledgingSourceBase.java |  13 +-
 .../source/SocketTextStreamFunction.java        |  15 +-
 .../api/functions/source/SourceFunction.java    |   3 +-
 .../source/StatefulSequenceSource.java          |   6 +-
 .../source/TimestampedFileInputSplit.java       |   3 +-
 .../timestamps/AscendingTimestampExtractor.java |   5 +-
 ...BoundedOutOfOrdernessTimestampExtractor.java |   1 +
 .../AggregateApplyAllWindowFunction.java        |   3 +-
 .../windowing/AggregateApplyWindowFunction.java |   4 +-
 .../functions/windowing/AllWindowFunction.java  |   3 +-
 .../windowing/FoldApplyAllWindowFunction.java   |  10 +-
 .../FoldApplyProcessAllWindowFunction.java      |  10 +-
 .../FoldApplyProcessWindowFunction.java         |  10 +-
 .../windowing/FoldApplyWindowFunction.java      |  10 +-
 .../InternalProcessApplyAllWindowContext.java   |   1 +
 .../InternalProcessApplyWindowContext.java      |   1 +
 .../windowing/PassThroughAllWindowFunction.java |   1 +
 .../windowing/PassThroughWindowFunction.java    |   1 +
 .../windowing/ReduceApplyAllWindowFunction.java |   4 +-
 .../ReduceApplyProcessAllWindowFunction.java    |   4 +-
 .../ReduceApplyProcessWindowFunction.java       |   4 +-
 .../windowing/ReduceApplyWindowFunction.java    |   4 +-
 .../windowing/RichAllWindowFunction.java        |   1 +
 .../api/functions/windowing/WindowFunction.java |   3 +-
 .../windowing/delta/DeltaFunction.java          |   3 +-
 .../windowing/delta/extractor/Extractor.java    |   3 +-
 .../delta/extractor/FieldFromArray.java         |   3 +-
 .../delta/extractor/FieldsFromArray.java        |   3 +-
 .../FunctionMasterCheckpointHookFactory.java    |   4 +-
 .../streaming/api/graph/JSONGenerator.java      |  13 +-
 .../flink/streaming/api/graph/StreamConfig.java |  15 +-
 .../flink/streaming/api/graph/StreamEdge.java   |   5 +-
 .../flink/streaming/api/graph/StreamGraph.java  |  28 +-
 .../api/graph/StreamGraphGenerator.java         |  20 +-
 .../streaming/api/graph/StreamGraphHasher.java  |   3 +-
 .../api/graph/StreamGraphHasherV2.java          |  20 +-
 .../api/graph/StreamGraphUserHashHasher.java    |   3 +-
 .../flink/streaming/api/graph/StreamNode.java   |   7 +-
 .../api/graph/StreamingJobGraphGenerator.java   |  25 +-
 .../api/operators/AbstractStreamOperator.java   |  23 +-
 .../operators/AbstractUdfStreamOperator.java    |   8 +-
 .../api/operators/HeapInternalTimerService.java |  18 +-
 .../operators/InternalTimeServiceManager.java   |   7 +-
 .../streaming/api/operators/InternalTimer.java  |   4 +-
 .../api/operators/InternalTimerService.java     |   1 +
 .../streaming/api/operators/KeyContext.java     |   1 +
 .../api/operators/KeyedProcessOperator.java     |   6 +-
 .../api/operators/OnWatermarkCallback.java      |   3 +-
 .../api/operators/OperatorSnapshotResult.java   |   3 +-
 .../flink/streaming/api/operators/Output.java   |   1 +
 .../api/operators/ProcessOperator.java          |   4 +-
 .../api/operators/StreamGroupedFold.java        |   8 +-
 .../api/operators/StreamGroupedReduce.java      |   1 -
 .../streaming/api/operators/StreamOperator.java |   3 +-
 .../streaming/api/operators/StreamProject.java  |   1 -
 .../streaming/api/operators/StreamSource.java   |   5 +-
 .../api/operators/StreamSourceContexts.java     |   3 +-
 .../api/operators/StreamingRuntimeContext.java  |   5 +-
 .../streaming/api/operators/Triggerable.java    |   1 +
 .../api/operators/async/AsyncWaitOperator.java  |  14 +-
 .../streaming/api/operators/async/Emitter.java  |   4 +-
 .../async/queue/AsyncCollectionResult.java      |   3 +-
 .../async/queue/OrderedStreamElementQueue.java  |  14 +-
 .../async/queue/StreamElementQueue.java         |   3 +-
 .../async/queue/StreamElementQueueEntry.java    |   3 +-
 .../async/queue/StreamRecordQueueEntry.java     |   3 +-
 .../queue/UnorderedStreamElementQueue.java      |  14 +-
 .../api/operators/co/CoProcessOperator.java     |   6 +-
 .../operators/co/KeyedCoProcessOperator.java    |   6 +-
 .../CoFeedbackTransformation.java               |   9 +-
 .../transformations/FeedbackTransformation.java |   7 +-
 .../transformations/OneInputTransformation.java |   9 +-
 .../PartitionTransformation.java                |   9 +-
 .../transformations/SelectTransformation.java   |   7 +-
 .../SideOutputTransformation.java               |   9 +-
 .../api/transformations/SinkTransformation.java |   9 +-
 .../transformations/SourceTransformation.java   |   6 +-
 .../transformations/SplitTransformation.java    |   9 +-
 .../transformations/StreamTransformation.java   |   9 +-
 .../transformations/TwoInputTransformation.java |   9 +-
 .../transformations/UnionTransformation.java    |   7 +-
 .../assigners/BaseAlignedWindowAssigner.java    |   4 +-
 .../assigners/EventTimeSessionWindows.java      |   6 +-
 .../api/windowing/assigners/GlobalWindows.java  |   6 +-
 .../assigners/MergingWindowAssigner.java        |   4 +-
 .../assigners/ProcessingTimeSessionWindows.java |   6 +-
 .../assigners/SlidingEventTimeWindows.java      |   7 +-
 .../assigners/SlidingProcessingTimeWindows.java |   8 +-
 .../assigners/TumblingEventTimeWindows.java     |   6 +-
 .../TumblingProcessingTimeWindows.java          |   7 +-
 .../api/windowing/assigners/WindowAssigner.java |   5 +-
 .../api/windowing/evictors/CountEvictor.java    |   5 +-
 .../api/windowing/evictors/DeltaEvictor.java    |   7 +-
 .../api/windowing/evictors/Evictor.java         |   4 +-
 .../api/windowing/evictors/TimeEvictor.java     |   5 +-
 .../streaming/api/windowing/time/Time.java      |   5 +-
 .../api/windowing/triggers/CountTrigger.java    |   1 -
 .../windowing/triggers/EventTimeTrigger.java    |   2 -
 .../api/windowing/triggers/PurgingTrigger.java  |   1 +
 .../api/windowing/triggers/Trigger.java         |   3 +-
 .../api/windowing/windows/GlobalWindow.java     |   4 +-
 .../api/windowing/windows/TimeWindow.java       |  16 +-
 .../streaming/api/windowing/windows/Window.java |   2 +-
 .../streaming/runtime/io/BarrierBuffer.java     |  10 +-
 .../streaming/runtime/io/BarrierTracker.java    |   5 +-
 .../runtime/io/BlockingQueueBroker.java         |   4 +-
 .../streaming/runtime/io/BufferSpiller.java     |  20 +-
 .../runtime/io/CheckpointBarrierHandler.java    |   3 +-
 .../streaming/runtime/io/InputGateUtil.java     |   8 +-
 .../runtime/io/RecordWriterOutput.java          |   8 +-
 .../runtime/io/StreamInputProcessor.java        |   7 +-
 .../runtime/io/StreamRecordWriter.java          |  10 +-
 .../runtime/io/StreamTwoInputProcessor.java     |   9 +-
 .../runtime/operators/CheckpointCommitter.java  |   4 +-
 .../operators/GenericWriteAheadSink.java        |  15 +-
 ...TimestampsAndPeriodicWatermarksOperator.java |   1 -
 ...mestampsAndPunctuatedWatermarksOperator.java |   1 -
 .../runtime/operators/package-info.java         |   1 +
 ...ractAlignedProcessingTimeWindowOperator.java |   8 +-
 .../windowing/AbstractKeyedTimePanes.java       |   9 +-
 .../windowing/AccumulatingKeyedTimePanes.java   |   4 +-
 ...ccumulatingProcessingTimeWindowOperator.java |   4 +-
 ...AggregatingProcessingTimeWindowOperator.java |   1 -
 .../windowing/EvictingWindowOperator.java       |  17 +-
 .../runtime/operators/windowing/KeyMap.java     |   8 +-
 .../operators/windowing/MergingWindowSet.java   |  13 +-
 .../operators/windowing/TimestampedValue.java   |   1 +
 .../operators/windowing/WindowOperator.java     |  22 +-
 ...ternalAggregateProcessAllWindowFunction.java |   4 +-
 .../InternalAggregateProcessWindowFunction.java |   4 +-
 .../InternalIterableAllWindowFunction.java      |   1 +
 ...nternalIterableProcessAllWindowFunction.java |   1 +
 .../InternalIterableProcessWindowFunction.java  |   1 +
 .../InternalIterableWindowFunction.java         |   1 +
 .../InternalProcessAllWindowContext.java        |   1 +
 .../functions/InternalProcessWindowContext.java |   1 +
 .../InternalSingleValueAllWindowFunction.java   |   4 +-
 ...rnalSingleValueProcessAllWindowFunction.java |   4 +-
 ...nternalSingleValueProcessWindowFunction.java |   4 +-
 .../InternalSingleValueWindowFunction.java      |   4 +-
 .../functions/InternalWindowFunction.java       |   1 +
 .../operators/windowing/package-info.java       |   1 +
 .../runtime/partitioner/ShufflePartitioner.java |   4 +-
 .../runtime/partitioner/StreamPartitioner.java  |   5 +-
 .../runtime/streamrecord/LatencyMarker.java     |   1 -
 .../streamrecord/StreamElementSerializer.java   |   8 +-
 .../streamstatus/StatusWatermarkValve.java      |   7 +-
 .../streamstatus/StreamStatusMaintainer.java    |   1 +
 .../streamstatus/StreamStatusProvider.java      |   1 +
 .../ExceptionInChainedOperatorException.java    |   4 +-
 .../streaming/runtime/tasks/OperatorChain.java  |  14 +-
 .../runtime/tasks/OperatorStateHandles.java     |   5 +-
 .../runtime/tasks/SourceStreamTask.java         |   1 -
 .../tasks/StoppableSourceStreamTask.java        |   1 +
 .../runtime/tasks/StreamIterationHead.java      |   8 +-
 .../runtime/tasks/StreamIterationTail.java      |   7 +-
 .../streaming/runtime/tasks/StreamTask.java     |  25 +-
 .../tasks/SystemProcessingTimeService.java      |  12 +-
 .../tasks/TestProcessingTimeService.java        |   5 +-
 .../streaming/runtime/tasks/TimerException.java |   1 +
 .../runtime/tasks/TwoInputStreamTask.java       |   6 +-
 .../streaming/runtime/tasks/package-info.java   |   1 +
 .../flink/streaming/util/HDFSCopyFromLocal.java |   7 +-
 .../flink/streaming/util/HDFSCopyToLocal.java   |   7 +-
 .../util/functions/StreamingFunctionUtils.java  |   7 +-
 .../streaming/util/keys/KeySelectorUtil.java    |  10 +-
 .../AbstractDeserializationSchema.java          |   3 +-
 .../serialization/DeserializationSchema.java    |   6 +-
 .../util/serialization/SerializationSchema.java |   3 +-
 .../util/serialization/SimpleStringSchema.java  |   9 +-
 .../TypeInformationSerializationSchema.java     |   3 +-
 .../streaming/util/typeutils/FieldAccessor.java |  19 +-
 .../util/typeutils/FieldAccessorFactory.java    |   7 +-
 .../consumer/StreamTestSingleInputGate.java     |   5 +-
 .../streaming/api/AggregationFunctionTest.java  |  41 ++-
 .../flink/streaming/api/DataStreamTest.java     |  34 ++-
 .../streaming/api/RestartStrategyTest.java      |  12 +-
 .../flink/streaming/api/SourceFunctionTest.java |  16 +-
 .../api/StreamExecutionEnvironmentTest.java     |  12 +-
 .../flink/streaming/api/TypeFillTest.java       |  11 +-
 .../api/checkpoint/ListCheckpointedTest.java    |   4 +
 .../api/collector/OutputSelectorTest.java       |  13 +-
 .../LocalStreamEnvironmentITCase.java           |   5 +-
 .../AscendingTimestampExtractorTest.java        |   6 +-
 ...dedOutOfOrdernessTimestampExtractorTest.java |   6 +-
 .../api/functions/FromElementsFunctionTest.java |  20 +-
 .../functions/IngestionTimeExtractorTest.java   |   7 +-
 .../api/functions/ListSourceContext.java        |   1 -
 .../functions/StatefulSequenceSourceTest.java   |   7 +-
 .../functions/async/RichAsyncFunctionTest.java  |   4 +-
 .../sink/OutputFormatSinkFunctionTest.java      |   4 +
 .../functions/sink/SocketClientSinkTest.java    |   3 +-
 .../source/FileMonitoringFunctionTest.java      |   8 +-
 .../source/InputFormatSourceFunctionTest.java   |   7 +-
 .../source/SocketTextStreamFunctionTest.java    |   7 +-
 .../delta/extractor/ArrayFromTupleTest.java     |   9 +-
 .../extractor/ConcatenatedExtractTest.java      |   8 +-
 .../delta/extractor/FieldFromArrayTest.java     |   3 +
 .../delta/extractor/FieldFromTupleTest.java     |   4 +
 .../delta/extractor/FieldsFromArrayTest.java    |   8 +-
 .../delta/extractor/FieldsFromTupleTest.java    |   9 +-
 .../streaming/api/graph/SlotAllocationTest.java |  26 +-
 .../api/graph/StreamGraphGeneratorTest.java     |  24 +-
 .../graph/StreamingJobGraphGeneratorTest.java   |   7 +-
 .../operators/AbstractStreamOperatorTest.java   |  39 ++-
 .../AbstractUdfStreamOperatorLifecycleTest.java |   1 +
 .../FoldApplyProcessWindowFunctionTest.java     |   8 +-
 .../operators/FoldApplyWindowFunctionTest.java  |   8 +-
 .../operators/HeapInternalTimerServiceTest.java |  15 +-
 .../api/operators/KeyedProcessOperatorTest.java |   3 +-
 .../operators/OperatorSnapshotResultTest.java   |   4 +
 .../api/operators/ProcessOperatorTest.java      |   4 +-
 .../operators/StateDescriptorPassingTest.java   |  11 +-
 .../StateInitializationContextImplTest.java     |   6 +-
 ...StateSnapshotContextSynchronousImplTest.java |   4 +
 .../api/operators/StreamFilterTest.java         |   5 +-
 .../api/operators/StreamFlatMapTest.java        |   7 +-
 .../api/operators/StreamGroupedFoldTest.java    |   4 +-
 .../api/operators/StreamGroupedReduceTest.java  |   5 +-
 .../streaming/api/operators/StreamMapTest.java  |   5 +-
 .../StreamOperatorSnapshotRestoreTest.java      |   4 +
 .../api/operators/StreamProjectTest.java        |   4 +-
 .../StreamSourceContextIdleDetectionTests.java  |  52 ++--
 .../operators/StreamingRuntimeContextTest.java  |  12 +-
 .../api/operators/TestInternalTimerService.java |   1 +
 .../WrappingFunctionSnapshotRestoreTest.java    |   5 +-
 .../operators/async/AsyncWaitOperatorTest.java  |  24 +-
 .../api/operators/async/EmitterTest.java        |   4 +
 .../queue/OrderedStreamElementQueueTest.java    |   3 +-
 .../async/queue/StreamElementQueueTest.java     |   1 +
 .../queue/UnorderedStreamElementQueueTest.java  |   3 +-
 .../api/operators/co/CoProcessOperatorTest.java |   9 +-
 .../api/operators/co/CoStreamFlatMapTest.java   |  11 +-
 .../api/operators/co/CoStreamMapTest.java       |   4 +-
 .../co/KeyedCoProcessOperatorTest.java          |   7 +-
 .../functions/InternalWindowFunctionTest.java   |  46 +--
 .../api/streamtask/MockRecordWriter.java        |  11 +-
 .../api/streamtask/StreamIterationHeadTest.java |   5 +-
 .../deltafunction/CosineDistanceTest.java       |  43 +--
 .../deltafunction/EuclideanDistanceTest.java    |  41 +--
 .../StreamingJobGraphGeneratorNodeHashTest.java |   5 +-
 .../flink/streaming/graph/TranslationTest.java  |   6 +-
 .../WithMasterCheckpointHookConfigTest.java     |   7 +-
 .../io/BarrierBufferAlignmentLimitTest.java     |  24 +-
 .../io/BarrierBufferMassiveRandomTest.java      |   9 +-
 .../streaming/runtime/io/BarrierBufferTest.java |  51 ++--
 .../runtime/io/BarrierTrackerTest.java          |   2 +-
 .../streaming/runtime/io/BufferSpillerTest.java |  24 +-
 .../streaming/runtime/io/MockInputGate.java     |   3 +
 .../io/SpilledBufferOrEventSequenceTest.java    |   9 +-
 .../runtime/io/StreamRecordWriterTest.java      |   9 +-
 .../ContinuousFileProcessingRescalingTest.java  |   5 +-
 .../operators/GenericWriteAheadSinkTest.java    |   8 +-
 .../operators/StreamOperatorChainingTest.java   |   6 +-
 .../operators/StreamSourceOperatorTest.java     |  17 +-
 .../runtime/operators/StreamTaskTimerTest.java  |  14 +-
 .../TestProcessingTimeServiceTest.java          |   8 +-
 ...stampsAndPeriodicWatermarksOperatorTest.java |   7 +-
 ...ampsAndPunctuatedWatermarksOperatorTest.java |   3 +
 .../operators/WriteAheadSinkTestBase.java       |   3 +
 ...AlignedProcessingTimeWindowOperatorTest.java |  21 +-
 ...AlignedProcessingTimeWindowOperatorTest.java |  12 +-
 .../windowing/AllWindowTranslationTest.java     |   4 +-
 .../ContinuousEventTimeTriggerTest.java         |   6 +-
 .../operators/windowing/CountTriggerTest.java   |   4 +-
 .../windowing/EventTimeSessionWindowsTest.java  |  39 ++-
 .../windowing/EventTimeTriggerTest.java         |   4 +-
 .../EvictingWindowOperatorContractTest.java     |   1 +
 .../windowing/EvictingWindowOperatorTest.java   | 143 ++++-----
 .../operators/windowing/GlobalWindowsTest.java  |   9 +-
 .../windowing/KeyMapPutIfAbsentTest.java        |   5 +-
 .../operators/windowing/KeyMapPutTest.java      |  17 +-
 .../runtime/operators/windowing/KeyMapTest.java |  12 +-
 .../windowing/MergingWindowSetTest.java         |  18 +-
 .../ProcessingTimeSessionWindowsTest.java       |  25 +-
 .../windowing/ProcessingTimeTriggerTest.java    |   4 +-
 .../operators/windowing/PurgingTriggerTest.java |  11 +-
 .../RegularWindowOperatorContractTest.java      |  28 +-
 .../windowing/SimpleTriggerTestHarness.java     |   1 +
 .../windowing/SlidingEventTimeWindowsTest.java  |  12 +-
 .../SlidingProcessingTimeWindowsTest.java       |  11 +-
 .../windowing/StreamRecordMatchers.java         | 290 +++++++++----------
 .../operators/windowing/TimeWindowTest.java     |  44 +--
 .../windowing/TimeWindowTranslationTest.java    |   9 +-
 .../operators/windowing/TriggerTestHarness.java |   5 +-
 .../windowing/TumblingEventTimeWindowsTest.java |  10 +-
 .../TumblingProcessingTimeWindowsTest.java      |  10 +-
 .../windowing/WindowOperatorContractTest.java   |  77 +++--
 .../WindowOperatorFrom11MigrationTest.java      |  46 ++-
 .../WindowOperatorFrom12MigrationTest.java      |  77 ++---
 .../operators/windowing/WindowOperatorTest.java | 264 ++++++++---------
 .../windowing/WindowTranslationTest.java        |  15 +-
 .../operators/windowing/WindowedValue.java      |  33 ++-
 .../partitioner/BroadcastPartitionerTest.java   |   8 +-
 .../partitioner/ForwardPartitionerTest.java     |   8 +-
 .../partitioner/GlobalPartitionerTest.java      |   8 +-
 .../KeyGroupStreamPartitionerTest.java          |  10 +-
 .../partitioner/RebalancePartitionerTest.java   |   8 +-
 .../partitioner/RescalePartitionerTest.java     |  12 +-
 .../partitioner/ShufflePartitionerTest.java     |  10 +-
 .../StreamElementSerializerTest.java            |   4 +-
 .../runtime/streamrecord/StreamRecordTest.java  |  11 +-
 .../streamstatus/StatusWatermarkValveTest.java  |   4 +-
 .../runtime/streamstatus/StreamStatusTest.java  |   5 +-
 .../runtime/tasks/BlockingCheckpointsTest.java  |  11 +-
 .../tasks/InterruptSensitiveRestoreTest.java    |   9 +-
 .../runtime/tasks/OneInputStreamTaskTest.java   |  34 ++-
 .../tasks/OneInputStreamTaskTestHarness.java    |  10 +-
 .../SourceExternalCheckpointTriggerTest.java    |   6 +-
 .../runtime/tasks/SourceStreamTaskTest.java     |  30 +-
 .../runtime/tasks/StreamMockEnvironment.java    |   9 +-
 .../StreamTaskCancellationBarrierTest.java      |  14 +-
 .../streaming/runtime/tasks/StreamTaskTest.java |  44 +--
 .../runtime/tasks/StreamTaskTestHarness.java    |  14 +-
 .../tasks/SystemProcessingTimeServiceTest.java  |   9 +-
 .../runtime/tasks/TwoInputStreamTaskTest.java   |   8 +-
 .../tasks/TwoInputStreamTaskTestHarness.java    |  10 +-
 .../util/AbstractDeserializationSchemaTest.java |   8 +-
 .../util/AbstractStreamOperatorTestHarness.java |  41 ++-
 .../streaming/util/CollectingSourceContext.java |   3 +
 .../flink/streaming/util/CollectorOutput.java   |  16 +-
 .../streaming/util/EvenOddOutputSelector.java   |   4 +
 .../streaming/util/HDFSCopyUtilitiesTest.java   |   5 +
 .../KeyedOneInputStreamOperatorTestHarness.java |   9 +-
 .../KeyedTwoInputStreamOperatorTestHarness.java |   5 +-
 .../flink/streaming/util/MockContext.java       |  13 +-
 .../apache/flink/streaming/util/MockOutput.java |  20 +-
 .../apache/flink/streaming/util/NoOpIntMap.java |   4 +
 .../util/OneInputStreamOperatorTestHarness.java |   2 +-
 .../streaming/util/OperatorSnapshotUtil.java    |  14 +-
 .../streaming/util/SourceFunctionUtil.java      |  16 +-
 .../flink/streaming/util/TestHarnessUtil.java   |   4 +-
 .../util/TwoInputStreamOperatorTestHarness.java |   3 +-
 .../TypeInformationSerializationSchemaTest.java |   8 +-
 .../util/keys/ArrayKeySelectorTest.java         |   7 +-
 .../serialization/SimpleStringSchemaTest.java   |   4 +-
 .../util/typeutils/FieldAccessorTest.java       |  53 ++--
 tools/maven/strict-checkstyle.xml               |  22 +-
 397 files changed, 2417 insertions(+), 1853 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
index 46142de..ab972a9 100644
--- a/flink-streaming-java/pom.xml
+++ b/flink-streaming-java/pom.xml
@@ -139,6 +139,7 @@ under the License.
 				<configuration>
 					<configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
 					<suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
 					<logViolationsToConsole>true</logViolationsToConsole>
 					<failOnViolation>true</failOnViolation>
 				</configuration>

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/api/graph/StreamGraphHasherV1.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/api/graph/StreamGraphHasherV1.java b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/api/graph/StreamGraphHasherV1.java
index f468c93..cfaa4b1 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/api/graph/StreamGraphHasherV1.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/api/graph/StreamGraphHasherV1.java
@@ -18,11 +18,21 @@
 
 package org.apache.flink.migration.streaming.api.graph;
 
-import static org.apache.flink.util.StringUtils.byteToHexString;
+import org.apache.flink.streaming.api.graph.StreamEdge;
+import org.apache.flink.streaming.api.graph.StreamGraph;
+import org.apache.flink.streaming.api.graph.StreamGraphHasher;
+import org.apache.flink.streaming.api.graph.StreamNode;
+import org.apache.flink.streaming.api.operators.AbstractUdfStreamOperator;
+import org.apache.flink.streaming.api.operators.ChainingStrategy;
+import org.apache.flink.streaming.api.operators.StreamOperator;
+import org.apache.flink.streaming.runtime.partitioner.ForwardPartitioner;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.nio.charset.Charset;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -34,16 +44,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
-import org.apache.flink.streaming.api.graph.StreamEdge;
-import org.apache.flink.streaming.api.graph.StreamGraph;
-import org.apache.flink.streaming.api.graph.StreamGraphHasher;
-import org.apache.flink.streaming.api.graph.StreamNode;
-import org.apache.flink.streaming.api.operators.AbstractUdfStreamOperator;
-import org.apache.flink.streaming.api.operators.ChainingStrategy;
-import org.apache.flink.streaming.api.operators.StreamOperator;
-import org.apache.flink.streaming.runtime.partitioner.ForwardPartitioner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static org.apache.flink.util.StringUtils.byteToHexString;
 
 /**
  * StreamGraphHasher from Flink 1.1. This contains duplicated code to ensure that the algorithm does not change with

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/MultiplexingStreamRecordSerializer.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/MultiplexingStreamRecordSerializer.java b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/MultiplexingStreamRecordSerializer.java
index 81ba33a..b1471b2 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/MultiplexingStreamRecordSerializer.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/MultiplexingStreamRecordSerializer.java
@@ -18,10 +18,6 @@
 
 package org.apache.flink.migration.streaming.runtime.streamrecord;
 
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-
 import org.apache.flink.api.common.typeutils.CompatibilityResult;
 import org.apache.flink.api.common.typeutils.CompatibilityUtil;
 import org.apache.flink.api.common.typeutils.CompositeTypeSerializerConfigSnapshot;
@@ -36,6 +32,10 @@ import org.apache.flink.streaming.api.watermark.Watermark;
 import org.apache.flink.streaming.runtime.streamrecord.StreamElement;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 
+import java.io.IOException;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * Legacy multiplexing {@link TypeSerializer} for stream records, watermarks and other stream
  * elements.
@@ -52,7 +52,6 @@ public class MultiplexingStreamRecordSerializer<T> extends TypeSerializer<Stream
 
 	private final TypeSerializer<T> typeSerializer;
 
-
 	public MultiplexingStreamRecordSerializer(TypeSerializer<T> serializer) {
 		if (serializer instanceof MultiplexingStreamRecordSerializer || serializer instanceof StreamRecordSerializer) {
 			throw new RuntimeException("StreamRecordSerializer given to StreamRecordSerializer as value TypeSerializer: " + serializer);

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/StreamRecordSerializer.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/StreamRecordSerializer.java b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/StreamRecordSerializer.java
index 5c32c19..e018ba0 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/StreamRecordSerializer.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/migration/streaming/runtime/streamrecord/StreamRecordSerializer.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.migration.streaming.runtime.streamrecord;
 
-import java.io.IOException;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.typeutils.CompatibilityResult;
 import org.apache.flink.api.common.typeutils.CompatibilityUtil;
@@ -33,6 +32,8 @@ import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.util.Preconditions;
 
+import java.io.IOException;
+
 /**
  * Serializer for {@link StreamRecord}. This version ignores timestamps and only deals with
  * the element.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
index 43d2659..427b86b 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.flink.streaming.api;
 
 import org.apache.flink.annotation.Internal;

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
index 9925608..d586ae7 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.streaming.api;
 
-
 import org.apache.flink.annotation.PublicEvolving;
 
 /**

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
index 7cdfdc2..eedc7a5 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.flink.streaming.api;
 
 /**

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java
index ef8b631..648d0e0 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.flink.streaming.api;
 
 import org.apache.flink.annotation.PublicEvolving;

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java
index 6de7329..7dedfbf 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java
@@ -18,9 +18,10 @@
 
 package org.apache.flink.streaming.api.checkpoint;
 
-import java.io.Serializable;
 import org.apache.flink.annotation.PublicEvolving;
 
+import java.io.Serializable;
+
 /**
  * This method must be implemented by functions that have state that needs to be
  * checkpointed. The functions get a call whenever a checkpoint should take place

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java
index b96c242..2230f59 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java
@@ -18,9 +18,10 @@
 
 package org.apache.flink.streaming.api.checkpoint;
 
-import java.io.Serializable;
 import org.apache.flink.annotation.PublicEvolving;
 
+import java.io.Serializable;
+
 /**
  * This interface marks a function/operator as checkpointed similar to the
  * {@link Checkpointed} interface, but gives the Flink framework the option to

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedRestoring.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedRestoring.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedRestoring.java
index f695418..cfaa505 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedRestoring.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedRestoring.java
@@ -18,9 +18,10 @@
 
 package org.apache.flink.streaming.api.checkpoint;
 
-import java.io.Serializable;
 import org.apache.flink.annotation.PublicEvolving;
 
+import java.io.Serializable;
+
 /**
  * This deprecated interface contains the methods for restoring from the legacy checkpointing mechanism of state.
  * @param <T> type of the restored state.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
index 49ce3e3..0b8b1b6 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
@@ -18,13 +18,14 @@
 
 package org.apache.flink.streaming.api.checkpoint;
 
-import java.io.Serializable;
-import java.util.List;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.RichFunction;
 import org.apache.flink.api.common.state.OperatorStateStore;
 import org.apache.flink.configuration.Configuration;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * This interface can be implemented by functions that want to store state in checkpoints.
  * It can be used in a similar way as the deprecated {@link Checkpointed} interface, but

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/CopyingDirectedOutput.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/CopyingDirectedOutput.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/CopyingDirectedOutput.java
index f74d652..5f7e278 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/CopyingDirectedOutput.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/CopyingDirectedOutput.java
@@ -17,14 +17,15 @@
 
 package org.apache.flink.streaming.api.collector.selector;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.streaming.api.graph.StreamEdge;
 import org.apache.flink.streaming.api.operators.Output;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 
 /**
  * Special version of {@link DirectedOutput} that performs a shallow copy of the

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/DirectedOutput.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/DirectedOutput.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/DirectedOutput.java
index 660a077..ec4700f 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/DirectedOutput.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/DirectedOutput.java
@@ -17,15 +17,6 @@
 
 package org.apache.flink.streaming.api.collector.selector;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.streaming.api.graph.StreamEdge;
 import org.apache.flink.streaming.api.operators.Output;
@@ -35,6 +26,15 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.util.OutputTag;
 import org.apache.flink.util.XORShiftRandom;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
 /**
  * Wrapping {@link Output} that forwards to other {@link Output Outputs } based on a list of
  * {@link OutputSelector OutputSelectors}.
@@ -51,7 +51,6 @@ public class DirectedOutput<OUT> implements Output<StreamRecord<OUT>> {
 
 	private final Random random = new XORShiftRandom();
 
-
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public DirectedOutput(
 			List<OutputSelector<OUT>> outputSelectors,
@@ -63,7 +62,6 @@ public class DirectedOutput<OUT> implements Output<StreamRecord<OUT>> {
 			allOutputs[i] = outputs.get(i).f0;
 		}
 
-
 		HashSet<Output<StreamRecord<OUT>>> selectAllOutputs = new HashSet<Output<StreamRecord<OUT>>>();
 		HashMap<String, ArrayList<Output<StreamRecord<OUT>>>> outputMap = new HashMap<String, ArrayList<Output<StreamRecord<OUT>>>>();
 
@@ -100,7 +98,6 @@ public class DirectedOutput<OUT> implements Output<StreamRecord<OUT>> {
 		}
 	}
 
-
 	@Override
 	public void emitWatermark(Watermark mark) {
 		for (Output<StreamRecord<OUT>> out : allOutputs) {

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/OutputSelector.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/OutputSelector.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/OutputSelector.java
index b40f3f5..a8433fe 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/OutputSelector.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/collector/selector/OutputSelector.java
@@ -17,12 +17,12 @@
 
 package org.apache.flink.streaming.api.collector.selector;
 
-import java.io.Serializable;
-
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator;
 import org.apache.flink.streaming.api.datastream.SplitStream;
 
+import java.io.Serializable;
+
 /**
  * Interface for defining an OutputSelector for a {@link SplitStream} using
  * the {@link SingleOutputStreamOperator#split} call. Every output object of a

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
index 7ea65fc..31dbb4f 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static org.apache.flink.util.Preconditions.checkArgument;
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.AggregateFunction;
@@ -70,6 +67,9 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.util.OutputTag;
 import org.apache.flink.util.Preconditions;
 
+import static org.apache.flink.util.Preconditions.checkArgument;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
 /**
  * A {@code AllWindowedStream} represents a data stream where the stream of
  * elements is split into windows based on a

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AsyncDataStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AsyncDataStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AsyncDataStream.java
index 759e32a..8461d2c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AsyncDataStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AsyncDataStream.java
@@ -17,7 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import java.util.concurrent.TimeUnit;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.Utils;
@@ -25,6 +24,8 @@ import org.apache.flink.api.java.typeutils.TypeExtractor;
 import org.apache.flink.streaming.api.functions.async.AsyncFunction;
 import org.apache.flink.streaming.api.operators.async.AsyncWaitOperator;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * A helper class to apply {@link AsyncFunction} to a data stream.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
index f0c3dc2..d112260 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
@@ -17,11 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -44,6 +39,12 @@ import org.apache.flink.streaming.api.windowing.triggers.Trigger;
 import org.apache.flink.streaming.api.windowing.windows.Window;
 import org.apache.flink.util.Collector;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  *{@code CoGroupedStreams} represents two {@link DataStream DataStreams} that have been co-grouped.
  * A streaming co-group operation is evaluated over elements in a window.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
index 0a2b4e1..0b882c8 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
@@ -17,8 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static java.util.Objects.requireNonNull;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -37,6 +35,8 @@ import org.apache.flink.streaming.api.operators.co.CoStreamMap;
 import org.apache.flink.streaming.api.operators.co.KeyedCoProcessOperator;
 import org.apache.flink.streaming.api.transformations.TwoInputTransformation;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * ConnectedStreams represent two connected streams of (possibly) different data types.
  * Connected streams are useful for cases where operations on one stream directly

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
index c531987..0cdc9a1 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
@@ -17,8 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import java.util.ArrayList;
-import java.util.List;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -96,6 +94,9 @@ import org.apache.flink.streaming.util.keys.KeySelectorUtil;
 import org.apache.flink.streaming.util.serialization.SerializationSchema;
 import org.apache.flink.util.Preconditions;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A DataStream represents a stream of elements of the same type. A DataStream
  * can be transformed into another DataStream by applying a transformation as

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
index b0be71f..7fa66db 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
@@ -17,7 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import java.util.Collection;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -28,6 +27,8 @@ import org.apache.flink.streaming.api.transformations.CoFeedbackTransformation;
 import org.apache.flink.streaming.api.transformations.FeedbackTransformation;
 import org.apache.flink.streaming.api.transformations.StreamTransformation;
 
+import java.util.Collection;
+
 /**
  * The iterative data stream represents the start of an iteration in a {@link DataStream}.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
index 77a252e..e1ffe86 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
@@ -17,8 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static java.util.Objects.requireNonNull;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.CoGroupFunction;
@@ -35,6 +33,8 @@ import org.apache.flink.streaming.api.windowing.triggers.Trigger;
 import org.apache.flink.streaming.api.windowing.windows.Window;
 import org.apache.flink.util.Collector;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  *{@code JoinedStreams} represents two {@link DataStream DataStreams} that have been joined.
  * A streaming join operation is evaluated over elements in a window.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
index e3171c3..698deb8 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
@@ -17,11 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -72,6 +67,13 @@ import org.apache.flink.streaming.api.windowing.windows.Window;
 import org.apache.flink.streaming.runtime.partitioner.KeyGroupStreamPartitioner;
 import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner;
 
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.UUID;
+
 /**
  * A {@code KeyedStream} represents a {@link DataStream} on which operator state is
  * partitioned by key using a provided {@link KeySelector}. Typical operations supported by a

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
index d033e98..e0deb9a 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
@@ -17,10 +17,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static java.util.Objects.requireNonNull;
-
-import java.util.HashMap;
-import java.util.Map;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.InvalidTypesException;
@@ -37,6 +33,11 @@ import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner;
 import org.apache.flink.util.OutputTag;
 import org.apache.flink.util.Preconditions;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * {@code SingleOutputStreamOperator} represents a user defined transformation
  * applied on a {@link DataStream} with one predefined output type.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SplitStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SplitStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SplitStream.java
index 9fcd2fc..4be6b6e 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SplitStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SplitStream.java
@@ -17,12 +17,13 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import com.google.common.collect.Lists;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.streaming.api.collector.selector.OutputSelector;
 import org.apache.flink.streaming.api.transformations.SelectTransformation;
 import org.apache.flink.streaming.api.transformations.SplitTransformation;
 
+import com.google.common.collect.Lists;
+
 /**
  * The SplitStream represents an operator that has been split using an
  * {@link OutputSelector}. Named outputs can be selected using the

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
index 7913e95..f8a1914 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.streaming.api.datastream;
 
-import static org.apache.flink.util.Preconditions.checkArgument;
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -79,6 +76,9 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.util.OutputTag;
 import org.apache.flink.util.Preconditions;
 
+import static org.apache.flink.util.Preconditions.checkArgument;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
 /**
  * A {@code WindowedStream} represents a data stream where elements are grouped by
  * key, and for each key, the stream of elements is split into windows based on a
@@ -1709,7 +1709,6 @@ public class WindowedStream<T, K, W extends Window> {
 			InternalWindowFunction<Iterable<T>, R, K, TimeWindow> timeWindowFunction =
 					(InternalWindowFunction<Iterable<T>, R, K, TimeWindow>) function;
 
-
 			OneInputStreamOperator<T, R> op = new AccumulatingProcessingTimeWindowOperator<>(
 					timeWindowFunction, input.getKeySelector(),
 					input.getKeyType().createSerializer(getExecutionEnvironment().getConfig()),
@@ -1721,7 +1720,6 @@ public class WindowedStream<T, K, W extends Window> {
 		return null;
 	}
 
-
 	public StreamExecutionEnvironment getExecutionEnvironment() {
 		return input.getExecutionEnvironment();
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
index 8d8abfb..da65147 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
@@ -18,15 +18,15 @@
 
 package org.apache.flink.streaming.api.environment;
 
-import static java.util.Objects.requireNonNull;
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.runtime.jobgraph.JobStatus;
 import org.apache.flink.streaming.api.CheckpointingMode;
 
+import static java.util.Objects.requireNonNull;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
 /**
  * Configuration that captures all checkpointing related settings.
  */

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
index b4031fa..6b31ff8 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
@@ -26,8 +26,8 @@ import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.TaskManagerOptions;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
-
 import org.apache.flink.streaming.api.graph.StreamGraph;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
index 2ff45ba..042248b 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
@@ -17,15 +17,6 @@
 
 package org.apache.flink.streaming.api.environment;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.api.common.JobExecutionResult;
@@ -36,11 +27,20 @@ import org.apache.flink.client.program.ProgramInvocationException;
 import org.apache.flink.client.program.StandaloneClusterClient;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
-
 import org.apache.flink.streaming.api.graph.StreamGraph;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * A {@link StreamExecutionEnvironment} for executing on a cluster.
  */
@@ -253,7 +253,6 @@ public class RemoteStreamEnvironment extends StreamExecutionEnvironment {
 		return port;
 	}
 
-
 	public Configuration getClientConfiguration() {
 		return clientConfiguration;
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
index 52d2c4b..64c3a1f 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamContextEnvironment.java
@@ -21,7 +21,6 @@ import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.JobExecutionResult;
 import org.apache.flink.client.program.ContextEnvironment;
 import org.apache.flink.client.program.DetachedEnvironment;
-
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.GlobalConfiguration;
 import org.apache.flink.streaming.api.graph.StreamGraph;

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index 97117d2..46c821e 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -17,16 +17,6 @@
 
 package org.apache.flink.streaming.api.environment;
 
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
-import com.esotericsoftware.kryo.Serializer;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.Public;
 import org.apache.flink.annotation.PublicEvolving;
@@ -87,6 +77,18 @@ import org.apache.flink.streaming.api.transformations.StreamTransformation;
 import org.apache.flink.util.Preconditions;
 import org.apache.flink.util.SplittableIterator;
 
+import com.esotericsoftware.kryo.Serializer;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
 /**
  * The StreamExecutionEnvironment is the context in which a streaming program is executed. A
  * {@link LocalStreamEnvironment} will cause execution in the current JVM, a

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
index 4621988..823a5c3 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
@@ -18,10 +18,11 @@
 
 package org.apache.flink.streaming.api.functions;
 
-import javax.annotation.Nullable;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.streaming.api.watermark.Watermark;
 
+import javax.annotation.Nullable;
+
 /**
  * The {@code AssignerWithPeriodicWatermarks} assigns event time timestamps to elements,
  * and generates low watermarks that signal event time progress within the stream.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
index 2040e77..a69a839 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
@@ -18,9 +18,10 @@
 
 package org.apache.flink.streaming.api.functions;
 
-import javax.annotation.Nullable;
 import org.apache.flink.streaming.api.watermark.Watermark;
 
+import javax.annotation.Nullable;
+
 /**
  * The {@code AssignerWithPunctuatedWatermarks} assigns event time timestamps to elements,
  * and generates low watermarks that signal event time progress within the stream.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
index a2a84fe..6f13f5c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
@@ -67,7 +67,6 @@ public class ComparableAggregator<T> extends AggregationFunction<T> {
 		this(aggregationType, FieldAccessorFactory.getAccessor(typeInfo, field, config), first);
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public T reduce(T value1, T value2) throws Exception {

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
index 9202a49..14218ea 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
@@ -17,11 +17,11 @@
 
 package org.apache.flink.streaming.api.functions.aggregation;
 
-import java.io.Serializable;
-
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.streaming.api.functions.aggregation.AggregationFunction.AggregationType;
 
+import java.io.Serializable;
+
 /**
  * Internal comparator implementation, for use with {@link ComparableAggregator}.
  */

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
index 9bbac3d..a177c58 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
@@ -17,9 +17,10 @@
 
 package org.apache.flink.streaming.api.functions.aggregation;
 
-import java.io.Serializable;
 import org.apache.flink.annotation.Internal;
 
+import java.io.Serializable;
+
 /**
  * Internal function for summing up contents of fields. This is used with {@link SumAggregator}.
  */

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/AsyncFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/AsyncFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/AsyncFunction.java
index c0cde30..5bb4459 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/AsyncFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/AsyncFunction.java
@@ -18,11 +18,12 @@
 
 package org.apache.flink.streaming.api.functions.async;
 
-import java.io.Serializable;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.Function;
 import org.apache.flink.streaming.api.functions.async.collector.AsyncCollector;
 
+import java.io.Serializable;
+
 /**
  * A function to trigger Async I/O operation.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java
index 3885b1c..84f9e53 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.streaming.api.functions.async;
 
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.accumulators.Accumulator;
@@ -50,6 +47,10 @@ import org.apache.flink.streaming.api.functions.async.collector.AsyncCollector;
 import org.apache.flink.types.Value;
 import org.apache.flink.util.Preconditions;
 
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Rich variant of the {@link AsyncFunction}. As a {@link RichFunction}, it gives access to the
  * {@link RuntimeContext} and provides setup and teardown methods:
@@ -181,7 +182,6 @@ public abstract class RichAsyncFunction<IN, OUT> extends AbstractRichFunction im
 			throw new UnsupportedOperationException("State is not supported in rich async functions.");
 		}
 
-
 		@Override
 		public <V, A extends Serializable> void addAccumulator(String name, Accumulator<V, A> accumulator) {
 			throw new UnsupportedOperationException("Accumulators are not supported in rich async functions.");

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/collector/AsyncCollector.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/collector/AsyncCollector.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/collector/AsyncCollector.java
index 9c07d1a..964c13a 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/collector/AsyncCollector.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/collector/AsyncCollector.java
@@ -18,9 +18,10 @@
 
 package org.apache.flink.streaming.api.functions.async.collector;
 
-import java.util.Collection;
 import org.apache.flink.annotation.PublicEvolving;
 
+import java.util.Collection;
+
 /**
  * {@link AsyncCollector} collects data / error in user codes while processing async i/o.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
index 03bfcbd..d693ee4 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
@@ -18,12 +18,12 @@
 
 package org.apache.flink.streaming.api.functions.co;
 
-import java.io.Serializable;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.api.common.functions.Function;
 import org.apache.flink.util.Collector;
 
+import java.io.Serializable;
+
 /**
  * A CoFlatMapFunction implements a flat-map transformation over two
  * connected streams.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
index 71fcbc8..3a3904a 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
@@ -18,11 +18,11 @@
 
 package org.apache.flink.streaming.api.functions.co;
 
-import java.io.Serializable;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.api.common.functions.Function;
 
+import java.io.Serializable;
+
 /**
  * A CoFlatMapFunction implements a map() transformation over two
  * connected streams.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
index ed308c5..fbcc2d0 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
@@ -17,8 +17,6 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
-import java.io.IOException;
-
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.functions.RuntimeContext;
@@ -32,6 +30,8 @@ import org.apache.flink.configuration.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 /**
  * Simple implementation of the SinkFunction writing tuples in the specified
  * OutputFormat format.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
index bc47e9f..e646663 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
@@ -17,12 +17,12 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
-import java.io.PrintStream;
-
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
 
+import java.io.PrintStream;
+
 /**
  * Implementation of the SinkFunction writing every tuple to the standard
  * output or standard error stream.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
index 68a630b..cb9e11d 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
@@ -17,11 +17,11 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
-import java.io.Serializable;
-
 import org.apache.flink.annotation.Public;
 import org.apache.flink.api.common.functions.Function;
 
+import java.io.Serializable;
+
 /**
  * Interface for implementing user defined sink functionality.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
index 88cd4df..c43345b 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
@@ -17,19 +17,21 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
-import static org.apache.flink.util.Preconditions.checkArgument;
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.runtime.util.SerializableObject;
 import org.apache.flink.streaming.util.serialization.SerializationSchema;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import static org.apache.flink.util.Preconditions.checkArgument;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
 /**
  * Socket client that acts as a streaming sink. The data is sent to a Socket as a byte array.
  *

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormat.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormat.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormat.java
index 270b7b5..65915af 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormat.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormat.java
@@ -17,9 +17,10 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
+import org.apache.flink.annotation.PublicEvolving;
+
 import java.io.Serializable;
 import java.util.ArrayList;
-import org.apache.flink.annotation.PublicEvolving;
 
 /**
  * Abstract class for formatting the output of the writeAsText and writeAsCsv

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsCsv.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsCsv.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsCsv.java
index ed1451b..234dd39 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsCsv.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsCsv.java
@@ -17,12 +17,13 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
+import org.apache.flink.annotation.PublicEvolving;
+
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import org.apache.flink.annotation.PublicEvolving;
 
 /**
  * Writes tuples in csv format.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsText.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsText.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsText.java
index eb9ddcd..e331ed9 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsText.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteFormatAsText.java
@@ -17,12 +17,13 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
+import org.apache.flink.annotation.PublicEvolving;
+
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import org.apache.flink.annotation.PublicEvolving;
 
 /**
  * Writes tuples in text format.

http://git-wip-us.apache.org/repos/asf/flink/blob/12b4185c/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteSinkFunction.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteSinkFunction.java
index 9c8f5bd..fa2bd8d 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteSinkFunction.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/WriteSinkFunction.java
@@ -17,10 +17,11 @@
 
 package org.apache.flink.streaming.api.functions.sink;
 
+import org.apache.flink.annotation.PublicEvolving;
+
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import org.apache.flink.annotation.PublicEvolving;
 
 /**
  * Simple implementation of the SinkFunction writing tuples as simple text to