Test fixes

rjeberhard · rjeberhard · commit b796abbc3cfb · 2023-02-03T06:04:52.000-05:00
diff --git a/kubernetes/src/main/java/io/kubernetes/client/common/PartialObjectMetadataList.java b/kubernetes/src/main/java/io/kubernetes/client/common/PartialObjectMetadataList.java
@@ -23,8 +23,7 @@ public class PartialObjectMetadataList implements KubernetesListObject {
   private String apiVersion;
   private String kind;
   private V1ListMeta metadata;
-  private List<KubernetesObject> items;
-
+  private List<PartialObjectMetadata> items;
 
   public PartialObjectMetadataList apiVersion(String apiVersion) {
     this.apiVersion = apiVersion;
@@ -71,13 +70,12 @@ public void setMetadata(V1ListMeta metadata) {
     this.metadata = metadata;
   }
 
-  @SuppressWarnings("unchecked")
-  public PartialObjectMetadataList items(List<? extends KubernetesObject> items) {
-    this.items = (List<KubernetesObject>) items;
+  public PartialObjectMetadataList items(List<PartialObjectMetadata> items) {
+    this.items = items;
     return this;
   }
 
-  public PartialObjectMetadataList addItemsItem(KubernetesObject item) {
+  public PartialObjectMetadataList addItemsItem(PartialObjectMetadata item) {
     if (items == null) {
       items = new ArrayList<>();
     }
@@ -87,13 +85,12 @@ public PartialObjectMetadataList addItemsItem(KubernetesObject item) {
 
   @Override
   @Nullable
-  public List<? extends KubernetesObject> getItems() {
+  public List<PartialObjectMetadata> getItems() {
     return items;
   }
 
-  @SuppressWarnings("unchecked")
-  public void setItems(List<? extends KubernetesObject> items) {
-    this.items = (List<KubernetesObject>) items;
+  public void setItems(List<PartialObjectMetadata> items) {
+    this.items = items;
   }
 
   @Override
diff --git a/util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java b/util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java
@@ -81,9 +81,10 @@ public class GenericKubernetesApi<
     ApiType extends KubernetesObject, ApiListType extends KubernetesListObject> {
 
   private static final String PARTIAL_OBJECT_METADATA_HEADER =
-      "as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json";
+      "application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json";
+
   private static final String PARTIAL_OBJECT_METADATA_LIST_HEADER =
-      "as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json";
+      "application/json;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json";
 
   // TODO(yue9944882): supports status operations..
   // TODO(yue9944882): supports generic sub-resource operations..
diff --git a/util/src/test/java/io/kubernetes/client/util/generic/GenericKubernetesApiTest.java b/util/src/test/java/io/kubernetes/client/util/generic/GenericKubernetesApiTest.java
@@ -133,7 +133,8 @@ public void listNamespacedJobWithPartialMetadataObjectListHeader() {
     assertEquals(jobList, jobListResp.getObject());
     assertNull(jobListResp.getStatus());
     verify(1, getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs"))
-        .withHeader("Accept", equalTo("as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json")));
+        .withHeader("Accept",
+            equalTo("application/json;as=PartialObjectMetadataList;g=meta.k8s.io;v=v1,application/json")));
   }
 
   @Test
@@ -154,7 +155,8 @@ public void getNamespacedJobWithPartialMetadataObjectHeader() {
     assertEquals(job, jobResp.getObject());
     assertNull(jobResp.getStatus());
     verify(1, getRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/default/jobs/noxu"))
-        .withHeader("Accept", equalTo("as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json")));
+        .withHeader("Accept",
+            equalTo("application/json;as=PartialObjectMetadata;g=meta.k8s.io;v=v1,application/json")));
   }
 
   @Test
