You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/24 21:01:54 UTC

[17/18] incubator-beam git commit: Optimize imports

Optimize imports


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c623a271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c623a271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c623a271

Branch: refs/heads/master
Commit: c623a271a3f58a834a803cf9d3b5e5c0920caea7
Parents: 5776b93
Author: bchambers <bc...@google.com>
Authored: Wed Aug 24 13:01:03 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Aug 24 13:39:04 2016 -0700

----------------------------------------------------------------------
 .../beam/examples/DebuggingWordCount.java       |   8 +-
 .../apache/beam/examples/WindowedWordCount.java |  17 ++-
 .../org/apache/beam/examples/WordCount.java     |   8 +-
 .../common/ExampleBigQueryTableOptions.java     |   3 +-
 .../beam/examples/common/ExampleOptions.java    |   7 +-
 .../beam/examples/common/ExampleUtils.java      |  14 +--
 .../examples/common/PubsubFileInjector.java     |  14 +--
 .../beam/examples/complete/AutoComplete.java    |  33 +++---
 .../examples/complete/StreamingWordExtract.java |  12 +-
 .../apache/beam/examples/complete/TfIdf.java    |  14 +--
 .../examples/complete/TopWikipediaSessions.java |   7 +-
 .../examples/complete/TrafficMaxLaneFlow.java   |  19 ++--
 .../beam/examples/complete/TrafficRoutes.java   |  29 +++--
 .../examples/cookbook/BigQueryTornadoes.java    |  12 +-
 .../cookbook/CombinePerKeyExamples.java         |  12 +-
 .../examples/cookbook/DatastoreWordCount.java   |  18 ++-
 .../beam/examples/cookbook/FilterExamples.java  |  14 +--
 .../beam/examples/cookbook/JoinExamples.java    |   3 +-
 .../examples/cookbook/MaxPerKeyExamples.java    |  12 +-
 .../beam/examples/cookbook/TriggerExample.java  |  17 ++-
 .../beam/examples/DebuggingWordCountTest.java   |   6 +-
 .../org/apache/beam/examples/WordCountIT.java   |   4 +-
 .../org/apache/beam/examples/WordCountTest.java |   6 +-
 .../examples/complete/AutoCompleteTest.java     |  12 +-
 .../beam/examples/complete/TfIdfTest.java       |   6 +-
 .../complete/TopWikipediaSessionsTest.java      |   7 +-
 .../examples/cookbook/BigQueryTornadoesIT.java  |   1 -
 .../cookbook/BigQueryTornadoesTest.java         |   7 +-
 .../cookbook/CombinePerKeyExamplesTest.java     |   7 +-
 .../examples/cookbook/DeDupExampleTest.java     |   6 +-
 .../examples/cookbook/FilterExamplesTest.java   |   9 +-
 .../examples/cookbook/JoinExamplesTest.java     |   9 +-
 .../cookbook/MaxPerKeyExamplesTest.java         |   9 +-
 .../examples/cookbook/TriggerExampleTest.java   |  17 ++-
 .../beam/examples/MinimalWordCountJava8.java    |   3 +-
 .../beam/examples/complete/game/GameStats.java  |   8 +-
 .../examples/complete/game/HourlyTeamScore.java |   8 +-
 .../examples/complete/game/LeaderBoard.java     |   8 +-
 .../beam/examples/complete/game/UserScore.java  |   8 +-
 .../complete/game/injector/Injector.java        |   8 +-
 .../complete/game/injector/InjectorUtils.java   |   1 -
 .../injector/RetryHttpInitializerWrapper.java   |   1 -
 .../complete/game/utils/WriteToBigQuery.java    |  18 ++-
 .../game/utils/WriteWindowedToBigQuery.java     |   6 +-
 .../examples/MinimalWordCountJava8Test.java     |  21 ++--
 .../examples/complete/game/GameStatsTest.java   |   8 +-
 .../complete/game/HourlyTeamScoreTest.java      |   8 +-
 .../examples/complete/game/UserScoreTest.java   |   8 +-
 .../beam/runners/core/SideInputHandler.java     |  17 ++-
 .../core/UnboundedReadFromBoundedSource.java    |  37 +++----
 .../apache/beam/sdk/util/AssignWindowsDoFn.java |   7 +-
 .../beam/sdk/util/BatchTimerInternals.java      |   8 +-
 .../apache/beam/sdk/util/DoFnRunnerBase.java    |  22 ++--
 .../org/apache/beam/sdk/util/DoFnRunners.java   |   3 +-
 .../GroupAlsoByWindowsViaOutputBufferDoFn.java  |   7 +-
 .../sdk/util/GroupByKeyViaGroupByKeyOnly.java   |   9 +-
 .../sdk/util/LateDataDroppingDoFnRunner.java    |  10 +-
 .../apache/beam/sdk/util/PaneInfoTracker.java   |   6 +-
 .../sdk/util/PushbackSideInputDoFnRunner.java   |   6 +-
 .../java/org/apache/beam/sdk/util/ReduceFn.java |   4 +-
 .../beam/sdk/util/ReduceFnContextFactory.java   |  12 +-
 .../apache/beam/sdk/util/ReduceFnRunner.java    |  26 ++---
 .../apache/beam/sdk/util/SimpleDoFnRunner.java  |   2 +-
 .../apache/beam/sdk/util/SystemReduceFn.java    |   3 +-
 .../org/apache/beam/sdk/util/TriggerRunner.java |  16 +--
 .../org/apache/beam/sdk/util/WatermarkHold.java |  12 +-
 .../beam/runners/core/SideInputHandlerTest.java |   4 +-
 .../UnboundedReadFromBoundedSourceTest.java     |  27 ++---
 .../beam/sdk/util/BatchTimerInternalsTest.java  |   1 -
 .../sdk/util/GroupAlsoByWindowsProperties.java  |  19 ++--
 ...oupAlsoByWindowsViaOutputBufferDoFnTest.java |   1 -
 .../util/LateDataDroppingDoFnRunnerTest.java    |   9 +-
 .../util/PushbackSideInputDoFnRunnerTest.java   |   9 +-
 .../beam/sdk/util/ReduceFnRunnerTest.java       |  13 +--
 .../apache/beam/sdk/util/ReduceFnTester.java    |  45 ++++----
 .../beam/sdk/util/SimpleDoFnRunnerTest.java     |   6 +-
 .../runners/direct/AggregatorContainer.java     |   8 +-
 .../direct/BoundedReadEvaluatorFactory.java     |  14 +--
 .../beam/runners/direct/CommittedResult.java    |   9 +-
 .../direct/ConsumerTrackingPipelineVisitor.java |  13 +--
 .../beam/runners/direct/DirectRegistrar.java    |   5 +-
 .../beam/runners/direct/DirectRunner.java       |  25 ++---
 .../runners/direct/DirectTimerInternals.java    |   4 +-
 .../runners/direct/DoFnLifecycleManager.java    |  15 +--
 ...ecycleManagerRemovingTransformEvaluator.java |   1 -
 .../beam/runners/direct/EvaluationContext.java  |  26 ++---
 .../direct/ExecutorServiceParallelExecutor.java |  34 +++---
 .../GroupAlsoByWindowEvaluatorFactory.java      |   6 +-
 .../direct/GroupByKeyOnlyEvaluatorFactory.java  |  13 +--
 .../ImmutabilityCheckingBundleFactory.java      |   6 +-
 .../direct/ImmutabilityEnforcementFactory.java  |   5 +-
 .../direct/ImmutableListBundleFactory.java      |   6 +-
 .../direct/KeyedPValueTrackingVisitor.java      |   5 +-
 .../beam/runners/direct/NanosOffsetClock.java   |   3 +-
 .../beam/runners/direct/ParDoEvaluator.java     |  14 +--
 .../direct/ParDoMultiEvaluatorFactory.java      |  11 +-
 .../direct/ParDoSingleEvaluatorFactory.java     |  13 +--
 .../beam/runners/direct/PipelineExecutor.java   |   3 +-
 .../beam/runners/direct/SideInputContainer.java |  19 ++--
 .../apache/beam/runners/direct/StepAndKey.java  |   4 +-
 .../runners/direct/StepTransformResult.java     |  16 +--
 .../direct/TestStreamEvaluatorFactory.java      |  14 +--
 .../direct/TransformEvaluatorFactory.java       |   3 +-
 .../direct/TransformEvaluatorRegistry.java      |  16 +--
 .../beam/runners/direct/TransformExecutor.java  |   8 +-
 .../direct/TransformExecutorServices.java       |   1 -
 .../beam/runners/direct/TransformResult.java    |   7 +-
 .../direct/UnboundedReadDeduplicator.java       |  11 +-
 .../direct/UnboundedReadEvaluatorFactory.java   |  16 +--
 .../direct/UncommittedBundleOutputManager.java  |   3 +-
 .../runners/direct/ViewEvaluatorFactory.java    |   5 +-
 .../direct/WatermarkCallbackExecutor.java       |  11 +-
 .../beam/runners/direct/WatermarkManager.java   |  28 ++---
 .../runners/direct/WindowEvaluatorFactory.java  |  10 +-
 .../direct/WriteWithShardingFactory.java        |   7 +-
 .../runners/direct/AggregatorContainerTest.java |   8 +-
 .../direct/BoundedReadEvaluatorFactoryTest.java |  13 +--
 .../runners/direct/CommittedResultTest.java     |  13 +--
 .../ConsumerTrackingPipelineVisitorTest.java    |   6 +-
 .../runners/direct/DirectRegistrarTest.java     |   9 +-
 .../beam/runners/direct/DirectRunnerTest.java   |  14 +--
 .../direct/DirectTimerInternalsTest.java        |   1 -
 ...leManagerRemovingTransformEvaluatorTest.java |   6 +-
 .../direct/DoFnLifecycleManagerTest.java        |  12 +-
 .../direct/DoFnLifecycleManagersTest.java       |   9 +-
 .../EncodabilityEnforcementFactoryTest.java     |  10 +-
 .../runners/direct/EvaluationContextTest.java   |  17 ++-
 .../direct/FlattenEvaluatorFactoryTest.java     |   1 -
 .../direct/ForwardingPTransformTest.java        |   1 -
 .../direct/GroupByKeyEvaluatorFactoryTest.java  |   8 +-
 .../GroupByKeyOnlyEvaluatorFactoryTest.java     |   8 +-
 .../ImmutabilityCheckingBundleFactoryTest.java  |   1 -
 .../ImmutabilityEnforcementFactoryTest.java     |   6 +-
 .../direct/ImmutableListBundleFactoryTest.java  |  11 +-
 .../direct/KeyedPValueTrackingVisitorTest.java  |   9 +-
 .../beam/runners/direct/ParDoEvaluatorTest.java |  14 +--
 .../direct/ParDoMultiEvaluatorFactoryTest.java  |   2 +-
 .../direct/ParDoSingleEvaluatorFactoryTest.java |   2 +-
 .../runners/direct/SideInputContainerTest.java  |  17 ++-
 .../runners/direct/StepTransformResultTest.java |   1 -
 .../beam/runners/direct/StructuralKeyTest.java  |   1 -
 .../direct/TransformExecutorServicesTest.java   |   4 +-
 .../runners/direct/TransformExecutorTest.java   |  23 ++--
 .../direct/UnboundedReadDeduplicatorTest.java   |  12 +-
 .../UnboundedReadEvaluatorFactoryTest.java      |  26 ++---
 .../direct/ViewEvaluatorFactoryTest.java        |   4 +-
 .../direct/WatermarkCallbackExecutorTest.java   |   8 +-
 .../runners/direct/WatermarkManagerTest.java    |  21 ++--
 .../direct/WindowEvaluatorFactoryTest.java      |  14 +--
 .../direct/WriteWithShardingFactoryTest.java    |  27 ++---
 .../beam/runners/flink/examples/TFIDF.java      |  14 +--
 .../beam/runners/flink/examples/WordCount.java  |   1 -
 .../flink/examples/streaming/AutoComplete.java  |   6 +-
 .../flink/examples/streaming/JoinExamples.java  |   1 -
 .../examples/streaming/KafkaIOExamples.java     |  12 +-
 .../KafkaWindowedWordCountExample.java          |   4 +-
 .../examples/streaming/WindowedWordCount.java   |   4 +-
 .../flink/DefaultParallelismFactory.java        |   1 -
 .../FlinkPipelineExecutionEnvironment.java      |   4 +-
 .../runners/flink/FlinkPipelineOptions.java     |   6 +-
 .../apache/beam/runners/flink/FlinkRunner.java  |  23 ++--
 .../runners/flink/FlinkRunnerRegistrar.java     |   5 +-
 .../beam/runners/flink/FlinkRunnerResult.java   |  10 +-
 .../beam/runners/flink/TestFlinkRunner.java     |   2 -
 .../FlinkBatchPipelineTranslator.java           |   1 -
 .../FlinkBatchTransformTranslators.java         |  19 ++--
 .../FlinkBatchTranslationContext.java           |   6 +-
 .../FlinkStreamingPipelineTranslator.java       |   1 -
 .../FlinkStreamingTransformTranslators.java     |  25 ++---
 .../FlinkStreamingTranslationContext.java       |   6 +-
 .../functions/FlinkAssignContext.java           |   6 +-
 .../functions/FlinkAssignWindows.java           |   4 +-
 .../functions/FlinkDoFnFunction.java            |   4 +-
 .../FlinkMergingNonShuffleReduceFunction.java   |  17 ++-
 .../FlinkMergingPartialReduceFunction.java      |  17 ++-
 .../functions/FlinkMergingReduceFunction.java   |  21 ++--
 .../functions/FlinkMultiOutputDoFnFunction.java |   4 +-
 .../FlinkMultiOutputProcessContext.java         |   6 +-
 .../FlinkMultiOutputPruningFunction.java        |   1 -
 .../functions/FlinkNoElementAssignContext.java  |   1 -
 .../functions/FlinkPartialReduceFunction.java   |  17 ++-
 .../functions/FlinkProcessContext.java          |  15 +--
 .../functions/FlinkReduceFunction.java          |  21 ++--
 .../functions/SideInputInitializer.java         |  10 +-
 .../translation/types/CoderTypeInformation.java |   1 -
 .../translation/types/CoderTypeSerializer.java  |   8 +-
 .../types/EncodedValueComparator.java           |   6 +-
 .../types/EncodedValueSerializer.java           |   4 +-
 .../types/EncodedValueTypeInformation.java      |   4 -
 .../flink/translation/types/FlinkCoder.java     |  11 +-
 .../flink/translation/types/KvKeySelector.java  |   1 -
 .../utils/SerializedPipelineOptions.java        |   4 +-
 .../wrappers/DataInputViewWrapper.java          |   3 +-
 .../wrappers/DataOutputViewWrapper.java         |   3 +-
 .../SerializableFnAggregatorWrapper.java        |   9 +-
 .../translation/wrappers/SourceInputFormat.java |   6 +-
 .../translation/wrappers/SourceInputSplit.java  |   1 -
 .../wrappers/streaming/DoFnOperator.java        |  22 ++--
 .../wrappers/streaming/FlinkStateInternals.java |  13 +--
 .../streaming/SingletonKeyedWorkItem.java       |   3 +-
 .../streaming/SingletonKeyedWorkItemCoder.java  |  17 ++-
 .../wrappers/streaming/WindowDoFnOperator.java  |  34 +++---
 .../wrappers/streaming/WorkItemKeySelector.java |   5 +-
 .../streaming/io/BoundedSourceWrapper.java      |   9 +-
 .../streaming/io/UnboundedFlinkSink.java        |  14 +--
 .../streaming/io/UnboundedFlinkSource.java      |   7 +-
 .../streaming/io/UnboundedSocketSource.java     |  17 ++-
 .../streaming/io/UnboundedSourceWrapper.java    |  15 +--
 .../flink/EncodedValueComparatorTest.java       |   1 -
 .../runners/flink/FlinkRunnerRegistrarTest.java |   1 -
 .../beam/runners/flink/PipelineOptionsTest.java |   6 +-
 .../beam/runners/flink/ReadSourceITCase.java    |   9 +-
 .../flink/ReadSourceStreamingITCase.java        |   4 +-
 .../beam/runners/flink/WriteSinkITCase.java     |  13 +--
 .../flink/streaming/DoFnOperatorTest.java       |  11 +-
 .../streaming/FlinkStateInternalsTest.java      |   6 +-
 .../flink/streaming/GroupByNullKeyTest.java     |  11 +-
 .../flink/streaming/TestCountingSource.java     |  12 +-
 .../streaming/TopWikipediaSessionsITCase.java   |  11 +-
 .../streaming/UnboundedSourceWrapperTest.java   |   8 +-
 .../dataflow/BlockingDataflowRunner.java        |   7 +-
 .../runners/dataflow/DataflowJobException.java  |   1 -
 .../runners/dataflow/DataflowPipelineJob.java   |  30 +++--
 .../dataflow/DataflowPipelineRegistrar.java     |   5 +-
 .../dataflow/DataflowPipelineTranslator.java    |  48 ++++----
 .../beam/runners/dataflow/DataflowRunner.java   | 107 +++++++++---------
 .../runners/dataflow/DataflowRunnerHooks.java   |   3 +-
 .../dataflow/internal/CustomSources.java        |  18 ++-
 .../internal/DataflowAggregatorTransforms.java  |  10 +-
 .../internal/DataflowMetricUpdateExtractor.java |  10 +-
 .../DataflowUnboundedReadFromBoundedSource.java |  37 +++----
 .../runners/dataflow/internal/IsmFormat.java    |  35 +++---
 .../dataflow/internal/ReadTranslator.java       |   8 +-
 .../dataflow/options/CloudDebuggerOptions.java  |   6 +-
 .../options/DataflowPipelineDebugOptions.java   |  11 +-
 .../options/DataflowPipelineOptions.java        |   7 +-
 .../DataflowPipelineWorkerPoolOptions.java      |   9 +-
 .../options/DataflowProfilingOptions.java       |   3 +-
 .../options/DataflowWorkerLoggingOptions.java   |   8 +-
 .../dataflow/testing/TestDataflowRunner.java    |  27 ++---
 .../dataflow/util/DataflowTransport.java        |   6 +-
 .../beam/runners/dataflow/util/DoFnInfo.java    |   3 +-
 .../beam/runners/dataflow/util/GcsStager.java   |   6 +-
 .../runners/dataflow/util/MonitoringUtil.java   |  14 +--
 .../beam/runners/dataflow/util/PackageUtil.java |  18 ++-
 .../runners/dataflow/util/RandomAccessData.java |  16 +--
 .../beam/runners/dataflow/util/Stager.java      |   1 -
 .../beam/runners/dataflow/util/TimeUtil.java    |   8 +-
 .../dataflow/BlockingDataflowRunnerTest.java    |   1 -
 .../dataflow/DataflowPipelineJobTest.java       |  33 +++---
 .../dataflow/DataflowPipelineRegistrarTest.java |   9 +-
 .../DataflowPipelineTranslatorTest.java         |  38 +++----
 .../runners/dataflow/DataflowRunnerTest.java    |  48 ++++----
 .../dataflow/RecordingPipelineVisitor.java      |   5 +-
 .../DataflowPipelineDebugOptionsTest.java       |   1 -
 .../options/DataflowPipelineOptionsTest.java    |   1 -
 .../options/DataflowProfilingOptionsTest.java   |   4 +-
 .../DataflowWorkerLoggingOptionsTest.java       |   8 +-
 .../testing/TestDataflowRunnerTest.java         |  35 +++---
 .../transforms/DataflowGroupByKeyTest.java      |   6 +-
 .../dataflow/transforms/DataflowViewTest.java   |   1 -
 .../dataflow/util/MonitoringUtilTest.java       |  17 ++-
 .../runners/dataflow/util/PackageUtilTest.java  |  41 ++++---
 .../dataflow/util/RandomAccessDataTest.java     |  13 +--
 .../runners/dataflow/util/TimeUtilTest.java     |   1 -
 .../apache/beam/runners/spark/SparkRunner.java  |   1 -
 .../runners/spark/SparkRunnerRegistrar.java     |   5 +-
 .../spark/aggregators/NamedAggregators.java     |  10 +-
 .../beam/runners/spark/coders/CoderHelpers.java |  12 +-
 .../runners/spark/coders/NullWritableCoder.java |   6 +-
 .../runners/spark/coders/WritableCoder.java     |  14 +--
 .../apache/beam/runners/spark/io/KafkaIO.java   |   8 +-
 .../beam/runners/spark/io/hadoop/HadoopIO.java  |   6 +-
 .../spark/io/hadoop/ShardNameBuilder.java       |   3 +-
 .../io/hadoop/ShardNameTemplateHelper.java      |   3 +-
 .../io/hadoop/TemplatedAvroKeyOutputFormat.java |   5 +-
 .../TemplatedSequenceFileOutputFormat.java      |   3 +-
 .../io/hadoop/TemplatedTextOutputFormat.java    |   3 +-
 .../runners/spark/translation/DoFnFunction.java |  10 +-
 .../spark/translation/EvaluationContext.java    |  19 ++--
 .../spark/translation/MultiDoFnFunction.java    |  16 +--
 .../spark/translation/SparkProcessContext.java  |  15 +--
 .../spark/translation/SparkRuntimeContext.java  |  19 ++--
 .../spark/translation/TransformEvaluator.java   |   3 +-
 .../spark/translation/TransformTranslator.java  |  30 +++--
 .../streaming/StreamingEvaluationContext.java   |  14 +--
 .../streaming/StreamingTransformTranslator.java |  26 ++---
 .../runners/spark/util/BroadcastHelper.java     |   8 +-
 .../beam/runners/spark/util/ByteArray.java      |   1 -
 .../apache/beam/runners/spark/DeDupTest.java    |  11 +-
 .../beam/runners/spark/EmptyInputTest.java      |   9 +-
 .../beam/runners/spark/SimpleWordCountTest.java |  15 +--
 .../runners/spark/SparkRunnerRegistrarTest.java |   9 +-
 .../apache/beam/runners/spark/TfIdfTest.java    |   6 +-
 .../runners/spark/coders/WritableCoderTest.java |   1 -
 .../beam/runners/spark/io/AvroPipelineTest.java |  25 ++---
 .../beam/runners/spark/io/NumShardsTest.java    |  21 ++--
 .../io/hadoop/HadoopFileFormatPipelineTest.java |   6 +-
 .../spark/io/hadoop/ShardNameBuilderTest.java   |   1 -
 .../spark/translation/CombineGloballyTest.java  |   9 +-
 .../spark/translation/CombinePerKeyTest.java    |  11 +-
 .../spark/translation/DoFnOutputTest.java       |   4 +-
 .../translation/MultiOutputWordCountTest.java   |   9 +-
 .../spark/translation/SerializationTest.java    |  23 ++--
 .../spark/translation/SideEffectsTest.java      |   6 +-
 .../translation/SparkPipelineOptionsTest.java   |   1 -
 .../translation/TransformTranslatorTest.java    |  21 ++--
 .../translation/WindowedWordCountTest.java      |   9 +-
 .../streaming/FlattenStreamingTest.java         |   8 +-
 .../streaming/KafkaStreamingTest.java           |  16 +--
 .../streaming/SimpleStreamingWordCountTest.java |  10 +-
 .../streaming/utils/EmbeddedKafkaCluster.java   |  12 +-
 .../streaming/utils/PAssertStreaming.java       |   4 +-
 .../beam/sdk/AggregatorPipelineExtractor.java   |  12 +-
 .../org/apache/beam/sdk/AggregatorValues.java   |   5 +-
 .../main/java/org/apache/beam/sdk/Pipeline.java |  21 ++--
 .../org/apache/beam/sdk/PipelineResult.java     |   4 +-
 .../org/apache/beam/sdk/coders/AvroCoder.java   |  35 +++---
 .../apache/beam/sdk/coders/BigDecimalCoder.java |   1 -
 .../beam/sdk/coders/BigEndianIntegerCoder.java  |   1 -
 .../beam/sdk/coders/BigEndianLongCoder.java     |   1 -
 .../apache/beam/sdk/coders/BigIntegerCoder.java |   1 -
 .../apache/beam/sdk/coders/ByteArrayCoder.java  |  11 +-
 .../org/apache/beam/sdk/coders/ByteCoder.java   |   1 -
 .../apache/beam/sdk/coders/ByteStringCoder.java |   7 +-
 .../java/org/apache/beam/sdk/coders/Coder.java  |  11 +-
 .../apache/beam/sdk/coders/CoderFactories.java  |   3 +-
 .../apache/beam/sdk/coders/CoderProviders.java  |   6 +-
 .../apache/beam/sdk/coders/CoderRegistry.java   |  24 ++--
 .../apache/beam/sdk/coders/CollectionCoder.java |   4 +-
 .../org/apache/beam/sdk/coders/CustomCoder.java |  16 +--
 .../apache/beam/sdk/coders/DefaultCoder.java    |   3 +-
 .../apache/beam/sdk/coders/DelegateCoder.java   |   1 -
 .../org/apache/beam/sdk/coders/DoubleCoder.java |   1 -
 .../apache/beam/sdk/coders/DurationCoder.java   |   8 +-
 .../apache/beam/sdk/coders/InstantCoder.java    |  12 +-
 .../apache/beam/sdk/coders/IterableCoder.java   |   9 +-
 .../beam/sdk/coders/IterableLikeCoder.java      |   9 +-
 .../org/apache/beam/sdk/coders/JAXBCoder.java   |  12 +-
 .../org/apache/beam/sdk/coders/KvCoder.java     |  13 +--
 .../org/apache/beam/sdk/coders/ListCoder.java   |   4 +-
 .../org/apache/beam/sdk/coders/MapCoder.java    |   9 +-
 .../apache/beam/sdk/coders/NullableCoder.java   |  12 +-
 .../beam/sdk/coders/SerializableCoder.java      |   6 +-
 .../org/apache/beam/sdk/coders/SetCoder.java    |   4 +-
 .../apache/beam/sdk/coders/StandardCoder.java   |  11 +-
 .../beam/sdk/coders/StringDelegateCoder.java    |   5 +-
 .../apache/beam/sdk/coders/StringUtf8Coder.java |  11 +-
 .../beam/sdk/coders/TableRowJsonCoder.java      |   4 +-
 .../beam/sdk/coders/TextualIntegerCoder.java    |   1 -
 .../org/apache/beam/sdk/coders/VarIntCoder.java |   4 +-
 .../apache/beam/sdk/coders/VarLongCoder.java    |   4 +-
 .../org/apache/beam/sdk/coders/VoidCoder.java   |   1 -
 .../beam/sdk/coders/protobuf/ProtoCoder.java    |  28 ++---
 .../beam/sdk/coders/protobuf/ProtobufUtil.java  |   4 +-
 .../java/org/apache/beam/sdk/io/AvroIO.java     |  24 ++--
 .../java/org/apache/beam/sdk/io/AvroSource.java |  45 ++++----
 .../apache/beam/sdk/io/BlockBasedSource.java    |   6 +-
 .../sdk/io/BoundedReadFromUnboundedSource.java  |  17 ++-
 .../org/apache/beam/sdk/io/BoundedSource.java   |  11 +-
 .../apache/beam/sdk/io/CompressedSource.java    |  16 +--
 .../org/apache/beam/sdk/io/CountingInput.java   |   4 +-
 .../org/apache/beam/sdk/io/CountingSource.java  |  11 +-
 .../org/apache/beam/sdk/io/FileBasedSink.java   |  29 +++--
 .../org/apache/beam/sdk/io/FileBasedSource.java |  17 ++-
 .../apache/beam/sdk/io/OffsetBasedSource.java   |  10 +-
 .../java/org/apache/beam/sdk/io/PubsubIO.java   |  20 ++--
 .../apache/beam/sdk/io/PubsubUnboundedSink.java |  23 ++--
 .../beam/sdk/io/PubsubUnboundedSource.java      |  47 ++++----
 .../main/java/org/apache/beam/sdk/io/Read.java  |   4 +-
 .../main/java/org/apache/beam/sdk/io/Sink.java  |   3 +-
 .../java/org/apache/beam/sdk/io/Source.java     |   8 +-
 .../java/org/apache/beam/sdk/io/TextIO.java     |  29 +++--
 .../org/apache/beam/sdk/io/UnboundedSource.java |  11 +-
 .../main/java/org/apache/beam/sdk/io/Write.java |  11 +-
 .../java/org/apache/beam/sdk/io/XmlSink.java    |  14 +--
 .../java/org/apache/beam/sdk/io/XmlSource.java  |  15 +--
 .../org/apache/beam/sdk/io/range/ByteKey.java   |   1 -
 .../apache/beam/sdk/io/range/ByteKeyRange.java  |   6 +-
 .../beam/sdk/io/range/ByteKeyRangeTracker.java  |   4 +-
 .../beam/sdk/io/range/OffsetRangeTracker.java   |   4 +-
 .../org/apache/beam/sdk/options/GcpOptions.java |  18 ++-
 .../org/apache/beam/sdk/options/GcsOptions.java |  15 +--
 .../beam/sdk/options/GoogleApiDebugOptions.java |   1 -
 .../beam/sdk/options/PipelineOptionSpec.java    |   4 +-
 .../beam/sdk/options/PipelineOptions.java       |  19 ++--
 .../sdk/options/PipelineOptionsFactory.java     |  26 ++---
 .../sdk/options/PipelineOptionsReflector.java   |   4 +-
 .../sdk/options/PipelineOptionsRegistrar.java   |   1 -
 .../sdk/options/PipelineOptionsValidator.java   |   6 +-
 .../sdk/options/ProxyInvocationHandler.java     |  38 +++----
 .../sdk/runners/PipelineRunnerRegistrar.java    |   1 -
 .../beam/sdk/runners/TransformHierarchy.java    |   9 +-
 .../beam/sdk/runners/TransformTreeNode.java     |  14 +--
 .../beam/sdk/testing/CoderProperties.java       |  23 ++--
 .../beam/sdk/testing/FileChecksumMatcher.java   |  17 ++-
 .../beam/sdk/testing/MatcherDeserializer.java   |   7 +-
 .../beam/sdk/testing/MatcherSerializer.java     |   7 +-
 .../org/apache/beam/sdk/testing/PAssert.java    |  24 ++--
 .../apache/beam/sdk/testing/PaneExtractors.java |   5 +-
 .../beam/sdk/testing/SerializableMatcher.java   |   3 +-
 .../beam/sdk/testing/SerializableMatchers.java  |  18 ++-
 .../beam/sdk/testing/SourceTestUtils.java       |  27 ++---
 .../apache/beam/sdk/testing/StaticWindows.java  |  10 +-
 .../apache/beam/sdk/testing/TestPipeline.java   |  32 +++---
 .../beam/sdk/testing/TestPipelineOptions.java   |   1 -
 .../org/apache/beam/sdk/testing/TestStream.java |  24 ++--
 .../beam/sdk/testing/WindowFnTestUtils.java     |  19 ++--
 .../apache/beam/sdk/testing/WindowSupplier.java |  10 +-
 .../beam/sdk/transforms/AppliedPTransform.java  |   5 +-
 .../sdk/transforms/ApproximateQuantiles.java    |  29 +++--
 .../beam/sdk/transforms/ApproximateUnique.java  |  23 ++--
 .../org/apache/beam/sdk/transforms/Combine.java |  27 ++---
 .../beam/sdk/transforms/CombineFnBase.java      |  10 +-
 .../apache/beam/sdk/transforms/CombineFns.java  |  39 +++----
 .../org/apache/beam/sdk/transforms/Count.java   |  13 +--
 .../org/apache/beam/sdk/transforms/Create.java  |  32 +++---
 .../org/apache/beam/sdk/transforms/DoFn.java    |  18 ++-
 .../beam/sdk/transforms/DoFnAdapters.java       |   4 +-
 .../apache/beam/sdk/transforms/DoFnTester.java  |  26 ++---
 .../beam/sdk/transforms/FlatMapElements.java    |   3 +-
 .../transforms/IntraBundleParallelization.java  |  11 +-
 .../org/apache/beam/sdk/transforms/Max.java     |   5 +-
 .../org/apache/beam/sdk/transforms/Mean.java    |  12 +-
 .../org/apache/beam/sdk/transforms/Min.java     |   5 +-
 .../org/apache/beam/sdk/transforms/OldDoFn.java |  19 ++--
 .../apache/beam/sdk/transforms/PTransform.java  |   7 +-
 .../org/apache/beam/sdk/transforms/ParDo.java   |  10 +-
 .../apache/beam/sdk/transforms/Partition.java   |   3 +-
 .../org/apache/beam/sdk/transforms/Sample.java  |   7 +-
 .../org/apache/beam/sdk/transforms/Top.java     |  20 ++--
 .../org/apache/beam/sdk/transforms/View.java    |   5 +-
 .../org/apache/beam/sdk/transforms/ViewFn.java  |   3 +-
 .../beam/sdk/transforms/WithTimestamps.java     |   1 -
 .../sdk/transforms/display/DisplayData.java     |  21 ++--
 .../beam/sdk/transforms/join/CoGbkResult.java   |  30 +++--
 .../sdk/transforms/join/CoGbkResultSchema.java  |  10 +-
 .../beam/sdk/transforms/join/CoGroupByKey.java  |   5 +-
 .../transforms/join/KeyedPCollectionTuple.java  |   7 +-
 .../beam/sdk/transforms/join/UnionCoder.java    |  14 +--
 .../sdk/transforms/reflect/DoFnInvokers.java    |  33 +++---
 .../sdk/transforms/reflect/DoFnSignature.java   |   5 +-
 .../sdk/transforms/reflect/DoFnSignatures.java  |   8 +-
 .../beam/sdk/transforms/windowing/AfterAll.java |   9 +-
 .../windowing/AfterDelayFromFirstElement.java   |  16 +--
 .../sdk/transforms/windowing/AfterEach.java     |   9 +-
 .../sdk/transforms/windowing/AfterFirst.java    |   9 +-
 .../sdk/transforms/windowing/AfterPane.java     |   9 +-
 .../windowing/AfterProcessingTime.java          |   9 +-
 .../AfterSynchronizedProcessingTime.java        |  10 +-
 .../transforms/windowing/AfterWatermark.java    |  12 +-
 .../sdk/transforms/windowing/BoundedWindow.java |   3 +-
 .../transforms/windowing/CalendarWindows.java   |   1 -
 .../transforms/windowing/DefaultTrigger.java    |   4 +-
 .../sdk/transforms/windowing/FixedWindows.java  |   4 +-
 .../sdk/transforms/windowing/GlobalWindow.java  |   6 +-
 .../sdk/transforms/windowing/GlobalWindows.java |   6 +-
 .../transforms/windowing/IntervalWindow.java    |  10 +-
 .../transforms/windowing/InvalidWindows.java    |   4 +-
 .../beam/sdk/transforms/windowing/Never.java    |   4 +-
 .../transforms/windowing/OrFinallyTrigger.java  |   7 +-
 .../sdk/transforms/windowing/OutputTimeFn.java  |   7 +-
 .../sdk/transforms/windowing/OutputTimeFns.java |   7 +-
 .../beam/sdk/transforms/windowing/PaneInfo.java |  14 +--
 .../windowing/PartitioningWindowFn.java         |   3 +-
 .../sdk/transforms/windowing/Repeatedly.java    |   6 +-
 .../beam/sdk/transforms/windowing/Sessions.java |   8 +-
 .../transforms/windowing/SlidingWindows.java    |  10 +-
 .../beam/sdk/transforms/windowing/Trigger.java  |  16 +--
 .../beam/sdk/transforms/windowing/Window.java   |   4 +-
 .../beam/sdk/transforms/windowing/WindowFn.java |   6 +-
 .../apache/beam/sdk/util/ActiveWindowSet.java   |   6 +-
 .../org/apache/beam/sdk/util/ApiSurface.java    |   6 +-
 .../apache/beam/sdk/util/AppliedCombineFn.java  |   6 +-
 ...AttemptAndTimeBoundedExponentialBackOff.java |   4 +-
 .../org/apache/beam/sdk/util/AvroUtils.java     |   7 +-
 .../beam/sdk/util/BaseExecutionContext.java     |   9 +-
 .../org/apache/beam/sdk/util/BitSetCoder.java   |   7 +-
 .../apache/beam/sdk/util/BucketingFunction.java |   3 +-
 .../BufferedElementCountingOutputStream.java    |   4 +-
 .../apache/beam/sdk/util/CloudKnownType.java    |   1 -
 .../org/apache/beam/sdk/util/CloudObject.java   |   2 -
 .../org/apache/beam/sdk/util/CoderUtils.java    |  17 ++-
 .../org/apache/beam/sdk/util/CombineFnUtil.java |   7 +-
 .../apache/beam/sdk/util/CredentialFactory.java |   1 -
 .../org/apache/beam/sdk/util/Credentials.java   |   9 +-
 .../beam/sdk/util/DirectSideInputReader.java    |   5 +-
 .../apache/beam/sdk/util/ExecutableTrigger.java |   7 +-
 .../apache/beam/sdk/util/ExecutionContext.java  |   5 +-
 .../sdk/util/ExposedByteArrayInputStream.java   |   3 +-
 .../sdk/util/ExposedByteArrayOutputStream.java  |   3 +-
 .../beam/sdk/util/FileIOChannelFactory.java     |   6 +-
 .../beam/sdk/util/FinishedTriggersSet.java      |   1 -
 .../beam/sdk/util/GcpCredentialFactory.java     |   6 +-
 .../beam/sdk/util/GcsIOChannelFactory.java      |   5 +-
 .../apache/beam/sdk/util/GcsPathValidator.java  |   3 +-
 .../java/org/apache/beam/sdk/util/GcsUtil.java  |  16 +--
 .../apache/beam/sdk/util/IOChannelUtils.java    |   5 +-
 .../apache/beam/sdk/util/IdentityWindowFn.java  |   6 +-
 .../apache/beam/sdk/util/InstanceBuilder.java   |   5 +-
 .../beam/sdk/util/KeyedWorkItemCoder.java       |  17 ++-
 .../apache/beam/sdk/util/KeyedWorkItems.java    |   4 +-
 .../beam/sdk/util/MergingActiveWindowSet.java   |  21 ++--
 .../apache/beam/sdk/util/MovingFunction.java    |   3 +-
 .../apache/beam/sdk/util/MutationDetectors.java |   5 +-
 .../sdk/util/NonMergingActiveWindowSet.java     |   6 +-
 .../beam/sdk/util/NoopCredentialFactory.java    |   4 +-
 .../beam/sdk/util/NullSideInputReader.java      |   6 +-
 .../beam/sdk/util/PCollectionViewWindow.java    |   3 +-
 .../apache/beam/sdk/util/PCollectionViews.java  |  25 ++---
 .../java/org/apache/beam/sdk/util/PTuple.java   |   3 +-
 .../beam/sdk/util/PerKeyCombineFnRunner.java    |   5 +-
 .../beam/sdk/util/PerKeyCombineFnRunners.java   |   6 +-
 .../org/apache/beam/sdk/util/PubsubClient.java  |   5 +-
 .../apache/beam/sdk/util/PubsubGrpcClient.java  |   8 +-
 .../apache/beam/sdk/util/PubsubJsonClient.java  |   5 +-
 .../apache/beam/sdk/util/PubsubTestClient.java  |   5 +-
 .../org/apache/beam/sdk/util/ReleaseInfo.java   |   6 +-
 .../org/apache/beam/sdk/util/Reshuffle.java     |   1 -
 .../apache/beam/sdk/util/ReshuffleTrigger.java  |   4 +-
 .../sdk/util/RetryHttpRequestInitializer.java   |   7 +-
 .../apache/beam/sdk/util/SerializableUtils.java |  13 +--
 .../org/apache/beam/sdk/util/Serializer.java    |   2 -
 .../apache/beam/sdk/util/SideInputReader.java   |   3 +-
 .../org/apache/beam/sdk/util/StringUtils.java   |   4 +-
 .../java/org/apache/beam/sdk/util/Structs.java  |   2 -
 .../beam/sdk/util/SystemDoFnInternal.java       |   3 +-
 .../apache/beam/sdk/util/TestCredential.java    |   1 -
 .../apache/beam/sdk/util/TimerInternals.java    |  26 ++---
 .../java/org/apache/beam/sdk/util/Timers.java   |   4 +-
 .../org/apache/beam/sdk/util/Transport.java     |   8 +-
 .../beam/sdk/util/TriggerContextFactory.java    |  18 ++-
 .../beam/sdk/util/UnownedInputStream.java       |   1 -
 .../beam/sdk/util/UnownedOutputStream.java      |   1 -
 .../sdk/util/UploadIdResponseInterceptor.java   |   4 +-
 .../apache/beam/sdk/util/ValueWithRecordId.java |  13 +--
 .../java/org/apache/beam/sdk/util/Values.java   |   1 -
 .../org/apache/beam/sdk/util/WindowedValue.java |  32 +++---
 .../beam/sdk/util/WindowingInternals.java       |   6 +-
 .../apache/beam/sdk/util/WindowingStrategy.java |  11 +-
 .../java/org/apache/beam/sdk/util/ZipFiles.java |   4 +-
 .../beam/sdk/util/common/ReflectHelpers.java    |   3 -
 .../org/apache/beam/sdk/util/gcsfs/GcsPath.java |   2 -
 .../CopyOnAccessInMemoryStateInternals.java     |  16 +--
 .../sdk/util/state/InMemoryStateInternals.java  |  13 +--
 .../sdk/util/state/MergingStateAccessor.java    |   3 +-
 .../beam/sdk/util/state/StateContexts.java      |   3 +-
 .../sdk/util/state/StateInternalsFactory.java   |   3 +-
 .../beam/sdk/util/state/StateMerging.java       |   9 +-
 .../beam/sdk/util/state/StateNamespaces.java    |  10 +-
 .../apache/beam/sdk/util/state/StateTable.java  |   4 +-
 .../apache/beam/sdk/util/state/StateTag.java    |   5 +-
 .../apache/beam/sdk/util/state/StateTags.java   |  10 +-
 .../beam/sdk/util/state/WatermarkHoldState.java |   1 -
 .../java/org/apache/beam/sdk/values/KV.java     |  10 +-
 .../java/org/apache/beam/sdk/values/PBegin.java |   5 +-
 .../apache/beam/sdk/values/PCollectionList.java |  12 +-
 .../beam/sdk/values/PCollectionTuple.java       |  12 +-
 .../apache/beam/sdk/values/PCollectionView.java |   3 +-
 .../java/org/apache/beam/sdk/values/PDone.java  |   5 +-
 .../java/org/apache/beam/sdk/values/PInput.java |   3 +-
 .../org/apache/beam/sdk/values/POutput.java     |   3 +-
 .../org/apache/beam/sdk/values/PValueBase.java  |   5 +-
 .../beam/sdk/values/TimestampedValue.java       |  12 +-
 .../org/apache/beam/sdk/values/TupleTag.java    |  13 +--
 .../apache/beam/sdk/values/TupleTagList.java    |   4 +-
 .../apache/beam/sdk/values/TypeDescriptor.java  |   2 -
 .../apache/beam/sdk/values/TypeDescriptors.java |   1 -
 .../dataflow/util/GcsPathValidatorTest.java     |   1 -
 .../sdk/AggregatorPipelineExtractorTest.java    |  15 +--
 .../org/apache/beam/sdk/DataflowMatchers.java   |   4 +-
 .../java/org/apache/beam/sdk/PipelineTest.java  |   4 +-
 .../java/org/apache/beam/sdk/TestUtils.java     |  10 +-
 .../org/apache/beam/sdk/WindowMatchers.java     |   9 +-
 .../org/apache/beam/sdk/WindowMatchersTest.java |   4 +-
 .../apache/beam/sdk/coders/AvroCoderTest.java   |  60 +++++-----
 .../beam/sdk/coders/BigDecimalCoderTest.java    |   6 +-
 .../sdk/coders/BigEndianIntegerCoderTest.java   |   6 +-
 .../beam/sdk/coders/BigEndianLongCoderTest.java |   6 +-
 .../beam/sdk/coders/BigIntegerCoderTest.java    |   6 +-
 .../beam/sdk/coders/ByteArrayCoderTest.java     |  10 +-
 .../apache/beam/sdk/coders/ByteCoderTest.java   |   6 +-
 .../beam/sdk/coders/ByteStringCoderTest.java    |  11 +-
 .../beam/sdk/coders/CoderFactoriesTest.java     |   5 +-
 .../beam/sdk/coders/CoderProvidersTest.java     |   4 +-
 .../beam/sdk/coders/CoderRegistryTest.java      |  31 +++---
 .../org/apache/beam/sdk/coders/CoderTest.java   |   4 +-
 .../beam/sdk/coders/CollectionCoderTest.java    |  14 +--
 .../apache/beam/sdk/coders/CustomCoderTest.java |  12 +-
 .../beam/sdk/coders/DefaultCoderTest.java       |   7 +-
 .../beam/sdk/coders/DelegateCoderTest.java      |  11 +-
 .../apache/beam/sdk/coders/DoubleCoderTest.java |   6 +-
 .../beam/sdk/coders/DurationCoderTest.java      |   9 +-
 .../beam/sdk/coders/InstantCoderTest.java       |  15 +--
 .../beam/sdk/coders/IterableCoderTest.java      |  10 +-
 .../apache/beam/sdk/coders/JAXBCoderTest.java   |  16 +--
 .../org/apache/beam/sdk/coders/KvCoderTest.java |  13 +--
 .../apache/beam/sdk/coders/ListCoderTest.java   |  10 +-
 .../apache/beam/sdk/coders/MapCoderTest.java    |  17 ++-
 .../beam/sdk/coders/NullableCoderTest.java      |  13 +--
 .../beam/sdk/coders/PrintBase64Encodings.java   |   4 +-
 .../beam/sdk/coders/SerializableCoderTest.java  |  14 +--
 .../apache/beam/sdk/coders/SetCoderTest.java    |  12 +-
 .../beam/sdk/coders/StandardCoderTest.java      |  16 +--
 .../sdk/coders/StringDelegateCoderTest.java     |   8 +-
 .../beam/sdk/coders/StringUtf8CoderTest.java    |   6 +-
 .../beam/sdk/coders/TableRowJsonCoderTest.java  |   9 +-
 .../sdk/coders/TextualIntegerCoderTest.java     |   6 +-
 .../apache/beam/sdk/coders/VarIntCoderTest.java |   6 +-
 .../beam/sdk/coders/VarLongCoderTest.java       |   6 +-
 .../sdk/coders/protobuf/ProtoCoderTest.java     |  14 +--
 .../sdk/coders/protobuf/ProtobufUtilTest.java   |  10 +-
 .../beam/sdk/io/AvroIOGeneratedClassTest.java   |  26 ++---
 .../java/org/apache/beam/sdk/io/AvroIOTest.java |  30 +++--
 .../org/apache/beam/sdk/io/AvroSourceTest.java  |  46 ++++----
 .../io/BoundedReadFromUnboundedSourceTest.java  |  11 +-
 .../beam/sdk/io/CompressedSourceTest.java       |  41 +++----
 .../apache/beam/sdk/io/CountingInputTest.java   |   2 -
 .../apache/beam/sdk/io/CountingSourceTest.java  |   6 +-
 .../apache/beam/sdk/io/FileBasedSinkTest.java   |  22 ++--
 .../apache/beam/sdk/io/FileBasedSourceTest.java |  32 +++---
 .../beam/sdk/io/OffsetBasedSourceTest.java      |  11 +-
 .../org/apache/beam/sdk/io/PubsubIOTest.java    |   5 +-
 .../beam/sdk/io/PubsubUnboundedSinkTest.java    |  13 +--
 .../beam/sdk/io/PubsubUnboundedSourceTest.java  |  19 ++--
 .../java/org/apache/beam/sdk/io/ReadTest.java   |  12 +-
 .../java/org/apache/beam/sdk/io/TextIOTest.java |  47 ++++----
 .../java/org/apache/beam/sdk/io/WriteTest.java  |  29 +++--
 .../org/apache/beam/sdk/io/XmlSinkTest.java     |  27 ++---
 .../org/apache/beam/sdk/io/XmlSourceTest.java   |  29 ++---
 .../range/ByteKeyRangeEstimateFractionTest.java |   1 -
 .../range/ByteKeyRangeInterpolateKeyTest.java   |   1 -
 .../beam/sdk/io/range/ByteKeyRangeTest.java     |   6 +-
 .../apache/beam/sdk/io/range/ByteKeyTest.java   |   3 +-
 .../apache/beam/sdk/options/GcpOptionsTest.java |  16 +--
 .../sdk/options/GoogleApiDebugOptionsTest.java  |   8 +-
 .../sdk/options/PipelineOptionsFactoryTest.java |  27 ++---
 .../options/PipelineOptionsReflectorTest.java   |   6 +-
 .../beam/sdk/options/PipelineOptionsTest.java   |  12 +-
 .../options/PipelineOptionsValidatorTest.java   |   1 -
 .../sdk/options/ProxyInvocationHandlerTest.java |  28 ++---
 .../beam/sdk/runners/PipelineRunnerTest.java    |   1 -
 .../beam/sdk/runners/TransformTreeTest.java     |   8 +-
 .../runners/dataflow/TestCountingSource.java    |  13 +--
 .../dataflow/TestCountingSourceTest.java        |   4 +-
 .../beam/sdk/testing/CoderPropertiesTest.java   |  11 +-
 .../beam/sdk/testing/CrashingRunnerTest.java    |   1 -
 .../apache/beam/sdk/testing/ExpectedLogs.java   |  12 +-
 .../beam/sdk/testing/ExpectedLogsTest.java      |  13 +--
 .../sdk/testing/FastNanoClockAndSleeper.java    |   1 -
 .../testing/FastNanoClockAndSleeperTest.java    |   3 +-
 .../sdk/testing/FileChecksumMatcherTest.java    |   9 +-
 .../apache/beam/sdk/testing/PAssertTest.java    |  17 ++-
 .../sdk/testing/PCollectionViewTesting.java     |  15 +--
 .../beam/sdk/testing/PaneExtractorsTest.java    |   4 +-
 .../sdk/testing/RestoreSystemProperties.java    |   5 +-
 .../sdk/testing/SerializableMatchersTest.java   |  12 +-
 .../beam/sdk/testing/SourceTestUtilsTest.java   |   9 +-
 .../beam/sdk/testing/StaticWindowsTest.java     |   4 +-
 .../beam/sdk/testing/SystemNanoTimeSleeper.java |   1 -
 .../sdk/testing/SystemNanoTimeSleeperTest.java  |   1 -
 .../beam/sdk/testing/TestPipelineTest.java      |  12 +-
 .../apache/beam/sdk/testing/TestStreamTest.java |   4 +-
 .../beam/sdk/testing/WindowSupplierTest.java    |  13 +--
 .../transforms/ApproximateQuantilesTest.java    |  13 +--
 .../sdk/transforms/ApproximateUniqueTest.java   |  18 ++-
 .../beam/sdk/transforms/CombineFnsTest.java     |  18 ++-
 .../apache/beam/sdk/transforms/CombineTest.java |  38 +++----
 .../apache/beam/sdk/transforms/CountTest.java   |   7 +-
 .../apache/beam/sdk/transforms/CreateTest.java  |  26 ++---
 .../DoFnDelegatingAggregatorTest.java           |   1 -
 .../apache/beam/sdk/transforms/DoFnTest.java    |   4 +-
 .../beam/sdk/transforms/DoFnTesterTest.java     |   4 +-
 .../apache/beam/sdk/transforms/FilterTest.java  |   5 +-
 .../sdk/transforms/FlatMapElementsTest.java     |  16 +--
 .../apache/beam/sdk/transforms/FlattenTest.java |  17 ++-
 .../beam/sdk/transforms/GroupByKeyTest.java     |  30 +++--
 .../IntraBundleParallelizationTest.java         |   7 +-
 .../apache/beam/sdk/transforms/KeysTest.java    |   4 +-
 .../apache/beam/sdk/transforms/KvSwapTest.java  |   4 +-
 .../beam/sdk/transforms/MapElementsTest.java    |   7 +-
 .../org/apache/beam/sdk/transforms/MaxTest.java |   5 +-
 .../apache/beam/sdk/transforms/MeanTest.java    |  10 +-
 .../org/apache/beam/sdk/transforms/MinTest.java |   5 +-
 .../apache/beam/sdk/transforms/NoOpOldDoFn.java |   1 -
 .../apache/beam/sdk/transforms/OldDoFnTest.java |   9 +-
 .../beam/sdk/transforms/PTransformTest.java     |   1 -
 .../beam/sdk/transforms/ParDoLifecycleTest.java |   6 +-
 .../apache/beam/sdk/transforms/ParDoTest.java   |  23 ++--
 .../beam/sdk/transforms/PartitionTest.java      |   9 +-
 .../sdk/transforms/RemoveDuplicatesTest.java    |  10 +-
 .../apache/beam/sdk/transforms/SampleTest.java  |  21 ++--
 .../beam/sdk/transforms/SimpleStatsFnsTest.java |   7 +-
 .../org/apache/beam/sdk/transforms/SumTest.java |   5 +-
 .../org/apache/beam/sdk/transforms/TopTest.java |  13 +--
 .../apache/beam/sdk/transforms/ValuesTest.java  |   4 +-
 .../apache/beam/sdk/transforms/ViewTest.java    |  31 +++---
 .../beam/sdk/transforms/WithKeysTest.java       |   6 +-
 .../beam/sdk/transforms/WithTimestampsTest.java |   4 +-
 .../display/DisplayDataEvaluator.java           |   8 +-
 .../display/DisplayDataEvaluatorTest.java       |   7 +-
 .../transforms/display/DisplayDataMatchers.java |   7 +-
 .../display/DisplayDataMatchersTest.java        |   2 -
 .../sdk/transforms/display/DisplayDataTest.java |  26 ++---
 .../transforms/join/CoGbkResultCoderTest.java   |   4 +-
 .../sdk/transforms/join/CoGbkResultTest.java    |   6 +-
 .../sdk/transforms/join/CoGroupByKeyTest.java   |  15 +--
 .../sdk/transforms/join/UnionCoderTest.java     |   4 +-
 .../transforms/reflect/DoFnInvokersTest.java    |   1 -
 .../transforms/reflect/DoFnSignaturesTest.java  |   9 +-
 .../sdk/transforms/windowing/AfterAllTest.java  |   1 -
 .../sdk/transforms/windowing/AfterEachTest.java |   1 -
 .../transforms/windowing/AfterFirstTest.java    |   1 -
 .../sdk/transforms/windowing/AfterPaneTest.java |   1 -
 .../windowing/AfterProcessingTimeTest.java      |   1 -
 .../AfterSynchronizedProcessingTimeTest.java    |   1 -
 .../windowing/AfterWatermarkTest.java           |   1 -
 .../windowing/CalendarWindowsTest.java          |  13 +--
 .../windowing/DefaultTriggerTest.java           |   1 -
 .../transforms/windowing/FixedWindowsTest.java  |  11 +-
 .../windowing/IntervalWindowTest.java           |   7 +-
 .../sdk/transforms/windowing/NeverTest.java     |   1 -
 .../windowing/OrFinallyTriggerTest.java         |   1 -
 .../sdk/transforms/windowing/PaneInfoTest.java  |   1 -
 .../transforms/windowing/RepeatedlyTest.java    |   1 -
 .../sdk/transforms/windowing/SessionsTest.java  |  16 +--
 .../windowing/SlidingWindowsTest.java           |  11 +-
 .../sdk/transforms/windowing/StubTrigger.java   |   4 +-
 .../sdk/transforms/windowing/TriggerTest.java   |   5 +-
 .../sdk/transforms/windowing/WindowTest.java    |   5 +-
 .../sdk/transforms/windowing/WindowingTest.java |  10 +-
 .../apache/beam/sdk/util/ApiSurfaceTest.java    |  10 +-
 ...mptAndTimeBoundedExponentialBackOffTest.java |   4 +-
 .../AttemptBoundedExponentialBackOffTest.java   |   1 -
 .../org/apache/beam/sdk/util/AvroUtilsTest.java |  20 ++--
 .../beam/sdk/util/BucketingFunctionTest.java    |   1 -
 ...BufferedElementCountingOutputStreamTest.java |  19 ++--
 .../apache/beam/sdk/util/CoderUtilsTest.java    |   7 +-
 .../apache/beam/sdk/util/CombineFnUtilTest.java |  13 +--
 .../beam/sdk/util/ExecutableTriggerTest.java    |   6 +-
 .../util/ExposedByteArrayInputStreamTest.java   |   5 +-
 .../util/ExposedByteArrayOutputStreamTest.java  |   5 +-
 .../beam/sdk/util/FileIOChannelFactoryTest.java |  16 ++-
 .../beam/sdk/util/FinishedTriggersSetTest.java  |   3 +-
 .../beam/sdk/util/GatherAllPanesTest.java       |   7 +-
 .../beam/sdk/util/GcsIOChannelFactoryTest.java  |   1 -
 .../org/apache/beam/sdk/util/GcsUtilTest.java   |  23 ++--
 .../beam/sdk/util/IOChannelUtilsTest.java       |   6 +-
 .../sdk/util/IdentitySideInputWindowFn.java     |   5 +-
 .../beam/sdk/util/InstanceBuilderTest.java      |   1 -
 .../beam/sdk/util/KeyedWorkItemCoderTest.java   |   4 +-
 .../sdk/util/MergingActiveWindowSetTest.java    |  13 +--
 .../beam/sdk/util/MovingFunctionTest.java       |   1 -
 .../beam/sdk/util/MutationDetectorsTest.java    |  17 ++-
 .../org/apache/beam/sdk/util/PTupleTest.java    |   1 -
 .../apache/beam/sdk/util/PubsubClientTest.java  |   7 +-
 .../beam/sdk/util/PubsubGrpcClientTest.java     |  16 +--
 .../beam/sdk/util/PubsubJsonClientTest.java     |  15 +--
 .../beam/sdk/util/PubsubTestClientTest.java     |  17 ++-
 .../org/apache/beam/sdk/util/ReshuffleTest.java |   7 +-
 .../beam/sdk/util/ReshuffleTriggerTest.java     |   1 -
 .../util/RetryHttpRequestInitializerTest.java   |  12 +-
 .../beam/sdk/util/SerializableUtilsTest.java    |  19 ++--
 .../apache/beam/sdk/util/StreamUtilsTest.java   |   9 +-
 .../apache/beam/sdk/util/StringUtilsTest.java   |   1 -
 .../org/apache/beam/sdk/util/StructsTest.java   |  11 +-
 .../beam/sdk/util/TimerInternalsTest.java       |   1 -
 .../org/apache/beam/sdk/util/TriggerTester.java |  31 +++---
 .../beam/sdk/util/UnownedInputStreamTest.java   |   3 +-
 .../beam/sdk/util/UnownedOutputStreamTest.java  |   3 +-
 .../util/UploadIdResponseInterceptorTest.java   |   7 +-
 .../beam/sdk/util/UserCodeExceptionTest.java    |   3 +-
 .../org/apache/beam/sdk/util/VarIntTest.java    |   9 +-
 .../apache/beam/sdk/util/WindowedValueTest.java |   9 +-
 .../org/apache/beam/sdk/util/ZipFilesTest.java  |  14 +--
 .../sdk/util/common/ReflectHelpersTest.java     |   6 +-
 .../apache/beam/sdk/util/gcsfs/GcsPathTest.java |  11 +-
 .../CopyOnAccessInMemoryStateInternalsTest.java |   1 -
 .../util/state/InMemoryStateInternalsTest.java  |   4 +-
 .../sdk/util/state/StateNamespacesTest.java     |   1 -
 .../beam/sdk/util/state/StateTagTest.java       |   1 -
 .../java/org/apache/beam/sdk/values/KVTest.java |   4 +-
 .../beam/sdk/values/PCollectionListTest.java    |   3 +-
 .../beam/sdk/values/PCollectionTupleTest.java   |   8 +-
 .../org/apache/beam/sdk/values/PDoneTest.java   |   4 +-
 .../beam/sdk/values/TypeDescriptorTest.java     |  10 +-
 .../beam/sdk/values/TypeDescriptorsTest.java    |   6 +-
 .../apache/beam/sdk/values/TypedPValueTest.java |   1 -
 .../extensions/joinlibrary/InnerJoinTest.java   |   6 +-
 .../joinlibrary/OuterLeftJoinTest.java          |   6 +-
 .../joinlibrary/OuterRightJoinTest.java         |   6 +-
 .../sdk/io/gcp/bigquery/BigQueryAvroUtils.java  |   7 +-
 .../beam/sdk/io/gcp/bigquery/BigQueryIO.java    | 111 +++++++++----------
 .../sdk/io/gcp/bigquery/BigQueryServices.java   |   5 +-
 .../io/gcp/bigquery/BigQueryServicesImpl.java   |  20 ++--
 .../io/gcp/bigquery/BigQueryTableInserter.java  |  14 +--
 .../gcp/bigquery/BigQueryTableRowIterator.java  |  12 +-
 .../beam/sdk/io/gcp/bigtable/BigtableIO.java    |  43 ++++---
 .../sdk/io/gcp/bigtable/BigtableService.java    |   6 +-
 .../io/gcp/bigtable/BigtableServiceImpl.java    |  12 +-
 .../beam/sdk/io/gcp/datastore/DatastoreV1.java  |  47 ++++----
 .../io/gcp/bigquery/BigQueryAvroUtilsTest.java  |  11 +-
 .../sdk/io/gcp/bigquery/BigQueryIOTest.java     |  73 ++++++------
 .../gcp/bigquery/BigQueryServicesImplTest.java  |  29 +++--
 .../gcp/bigquery/BigQueryTableInserterTest.java |  20 ++--
 .../bigquery/BigQueryTableRowIteratorTest.java  |  10 +-
 .../sdk/io/gcp/bigquery/BigQueryUtilTest.java   |  19 ++--
 .../sdk/io/gcp/bigtable/BigtableIOTest.java     |  53 ++++-----
 .../sdk/io/gcp/bigtable/BigtableReadIT.java     |   6 +-
 .../sdk/io/gcp/bigtable/BigtableWriteIT.java    |  29 +++--
 .../sdk/io/gcp/datastore/DatastoreV1Test.java   |  53 +++++----
 .../beam/sdk/io/gcp/datastore/V1ReadIT.java     |  13 +--
 .../sdk/io/gcp/datastore/V1TestOptions.java     |   3 +-
 .../beam/sdk/io/gcp/datastore/V1TestUtil.java   |  17 ++-
 .../beam/sdk/io/gcp/datastore/V1WriteIT.java    |   4 +-
 .../beam/sdk/io/hdfs/AvroHDFSFileSource.java    |  23 ++--
 .../beam/sdk/io/hdfs/AvroWrapperCoder.java      |  16 ++-
 .../apache/beam/sdk/io/hdfs/HDFSFileSink.java   |  17 ++-
 .../apache/beam/sdk/io/hdfs/HDFSFileSource.java |  30 +++--
 .../apache/beam/sdk/io/hdfs/WritableCoder.java  |  12 +-
 .../SimpleAuthAvroHDFSFileSource.java           |  12 +-
 .../hdfs/simpleauth/SimpleAuthHDFSFileSink.java |   3 +-
 .../simpleauth/SimpleAuthHDFSFileSource.java    |  12 +-
 .../beam/sdk/io/hdfs/AvroWrapperCoderTest.java  |   5 +-
 .../beam/sdk/io/hdfs/HDFSFileSourceTest.java    |  12 +-
 .../beam/sdk/io/hdfs/WritableCoderTest.java     |   1 -
 .../beam/sdk/io/jms/JmsCheckpointMark.java      |   9 +-
 .../java/org/apache/beam/sdk/io/jms/JmsIO.java  |  36 +++---
 .../org/apache/beam/sdk/io/jms/JmsRecord.java   |   1 -
 .../org/apache/beam/sdk/io/jms/JmsIOTest.java   |  25 ++---
 .../beam/sdk/io/kafka/KafkaCheckpointMark.java  |   8 +-
 .../org/apache/beam/sdk/io/kafka/KafkaIO.java   |  59 +++++-----
 .../apache/beam/sdk/io/kafka/KafkaRecord.java   |   3 +-
 .../beam/sdk/io/kafka/KafkaRecordCoder.java     |  14 +--
 .../apache/beam/sdk/io/kafka/KafkaIOTest.java   |  33 +++---
 .../beam/sdk/transforms/CombineJava8Test.java   |   7 +-
 .../beam/sdk/transforms/FilterJava8Test.java    |   4 +-
 .../transforms/FlatMapElementsJava8Test.java    |   9 +-
 .../sdk/transforms/MapElementsJava8Test.java    |   4 +-
 .../beam/sdk/transforms/PartitionJava8Test.java |   4 +-
 .../transforms/RemoveDuplicatesJava8Test.java   |  11 +-
 .../beam/sdk/transforms/WithKeysJava8Test.java  |   1 -
 .../sdk/transforms/WithTimestampsJava8Test.java |   4 +-
 .../src/main/java/DebuggingWordCount.java       |   9 +-
 .../src/main/java/WindowedWordCount.java        |  19 ++--
 .../main/java/common/DataflowExampleUtils.java  |  25 ++---
 .../common/ExampleBigQueryTableOptions.java     |   3 +-
 .../main/java/common/PubsubFileInjector.java    |  14 +--
 .../src/test/java/DebuggingWordCountTest.java   |   6 +-
 .../src/test/java/WordCountTest.java            |   5 +-
 .../src/main/java/StarterPipeline.java          |   1 -
 .../src/main/java/it/pkg/StarterPipeline.java   |   1 -
 .../coders/AvroCoderBenchmark.java              |   6 +-
 .../coders/ByteArrayCoderBenchmark.java         |   6 +-
 .../coders/CoderBenchmarking.java               |   3 +-
 .../coders/StringUtf8CoderBenchmark.java        |   6 +-
 856 files changed, 3599 insertions(+), 5533 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
