From 1cbc58bfc6b549008d647ca7866e02aed7f45d37 Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dkulp@apache.org>
Date: Wed, 7 Feb 2018 15:00:11 -0500
Subject: [PATCH] [BEAM-3640] Part1: Update Checkstyle to enforce blank lines
 for imports and classdefs

---
 .../examples/complete/game/utils/WriteToBigQuery.java    | 1 +
 .../runners/core/construction/WriteFilesTranslation.java | 1 +
 .../core/construction/CombineTranslationTest.java        | 2 +-
 .../core/construction/PTransformMatchersTest.java        | 3 +++
 .../apache/beam/runners/core/StatefulDoFnRunnerTest.java | 2 +-
 .../beam/runners/direct/CloningBundleFactoryTest.java    | 1 +
 .../runners/dataflow/BatchStatefulParDoOverrides.java    | 1 +
 .../org/apache/beam/runners/dataflow/DataflowRunner.java | 2 ++
 .../fnexecution/control/FnApiControlClientTest.java      | 1 +
 .../build-tools/src/main/resources/beam/checkstyle.xml   | 8 ++++++++
 .../beam/sdk/transforms/reflect/DoFnSignature.java       | 1 +
 .../src/test/java/org/apache/beam/sdk/PipelineTest.java  | 2 ++
 .../java/org/apache/beam/sdk/coders/AvroCoderTest.java   | 4 ++++
 .../java/org/apache/beam/sdk/transforms/ParDoTest.java   | 1 +
 .../beam/sdk/transforms/reflect/DoFnInvokersTest.java    | 9 ++++++++-
 .../reflect/DoFnSignaturesSplittableDoFnTest.java        | 1 +
 .../beam/sdk/transforms/reflect/OnTimerInvokersTest.java | 2 +-
 .../beam/sdk/transforms/windowing/WindowingTest.java     | 1 +
 .../beam/sdk/io/elasticsearch/ElasticsearchIO.java       | 1 +
 19 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/game/utils/WriteToBigQuery.java b/examples/java/src/main/java/org/apache/beam/examples/complete/game/utils/WriteToBigQuery.java
index 2ec4e5c9a1333..c1b3019b0dab2 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/game/utils/WriteToBigQuery.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/game/utils/WriteToBigQuery.java
@@ -91,6 +91,7 @@ FieldFn<InputT> getFieldFn() {
       return this.fieldFn;
     }
   }
+
   /** Convert each key/score pair into a BigQuery TableRow as specified by fieldFn. */
   protected class BuildRowFn extends DoFn<InputT, TableRow> {
 
diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java
index e5e18f74522f2..154893062babb 100644
--- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java
+++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java
@@ -294,6 +294,7 @@ public FunctionSpec translate(
       return new RawWriteFiles(protoTransform, rehydratedComponents);
     }
   }
+
   /** Registers {@link WriteFilesTranslator}. */
   @AutoService(TransformPayloadTranslatorRegistrar.class)
   public static class Registrar implements TransformPayloadTranslatorRegistrar {
diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CombineTranslationTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CombineTranslationTest.java
index 516974fcdd4eb..9083d5344c549 100644
--- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CombineTranslationTest.java
+++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CombineTranslationTest.java
@@ -220,5 +220,5 @@ public boolean equals(Object other) {
     public int hashCode() {
       return TestCombineFnWithContext.class.hashCode();
     }
-  };
+  }
 }
diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PTransformMatchersTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PTransformMatchersTest.java
index 9ca6d9408d02b..61a29f7b3150d 100644
--- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PTransformMatchersTest.java
+++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PTransformMatchersTest.java
@@ -132,6 +132,7 @@ public PCollection<Integer> expand(PCollection<KV<String, Integer>> input) {
             input.getPipeline(), input.getWindowingStrategy(), input.isBounded(), VarIntCoder.of());
       }
     }
+
     PTransformMatcher matcher = PTransformMatchers.classEqualTo(MyPTransform.class);
     MyPTransform subclass = new MyPTransform() {};
 
@@ -160,7 +161,9 @@ public void simpleProcess(ProcessContext ctxt) {
           ctxt.output(ctxt.element().getValue() + 1);
         }
       };
+
   private abstract static class SomeTracker extends RestrictionTracker<Void, Void> {}
+
   private DoFn<KV<String, Integer>, Integer> splittableDoFn =
       new DoFn<KV<String, Integer>, Integer>() {
         @ProcessElement
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
index 446a9f874ca85..36d7a66b539fb 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
@@ -235,5 +235,5 @@ public void processElement(
       Integer currentValue = MoreObjects.firstNonNull(state.read(), 0);
       state.write(currentValue + 1);
     }
-  };
+  }
 }
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
index 968c5ebc2591f..566e5b88f2bac 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/CloningBundleFactoryTest.java
@@ -173,6 +173,7 @@ public void keyedBundleDecodeFailsAddFails() {
   }
 
   static class Record {}
