Skip to content

Fix EndpointSlice deserialization when endpoints is null #4507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gautam-aman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix EndpointSlice deserialization when endpoints is null #4507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1EndpointSlice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,23 @@
*/
package io.kubernetes.client.openapi.models;

import java.util.Objects;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import java.util.*;

import com.google.gson.annotations.SerializedName;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import io.kubernetes.client.openapi.models.DiscoveryV1EndpointPort;
import io.kubernetes.client.openapi.models.V1Endpoint;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;

import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import io.kubernetes.client.openapi.JSON;

/**
Expand All @@ -69,8 +49,8 @@ public class V1EndpointSlice implements io.kubernetes.client.common.KubernetesOb

public static final String SERIALIZED_NAME_ENDPOINTS = "endpoints";
@SerializedName(SERIALIZED_NAME_ENDPOINTS)
@jakarta.annotation.Nonnull
private List<V1Endpoint> endpoints = new ArrayList<>();
@jakarta.annotation.Nullable
private List<V1Endpoint> endpoints = null;

public static final String SERIALIZED_NAME_KIND = "kind";
@SerializedName(SERIALIZED_NAME_KIND)
Expand Down Expand Up @@ -130,7 +110,7 @@ public void setApiVersion(@jakarta.annotation.Nullable String apiVersion) {
}


public V1EndpointSlice endpoints(@jakarta.annotation.Nonnull List<V1Endpoint> endpoints) {
public V1EndpointSlice endpoints(@jakarta.annotation.Nullable List<V1Endpoint> endpoints) {
this.endpoints = endpoints;
return this;
}
Expand All @@ -147,13 +127,14 @@ public V1EndpointSlice addEndpointsItem(V1Endpoint endpointsItem) {
* endpoints is a list of unique endpoints in this slice. Each slice may include a maximum of 1000 endpoints.
* @return endpoints
*/
@jakarta.annotation.Nonnull
@ApiModelProperty(required = true, value = "endpoints is a list of unique endpoints in this slice. Each slice may include a maximum of 1000 endpoints.")
@jakarta.annotation.Nullable
@ApiModelProperty(value = "endpoints is a list of unique endpoints in this slice. Each slice may include a maximum of 1000 endpoints.")
public List<V1Endpoint> getEndpoints() {
return endpoints;
}

public void setEndpoints(@jakarta.annotation.Nonnull List<V1Endpoint> endpoints) {

public void setEndpoints(@jakarta.annotation.Nullable List<V1Endpoint> endpoints) {
this.endpoints = endpoints;
}

Expand Down Expand Up @@ -290,8 +271,8 @@ private String toIndentedString(Object o) {

// a set of required properties/fields (JSON key names)
openapiRequiredFields = new HashSet<String>();

openapiRequiredFields.add("addressType");
openapiRequiredFields.add("endpoints");
}

/**
Expand Down Expand Up @@ -329,16 +310,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
throw new IllegalArgumentException(String.format("Expected the field `apiVersion` to be a primitive type in the JSON string but got `%s`", jsonObj.get("apiVersion").toString()));
}
// ensure the json data is an array
if (jsonObj.get("endpoints") != null && !jsonObj.get("endpoints").isJsonNull()) {
if (!jsonObj.get("endpoints").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `endpoints` to be an array in the JSON string but got `%s`", jsonObj.get("endpoints").toString()));
throw new IllegalArgumentException(
String.format(
"Expected the field `endpoints` to be an array or null in the JSON string but got `%s`",
jsonObj.get("endpoints").toString()
)
);
}

JsonArray jsonArrayendpoints = jsonObj.getAsJsonArray("endpoints");
// validate the required field `endpoints` (array)
for (int i = 0; i < jsonArrayendpoints.size(); i++) {
V1Endpoint.validateJsonElement(jsonArrayendpoints.get(i));
};
if ((jsonObj.get("kind") != null && !jsonObj.get("kind").isJsonNull()) && !jsonObj.get("kind").isJsonPrimitive()) {
}
}

if ((jsonObj.get("kind") != null && !jsonObj.get("kind").isJsonNull()) && !jsonObj.get("kind").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `kind` to be a primitive type in the JSON string but got `%s`", jsonObj.get("kind").toString()));
}
// validate the optional field `metadata`
Expand Down