index c1b273c..4a9aba9 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
@@ -17,6 +17,9 @@
  */
 package org.apache.beam.examples;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.options.Default;
@@ -29,14 +32,9 @@ import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.transforms.Sum;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-
 
 /**
  * An example that verifies word counts in Shakespeare and includes Dataflow best practices.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
index 842cb54..6d69f14 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
@@ -17,6 +17,13 @@
  */
 package org.apache.beam.examples;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -33,19 +40,9 @@ import org.apache.beam.sdk.transforms.windowing.FixedWindows;
 import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * An example that counts words in text, and can run over either unbounded or bounded input

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
index 42d30bb..d42d621 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
@@ -17,6 +17,9 @@
  */
 package org.apache.beam.examples;
 
+import com.google.common.base.Strings;
+import com.google.common.io.Resources;
+import java.io.IOException;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.options.Default;
@@ -37,11 +40,6 @@ import org.apache.beam.sdk.util.IOChannelUtils;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 
-import com.google.common.base.Strings;
-import com.google.common.io.Resources;
-
-import java.io.IOException;
-
 /**
  * An example that counts words in Shakespeare and includes Beam best practices.
  *

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/common/ExampleBigQueryTableOptions.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleBigQueryTableOptions.java b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleBigQueryTableOptions.java
index 54cc99e..2eef525 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleBigQueryTableOptions.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleBigQueryTableOptions.java
@@ -17,14 +17,13 @@
  */
 package org.apache.beam.examples.common;
 
