You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/05/23 18:18:04 UTC
[05/16] beam git commit: Rename BaseExecutionContext.StepContext to
BaseStepContext
Rename BaseExecutionContext.StepContext to BaseStepContext
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/8b7a1f6d
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/8b7a1f6d
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/8b7a1f6d
Branch: refs/heads/master
Commit: 8b7a1f6dfe0ac33814a0b0c67f37f47ab449ec4b
Parents: bed1c53
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon May 22 15:34:37 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue May 23 11:16:27 2017 -0700
----------------------------------------------------------------------
.../beam/runners/core/BaseExecutionContext.java | 14 +++++++-------
.../beam/runners/core/SimpleDoFnRunnerTest.java | 5 +++--
.../beam/runners/core/StatefulDoFnRunnerTest.java | 5 +++--
.../beam/runners/direct/DirectExecutionContext.java | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/8b7a1f6d/runners/core-java/src/main/java/org/apache/beam/runners/core/BaseExecutionContext.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/BaseExecutionContext.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/BaseExecutionContext.java
index a006999..5667250 100644
--- a/runners/core-java/src/main/java/org/apache/beam/runners/core/BaseExecutionContext.java
+++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/BaseExecutionContext.java
@@ -31,11 +31,11 @@ import org.apache.beam.sdk.values.TupleTag;
* Base class for implementations of {@link ExecutionContext}.
*
* <p>A concrete subclass should implement {@link #createStepContext} to create the appropriate
- * {@link StepContext} implementation. Any {@code StepContext} created will
+ * {@link BaseStepContext} implementation. Any {@code StepContext} created will
* be cached for the lifetime of this {@link ExecutionContext}.
*
* <p>BaseExecutionContext is generic to allow implementing subclasses to return a concrete subclass
- * of {@link StepContext} from {@link #getOrCreateStepContext(String, String)} and
+ * of {@link BaseStepContext} from {@link #getOrCreateStepContext(String, String)} and
* {@link #getAllStepContexts()} without forcing each subclass to override the method, e.g.
* <pre>{@code
* {@literal @}Override
@@ -56,12 +56,12 @@ public abstract class BaseExecutionContext<T extends StepContext>
/**
* Implementations should override this to create the specific type
- * of {@link StepContext} they need.
+ * of {@link BaseStepContext} they need.
*/
protected abstract T createStepContext(String stepName, String transformName);
/**
- * Returns the {@link StepContext} associated with the given step.
+ * Returns the {@link BaseStepContext} associated with the given step.
*/
@Override
public T getOrCreateStepContext(String stepName, String transformName) {
@@ -97,7 +97,7 @@ public abstract class BaseExecutionContext<T extends StepContext>
}
/**
- * Returns a collection view of all of the {@link StepContext}s.
+ * Returns a collection view of all of the {@link BaseStepContext}s.
*/
@Override
public Collection<? extends T> getAllStepContexts() {
@@ -110,12 +110,12 @@ public abstract class BaseExecutionContext<T extends StepContext>
* <p>To complete a concrete subclass, implement {@link #timerInternals} and
* {@link #stateInternals}.
*/
- public abstract static class StepContext implements org.apache.beam.runners.core.StepContext {
+ public abstract static class BaseStepContext implements org.apache.beam.runners.core.StepContext {
private final ExecutionContext executionContext;
private final String stepName;
private final String transformName;
- public StepContext(ExecutionContext executionContext, String stepName, String transformName) {
+ public BaseStepContext(ExecutionContext executionContext, String stepName, String transformName) {
this.executionContext = executionContext;
this.stepName = stepName;
this.transformName = transformName;
http://git-wip-us.apache.org/repos/asf/beam/blob/8b7a1f6d/runners/core-java/src/test/java/org/apache/beam/runners/core/SimpleDoFnRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/SimpleDoFnRunnerTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/SimpleDoFnRunnerTest.java
index abefd1c..3750e6c 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/SimpleDoFnRunnerTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/SimpleDoFnRunnerTest.java
@@ -29,7 +29,7 @@ import com.google.common.collect.ListMultimap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.beam.runners.core.BaseExecutionContext.StepContext;
+import org.apache.beam.runners.core.BaseExecutionContext.BaseStepContext;
import org.apache.beam.runners.core.DoFnRunners.OutputManager;
import org.apache.beam.runners.core.TimerInternals.TimerData;
import org.apache.beam.sdk.coders.Coder;
@@ -63,7 +63,8 @@ import org.mockito.MockitoAnnotations;
public class SimpleDoFnRunnerTest {
@Rule public ExpectedException thrown = ExpectedException.none();
- @Mock StepContext mockStepContext;
+ @Mock
+ BaseStepContext mockStepContext;
@Mock TimerInternals mockTimerInternals;
http://git-wip-us.apache.org/repos/asf/beam/blob/8b7a1f6d/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
index 5172f43..a335c3a 100644
--- a/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
+++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/StatefulDoFnRunnerTest.java
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
import com.google.common.base.MoreObjects;
import java.util.Collections;
-import org.apache.beam.runners.core.BaseExecutionContext.StepContext;
+import org.apache.beam.runners.core.BaseExecutionContext.BaseStepContext;
import org.apache.beam.runners.core.metrics.MetricsContainerImpl;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.VarIntCoder;
@@ -69,7 +69,8 @@ public class StatefulDoFnRunnerTest {
private static final IntervalWindow WINDOW_2 =
new IntervalWindow(new Instant(10), new Instant(20));
- @Mock StepContext mockStepContext;
+ @Mock
+ BaseStepContext mockStepContext;
private InMemoryStateInternals<String> stateInternals;
private InMemoryTimerInternals timerInternals;
http://git-wip-us.apache.org/repos/asf/beam/blob/8b7a1f6d/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java
index 107f39a..6d2d02a 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java
@@ -57,7 +57,7 @@ class DirectExecutionContext
* Step Context for the {@link DirectRunner}.
*/
public class DirectStepContext
- extends BaseExecutionContext.StepContext {
+ extends BaseStepContext {
private CopyOnAccessInMemoryStateInternals<?> stateInternals;
private DirectTimerInternals timerInternals;