From f3ca2befa11fbf219437c04779d6a79e6f4e92bf Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Mon, 24 Feb 2020 13:18:38 -0800 Subject: [PATCH 1/6] Update internalApi --- .../main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java | 2 ++ gax/src/main/java/com/google/api/gax/rpc/Watchdog.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java b/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java index e22f14122..5889668fa 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java @@ -31,12 +31,14 @@ import com.google.api.core.ApiClock; import com.google.api.core.BetaApi; +import com.google.api.core.InternalApi; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.threeten.bp.Duration; @BetaApi("The surface for streaming is not stable yet and may change in the future.") +@InternalApi public class FixedWatchdogProvider implements WatchdogProvider { @Nullable private final Watchdog watchdog; diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index 038bb1f3e..e9998b89b 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -30,7 +30,6 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.common.base.Preconditions; import java.util.Iterator; @@ -59,7 +58,6 @@ * had no outstanding demand. Duration.ZERO disables the timeout. * */ -@InternalApi public class Watchdog implements Runnable, BackgroundResource { // Dummy value to convert the ConcurrentHashMap into a Set private static Object PRESENT = new Object(); From 68ec5ac5c59596faea28b94938aa9860829b454e Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Mon, 24 Feb 2020 13:38:09 -0800 Subject: [PATCH 2/6] trigger kokoro From 3bb3fddfe66854ce9c89350558622faa56430d8b Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Mon, 24 Feb 2020 13:46:28 -0800 Subject: [PATCH 3/6] trigger kokoro again From 477400d1c1af6d6c1375666c3272fbbca8ed1eea Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 3 Mar 2020 22:04:23 -0800 Subject: [PATCH 4/6] add back betaapi --- gax/src/main/java/com/google/api/gax/rpc/Watchdog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index e9998b89b..cff6de9d5 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -31,6 +31,7 @@ import com.google.api.core.ApiClock; import com.google.api.gax.core.BackgroundResource; +import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; import java.util.Iterator; import java.util.Map.Entry; @@ -58,6 +59,7 @@ * had no outstanding demand. Duration.ZERO disables the timeout. * */ +@BetaApi public class Watchdog implements Runnable, BackgroundResource { // Dummy value to convert the ConcurrentHashMap into a Set private static Object PRESENT = new Object(); From de1d68c45a1f088d8e94b40c1e9bcbfe1e5cff8f Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 3 Mar 2020 22:15:38 -0800 Subject: [PATCH 5/6] format --- gax/src/main/java/com/google/api/gax/rpc/Watchdog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index cff6de9d5..cbbe9ebb8 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -30,8 +30,8 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.gax.core.BackgroundResource; import com.google.api.core.BetaApi; +import com.google.api.gax.core.BackgroundResource; import com.google.common.base.Preconditions; import java.util.Iterator; import java.util.Map.Entry; From 1b3470e9993e5ac169202dc85c44051fa3b87c01 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 3 Mar 2020 22:21:35 -0800 Subject: [PATCH 6/6] trigger kokoro again