+import com.google.api.services.bigquery.model.TableSchema;
 import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.DefaultValueFactory;
 import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.GcpOptions;
 import org.apache.beam.sdk.options.PipelineOptions;
 
-import com.google.api.services.bigquery.model.TableSchema;
-
 /**
  * Options that can be used to configure BigQuery tables in Beam examples.
  * The project defaults to the project being used to run the example.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
index 43afeb4..a7dcc7c 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
@@ -17,21 +17,18 @@
  */
 package org.apache.beam.examples.common;
 
+import com.google.common.base.MoreObjects;
+import java.util.concurrent.ThreadLocalRandom;
 import org.apache.beam.sdk.options.ApplicationNameOptions;
 import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.DefaultValueFactory;
 import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.PipelineOptions;
-
-import com.google.common.base.MoreObjects;
-
 import org.joda.time.DateTimeUtils;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import java.util.concurrent.ThreadLocalRandom;
-
 /**
  * Options that can be used to configure the Beam examples.
  */

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java
index 7f03fc0..eadb580 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java
@@ -17,13 +17,6 @@
  */
 package org.apache.beam.examples.common;
 
-import org.apache.beam.sdk.PipelineResult;
-import org.apache.beam.sdk.options.BigQueryOptions;
-import org.apache.beam.sdk.options.PipelineOptions;
-import org.apache.beam.sdk.options.PubsubOptions;
-import org.apache.beam.sdk.util.AttemptBoundedExponentialBackOff;
-import org.apache.beam.sdk.util.Transport;
-
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import com.google.api.client.util.BackOff;
@@ -43,12 +36,17 @@ import com.google.api.services.pubsub.model.Topic;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Uninterruptibles;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import org.apache.beam.sdk.PipelineResult;
+import org.apache.beam.sdk.options.BigQueryOptions;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.sdk.options.PubsubOptions;
+import org.apache.beam.sdk.util.AttemptBoundedExponentialBackOff;
+import org.apache.beam.sdk.util.Transport;
 
 /**
  * The utility class that sets up and tears down external resources,

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/common/PubsubFileInjector.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/PubsubFileInjector.java b/examples/java/src/main/java/org/apache/beam/examples/common/PubsubFileInjector.java
index 0a93521..e6a1495 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/common/PubsubFileInjector.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/common/PubsubFileInjector.java
@@ -17,6 +17,12 @@
  */
 package org.apache.beam.examples.common;
 