+
   static class RecordNoEncodeCoder extends AtomicCoder<Record> {
 
     @Override
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/BatchStatefulParDoOverrides.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/BatchStatefulParDoOverrides.java
index 1196a0647a80b..a10472d1f4519 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/BatchStatefulParDoOverrides.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/BatchStatefulParDoOverrides.java
@@ -120,6 +120,7 @@ public Map<PValue, ReplacementOutput> mapOutputs(
       return ReplacementOutputs.singleton(outputs, newOutput);
     }
   }
+
   private static class MultiOutputOverrideFactory<K, InputT, OutputT>
       implements PTransformOverrideFactory<
           PCollection<KV<K, InputT>>, PCollectionTuple, ParDo.MultiOutput<KV<K, InputT>, OutputT>> {
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index 895c7a1a661a2..b5874b24f937c 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -876,6 +876,7 @@ public void visitValue(PValue value, Node producer) {
         }
       }
     }
+
     BoundednessVisitor visitor = new BoundednessVisitor();
     p.traverseTopologically(visitor);
     return visitor.boundedness == IsBounded.UNBOUNDED;
@@ -1540,6 +1541,7 @@ public void process(ProcessContext c) throws Exception {
           .setCoder(source.getOutputCoder());
     }
   }
+
   /**
    * A marker {@link DoFn} for writing the contents of a {@link PCollection} to a streaming
    * {@link PCollectionView} backend implementation.
diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java
index c33105fa3616d..e26e426e60588 100644
--- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java
+++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java
@@ -136,6 +136,7 @@ public void testOnErrorCancelsOutstanding() throws Exception {
         client.handle(BeamFnApi.InstructionRequest.newBuilder().setInstructionId(id).build());
 
     class FrazzleException extends Exception {}
+
     client.asResponseObserver().onError(new FrazzleException());
 
     thrown.expect(ExecutionException.class);
diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
index 23fedbd50cf38..44c1bc1b3e98a 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
@@ -379,6 +379,14 @@ page at http://checkstyle.sourceforge.net/config.html -->
     WHITESPACE CHECKS
 
     -->
+    <module name="EmptyLineSeparator">
+      <property name="allowNoEmptyLineBetweenFields" value="false"/>
+      <property name="allowMultipleEmptyLines" value="true"/>
+      <property name="allowMultipleEmptyLinesInsideClassMembers" value="true"/>
+      <property name="tokens" value="IMPORT,CLASS_DEF" />
+      <!-- eventually start adding: ,INTERFACE_DEF,ENUM_DEF,
+           STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF, VARIABLE_DEF -->
+    </module>
 
     <module name="WhitespaceAround">
       <!-- Checks that various tokens are surrounded by whitespace.
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignature.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignature.java
index 96cb43b791899..d4824b2c7ea11 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignature.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignature.java
@@ -366,6 +366,7 @@ public abstract static class ProcessContextParameter extends Parameter {
     public abstract static class OnTimerContextParameter extends Parameter {
       OnTimerContextParameter() {}
     }
+
     /**
      * Descriptor for a {@link Parameter} of type {@link BoundedWindow}.
      *
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
index 5c0c0e9e857b8..3d29af5bfde04 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/PipelineTest.java
@@ -436,12 +436,14 @@ public PCollection<Integer> expand(PCollection<Integer> input) {
         return input.apply("custom_name", Sum.integersGlobally());
       }
     }
+
     class ReplacementTransform extends PTransform<PCollection<Integer>, PCollection<Integer>> {
       @Override
       public PCollection<Integer> expand(PCollection<Integer> input) {
         return input.apply("custom_name", Max.integersGlobally());
       }
     }
+
     class ReplacementOverrideFactory
         implements PTransformOverrideFactory<
             PCollection<Integer>, PCollection<Integer>, OriginalTransform> {
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
index fdcef3d4e74ad..9c8c5bf67feec 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
@@ -442,6 +442,7 @@ private static class NonDeterministicArray {
     @SuppressWarnings("unused")
     private UnorderedMapClass[] arrayField;
   }
+
   @Test
   public void testDeterministicNonDeterministicArray() {
     assertNonDeterministic(AvroCoder.of(NonDeterministicArray.class),
@@ -714,7 +715,9 @@ private abstract static class DeterministicUnionBase {}
 
   @Union({ UnionCase1.class, UnionCase2.class, UnionCase3.class })
   private abstract static class NonDeterministicUnionBase {}
+
   private static class UnionCase1 extends DeterministicUnionBase {}
+
   private static class UnionCase2 extends DeterministicUnionBase {
     @SuppressWarnings("unused")
     String field;
@@ -903,6 +906,7 @@ private static class SomeGeneric<T> {
     @SuppressWarnings("unused")
     private T foo;
   }
+
   private static class Foo {
     @SuppressWarnings("unused")
     String id;
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
index 4d9776ec0ee00..08cdeaca81479 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java
@@ -144,6 +144,7 @@ public void processElement(ProcessContext c, BoundedWindow window) {
           + ":" + window.maxTimestamp().getMillis());
     }
   }
+
   static class TestNoOutputDoFn extends DoFn<Integer, String> {
     @ProcessElement
     public void processElement(DoFn<Integer, String>.ProcessContext c) throws Exception {}
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
index 15c8bbb19a646..2c1575ab64c5a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnInvokersTest.java
@@ -120,6 +120,7 @@ class MockFn extends DoFn<String, String> {
       @ProcessElement
       public void processElement(ProcessContext c) throws Exception {}
     }
+
     MockFn mockFn = mock(MockFn.class);
     assertEquals(stop(), invokeProcessElement(mockFn));
     verify(mockFn).processElement(mockProcessContext);
@@ -180,6 +181,7 @@ class MockFn extends DoFn<String, String> {
       @DoFn.ProcessElement
       public void processElement(ProcessContext c, IntervalWindow w) throws Exception {}
     }
+
     MockFn fn = mock(MockFn.class);
     assertEquals(stop(), invokeProcessElement(fn));
     verify(fn).processElement(mockProcessContext, mockWindow);
@@ -204,6 +206,7 @@ class MockFn extends DoFn<String, String> {
       public void processElement(ProcessContext c, @StateId(stateId) ValueState<Integer> valueState)
           throws Exception {}
     }
+
     MockFn fn = mock(MockFn.class);
     assertEquals(stop(), invokeProcessElement(fn));
     verify(fn).processElement(mockProcessContext, mockState);
@@ -230,6 +233,7 @@ public void processElement(ProcessContext c, @TimerId(timerId) Timer timer)
       @OnTimer(timerId)
       public void onTimer() {}
     }
+
     MockFn fn = mock(MockFn.class);
     assertEquals(stop(), invokeProcessElement(fn));
     verify(fn).processElement(mockProcessContext, mockTimer);
@@ -254,6 +258,7 @@ public SomeRestrictionTracker newTracker(SomeRestriction restriction) {
         return null;
       }
     }
+
     MockFn fn = mock(MockFn.class);
     when(fn.processElement(mockProcessContext, null)).thenReturn(resume());
     assertEquals(resume(), invokeProcessElement(fn));
@@ -277,6 +282,7 @@ public void before() {}
       @Teardown
       public void after() {}
     }
+
     MockFn fn = mock(MockFn.class);
     DoFnInvoker<String, String> invoker = DoFnInvokers.invokerFor(fn);
     invoker.invokeSetup();
@@ -446,6 +452,7 @@ public RestrictionWithDefaultTracker getInitialRestriction(String element) {
         return null;
       }
     }
+
     MockFn fn = mock(MockFn.class);
     DoFnInvoker<String, String> invoker = DoFnInvokers.invokerFor(fn);
 
@@ -760,7 +767,7 @@ public void onMyTimer(IntervalWindow w) {
   static class StableNameTestDoFn extends DoFn<Void, Void> {
     @ProcessElement
     public void process() {}
-  };
+  }
 
   /**
    * This is a change-detector test that the generated name is stable across runs.
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnSignaturesSplittableDoFnTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnSignaturesSplittableDoFnTest.java
index ce29ecb5f72e8..a76201bea13b1 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnSignaturesSplittableDoFnTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnSignaturesSplittableDoFnTest.java
@@ -199,6 +199,7 @@ class UnsplittableFn extends DoFn<Integer, String> {
       @ProcessElement
       public void process(ProcessContext context) {}
     }
+
     assertEquals(
         PCollection.IsBounded.BOUNDED,
         DoFnSignatures
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/OnTimerInvokersTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/OnTimerInvokersTest.java
index 0cc67c63b662f..af6b6ce2e4f6e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/OnTimerInvokersTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/OnTimerInvokersTest.java
@@ -117,7 +117,7 @@ public void process() {}
 
     @OnTimer(TIMER_ID)
     public void onMyTimer() {}
-  };
+  }
 
   /**
    * This is a change-detector test that the generated name is stable across runs.
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
index 09cedc49bd95c..c6aadf46fa515 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowingTest.java
@@ -68,6 +68,7 @@ public void processElement(ProcessContext c, BoundedWindow window) {
                 + ":" + window);
       }
     }
+
     private WindowFn<? super String, ?> windowFn;
     public WindowedCount(WindowFn<? super String, ?> windowFn) {
       this.windowFn = windowFn;
diff --git a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
index cebd70b7623b7..9c8f509d57218 100644
--- a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
+++ b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
@@ -858,6 +858,7 @@ public void closeClient() throws Exception {
       }
     }
   }
+
   static int getBackendVersion(ConnectionConfiguration connectionConfiguration) {
     try (RestClient restClient = connectionConfiguration.createClient()) {
       Response response = restClient.performRequest("GET", "");