Merge pull request #619 from yue9944882/cleanup/remove-duplicated-patch-format

k8s-ci-robot · web-flow · commit cb87e2c33215 · 2019-07-14T20:51:05.000-07:00
Chore: Remove duplicated patch format from ApiClient
diff --git a/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java b/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java
@@ -73,10 +73,6 @@ public class ApiClient {
 
     private HttpLoggingInterceptor loggingInterceptor;
 
-    public static final String PATCH_FORMAT_JSON_PATCH = "application/json-patch+json";
-    public static final String PATCH_FORMAT_JSON_MERGE_PATCH = "application/merge-patch+json";
-    public static final String PATCH_FORMAT_STRATEGIC_MERGE_PATCH = "application/strategic-merge-patch+json";
-
     /*
      * Constructor for ApiClient
      */
diff --git a/util/src/test/java/io/kubernetes/client/util/ClientBuilderPatchTest.java b/util/src/test/java/io/kubernetes/client/util/ClientBuilderPatchTest.java
@@ -68,6 +68,6 @@ public void testOverridePatchFormatInterceptor() throws IOException, ApiExceptio
     WireMock.verify(
         1,
         patchRequestedFor(urlPathEqualTo("/apis"))
-            .withHeader("Content-Type", equalTo(ApiClient.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)));
+            .withHeader("Content-Type", equalTo(V1Patch.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,6 @@ public void testOverridePatchFormatInterceptor() throws IOException, ApiExceptio`
`68`	`68`	`WireMock.verify(`
`69`	`69`	`1,`
`70`	`70`	`patchRequestedFor(urlPathEqualTo("/apis"))`
`71`		`- .withHeader("Content-Type", equalTo(ApiClient.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)));`
	`71`	`+ .withHeader("Content-Type", equalTo(V1Patch.PATCH_FORMAT_STRATEGIC_MERGE_PATCH)));`
`72`	`72`	`}`
`73`	`73`	`}`