Removes DoFn.ProcessContinuation completely
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/62e23b71 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/62e23b71 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/62e23b71 Branch: refs/heads/master Commit: 62e23b71e3b964033c15707629b560dfc8204654 Parents: 0a0b1c8 Author: Eugene Kirpichov <kirpic...@google.com> Authored: Fri Apr 7 17:54:18 2017 -0700 Committer: Eugene Kirpichov <kirpic...@google.com> Committed: Mon Apr 10 22:51:34 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/transforms/DoFn.java | 4 ---- .../sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java | 7 ------- .../org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java | 4 +--- 3 files changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/62e23b71/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java index e35457c..74a1348 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java @@ -698,10 +698,6 @@ public abstract class DoFn<InputT, OutputT> implements Serializable, HasDisplayD @Experimental(Kind.SPLITTABLE_DO_FN) public @interface UnboundedPerElement {} - /** Do not use. See https://issues.apache.org/jira/browse/BEAM-1904 */ - @Deprecated - public class ProcessContinuation {} - /** * Returns an {@link Aggregator} with aggregation logic specified by the {@link CombineFn} * argument. The name provided must be unique across {@link Aggregator}s created within the {@link http://git-wip-us.apache.org/repos/asf/beam/blob/62e23b71/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java index 4b0cbf7..6bef4df 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java @@ -50,7 +50,6 @@ import net.bytebuddy.implementation.bytecode.Throw; import net.bytebuddy.implementation.bytecode.assign.Assigner; import net.bytebuddy.implementation.bytecode.assign.Assigner.Typing; import net.bytebuddy.implementation.bytecode.assign.TypeCasting; -import net.bytebuddy.implementation.bytecode.constant.NullConstant; import net.bytebuddy.implementation.bytecode.constant.TextConstant; import net.bytebuddy.implementation.bytecode.member.FieldAccess; import net.bytebuddy.implementation.bytecode.member.MethodInvocation; @@ -659,12 +658,6 @@ public class ByteBuddyDoFnInvokerFactory implements DoFnInvokerFactory { } return new StackManipulation.Compound(pushParameters); } - - @Override - protected StackManipulation afterDelegation(MethodDescription instrumentedMethod) { - return new StackManipulation.Compound( - NullConstant.INSTANCE, MethodReturn.REFERENCE); - } } private static class UserCodeMethodInvocation implements StackManipulation { http://git-wip-us.apache.org/repos/asf/beam/blob/62e23b71/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java index cc06e70..0fbcc84 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java @@ -53,10 +53,8 @@ public interface DoFnInvoker<InputT, OutputT> { * Invoke the {@link DoFn.ProcessElement} method on the bound {@link DoFn}. * * @param extra Factory for producing extra parameter objects (such as window), if necessary. - * @return {@code null} - see <a href="https://issues.apache.org/jira/browse/BEAM-1904";>JIRA</a> - * tracking the complete removal of {@link DoFn.ProcessContinuation}. */ - DoFn.ProcessContinuation invokeProcessElement(ArgumentProvider<InputT, OutputT> extra); + void invokeProcessElement(ArgumentProvider<InputT, OutputT> extra); /** Invoke the appropriate {@link DoFn.OnTimer} method on the bound {@link DoFn}. */ void invokeOnTimer(String timerId, ArgumentProvider<InputT, OutputT> arguments);