+import com.google.api.services.pubsub.Pubsub;
+import com.google.api.services.pubsub.model.PublishRequest;
+import com.google.api.services.pubsub.model.PubsubMessage;
+import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Arrays;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.options.Description;
@@ -28,14 +34,6 @@ import org.apache.beam.sdk.transforms.IntraBundleParallelization;
 import org.apache.beam.sdk.transforms.OldDoFn;
 import org.apache.beam.sdk.util.Transport;
 
-import com.google.api.services.pubsub.Pubsub;
-import com.google.api.services.pubsub.model.PublishRequest;
-import com.google.api.services.pubsub.model.PubsubMessage;
-import com.google.common.collect.ImmutableMap;
-
-import java.io.IOException;
-import java.util.Arrays;
-
 /**
  * A batch Dataflow pipeline for injecting a set of GCS files into
  * a PubSub topic line by line. Empty lines are skipped.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java b/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
index 120c64f..56c7855 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
@@ -21,6 +21,21 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.datastore.v1.client.DatastoreHelper.makeKey;
 import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import com.google.common.base.MoreObjects;
+import com.google.datastore.v1.Entity;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.Value;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -53,26 +68,8 @@ import org.apache.beam.sdk.transforms.windowing.WindowFn;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionList;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-import com.google.common.base.MoreObjects;
-import com.google.datastore.v1.Entity;
-import com.google.datastore.v1.Key;
-import com.google.datastore.v1.Value;
-
 import org.joda.time.Duration;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * An example that computes the most popular hash tags
  * for every prefix, which can be used for auto-completion.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java b/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
index 3f30f21..c4ad35b 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
@@ -17,6 +17,11 @@
  */
 package org.apache.beam.examples.complete;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.io.IOException;
