making interceptor name constants, removing todo, splitting lines

fabric8io · Dec 9, 2021 · 12cf9b9 · 12cf9b9
1 parent b2e97d6
commit 12cf9b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/OperationSupport.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/OperationSupport.java
@@ -301,7 +301,9 @@ protected void handleDelete(URL requestUrl, long gracePeriodSeconds, DeletionPro
    * @throws IOException IOException
    */
   protected <T, I> T handleCreate(I resource, Class<T> outputType) throws InterruptedException, IOException {
-    HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder().post(JSON, JSON_MAPPER.writeValueAsString(resource)).url(getResourceURLForWriteOperation(getResourceUrl(checkNamespace(resource), null)));
+    HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder()
+        .post(JSON, JSON_MAPPER.writeValueAsString(resource))
+        .url(getResourceURLForWriteOperation(getResourceUrl(checkNamespace(resource), null)));
     return handleResponse(requestBuilder, outputType, Collections.<String, String>emptyMap());
   }
 
@@ -404,7 +406,10 @@ protected <T> T handlePatch(T current, Map<String, Object> patchForUpdate, Class
    */
   protected <T> T handlePatch(PatchContext patchContext, T current, String patchForUpdate, Class<T> type, boolean status) throws InterruptedException, IOException {
     String bodyContentType = getContentTypeFromPatchContextOrDefault(patchContext);
-    HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder().patch(bodyContentType, patchForUpdate).url(getResourceURLForPatchOperation(getResourceUrl(checkNamespace(current), checkName(current), status), patchContext));
+    HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder()
+        .patch(bodyContentType, patchForUpdate)
+        .url(getResourceURLForPatchOperation(getResourceUrl(checkNamespace(current), checkName(current), status),
+            patchContext));
     return handleResponse(requestBuilder, type, Collections.emptyMap());
   }
 

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/http/HttpRequest.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/http/HttpRequest.java
@@ -33,7 +33,6 @@ public interface Builder extends BasicBuilder {
 
     Builder uri(String uri);
 
-    // TODO: should be uri
     Builder url(URL url);
 
     @Override

diff --git a/...t/src/main/java/io/fabric8/kubernetes/client/utils/BackwardsCompatibilityInterceptor.java b/...t/src/main/java/io/fabric8/kubernetes/client/utils/BackwardsCompatibilityInterceptor.java
@@ -32,6 +32,8 @@
 import java.util.regex.Matcher;
 
 public class BackwardsCompatibilityInterceptor implements Interceptor {
+
+  public static final String NAME = "BACKWARDS";
 
   private static final int API_GROUP = 1;
   private static final int API_VERSION = 2;

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/HttpClientUtils.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/HttpClientUtils.java
@@ -129,13 +129,13 @@ public void before(BasicBuilder builder, HttpHeaders headers) {
       }
     });
     // Impersonator Interceptor
-    interceptors.put("IMPERSONATOR", new ImpersonatorInterceptor(config));
+    interceptors.put(ImpersonatorInterceptor.NAME, new ImpersonatorInterceptor(config));
     // Token Refresh Interceptor
     interceptors.put(TokenRefreshInterceptor.NAME, new TokenRefreshInterceptor(config, factory));
     // Backwards Compatibility Interceptor
     String shouldDisableBackwardsCompatibilityInterceptor = Utils.getSystemPropertyOrEnvVar(KUBERNETES_BACKWARDS_COMPATIBILITY_INTERCEPTOR_DISABLE, "false");
     if (!Boolean.parseBoolean(shouldDisableBackwardsCompatibilityInterceptor)) {
-      interceptors.put("BACKWARDS", new BackwardsCompatibilityInterceptor());
+      interceptors.put(BackwardsCompatibilityInterceptor.NAME, new BackwardsCompatibilityInterceptor());
     }
 
     return interceptors;

diff --git a/...etes-client/src/main/java/io/fabric8/kubernetes/client/utils/ImpersonatorInterceptor.java b/...etes-client/src/main/java/io/fabric8/kubernetes/client/utils/ImpersonatorInterceptor.java
@@ -28,6 +28,9 @@
 import static io.fabric8.kubernetes.client.utils.Utils.isNotNullOrEmpty;
 
 public class ImpersonatorInterceptor implements Interceptor {
+
+  public static final String NAME = "IMPERSONATOR";
+
   private final Config config;
   public ImpersonatorInterceptor(Config config) {
     this.config = config;