beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lc...@apache.org
Subject [1/2] incubator-beam git commit: Drop static from interfaces
Date Thu, 20 Oct 2016 17:01:29 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/master 307819327 -> b5e15c23a


Drop static from interfaces

It's redundant.


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

Branch: refs/heads/master
Commit: 54736a80443b7a66a56507ad5b0f45e674408811
Parents: 3078193
Author: Dan Halperin <dhalperi@google.com>
Authored: Thu Oct 20 09:34:04 2016 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Thu Oct 20 09:34:08 2016 -0700

----------------------------------------------------------------------
 .../beam/examples/DebuggingWordCount.java       |  2 +-
 .../apache/beam/examples/WindowedWordCount.java |  2 +-
 .../org/apache/beam/examples/WordCount.java     |  2 +-
 .../beam/examples/complete/AutoComplete.java    |  2 +-
 .../apache/beam/examples/complete/TfIdf.java    |  2 +-
 .../examples/complete/TopWikipediaSessions.java |  2 +-
 .../examples/cookbook/BigQueryTornadoes.java    |  2 +-
 .../cookbook/CombinePerKeyExamples.java         |  2 +-
 .../beam/examples/cookbook/DeDupExample.java    |  2 +-
 .../beam/examples/cookbook/FilterExamples.java  |  2 +-
 .../beam/examples/cookbook/JoinExamples.java    |  2 +-
 .../examples/cookbook/MaxPerKeyExamples.java    |  2 +-
 .../beam/examples/complete/game/GameStats.java  |  2 +-
 .../examples/complete/game/HourlyTeamScore.java |  2 +-
 .../examples/complete/game/LeaderBoard.java     |  2 +-
 .../beam/examples/complete/game/UserScore.java  |  2 +-
 .../beam/runners/direct/DirectRunner.java       |  2 +-
 .../beam/runners/direct/WatermarkManager.java   |  2 +-
 .../beam/runners/spark/examples/WordCount.java  |  2 +-
 .../apache/beam/sdk/coders/DelegateCoder.java   |  2 +-
 .../apache/beam/sdk/io/CompressedSource.java    |  4 +-
 .../org/apache/beam/sdk/io/FileBasedSink.java   |  2 +-
 .../org/apache/beam/sdk/testing/PAssert.java    |  2 +-
 .../org/apache/beam/sdk/transforms/Combine.java |  2 +-
 .../sdk/transforms/reflect/DoFnSignatures.java  |  2 +-
 .../CopyOnAccessInMemoryStateInternals.java     |  2 +-
 .../sdk/options/PipelineOptionsFactoryTest.java | 44 ++++++++++----------
 .../beam/sdk/options/PipelineOptionsTest.java   |  6 +--
 .../options/PipelineOptionsValidatorTest.java   | 18 ++++----
 .../sdk/options/ProxyInvocationHandlerTest.java | 36 ++++++++--------
 .../beam/sdk/options/ValueProviderTest.java     |  6 +--
 .../apache/beam/sdk/util/ApiSurfaceTest.java    | 22 +++++-----
 .../PipelineOptionsFactoryJava8Test.java        |  8 ++--
 .../src/main/java/DebuggingWordCount.java       |  2 +-
 .../src/main/java/WindowedWordCount.java        |  2 +-
 .../src/main/java/WordCount.java                |  2 +-
 36 files changed, 100 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 eb38227..90d77b3 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