+import java.util.ArrayList;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -31,13 +36,6 @@ import org.apache.beam.sdk.options.StreamingOptions;
 import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.ParDo;
 
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
 /**
  * A streaming Dataflow Example using BigQuery output.
  *

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
index 76b6b6a..a5a9392 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
@@ -17,6 +17,12 @@
  */
 package org.apache.beam.examples.complete;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashSet;
+import java.util.Set;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.coders.KvCoder;
@@ -51,17 +57,9 @@ import org.apache.beam.sdk.values.PCollectionView;
 import org.apache.beam.sdk.values.PDone;
 import org.apache.beam.sdk.values.PInput;
 import org.apache.beam.sdk.values.TupleTag;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * An example that computes a basic TF-IDF search table for a directory or GCS prefix.
  *

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
index aff41cc..4c5472b 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
@@ -17,6 +17,8 @@
  */
 package org.apache.beam.examples.complete;
 
+import com.google.api.services.bigquery.model.TableRow;
+import java.util.List;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.coders.TableRowJsonCoder;
 import org.apache.beam.sdk.io.TextIO;
@@ -38,14 +40,9 @@ import org.apache.beam.sdk.transforms.windowing.Sessions;
 import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-
-import com.google.api.services.bigquery.model.TableRow;
-
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 
-import java.util.List;
-
 /**
  * An example that reads Wikipedia edit data from Cloud Storage and computes the user with
  * the longest string of edits separated by no more than an hour within each month.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
index 394b432..f7ff035 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
@@ -17,6 +17,14 @@
  */
 package org.apache.beam.examples.complete;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.avro.reflect.Nullable;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -39,22 +47,11 @@ import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PBegin;
 import org.apache.beam.sdk.values.PCollection;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import org.apache.avro.reflect.Nullable;
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A Dataflow Example that runs in both batch and streaming modes with traffic sensor data.
  * You can configure the running mode by setting {@literal --streaming} to true or false.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
