comments pt2

Author: Kunal Kak

dialogue-core/src/main/java/com/palantir/dialogue/core/Config.java

@@ -19,14 +19,14 @@
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
 import com.palantir.conjure.java.client.config.ClientConfiguration.ClientQoS;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.random.SafeThreadLocalRandom;
 import com.palantir.refreshable.Refreshable;
 import java.util.List;
+import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Random;
 import java.util.concurrent.ScheduledExecutorService;
@@ -81,8 +81,8 @@ default int maxQueueSize() {
     OptionalInt overrideSingleHostIndex();
 
     @Value.Default
-    default Enforcement deadlineEnforcement() {
-        return Enforcement.DEFER;
+    default Optional<Boolean> deadlineEnforcement() {
+        return Optional.empty();
     }
 
     @Value.Check

dialogue-core/src/main/java/com/palantir/dialogue/core/DeadlineAdvertisementChannel.java

@@ -26,6 +26,7 @@
 import com.palantir.dialogue.Request;
 import com.palantir.dialogue.Response;
 import java.time.Duration;
+import java.util.Optional;
 
 final class DeadlineAdvertisementChannel implements Channel {
 
@@ -34,11 +35,15 @@ final class DeadlineAdvertisementChannel implements Channel {
     private final Deadlines.Enforcement enforcement;
 
     static DeadlineAdvertisementChannel create(Channel delegate, Duration readTimeout) {
-        return new DeadlineAdvertisementChannel(delegate, readTimeout, Deadlines.Enforcement.DEFER);
+        return new DeadlineAdvertisementChannel(delegate, readTimeout, Enforcement.DEFER);
     }
 
-    static DeadlineAdvertisementChannel create(Channel delegate, Duration readTimeout, Enforcement enforcement) {
-        return new DeadlineAdvertisementChannel(delegate, readTimeout, enforcement);
+    static DeadlineAdvertisementChannel create(
+            Channel delegate, Duration readTimeout, Optional<Boolean> enforceDeadlines) {
+        Enforcement deadlineEnforcement = enforceDeadlines
+                .map(value -> value ? Enforcement.ENFORCE : Enforcement.DISABLE)
+                .orElse(Enforcement.DEFER);
+        return new DeadlineAdvertisementChannel(delegate, readTimeout, deadlineEnforcement);
     }
 
     private DeadlineAdvertisementChannel(Channel delegate, Duration readTimeout, Deadlines.Enforcement enforcement) {

dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java

@@ -25,7 +25,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.errorprone.annotations.CheckReturnValue;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.dialogue.Channel;
 import com.palantir.dialogue.Endpoint;
 import com.palantir.dialogue.EndpointChannel;
@@ -146,10 +145,7 @@ public Builder overrideHostIndex(OptionalInt maybeUriIndex) {
         }
 
         public Builder deadlineEnforcement(Optional<Boolean> deadlineEnforcement) {
-            Enforcement enforcement = deadlineEnforcement
-                    .map(enforce -> enforce ? Enforcement.ENFORCE : Enforcement.DISABLE)
-                    .orElse(Enforcement.DEFER);
-            builder.deadlineEnforcement(enforcement);
+            builder.deadlineEnforcement(deadlineEnforcement);
             return this;
         }
 

dialogue-core/src/test/java/com/palantir/dialogue/core/DeadlineAdvertisementChannelTest.java

@@ -140,7 +140,7 @@ void returns_failed_future_on_expired_deadline() {
                     Request.builder().putHeaderParams("Expect-Within", "0").build();
             Deadlines.parseFromRequest(Optional.empty(), inboundRequest, Decoder.INSTANCE, Enforcement.ENFORCE);
 
-            Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Enforcement.ENFORCE);
+            Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Optional.of(true));
             ListenableFuture<Response> response =
                     channel.execute(TestEndpoint.GET, Request.builder().build());
             assertThat(response).isDone();
@@ -165,7 +165,7 @@ void expired_deadline_respects_client_enforcement_strategy() throws ExecutionExc
                     Request.builder().putHeaderParams("Expect-Within", "0").build();
             Deadlines.parseFromRequest(Optional.empty(), inboundRequest, Decoder.INSTANCE, Enforcement.ENFORCE);
 
-            Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Enforcement.DISABLE);
+            Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Optional.of(false));
             assertThat(channel.execute(TestEndpoint.GET, Request.builder().build()))
                     .isCancelled();
             assertThat(requests).singleElement().satisfies(request -> {
@@ -202,7 +202,7 @@ void adds_enforcement_header_when_enabled() {
             requests.add(request);
             return Futures.immediateCancelledFuture();
         };
-        Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Enforcement.ENFORCE);
+        Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Optional.of(true));
         assertThat(channel.execute(TestEndpoint.GET, Request.builder().build())).isCancelled();
 
         assertThat(requests).singleElement().satisfies(request -> {
@@ -220,7 +220,7 @@ void adds_enforcement_header_when_disabled() {
             requests.add(request);
             return Futures.immediateCancelledFuture();
         };
-        Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Enforcement.DISABLE);
+        Channel channel = DeadlineAdvertisementChannel.create(delegate, readTimeout, Optional.of(false));
         assertThat(channel.execute(TestEndpoint.GET, Request.builder().build())).isCancelled();
 
         assertThat(requests).singleElement().satisfies(request -> {