Repository: incubator-beam
Updated Branches:
  refs/heads/master beed6080b -> e017ca108


Delete deprecated TimerCallback


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/5587e1cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/5587e1cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/5587e1cc

Branch: refs/heads/master
Commit: 5587e1cccb08839ef57a7d19b5dc3cf0a3725646
Parents: d624d3b
Author: Kenneth Knowles <k...@google.com>
Authored: Thu Dec 15 20:26:40 2016 -0800
Committer: Kenneth Knowles <k...@google.com>
Committed: Thu Dec 15 22:38:10 2016 -0800

----------------------------------------------------------------------
 .../sdk/util/state/InMemoryTimerInternals.java  | 25 -------------
 .../beam/sdk/util/state/TimerCallback.java      | 38 --------------------
 2 files changed, 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5587e1cc/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/InMemoryTimerInternals.java
----------------------------------------------------------------------
diff --git 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/InMemoryTimerInternals.java
 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/InMemoryTimerInternals.java
index 44f9016..44b44f0 100644
--- 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/InMemoryTimerInternals.java
+++ 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/InMemoryTimerInternals.java
@@ -272,29 +272,4 @@ public class InMemoryTimerInternals implements 
TimerInternals {
       return null;
     }
   }
-
-  /** Advances processing time to the given value and fires processing-time 
timers accordingly.
-   *
-   *  @deprecated Use advanceProcessingTime without callback and 
fireProcessingTimers.
-   */
-  @Deprecated
-  public void advanceProcessingTime(
-      TimerCallback timerCallback, Instant newProcessingTime) throws Exception 
{
-    advanceProcessingTime(newProcessingTime);
-    advanceAndFire(timerCallback, newProcessingTime, 
TimeDomain.PROCESSING_TIME);
-  }
-
-  @Deprecated
-  private void advanceAndFire(
-      TimerCallback timerCallback, Instant currentTime, TimeDomain domain)
-      throws Exception {
-    checkNotNull(timerCallback);
-    TimerData timer;
-    while ((timer = removeNextTimer(currentTime, domain)) != null) {
-      WindowTracing.trace(
-          "{}.advanceAndFire: firing {} at {}",
-          getClass().getSimpleName(), timer, currentTime);
-      timerCallback.onTimer(timer);
-    }
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5587e1cc/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerCallback.java
----------------------------------------------------------------------
diff --git 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerCallback.java
 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerCallback.java
deleted file mode 100644
index 83791d6..0000000
--- 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerCallback.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.beam.sdk.util.state;
-
-import org.apache.beam.sdk.util.TimerInternals;
-
-/**
- * A callback that processes a {@link TimerInternals.TimerData TimerData}.
- *
- * @deprecated Use InMemoryTimerInternals advance and remove methods instead 
of callback.
- */
-@Deprecated
-public interface TimerCallback {
-  /** Processes the {@link TimerInternals.TimerData TimerData}. */
-  void onTimer(TimerInternals.TimerData timer) throws Exception;
-
-  TimerCallback NO_OP = new TimerCallback() {
-    @Override
-    public void onTimer(TimerInternals.TimerData timer) throws Exception {
-      // Nothing
-    }
-  };
-}

Reply via email to