index ef716e9..12eaeaa 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
@@ -17,6 +17,19 @@
  */
 package org.apache.beam.examples.complete;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import org.apache.avro.reflect.Nullable;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -38,27 +51,11 @@ import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PBegin;
 import org.apache.beam.sdk.values.PCollection;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-import com.google.common.collect.Lists;
-
-import org.apache.avro.reflect.Nullable;
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
 /**
  * A Dataflow Example that runs in both batch and streaming modes with traffic sensor data.
  * You can configure the running mode by setting {@literal --streaming} to true or false.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
index 09d9c29..439cf02 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
@@ -17,6 +17,11 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
 import org.apache.beam.sdk.options.Default;
@@ -31,13 +36,6 @@ import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * An example that reads the public samples of weather data from BigQuery, counts the number of
  * tornadoes that occur in each month, and writes the results to BigQuery.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
index 67918a3..1d280a6 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
@@ -17,6 +17,11 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
 import org.apache.beam.sdk.options.Default;
@@ -34,13 +39,6 @@ import org.apache.beam.sdk.transforms.Sum;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * An example that reads the public 'Shakespeare' data, and for each word in
  * the dataset that is over a given length, generates a string containing the

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
index 215e2ff..9a9e799 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
@@ -22,6 +22,14 @@ import static com.google.datastore.v1.client.DatastoreHelper.makeFilter;
 import static com.google.datastore.v1.client.DatastoreHelper.makeKey;
 import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
 
+import com.google.datastore.v1.Entity;
+import com.google.datastore.v1.Key;
+import com.google.datastore.v1.PropertyFilter;
+import com.google.datastore.v1.Query;
+import com.google.datastore.v1.Value;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Nullable;
 import org.apache.beam.examples.WordCount;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.TextIO;
@@ -36,16 +44,6 @@ import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.ParDo;
 
-import com.google.datastore.v1.Entity;
-import com.google.datastore.v1.Key;
-import com.google.datastore.v1.PropertyFilter;
-import com.google.datastore.v1.Query;
-import com.google.datastore.v1.Value;
-
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Nullable;
-
 /**
  * A WordCount example using DatastoreIO.
  *

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
index 9a0f7a2..6c42520 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
@@ -17,6 +17,12 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
 import org.apache.beam.sdk.options.Default;
@@ -32,14 +38,6 @@ import org.apache.beam.sdk.transforms.View;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionView;
 
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
 /**
  * This is an example that demonstrates several approaches to filtering, and use of the Mean
  * transform. It shows how to dynamically set parameters by defining and using new pipeline options,

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
index 5ff2ce2..1b91bf1 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableRow;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.TextIO;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -33,8 +34,6 @@ import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TupleTag;
 
-import com.google.api.services.bigquery.model.TableRow;
-
 /**
  * This example shows how to do a join on two collections.
  * It uses a sample of the GDELT 'world event' data (http://goo.gl/OB6oin), joining the event

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
index 4f266d3..3772a7b 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
@@ -17,6 +17,11 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
 import org.apache.beam.sdk.options.Default;
@@ -31,13 +36,6 @@ import org.apache.beam.sdk.transforms.ParDo;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * An example that reads the public samples of weather data from BigQuery, and finds
  * the maximum temperature ('mean_temp') for each month.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
index 04ac2c3..db59435 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
@@ -17,6 +17,13 @@
  */
 package org.apache.beam.examples.cookbook;
 
