Merge pull request #959 from yue9944882/cleanup/unused-code

Chore: Clean up unused codes

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/generic/GenericKubernetesApi.java

@@ -18,8 +18,8 @@
 import io.kubernetes.client.openapi.apis.CustomObjectsApi;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Status;
+import io.kubernetes.client.util.ObjectAccessor;
 import io.kubernetes.client.util.PatchUtils;
-import io.kubernetes.client.util.Reflect;
 import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.Watchable;
 import io.kubernetes.client.util.exception.ObjectMetaReflectException;
@@ -379,7 +379,7 @@ public KubernetesApiResponse<ApiListType> list(String namespace, final ListOptio
   public KubernetesApiResponse<ApiType> create(ApiType object, final CreateOptions createOptions) {
     V1ObjectMeta objectMeta;
     try {
-      objectMeta = Reflect.objectMetadata(object);
+      objectMeta = ObjectAccessor.objectMetadata(object);
     } catch (ObjectMetaReflectException e) {
       throw new IllegalArgumentException("fail to extract object metadata");
     }
@@ -425,7 +425,7 @@ public KubernetesApiResponse<ApiType> create(ApiType object, final CreateOptions
   public KubernetesApiResponse<ApiType> update(ApiType object, final UpdateOptions updateOptions) {
     V1ObjectMeta objectMeta;
     try {
-      objectMeta = Reflect.objectMetadata(object);
+      objectMeta = ObjectAccessor.objectMetadata(object);
     } catch (ObjectMetaReflectException e) {
       throw new IllegalArgumentException("fail to extract object metadata");
     }

util/src/main/java/io/kubernetes/client/util/ClientBuilder.java

@@ -21,7 +21,6 @@
 import static io.kubernetes.client.util.KubeConfig.KUBECONFIG;
 import static io.kubernetes.client.util.KubeConfig.KUBEDIR;
 
-import com.google.common.base.Strings;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.util.credentials.AccessTokenAuthentication;
 import io.kubernetes.client.util.credentials.Authentication;
@@ -38,10 +37,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +47,6 @@ public class ClientBuilder {
   private String basePath = Config.DEFAULT_FALLBACK_HOST;
   private byte[] caCertBytes = null;
   private boolean verifyingSsl = true;
-  private String overridePatchFormat;
   private Authentication authentication;
 
   /**
@@ -295,15 +289,6 @@ public ClientBuilder setVerifyingSsl(boolean verifyingSsl) {
     return this;
   }
 
-  public String overridePatchFormat() {
-    return overridePatchFormat;
-  }
-
-  public ClientBuilder setOverridePatchFormat(String patchFormat) {
-    this.overridePatchFormat = patchFormat;
-    return this;
-  }
-
   public ApiClient build() {
     final ApiClient client = new ApiClient();
 
@@ -333,34 +318,6 @@ public ApiClient build() {
       client.setSslCaCert(new ByteArrayInputStream(caCertBytes));
     }
 
-    if (!Strings.isNullOrEmpty(overridePatchFormat)) {
-      OkHttpClient withInterceptor =
-          client
-              .getHttpClient()
-              .newBuilder()
-              .addInterceptor(
-                  new Interceptor() {
-                    @Override
-                    public Response intercept(Chain chain) throws IOException {
-                      Request request = chain.request();
-
-                      if ("PATCH".equals(request.method())) {
-
-                        Request newRequest =
-                            request
-                                .newBuilder()
-                                .patch(
-                                    new ProxyContentTypeRequestBody(
-                                        request.body(), overridePatchFormat))
-                                .build();
-                        return chain.proceed(newRequest);
-                      }
-                      return chain.proceed(request);
-                    }
-                  })
-              .build();
-      client.setHttpClient(withInterceptor);
-    }
     return client;
   }
 }

util/src/main/java/io/kubernetes/client/util/Reflect.java

@@ -21,9 +21,7 @@
 import static org.mockito.Mockito.verify;
 
 import com.google.common.io.Resources;
-import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiClient;
-import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.credentials.Authentication;
 import java.io.File;
 import java.io.IOException;
@@ -178,14 +176,6 @@ public void testSslCertCaBad() throws Exception {
             .build();
   }
 
-  @Test
-  public void testOverridePatchFormat() throws IOException, ApiException {
-    final ApiClient client =
-        new ClientBuilder()
-            .setOverridePatchFormat(V1Patch.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)
-            .build();
-  }
-
   @Test
   public void testHomeDirPreferredOverKubeConfig() throws Exception {
     environmentVariables.set("HOME", HOME_PATH);