Repository: beam Updated Branches: refs/heads/master a29e0ad61 -> 66fcda99c
NonNull by default in sdk/runners Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/51118fb8 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/51118fb8 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/51118fb8 Branch: refs/heads/master Commit: 51118fb8e5adc0b21cf306d7ef9cfaec5d21adf8 Parents: 31eeb10 Author: Kenneth Knowles <[email protected]> Authored: Thu Oct 19 19:50:47 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Fri Oct 20 12:43:38 2017 -0700 ---------------------------------------------------------------------- .../apache/beam/sdk/runners/TransformHierarchy.java | 15 +++++++++------ .../org/apache/beam/sdk/runners/package-info.java | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/51118fb8/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java index c2d5771..ec1f7d9 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java @@ -309,11 +309,13 @@ public class TransformHierarchy { * for initialization and ordered visitation. */ public class Node { - private final Node enclosingNode; + // null for the root node, otherwise the enclosing node + @Nullable private final Node enclosingNode; + // The PTransform for this node, which may be a composite PTransform. // The root of a TransformHierarchy is represented as a Node // with a null transform field. - private final PTransform<?, ?> transform; + @Nullable private final PTransform<?, ?> transform; private final String fullName; @@ -324,21 +326,22 @@ public class TransformHierarchy { private final Map<TupleTag<?>, PValue> inputs; // TODO: track which outputs need to be exported to parent. - // Output of the transform, in expanded form. - private Map<TupleTag<?>, PValue> outputs; + // Output of the transform, in expanded form. Null if not yet set. + @Nullable private Map<TupleTag<?>, PValue> outputs; @VisibleForTesting boolean finishedSpecifying = false; /** * Creates the root-level node. The root level node has a null enclosing node, a null transform, - * an empty map of inputs, and a name equal to the empty string. + * an empty map of inputs, an empty map of outputs, and a name equal to the empty string. */ private Node() { this.enclosingNode = null; this.transform = null; this.fullName = ""; this.inputs = Collections.emptyMap(); + this.outputs = Collections.emptyMap(); } /** @@ -469,7 +472,7 @@ public class TransformHierarchy { /** Returns the transform input, in fully expanded form. */ public Map<TupleTag<?>, PValue> getInputs() { - return inputs == null ? Collections.<TupleTag<?>, PValue>emptyMap() : inputs; + return inputs; } /** http://git-wip-us.apache.org/repos/asf/beam/blob/51118fb8/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/package-info.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/package-info.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/package-info.java index 2726936..cd28c64 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/package-info.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/package-info.java @@ -20,4 +20,8 @@ * <p>Internals for use by runners. */ +@DefaultAnnotation(NonNull.class) package org.apache.beam.sdk.runners; + +import edu.umd.cs.findbugs.annotations.DefaultAnnotation; +import edu.umd.cs.findbugs.annotations.NonNull;