+import com.google.api.services.bigquery.model.TableFieldSchema;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.api.services.bigquery.model.TableSchema;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExampleOptions;
 import org.apache.beam.examples.common.ExampleUtils;
@@ -42,19 +49,9 @@ import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionList;
-
-import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.api.services.bigquery.model.TableReference;
-import com.google.api.services.bigquery.model.TableRow;
-import com.google.api.services.bigquery.model.TableSchema;
-
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 /**
  * This example illustrates the basic concepts behind triggering. It shows how to use different
  * trigger definitions to produce partial (speculative) results before all the data is processed and

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java b/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java
index f463b1e..c1bd5d4 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java
@@ -18,16 +18,14 @@
 package org.apache.beam.examples;
 
 import com.google.common.io.Files;
-
+import java.io.File;
+import java.nio.charset.StandardCharsets;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-
 /**
  * Tests for {@link DebuggingWordCount}.
  */

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
index f93dc2b..ca0c9d6 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
@@ -18,6 +18,7 @@
 
 package org.apache.beam.examples;
 
+import java.util.Date;
 import org.apache.beam.examples.WordCount.WordCountOptions;
 import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
@@ -25,13 +26,10 @@ import org.apache.beam.sdk.testing.FileChecksumMatcher;
 import org.apache.beam.sdk.testing.TestPipeline;
 import org.apache.beam.sdk.testing.TestPipelineOptions;
 import org.apache.beam.sdk.util.IOChannelUtils;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.Date;
