Skip to content

Commit

Permalink
Drop static from interfaces
Browse files Browse the repository at this point in the history
It's redundant.
  • Loading branch information
dhalperi committed Oct 20, 2016
1 parent 3078193 commit 54736a8
Show file tree
Hide file tree
Showing 36 changed files with 100 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void processElement(ProcessContext c) {
* <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.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ private static TableReference getTableReference(Options options) {
* 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public PCollection<KV<String, Long>> apply(PCollection<String> lines) {
*
* <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:https://apache-beam-samples/shakespeare/kinglear.txt")
String getInputFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public void processElement(ProcessContext c) {
*
* <p>Inherits standard Beam example configuration options.
*/
private static interface Options
private interface Options
extends ExampleOptions, ExampleBigQueryTableOptions, StreamingOptions {
@Description("Input text file")
@Validation.Required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:https://apache-beam-samples/shakespeare/")
String getInput();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public void processElement(ProcessContext c) {
*
* <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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public PCollection<TableRow> apply(PCollection<TableRow> rows) {
*
* <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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public String apply(Iterable<String> input) {
*
* <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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:https://apache-beam-samples/shakespeare/*")
String getInput();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void processElement(ProcessContext c) {
*
* <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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void processElement(ProcessContext c) {
*
* <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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public PCollection<TableRow> apply(PCollection<TableRow> rows) {
*
* <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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void processElement(ProcessContext c, BoundedWindow window) {
/**
* 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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public PCollection<KV<String, Integer>> apply(
/**
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ interface CommittedBundle<T> {
* @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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public PCollection<KV<String, Long>> apply(PCollection<String> lines) {
*
* <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:https://beam-samples/shakespeare/kinglear.txt")
String getInputFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -84,7 +84,7 @@ public ReadableByteChannel createDecompressingChannel(ReadableByteChannel channe
* 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ public static FileOperations getFileOperations(String spec, PipelineOptions opti
* 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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ public Void apply(Iterable<T> actual) {
* {@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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ public abstract static class AccumulatingCombineFn<
* 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ private static Collection<Field> declaredFieldsWithAnnotation(
return declaredMembersWithAnnotation(anno, startClass, stopClass, GET_FIELDS);
}

private static interface MemberGetter<MemberT> {
private interface MemberGetter<MemberT> {
public MemberT[] getMembers(Class<?> clazz);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ protected StateBinder<K> binderForNamespace(final StateNamespace namespace, Stat
return binderFactory.forNamespace(namespace, c);
}

private static interface StateBinderFactory<K> {
private interface StateBinderFactory<K> {
StateBinder<K> forNamespace(StateNamespace namespace, StateContext<?> c);
}

Expand Down
Loading

0 comments on commit 54736a8

Please sign in to comment.