RetryingClientDecorator should be outside the authentication decorato…

…r. + Pass the builder to next chains appropriately.
line · Jul 21, 2024 · 9189264 · 9189264
1 parent 0d56428
commit 9189264
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/nacos/src/main/java/com/linecorp/armeria/internal/nacos/NacosClient.java b/nacos/src/main/java/com/linecorp/armeria/internal/nacos/NacosClient.java
@@ -52,11 +52,12 @@ public static NacosClientBuilder builder(URI nacosUri, String serviceName) {
                 @Nullable String clusterName, @Nullable Boolean healthyOnly, @Nullable String app) {
         this.uri = uri;
 
-        final WebClientBuilder builder = WebClient.builder(uri)
-                                                  .decorator(retryingClientDecorator);
+        WebClientBuilder builder = WebClient.builder(uri);
         if (username != null && password != null) {
-            builder.decorator(LoginClient.newDecorator(builder.build(), username, password));
+            builder = builder.decorator(LoginClient.newDecorator(builder.build(), username, password));
         }
+        builder = builder.decorator(retryingClientDecorator);
+
         final WebClient webClient = builder.build();
 
         queryInstancesClient = QueryInstancesClient.of(webClient, nacosApiVersion, serviceName, namespaceId,