From 3f0a6d2474dcbac604991c45298c7b89fefa27a7 Mon Sep 17 00:00:00 2001
From: hannahrogers-google
 <52459909+hannahrogers-google@users.noreply.github.com>
Date: Tue, 22 Jun 2021 07:29:06 -0700
Subject: [PATCH] fix: allow retries for subscriber unary rpcs (#721)

* fix: allow retries for subscriber unary rpcs

* fix: format
---
 .../java/com/google/cloud/pubsub/v1/Subscriber.java   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
index 9de0420ea..656a19fdd 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
@@ -18,7 +18,6 @@
 
 import com.google.api.core.AbstractApiService;
 import com.google.api.core.ApiClock;
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiService;
 import com.google.api.core.BetaApi;
 import com.google.api.core.CurrentMillisClock;
@@ -35,7 +34,6 @@
 import com.google.api.gax.rpc.HeaderProvider;
 import com.google.api.gax.rpc.NoHeaderProvider;
 import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.pubsub.v1.stub.GrpcSubscriberStub;
 import com.google.cloud.pubsub.v1.stub.SubscriberStub;
@@ -97,7 +95,6 @@ public class Subscriber extends AbstractApiService implements SubscriberInterfac
       20 * 1024 * 1024; // 20MB API maximum message size.
   @InternalApi static final int MAX_ACK_DEADLINE_SECONDS = 600;
   @InternalApi static final int MIN_ACK_DEADLINE_SECONDS = 10;
-  private static final Duration UNARY_TIMEOUT = Duration.ofSeconds(60);
   private static final Duration ACK_EXPIRATION_PADDING = Duration.ofSeconds(5);
 
   private static final Logger logger = Logger.getLogger(Subscriber.class.getName());
@@ -167,14 +164,6 @@ private Subscriber(Builder builder) {
               .setTransportChannelProvider(channelProvider)
               .setHeaderProvider(builder.headerProvider)
               .setEndpoint(builder.endpoint)
-              .applyToAllUnaryMethods(
-                  new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
-                    @Override
-                    public Void apply(UnaryCallSettings.Builder<?, ?> settingsBuilder) {
-                      settingsBuilder.setSimpleTimeoutNoRetries(UNARY_TIMEOUT);
-                      return null;
-                    }
-                  })
               .build();
       // TODO(pongad): what about internal header??
     } catch (Exception e) {