fixup rebase

palantir · Oct 21, 2024 · 4a27098 · 4a27098
1 parent fe237ad
commit 4a27098
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/...java/com/palantir/dialogue/core/CautiousIncreaseAggressiveDecreaseConcurrencyLimiter.java b/...java/com/palantir/dialogue/core/CautiousIncreaseAggressiveDecreaseConcurrencyLimiter.java
@@ -19,8 +19,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.AtomicDouble;
 import com.google.common.util.concurrent.FutureCallback;
-import com.palantir.conjure.java.api.errors.QosReason;
-import com.palantir.conjure.java.api.errors.QosReason.DueTo;
 import com.palantir.dialogue.Response;
 import com.palantir.dialogue.core.LimitedChannel.LimitEnforcement;
 import com.palantir.logsafe.SafeArg;
@@ -103,7 +101,7 @@ enum Behavior {
             void onSuccess(Response result, PermitControl control) {
                 if (Responses.isTooManyRequests(result)
                         || Responses.isInternalServerError(result)
-                        || isQosDueToCustom(result)) {
+                        || Responses.isQosDueToCustom(result)) {
                     // 429, 500, or QoS due to a custom reason
                     control.ignore();
                 } else if ((Responses.isQosStatus(result) && !Responses.isTooManyRequests(result))
@@ -127,7 +125,7 @@ void onFailure(Throwable throwable, PermitControl control) {
         ENDPOINT_LEVEL() {
             @Override
             void onSuccess(Response result, PermitControl control) {
-                if ((Responses.isTooManyRequests(result) && !isQosDueToCustom(result))
+                if ((Responses.isTooManyRequests(result) && !Responses.isQosDueToCustom(result))
                         || Responses.isInternalServerError(result)) {
                     // non-custom 429 or 500
                     control.dropped();
@@ -161,11 +159,6 @@ void onFailure(Throwable _throwable, PermitControl control) {
         abstract void onFailure(Throwable throwable, PermitControl control);
     }
 
-    private static boolean isQosDueToCustom(Response result) {
-        QosReason reason = DialogueQosReasonDecoder.parse(result);
-        return DueTo.CUSTOM.equals(reason.dueTo().orElse(null));
-    }
-
     interface PermitControl {
 
         /**

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/Responses.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/Responses.java
@@ -49,15 +49,16 @@ static boolean isQosDueToCustom(Response result) {
             return false;
         }
         QosReason reason = DialogueQosReasonDecoder.parse(result);
-        return DueTo.CUSTOM.equals(reason.dueTo().orElse(null));
+        return reason.dueTo().isPresent() && DueTo.CUSTOM.equals(reason.dueTo().get());
     }
 
     static boolean isRetryableQos(Response result) {
         if (!isQosStatus(result)) {
             return false;
         }
         QosReason reason = DialogueQosReasonDecoder.parse(result);
-        return !RetryHint.DO_NOT_RETRY.equals(reason.retryHint().orElse(null));
+        return reason.retryHint().isEmpty()
+                || !RetryHint.DO_NOT_RETRY.equals(reason.retryHint().get());
     }
 
     static boolean isServerErrorRange(Response response) {