Repository: incubator-beam Updated Branches: refs/heads/master 2efc27829 -> 465c7d1f1
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PerKeyCombineFnRunner.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PerKeyCombineFnRunner.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PerKeyCombineFnRunner.java index e8fa4f7..c1a93b7 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PerKeyCombineFnRunner.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PerKeyCombineFnRunner.java @@ -37,7 +37,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * * <p>It can be a {@code KeyedCombineFn} or a {@code KeyedCombineFnWithContext}. */ - public PerKeyCombineFn<K, InputT, AccumT, OutputT> fn(); + PerKeyCombineFn<K, InputT, AccumT, OutputT> fn(); ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +47,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public AccumT createAccumulator(K key, OldDoFn<?, ?>.ProcessContext c); + AccumT createAccumulator(K key, OldDoFn<?, ?>.ProcessContext c); /** * Forwards the call to a {@link PerKeyCombineFn} to add the input in a {@link OldDoFn}. @@ -55,7 +55,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public AccumT addInput(K key, AccumT accumulator, InputT input, OldDoFn<?, ?>.ProcessContext c); + AccumT addInput(K key, AccumT accumulator, InputT input, OldDoFn<?, ?>.ProcessContext c); /** * Forwards the call to a {@link PerKeyCombineFn} to merge accumulators in a {@link OldDoFn}. @@ -63,7 +63,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public AccumT mergeAccumulators( + AccumT mergeAccumulators( K key, Iterable<AccumT> accumulators, OldDoFn<?, ?>.ProcessContext c); /** @@ -72,7 +72,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public OutputT extractOutput(K key, AccumT accumulator, OldDoFn<?, ?>.ProcessContext c); + OutputT extractOutput(K key, AccumT accumulator, OldDoFn<?, ?>.ProcessContext c); /** * Forwards the call to a {@link PerKeyCombineFn} to compact the accumulator in a {@link OldDoFn}. @@ -80,7 +80,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public AccumT compact(K key, AccumT accumulator, OldDoFn<?, ?>.ProcessContext c); + AccumT compact(K key, AccumT accumulator, OldDoFn<?, ?>.ProcessContext c); /** * Forwards the call to a {@link PerKeyCombineFn} to combine the inputs and extract output @@ -89,7 +89,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public OutputT apply(K key, Iterable<? extends InputT> inputs, OldDoFn<?, ?>.ProcessContext c); + OutputT apply(K key, Iterable<? extends InputT> inputs, OldDoFn<?, ?>.ProcessContext c); /** * Forwards the call to a {@link PerKeyCombineFn} to add all inputs in a {@link OldDoFn}. @@ -97,7 +97,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from {@code OldDoFn.ProcessContext} * if it is required. */ - public AccumT addInputs(K key, Iterable<InputT> inputs, OldDoFn<?, ?>.ProcessContext c); + AccumT addInputs(K key, Iterable<InputT> inputs, OldDoFn<?, ?>.ProcessContext c); ///////////////////////////////////////////////////////////////////////////// @@ -107,7 +107,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from * {@link PipelineOptions} and {@link SideInputReader} if it is required. */ - public AccumT createAccumulator(K key, PipelineOptions options, + AccumT createAccumulator(K key, PipelineOptions options, SideInputReader sideInputReader, Collection<? extends BoundedWindow> windows); /** @@ -116,7 +116,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from * {@link PipelineOptions} and {@link SideInputReader} if it is required. */ - public AccumT addInput(K key, AccumT accumulator, InputT value, PipelineOptions options, + AccumT addInput(K key, AccumT accumulator, InputT value, PipelineOptions options, SideInputReader sideInputReader, Collection<? extends BoundedWindow> windows); /** @@ -125,7 +125,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from * {@link PipelineOptions} and {@link SideInputReader} if it is required. */ - public AccumT mergeAccumulators(K key, Iterable<AccumT> accumulators, PipelineOptions options, + AccumT mergeAccumulators(K key, Iterable<AccumT> accumulators, PipelineOptions options, SideInputReader sideInputReader, Collection<? extends BoundedWindow> windows); /** @@ -134,7 +134,7 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from * {@link PipelineOptions} and {@link SideInputReader} if it is required. */ - public OutputT extractOutput(K key, AccumT accumulator, PipelineOptions options, + OutputT extractOutput(K key, AccumT accumulator, PipelineOptions options, SideInputReader sideInputReader, Collection<? extends BoundedWindow> windows); /** @@ -143,6 +143,6 @@ public interface PerKeyCombineFnRunner<K, InputT, AccumT, OutputT> extends Seria * <p>It constructs a {@code CombineWithContext.Context} from * {@link PipelineOptions} and {@link SideInputReader} if it is required. */ - public AccumT compact(K key, AccumT accumulator, PipelineOptions options, + AccumT compact(K key, AccumT accumulator, PipelineOptions options, SideInputReader sideInputReader, Collection<? extends BoundedWindow> windows); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TimerInternals.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TimerInternals.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TimerInternals.java index 161037d..58678f8 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TimerInternals.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TimerInternals.java @@ -142,7 +142,7 @@ public interface TimerInternals { /** * Data about a timer as represented within {@link TimerInternals}. */ - public static class TimerData implements Comparable<TimerData> { + class TimerData implements Comparable<TimerData> { private final StateNamespace namespace; private final Instant timestamp; private final TimeDomain domain; @@ -223,7 +223,7 @@ public interface TimerInternals { /** * A {@link Coder} for {@link TimerData}. */ - public class TimerDataCoder extends StandardCoder<TimerData> { + class TimerDataCoder extends StandardCoder<TimerData> { private static final StringUtf8Coder STRING_CODER = StringUtf8Coder.of(); private static final InstantCoder INSTANT_CODER = InstantCoder.of(); private final Coder<? extends BoundedWindow> windowCoder; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Timers.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Timers.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Timers.java index beb80ec..7415d7a 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Timers.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Timers.java @@ -41,18 +41,18 @@ public interface Timers { * @param timestamp the time at which the timer should be delivered * @param timeDomain the domain that the {@code timestamp} applies to */ - public abstract void setTimer(Instant timestamp, TimeDomain timeDomain); + void setTimer(Instant timestamp, TimeDomain timeDomain); /** Removes the timer set in this context for the {@code timestmap} and {@code timeDomain}. */ - public abstract void deleteTimer(Instant timestamp, TimeDomain timeDomain); + void deleteTimer(Instant timestamp, TimeDomain timeDomain); /** Returns the current processing time. */ - public abstract Instant currentProcessingTime(); + Instant currentProcessingTime(); /** Returns the current synchronized processing time or {@code null} if unknown. */ @Nullable - public abstract Instant currentSynchronizedProcessingTime(); + Instant currentSynchronizedProcessingTime(); /** Returns the current event time. */ - public abstract Instant currentEventTime(); + Instant currentEventTime(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterable.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterable.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterable.java index 23f8960..d8086bb 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterable.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterable.java @@ -24,5 +24,5 @@ package org.apache.beam.sdk.util.common; */ public interface Reiterable<T> extends Iterable<T> { @Override - public Reiterator<T> iterator(); + Reiterator<T> iterator(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterator.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterator.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterator.java index 8624790..e865c83 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterator.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/common/Reiterator.java @@ -36,5 +36,5 @@ public interface Reiterator<T> extends Iterator<T> { * true for the corresponding elements of each if the original source is * logically immutable. */ - public Reiterator<T> copy(); + Reiterator<T> copy(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/StateContext.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/StateContext.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/StateContext.java index 1d441a6..887a5f1 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/StateContext.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/StateContext.java @@ -29,15 +29,15 @@ public interface StateContext<W extends BoundedWindow> { * Returns the {@code PipelineOptions} specified with the * {@link org.apache.beam.sdk.runners.PipelineRunner}. */ - public abstract PipelineOptions getPipelineOptions(); + PipelineOptions getPipelineOptions(); /** * Returns the value of the side input for the corresponding state window. */ - public abstract <T> T sideInput(PCollectionView<T> view); + <T> T sideInput(PCollectionView<T> view); /** * Returns the window corresponding to the state. */ - public abstract W window(); + W window(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java index 457e78a..a351723 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java @@ -49,7 +49,7 @@ public interface PCollectionView<T> extends PValue, Serializable { * obtain that information via a package-private channel. */ @Deprecated - public TupleTag<Iterable<WindowedValue<?>>> getTagInternal(); + TupleTag<Iterable<WindowedValue<?>>> getTagInternal(); /** * @deprecated this method will be removed entirely. The {@link ViewFn} for a side input is an @@ -57,7 +57,7 @@ public interface PCollectionView<T> extends PValue, Serializable { * obtain this specification via a package-private channel. */ @Deprecated - public ViewFn<Iterable<WindowedValue<?>>, T> getViewFn(); + ViewFn<Iterable<WindowedValue<?>>, T> getViewFn(); /** * @deprecated this method will be removed entirely. The {@link PCollection} underlying a side @@ -66,7 +66,7 @@ public interface PCollectionView<T> extends PValue, Serializable { * channel. */ @Deprecated - public WindowingStrategy<?, ?> getWindowingStrategyInternal(); + WindowingStrategy<?, ?> getWindowingStrategyInternal(); /** * @deprecated this method will be removed entirely. The {@link PCollection} underlying a side @@ -74,5 +74,5 @@ public interface PCollectionView<T> extends PValue, Serializable { * ParDo} transform, which will obtain that information via a package-private channel. */ @Deprecated - public Coder<Iterable<WindowedValue<?>>> getCoderInternal(); + Coder<Iterable<WindowedValue<?>>> getCoderInternal(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PInput.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PInput.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PInput.java index 1b3791d..f938aeb 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PInput.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PInput.java @@ -28,7 +28,7 @@ public interface PInput { /** * Returns the owning {@link Pipeline} of this {@link PInput}. */ - public Pipeline getPipeline(); + Pipeline getPipeline(); /** * Expands this {@link PInput} into a list of its component output @@ -43,7 +43,7 @@ public interface PInput { * * <p>Not intended to be invoked directly by user code. */ - public Collection<? extends PValue> expand(); + Collection<? extends PValue> expand(); /** * After building, finalizes this {@code PInput} to make it ready for @@ -52,5 +52,5 @@ public interface PInput { * <p>Automatically invoked whenever {@code apply()} is invoked on * this {@code PInput}, so users do not normally call this explicitly. */ - public void finishSpecifying(); + void finishSpecifying(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/values/POutput.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/POutput.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/POutput.java index 6be9215..27a280f 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/POutput.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/POutput.java @@ -30,7 +30,7 @@ public interface POutput { /** * Returns the owning {@link Pipeline} of this {@link POutput}. */ - public Pipeline getPipeline(); + Pipeline getPipeline(); /** * Expands this {@link POutput} into a list of its component output @@ -45,7 +45,7 @@ public interface POutput { * * <p>Not intended to be invoked directly by user code. */ - public Collection<? extends PValue> expand(); + Collection<? extends PValue> expand(); /** * Records that this {@code POutput} is an output of the given @@ -58,7 +58,7 @@ public interface POutput { * is automatically invoked as part of applying the * producing {@link PTransform}. */ - public void recordAsOutput(AppliedPTransform<?, ?, ?> transform); + void recordAsOutput(AppliedPTransform<?, ?, ?> transform); /** * As part of applying the producing {@link PTransform}, finalizes this @@ -72,5 +72,5 @@ public interface POutput { * used as a {@link PInput}, when {@link Pipeline#run} * is called, so users do not normally call this explicitly. */ - public void finishSpecifyingOutput(); + void finishSpecifyingOutput(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PValue.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PValue.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PValue.java index 08eeb13..0cee2ca 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PValue.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PValue.java @@ -28,12 +28,12 @@ public interface PValue extends POutput, PInput { /** * Returns the name of this {@link PValue}. */ - public String getName(); + String getName(); /** * Returns the {@link AppliedPTransform} that this {@link PValue} is an output of. * * <p>For internal use only. */ - public AppliedPTransform<?, ?, ?> getProducingTransformInternal(); + AppliedPTransform<?, ?, ?> getProducingTransformInternal(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java ---------------------------------------------------------------------- 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 a97acfb..f6329a0 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 @@ -260,7 +260,7 @@ public class AvroCoderTest { SerializableUtils.ensureSerializable(coder); } - private final void assertDeterministic(AvroCoder<?> coder) { + private void assertDeterministic(AvroCoder<?> coder) { try { coder.verifyDeterministic(); } catch (NonDeterministicException e) { @@ -268,7 +268,7 @@ public class AvroCoderTest { } } - private final void assertNonDeterministic(AvroCoder<?> coder, + private void assertNonDeterministic(AvroCoder<?> coder, Matcher<String> reason1) { try { coder.verifyDeterministic(); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/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 90bd1aa..64d8c51 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 @@ -247,7 +247,7 @@ public class PipelineOptionsFactoryTest { /** A test interface that contains a non-bean style method. */ public interface ExtraneousMethod extends PipelineOptions { - public String extraneousMethod(int value, String otherValue); + String extraneousMethod(int value, String otherValue); } @Test http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c4cfb210/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 1d2373e..0f3e2ff 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 @@ -107,7 +107,7 @@ public class ApiSurfaceTest { return anyOf((Iterable) ALLOWED_PACKAGES).matches(clazz); } - private static final Matcher<Class<?>> inPackage(String packageName) { + private static Matcher<Class<?>> inPackage(String packageName) { return new ClassInPackage(packageName); }