-
 /**
  * End-to-end tests of WordCount.
  */

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java
index 9d36a3e..98c5b17 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountTest.java
@@ -17,6 +17,8 @@
  */
 package org.apache.beam.examples;
 
+import java.util.Arrays;
+import java.util.List;
 import org.apache.beam.examples.WordCount.CountWords;
 import org.apache.beam.examples.WordCount.ExtractWordsFn;
 import org.apache.beam.examples.WordCount.FormatAsTextFn;
@@ -30,7 +32,6 @@ import org.apache.beam.sdk.transforms.DoFn;
 import org.apache.beam.sdk.transforms.DoFnTester;
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.values.PCollection;
-
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
@@ -38,9 +39,6 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Tests of WordCount.
  */

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c623a271/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java b/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java
index 6f28dec..b6751c5 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/complete/AutoCompleteTest.java
@@ -17,6 +17,11 @@
  */
 package org.apache.beam.examples.complete;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import org.apache.beam.examples.complete.AutoComplete.CompletionCandidate;
 import org.apache.beam.examples.complete.AutoComplete.ComputeTopCompletions;
 import org.apache.beam.sdk.Pipeline;
@@ -33,19 +38,12 @@ import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.TimestampedValue;
-
 import org.joda.time.Duration;
 import org.joda.time.Instant;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Tests of AutoComplete.
  */