@@ -158,7 +158,7 @@ public class DebuggingWordCount {
    * <p>Inherits standard configuration options and all options defined in
    * {@link WordCount.WordCountOptions}.
    */
-  public static interface WordCountOptions extends WordCount.WordCountOptions {
+  public interface WordCountOptions extends WordCount.WordCountOptions {
 
     @Description("Regex filter pattern to use in DebuggingWordCount. "
         + "Only words matching this pattern will be counted.")

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 c8bd9d3..4e254bd 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
@@ -166,7 +166,7 @@ public class WindowedWordCount {
    * table, as well as the {@link WordCount.WordCountOptions} support for
    * specification of the input file.
    */
-  public static interface Options extends WordCount.WordCountOptions,
+  public interface Options extends WordCount.WordCountOptions,
       ExampleOptions, ExampleBigQueryTableOptions {
     @Description("Fixed window duration, in minutes")
     @Default.Integer(WINDOW_SIZE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 498b069..9187418 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
@@ -152,7 +152,7 @@ public class WordCount {
    *
    * <p>Inherits standard configuration options.
    */
-  public static interface WordCountOptions extends PipelineOptions {
+  public interface WordCountOptions extends PipelineOptions {
     @Description("Path of the file to read from")
     @Default.String("gs://apache-beam-samples/shakespeare/kinglear.txt")
     String getInputFile();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 c3ac614..c556e3f 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
@@ -412,7 +412,7 @@ public class AutoComplete {
    *
    * <p>Inherits standard Beam example configuration options.
    */
-  private static interface Options
+  private interface Options
       extends ExampleOptions, ExampleBigQueryTableOptions, StreamingOptions {
     @Description("Input text file")
     @Validation.Required

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 59bbd49..d4107c9 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
@@ -86,7 +86,7 @@ public class TfIdf {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Path to the directory or GCS prefix containing files to read from")
     @Default.String("gs://apache-beam-samples/shakespeare/")
     String getInput();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 0f594d7..15923eb 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
@@ -180,7 +180,7 @@ public class TopWikipediaSessions {
    *
    * <p>Inherits standard Beam configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description(
       "Input specified as a GCS path containing a BigQuery table exported as json")
     @Default.String(EXPORTED_WIKI_TABLE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 1e4918d..391ea90 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
@@ -131,7 +131,7 @@ public class BigQueryTornadoes {
    *
    * <p>Inherits standard configuration options.
    */
-  static interface Options extends PipelineOptions {
+  interface Options extends PipelineOptions {
     @Description("Table to read from, specified as "
         + "<project_id>:<dataset_id>.<table_id>")
     @Default.String(WEATHER_SAMPLES_TABLE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 fc11ac9..1f0abce 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
@@ -173,7 +173,7 @@ public class CombinePerKeyExamples {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Table to read from, specified as "
         + "<project_id>:<dataset_id>.<table_id>")
     @Default.String(SHAKESPEARE_TABLE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
index 594d52d..8e7476b 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
@@ -55,7 +55,7 @@ public class DeDupExample {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Path to the directory or GCS prefix containing files to read from")
     @Default.String("gs://apache-beam-samples/shakespeare/*")
     String getInput();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 01d668b..0b2ae73 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
@@ -197,7 +197,7 @@ public class FilterExamples {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Table to read from, specified as "
         + "<project_id>:<dataset_id>.<table_id>")
     @Default.String(WEATHER_SAMPLES_TABLE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 799cad3..d66e070 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
@@ -154,7 +154,7 @@ public class JoinExamples {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Path of the file to write to")
     @Validation.Required
     String getOutput();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/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 3a4fa26..eed4bbd 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
@@ -123,7 +123,7 @@ public class MaxPerKeyExamples {
    *
    * <p>Inherits standard configuration options.
    */
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     @Description("Table to read from, specified as "
         + "<project_id>:<dataset_id>.<table_id>")
     @Default.String(WEATHER_SAMPLES_TABLE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
index e39a9ff..ba52e12 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
@@ -161,7 +161,7 @@ public class GameStats extends LeaderBoard {
   /**
    * Options supported by {@link GameStats}.
    */
-  static interface Options extends LeaderBoard.Options {
+  interface Options extends LeaderBoard.Options {
     @Description("Numeric value of fixed window duration for user analysis, in minutes")
     @Default.Integer(60)
     Integer getFixedWindowDuration();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
index 1231c91..1f92906 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
@@ -86,7 +86,7 @@ public class HourlyTeamScore extends UserScore {
   /**
    * Options supported by {@link HourlyTeamScore}.
    */
-  static interface Options extends UserScore.Options {
+  interface Options extends UserScore.Options {
 
     @Description("Numeric value of fixed window duration, in minutes")
     @Default.Integer(60)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
index 18a5aa1..1eac26c 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
@@ -103,7 +103,7 @@ public class LeaderBoard extends HourlyTeamScore {
   /**
    * Options supported by {@link LeaderBoard}.
    */
-  static interface Options extends HourlyTeamScore.Options, ExampleOptions, StreamingOptions {
+  interface Options extends HourlyTeamScore.Options, ExampleOptions, StreamingOptions {
 
     @Description("Pub/Sub topic to read from")
     @Validation.Required

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
index fc4e7f3..db89702 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
@@ -177,7 +177,7 @@ public class UserScore {
   /**
    * Options supported by {@link UserScore}.
    */
-  public static interface Options extends PipelineOptions {
+  public interface Options extends PipelineOptions {
 
     @Description("Path to the data file(s) containing game data.")
     // The default maps to two large Google Cloud Storage files (each ~12GB) holding two subsequent

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java
index 36d19cf..b79a42f 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java
@@ -180,7 +180,7 @@ public class DirectRunner
    * @param <ElemT> the type of elements the input {@link PCollection} contains.
    * @param <ViewT> the type of the PCollectionView this writer writes to.
    */
-  public static interface PCollectionViewWriter<ElemT, ViewT> {
+  public interface PCollectionViewWriter<ElemT, ViewT> {
     void add(Iterable<WindowedValue<ElemT>> values);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java
index c55a036..1dfbf19 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/WatermarkManager.java
@@ -131,7 +131,7 @@ public class WatermarkManager {
    * timestamp which indicates we have received all of the data and there will be no more on-time or
    * late data. This value is represented by {@link WatermarkManager#THE_END_OF_TIME}.
    */
-  private static interface Watermark {
+  private interface Watermark {
     /**
      * Returns the current value of this watermark.
      */

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/runners/spark/src/main/java/org/apache/beam/runners/spark/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/examples/WordCount.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/examples/WordCount.java
index 1af84ad..0ae78f2 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/examples/WordCount.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/examples/WordCount.java
@@ -108,7 +108,7 @@ public class WordCount {
    *
    * <p>Inherits standard configuration options.
    */
-  public static interface WordCountOptions extends PipelineOptions {
+  public interface WordCountOptions extends PipelineOptions {
     @Description("Path of the file to read from")
     @Default.String("gs://beam-samples/shakespeare/kinglear.txt")
     String getInputFile();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
index e7f9d4a..c71d761 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/DelegateCoder.java
@@ -48,7 +48,7 @@ public final class DelegateCoder<T, IntermediateT> extends CustomCoder<T> {
    * A {@link DelegateCoder.CodingFunction CodingFunction&lt;InputT, OutputT&gt;} is a serializable
    * function from {@code InputT} to {@code OutputT} that may throw any {@link Exception}.
    */
-  public static interface CodingFunction<InputT, OutputT> extends Serializable {
+  public interface CodingFunction<InputT, OutputT> extends Serializable {
      public abstract OutputT apply(InputT input) throws Exception;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
index 8a5fedd..680dc2c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
@@ -71,7 +71,7 @@ public class CompressedSource<T> extends FileBasedSource<T> {
   /**
    * Factory interface for creating channels that decompress the content of an underlying channel.
    */
-  public static interface DecompressingChannelFactory extends Serializable {
+  public interface DecompressingChannelFactory extends Serializable {
     /**
      * Given a channel, create a channel that decompresses the content read from the channel.
      * @throws IOException
@@ -84,7 +84,7 @@ public class CompressedSource<T> extends FileBasedSource<T> {
    * Factory interface for creating channels that decompress the content of an underlying channel,
    * based on both the channel and the file name.
    */
-  private static interface FileNameBasedDecompressingChannelFactory
+  private interface FileNameBasedDecompressingChannelFactory
       extends DecompressingChannelFactory {
     /**
      * Given a channel, create a channel that decompresses the content read from the channel.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
index 7e95c5b..a045d8a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
@@ -680,7 +680,7 @@ public abstract class FileBasedSink<T> extends Sink<T> {
    * copy-if-existing and do not throw exceptions on file not found to enable retries of these
    * operations in the case of transient error.
    */
-  private static interface FileOperations {
+  private interface FileOperations {
     /**
      * Copy a collection of files from one location to another.
      *

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
index 56a1b7c..ce614fb 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
@@ -1181,7 +1181,7 @@ public class PAssert {
    * {@code assertFor(Expected)} which returns a {@code SerializableFunction<Actual, Void>} that
    * should verify the assertion..
    */
-  private static interface AssertRelation<ActualT, ExpectedT> extends Serializable {
+  private interface AssertRelation<ActualT, ExpectedT> extends Serializable {
     public SerializableFunction<ActualT, Void> assertFor(ExpectedT input);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
index e745372..df9a306 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
@@ -1026,7 +1026,7 @@ public class Combine {
      * The type of mutable accumulator values used by this
      * {@code AccumulatingCombineFn}.
      */
-    public abstract static interface Accumulator<InputT, AccumT, OutputT> {
+    public abstract interface Accumulator<InputT, AccumT, OutputT> {
       /**
        * Adds the given input value to this accumulator, modifying
        * this accumulator.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java
index 9611dd4..d11050c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java
@@ -704,7 +704,7 @@ public class DoFnSignatures {
     return declaredMembersWithAnnotation(anno, startClass, stopClass, GET_FIELDS);
   }
 
-  private static interface MemberGetter<MemberT> {
+  private interface MemberGetter<MemberT> {
     public MemberT[] getMembers(Class<?> clazz);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/CopyOnAccessInMemoryStateInternals.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
index da9aa3e..3ca00a9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
@@ -231,7 +231,7 @@ public class CopyOnAccessInMemoryStateInternals<K> implements StateInternals<K>
       return binderFactory.forNamespace(namespace, c);
     }
 
-    private static interface StateBinderFactory<K> {
+    private interface StateBinderFactory<K> {
       StateBinder<K> forNamespace(StateNamespace namespace, StateContext<?> c);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
index e12699b..90bd1aa 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
@@ -123,7 +123,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface missing a getter. */
-  public static interface MissingGetter extends PipelineOptions {
+  public interface MissingGetter extends PipelineOptions {
     void setObject(Object value);
   }
 
@@ -138,7 +138,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface missing multiple getters. */
-  public static interface MissingMultipleGetters extends MissingGetter {
+  public interface MissingMultipleGetters extends MissingGetter {
     void setOtherObject(Object value);
   }
 
@@ -155,7 +155,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface missing a setter. */
-  public static interface MissingSetter extends PipelineOptions {
+  public interface MissingSetter extends PipelineOptions {
     Object getObject();
   }
 
@@ -170,7 +170,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface missing multiple setters. */
-  public static interface MissingMultipleSetters extends MissingSetter {
+  public interface MissingMultipleSetters extends MissingSetter {
     Object getOtherObject();
   }
 
@@ -187,7 +187,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface missing a setter and a getter. */
-  public static interface MissingGettersAndSetters extends MissingGetter {
+  public interface MissingGettersAndSetters extends MissingGetter {
     Object getOtherObject();
   }
 
@@ -204,7 +204,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface with a type mismatch between the getter and setter. */
-  public static interface GetterSetterTypeMismatch extends PipelineOptions {
+  public interface GetterSetterTypeMismatch extends PipelineOptions {
     boolean getValue();
     void setValue(int value);
   }
@@ -220,7 +220,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface with multiple type mismatches between getters and setters. */
-  public static interface MultiGetterSetterTypeMismatch extends GetterSetterTypeMismatch {
+  public interface MultiGetterSetterTypeMismatch extends GetterSetterTypeMismatch {
     long getOther();
     void setOther(String other);
   }
@@ -237,7 +237,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface representing a composite interface. */
-  public static interface CombinedObject extends MissingGetter, MissingSetter {
+  public interface CombinedObject extends MissingGetter, MissingSetter {
   }
 
   @Test
@@ -246,7 +246,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface that contains a non-bean style method. */
-  public static interface ExtraneousMethod extends PipelineOptions {
+  public interface ExtraneousMethod extends PipelineOptions {
     public String extraneousMethod(int value, String otherValue);
   }
 
@@ -262,7 +262,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface that has a conflicting return type with its parent. */
-  public static interface ReturnTypeConflict extends CombinedObject {
+  public interface ReturnTypeConflict extends CombinedObject {
     @Override
     String getObject();
     void setObject(String value);
@@ -282,13 +282,13 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** An interface to provide multiple methods with return type conflicts. */
-  public static interface MultiReturnTypeConflictBase extends CombinedObject {
+  public interface MultiReturnTypeConflictBase extends CombinedObject {
     Object getOther();
     void setOther(Object object);
   }
 
   /** A test interface that has multiple conflicting return types with its parent. */
-  public static interface MultiReturnTypeConflict extends MultiReturnTypeConflictBase {
+  public interface MultiReturnTypeConflict extends MultiReturnTypeConflictBase {
     @Override
     String getObject();
     void setObject(String value);
@@ -324,7 +324,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** Test interface that has {@link JsonIgnore @JsonIgnore} on a setter for a property. */
-  public static interface SetterWithJsonIgnore extends PipelineOptions {
+  public interface SetterWithJsonIgnore extends PipelineOptions {
     String getValue();
     @JsonIgnore
     void setValue(String value);
@@ -340,7 +340,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** Test interface that has {@link JsonIgnore @JsonIgnore} on multiple setters. */
-  public static interface MultiSetterWithJsonIgnore extends SetterWithJsonIgnore {
+  public interface MultiSetterWithJsonIgnore extends SetterWithJsonIgnore {
     Integer getOther();
     @JsonIgnore
     void setOther(Integer other);
@@ -363,7 +363,7 @@ public class PipelineOptionsFactoryTest {
    * This class is has a conflicting field with {@link CombinedObject} that doesn't have
    * {@link JsonIgnore @JsonIgnore}.
    */
-  public static interface GetterWithJsonIgnore extends PipelineOptions {
+  public interface GetterWithJsonIgnore extends PipelineOptions {
     @JsonIgnore
     Object getObject();
     void setObject(Object value);
@@ -386,7 +386,7 @@ public class PipelineOptionsFactoryTest {
     options.as(CombinedObject.class);
   }
 
-  private static interface MultiGetters extends PipelineOptions {
+  private interface MultiGetters extends PipelineOptions {
     Object getObject();
     void setObject(Object value);
 
@@ -398,7 +398,7 @@ public class PipelineOptionsFactoryTest {
     void setConsistent(Void consistent);
   }
 
-  private static interface MultipleGettersWithInconsistentJsonIgnore extends PipelineOptions {
+  private interface MultipleGettersWithInconsistentJsonIgnore extends PipelineOptions {
     @JsonIgnore
     Object getObject();
     void setObject(Object value);
@@ -458,7 +458,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface containing all the primitives. */
-  public static interface Primitives extends PipelineOptions {
+  public interface Primitives extends PipelineOptions {
     boolean getBoolean();
     void setBoolean(boolean value);
     char getChar();
@@ -525,7 +525,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface containing all supported objects. */
-  public static interface Objects extends PipelineOptions {
+  public interface Objects extends PipelineOptions {
     Boolean getBoolean();
     void setBoolean(Boolean value);
     Character getChar();
@@ -622,7 +622,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface containing all supported array return types. */
-  public static interface Arrays extends PipelineOptions {
+  public interface Arrays extends PipelineOptions {
     boolean[] getBoolean();
     void setBoolean(boolean[] value);
     char[] getChar();
@@ -763,7 +763,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface containing all supported List return types. */
-  public static interface Lists extends PipelineOptions {
+  public interface Lists extends PipelineOptions {
     List<String> getString();
     void setString(List<String> value);
     List<Integer> getInteger();
@@ -867,7 +867,7 @@ public class PipelineOptionsFactoryTest {
   }
 
   /** A test interface containing all supported List return types. */
-  public static interface Maps extends PipelineOptions {
+  public interface Maps extends PipelineOptions {
     Map<Integer, Integer> getMap();
     void setMap(Map<Integer, Integer> value);
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java
index 7a3bd99..70a6c98 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java
@@ -34,7 +34,7 @@ public class PipelineOptionsTest {
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
   /** Interfaces used for testing that {@link PipelineOptions#as(Class)} functions. */
-  private static interface DerivedTestOptions extends BaseTestOptions {
+  private interface DerivedTestOptions extends BaseTestOptions {
     int getDerivedValue();
     void setDerivedValue(int derivedValue);
 
@@ -45,7 +45,7 @@ public class PipelineOptionsTest {
     void setIgnoredValue(Set<String> ignoredValue);
   }
 
-  private static interface ConflictedTestOptions extends BaseTestOptions {
+  private interface ConflictedTestOptions extends BaseTestOptions {
     String getDerivedValue();
     void setDerivedValue(String derivedValue);
 
@@ -56,7 +56,7 @@ public class PipelineOptionsTest {
     void setIgnoredValue(Set<String> ignoredValue);
   }
 
-  private static interface BaseTestOptions extends PipelineOptions {
+  private interface BaseTestOptions extends PipelineOptions {
     List<Boolean> getBaseValue();
     void setBaseValue(List<Boolean> baseValue);
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsValidatorTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsValidatorTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsValidatorTest.java
index 80d2a60..120d5ed 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsValidatorTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsValidatorTest.java
@@ -31,7 +31,7 @@ public class PipelineOptionsValidatorTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   /** A test interface with an {@link Validation.Required} annotation. */
-  public static interface Required extends PipelineOptions {
+  public interface Required extends PipelineOptions {
     @Validation.Required
     @Description("Fake Description")
     String getObject();
@@ -82,7 +82,7 @@ public class PipelineOptionsValidatorTest {
   }
 
   /** A test interface that overrides the parent's method. */
-  public static interface SubClassValidation extends Required {
+  public interface SubClassValidation extends Required {
     @Override
     String getObject();
     @Override
@@ -101,7 +101,7 @@ public class PipelineOptionsValidatorTest {
   }
 
   /** A test interface with a required group. */
-  public static interface GroupRequired extends PipelineOptions {
+  public interface GroupRequired extends PipelineOptions {
     @Validation.Required(groups = {"ham"})
     String getFoo();
     void setFoo(String foo);
@@ -141,7 +141,7 @@ public class PipelineOptionsValidatorTest {
   }
 
   /** A test interface with a member in multiple required groups. */
-  public static interface MultiGroupRequired extends PipelineOptions {
+  public interface MultiGroupRequired extends PipelineOptions {
     @Validation.Required(groups = {"spam", "ham"})
     String getFoo();
     void setFoo(String foo);
@@ -165,7 +165,7 @@ public class PipelineOptionsValidatorTest {
     PipelineOptionsValidator.validate(MultiGroupRequired.class, multiGroupRequired);
   }
 
-  private static interface LeftOptions extends PipelineOptions {
+  private interface LeftOptions extends PipelineOptions {
     @Validation.Required(groups = {"left"})
     String getFoo();
     void setFoo(String foo);
@@ -179,7 +179,7 @@ public class PipelineOptionsValidatorTest {
     void setBoth(String both);
   }
 
-  private static interface RightOptions extends PipelineOptions {
+  private interface RightOptions extends PipelineOptions {
     @Validation.Required(groups = {"right"})
     String getFoo();
     void setFoo(String foo);
@@ -193,7 +193,7 @@ public class PipelineOptionsValidatorTest {
     void setBoth(String both);
   }
 
-  private static interface JoinedOptions extends LeftOptions, RightOptions {}
+  private interface JoinedOptions extends LeftOptions, RightOptions {}
 
   @Test
   public void testWhenOptionIsDefinedInMultipleSuperInterfacesAndIsNotPresentFailsRequirement() {
@@ -253,7 +253,7 @@ public class PipelineOptionsValidatorTest {
     PipelineOptionsValidator.validate(JoinedOptions.class, options);
   }
 
-  private static interface SuperOptions extends PipelineOptions {
+  private interface SuperOptions extends PipelineOptions {
     @Validation.Required(groups = {"super"})
     String getFoo();
     void setFoo(String foo);
@@ -267,7 +267,7 @@ public class PipelineOptionsValidatorTest {
     void setSuperclassObj(String sup);
   }
 
-  private static interface SubOptions extends SuperOptions {
+  private interface SubOptions extends SuperOptions {
     @Override
     @Validation.Required(groups = {"sub"})
     String getFoo();

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
index eecfff8..32222d3 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ProxyInvocationHandlerTest.java
@@ -73,7 +73,7 @@ public class ProxyInvocationHandlerTest {
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
   /** A test interface with some primitives and objects. */
-  public static interface Simple extends PipelineOptions {
+  public interface Simple extends PipelineOptions {
     boolean isOptionEnabled();
     void setOptionEnabled(boolean value);
     int getPrimitive();
@@ -95,7 +95,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface containing all the JLS default values. */
-  public static interface JLSDefaults extends PipelineOptions {
+  public interface JLSDefaults extends PipelineOptions {
     boolean getBoolean();
     void setBoolean(boolean value);
     char getChar();
@@ -155,7 +155,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface containing all the {@link Default} annotations. */
-  public static interface DefaultAnnotations extends PipelineOptions {
+  public interface DefaultAnnotations extends PipelineOptions {
     @Default.Boolean(true)
     boolean getBoolean();
     void setBoolean(boolean value);
@@ -273,7 +273,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface containing an unknown method. */
-  public static interface UnknownMethod {
+  public interface UnknownMethod {
     void unknownMethod();
   }
 
@@ -289,7 +289,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that extends another interface. */
-  public static interface SubClass extends Simple {
+  public interface SubClass extends Simple {
     String getExtended();
     void setExtended(String value);
   }
@@ -324,7 +324,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that is a sibling to {@link SubClass}. */
-  public static interface Sibling extends Simple {
+  public interface Sibling extends Simple {
     String getSibling();
     void setSibling(String value);
   }
@@ -340,7 +340,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that has the same methods as the parent. */
-  public static interface MethodConflict extends Simple {
+  public interface MethodConflict extends Simple {
     @Override
     String getString();
     @Override
@@ -358,7 +358,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that has the same methods as its parent and grandparent. */
-  public static interface DeepMethodConflict extends MethodConflict {
+  public interface DeepMethodConflict extends MethodConflict {
     @Override
     String getString();
     @Override
@@ -388,7 +388,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that shares the same methods as {@link Sibling}. */
-  public static interface SimpleSibling extends PipelineOptions {
+  public interface SimpleSibling extends PipelineOptions {
     String getString();
     void setString(String value);
   }
@@ -403,7 +403,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that joins two sibling interfaces that have conflicting methods. */
-  public static interface SiblingMethodConflict extends Simple, SimpleSibling {
+  public interface SiblingMethodConflict extends Simple, SimpleSibling {
   }
 
   @Test
@@ -417,7 +417,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** A test interface that has only the getter and only a setter overriden. */
-  public static interface PartialMethodConflict extends Simple {
+  public interface PartialMethodConflict extends Simple {
     @Override
     String getString();
     @Override
@@ -460,7 +460,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** Test interface for JSON conversion of simple types. */
-  private static interface SimpleTypes extends PipelineOptions {
+  private interface SimpleTypes extends PipelineOptions {
     int getInteger();
     void setInteger(int value);
     String getString();
@@ -517,7 +517,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** Test interface for JSON conversion of container types. */
-  private static interface ContainerTypes extends PipelineOptions {
+  private interface ContainerTypes extends PipelineOptions {
     List<String> getList();
     void setList(List<String> values);
     Map<String, String> getMap();
@@ -587,7 +587,7 @@ public class ProxyInvocationHandlerTest {
     }
   }
 
-  private static interface ComplexTypes extends PipelineOptions {
+  private interface ComplexTypes extends PipelineOptions {
     ComplexType getComplexType();
     void setComplexType(ComplexType value);
   }
@@ -607,7 +607,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** Test interface for testing ignored properties during serialization. */
-  private static interface IgnoredProperty extends PipelineOptions {
+  private interface IgnoredProperty extends PipelineOptions {
     @JsonIgnore
     String getValue();
     void setValue(String value);
@@ -635,7 +635,7 @@ public class ProxyInvocationHandlerTest {
   }
 
   /** Test interface containing a class that is not serializable by Jackson. */
-  private static interface NotSerializableProperty extends PipelineOptions {
+  private interface NotSerializableProperty extends PipelineOptions {
     NotSerializable getValue();
     void setValue(NotSerializable value);
   }
@@ -654,7 +654,7 @@ public class ProxyInvocationHandlerTest {
    * Test interface that has {@link JsonIgnore @JsonIgnore} on a property that Jackson
    * can't serialize.
    */
-  private static interface IgnoredNotSerializableProperty extends PipelineOptions {
+  private interface IgnoredNotSerializableProperty extends PipelineOptions {
     @JsonIgnore
     NotSerializable getValue();
     void setValue(NotSerializable value);
@@ -688,7 +688,7 @@ public class ProxyInvocationHandlerTest {
    * Test interface containing a property that is serializable by Jackson only with
    * the additional metadata.
    */
-  private static interface SerializableWithMetadataProperty extends PipelineOptions {
+  private interface SerializableWithMetadataProperty extends PipelineOptions {
     SerializableWithMetadata getValue();
     void setValue(SerializableWithMetadata value);
   }

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java
index 0cde615..0d93b31 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java
@@ -40,7 +40,7 @@ public class ValueProviderTest {
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
   /** A test interface. */
-  public static interface TestOptions extends PipelineOptions {
+  public interface TestOptions extends PipelineOptions {
     @Default.String("bar")
     ValueProvider<String> getBar();
     void setBar(ValueProvider<String> bar);
@@ -137,7 +137,7 @@ public class ValueProviderTest {
   }
 
   /** A test interface. */
-  public static interface BadOptionsRuntime extends PipelineOptions {
+  public interface BadOptionsRuntime extends PipelineOptions {
     RuntimeValueProvider<String> getBar();
     void setBar(RuntimeValueProvider<String> bar);
   }
@@ -153,7 +153,7 @@ public class ValueProviderTest {
   }
 
   /** A test interface. */
-  public static interface BadOptionsStatic extends PipelineOptions {
+  public interface BadOptionsStatic extends PipelineOptions {
     StaticValueProvider<String> getBar();
     void setBar(StaticValueProvider<String> bar);
   }

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ApiSurfaceTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ApiSurfaceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ApiSurfaceTest.java
index 92dcbb8..1d2373e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ApiSurfaceTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ApiSurfaceTest.java
@@ -148,9 +148,9 @@ public class ApiSurfaceTest {
     assertThat(apiSurface.getExposedClasses(), containsInAnyOrder(expectedExposed.toArray()));
   }
 
-  private static interface Exposed { }
+  private interface Exposed { }
 
-  private static interface ExposedReturnType {
+  private interface ExposedReturnType {
     Exposed zero();
   }
 
@@ -159,7 +159,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedReturnType.class, Exposed.class);
   }
 
-  private static interface ExposedParameterTypeVarBound {
+  private interface ExposedParameterTypeVarBound {
     <T extends Exposed> void getList(T whatever);
   }
 
@@ -168,7 +168,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedParameterTypeVarBound.class, Exposed.class);
   }
 
-  private static interface ExposedWildcardBound {
+  private interface ExposedWildcardBound {
     void acceptList(List<? extends Exposed> arg);
   }
 
@@ -177,7 +177,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedWildcardBound.class, Exposed.class);
   }
 
-  private static interface ExposedActualTypeArgument extends List<Exposed> { }
+  private interface ExposedActualTypeArgument extends List<Exposed> { }
 
   @Test
   public void testExposedActualTypeArgument() throws Exception {
@@ -193,8 +193,8 @@ public class ApiSurfaceTest {
     assertThat(apiSurface.getExposedClasses(), emptyIterable());
   }
 
-  private static interface PrunedPattern { }
-  private static interface NotPruned extends PrunedPattern { }
+  private interface PrunedPattern { }
+  private interface NotPruned extends PrunedPattern { }
 
   @Test
   public void testprunedPattern() throws Exception {
@@ -203,7 +203,7 @@ public class ApiSurfaceTest {
     assertThat(apiSurface.getExposedClasses(), containsInAnyOrder((Class) NotPruned.class));
   }
 
-  private static interface ExposedTwice {
+  private interface ExposedTwice {
     Exposed zero();
     Exposed one();
   }
@@ -213,7 +213,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedTwice.class, Exposed.class);
   }
 
-  private static interface ExposedCycle {
+  private interface ExposedCycle {
     ExposedCycle zero(Exposed foo);
   }
 
@@ -222,7 +222,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedCycle.class, Exposed.class);
   }
 
-  private static interface ExposedGenericCycle {
+  private interface ExposedGenericCycle {
     Exposed zero(List<ExposedGenericCycle> foo);
   }
 
@@ -231,7 +231,7 @@ public class ApiSurfaceTest {
     assertExposed(ExposedGenericCycle.class, Exposed.class);
   }
 
-  private static interface ExposedArrayCycle {
+  private interface ExposedArrayCycle {
     Exposed zero(ExposedArrayCycle[] foo);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryJava8Test.java
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryJava8Test.java b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryJava8Test.java
index ada2a88..aaea3c4 100644
--- a/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryJava8Test.java
+++ b/sdks/java/java8tests/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryJava8Test.java
@@ -34,7 +34,7 @@ import org.junit.runners.JUnit4;
 public class PipelineOptionsFactoryJava8Test {
   @Rule public ExpectedException thrown = ExpectedException.none();
 
-  private static interface OptionsWithDefaultMethod extends PipelineOptions {
+  private interface OptionsWithDefaultMethod extends PipelineOptions {
     default Number getValue() {
       return 1024;
     }
@@ -52,7 +52,7 @@ public class PipelineOptionsFactoryJava8Test {
     assertThat(optsWithDefault.getValue(), equalTo(Double.valueOf(12.25)));
   }
 
-  private static interface ExtendedOptionsWithDefault extends OptionsWithDefaultMethod {}
+  private interface ExtendedOptionsWithDefault extends OptionsWithDefaultMethod {}
 
   @Test
   public void testDefaultMethodInExtendedClassIgnoresDefaultImplementation() {
@@ -64,13 +64,13 @@ public class PipelineOptionsFactoryJava8Test {
     assertThat(extendedOptsWithDefault.getValue(), equalTo(Double.NEGATIVE_INFINITY));
   }
 
-  private static interface Options extends PipelineOptions {
+  private interface Options extends PipelineOptions {
     Number getValue();
 
     void setValue(Number value);
   }
 
-  private static interface SubtypeReturingOptions extends Options {
+  private interface SubtypeReturingOptions extends Options {
     @Override
     Integer getValue();
     void setValue(Integer value);

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
index 4099a37..9727379 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
@@ -158,7 +158,7 @@ public class DebuggingWordCount {
    * <p>Inherits standard configuration options and all options defined in
    * {@link WordCount.WordCountOptions}.
    */
-  public static interface WordCountOptions extends WordCount.WordCountOptions {
+  public interface WordCountOptions extends WordCount.WordCountOptions {
 
     @Description("Regex filter pattern to use in DebuggingWordCount. "
         + "Only words matching this pattern will be counted.")

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
index 787e8c9..c92a37c 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
@@ -166,7 +166,7 @@ public class WindowedWordCount {
    * table, as well as the {@link WordCount.WordCountOptions} support for
    * specification of the input file.
    */
-  public static interface Options extends WordCount.WordCountOptions,
+  public interface Options extends WordCount.WordCountOptions,
       ExampleOptions, ExampleBigQueryTableOptions {
     @Description("Fixed window duration, in minutes")
     @Default.Integer(WINDOW_SIZE)

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54736a80/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
index b096d8d..80bfd3a 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
@@ -152,7 +152,7 @@ public class WordCount {
    *
    * <p>Inherits standard configuration options.
    */
-  public static interface WordCountOptions extends PipelineOptions {
+  public interface WordCountOptions extends PipelineOptions {
     @Description("Path of the file to read from")
     @Default.String("gs://apache-beam-samples/shakespeare/kinglear.txt")
     String getInputFile();


Mime
View raw message