Skip to content

Commit

Permalink
fix: generated classes handle java.lang.String type consistently (6094)
Browse files Browse the repository at this point in the history 
fix: generated classes handle java.lang.String type consistently

Generated Java classes all reference the java.lang.String type
using a simplified String reference.

Signed-off-by: Marc Nuri <[email protected]>
---
fix: generated classes handle java.lang.String type consistently (generated code)

Signed-off-by: Marc Nuri <[email protected]>
  • Loading branch information
@manusa
manusa authored Jul 1, 2024
1 parent 5136bb0 commit ea02994
Show file tree
Hide file tree
Showing 183 changed files with 3,011 additions and 3,054 deletions.
32 changes: 16 additions & 16 deletions ...on/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1/AdmissionResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ public class AdmissionResponse implements Editable<AdmissionResponseBuilder> , K
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, String> auditAnnotations = new LinkedHashMap<String, String>();
@JsonProperty("patch")
private java.lang.String patch;
private String patch;
@JsonProperty("patchType")
private java.lang.String patchType;
private String patchType;
@JsonProperty("status")
private Status status;
@JsonProperty("uid")
private java.lang.String uid;
private String uid;
@JsonProperty("warnings")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<java.lang.String> warnings = new ArrayList<java.lang.String>();
private List<String> warnings = new ArrayList<String>();
@JsonIgnore
private Map<java.lang.String, Object> additionalProperties = new LinkedHashMap<java.lang.String, Object>();
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

/**
* No args constructor for use in serialization
Expand All @@ -91,7 +91,7 @@ public class AdmissionResponse implements Editable<AdmissionResponseBuilder> , K
public AdmissionResponse() {
}

public AdmissionResponse(Boolean allowed, Map<String, String> auditAnnotations, java.lang.String patch, java.lang.String patchType, Status status, java.lang.String uid, List<java.lang.String> warnings) {
public AdmissionResponse(Boolean allowed, Map<String, String> auditAnnotations, String patch, String patchType, Status status, String uid, List<String> warnings) {
super();
this.allowed = allowed;
this.auditAnnotations = auditAnnotations;
Expand Down Expand Up @@ -123,22 +123,22 @@ public void setAuditAnnotations(Map<String, String> auditAnnotations) {
}

@JsonProperty("patch")
public java.lang.String getPatch() {
public String getPatch() {
return patch;
}

@JsonProperty("patch")
public void setPatch(java.lang.String patch) {
public void setPatch(String patch) {
this.patch = patch;
}

@JsonProperty("patchType")
public java.lang.String getPatchType() {
public String getPatchType() {
return patchType;
}

@JsonProperty("patchType")
public void setPatchType(java.lang.String patchType) {
public void setPatchType(String patchType) {
this.patchType = patchType;
}

Expand All @@ -153,23 +153,23 @@ public void setStatus(Status status) {
}

@JsonProperty("uid")
public java.lang.String getUid() {
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(java.lang.String uid) {
public void setUid(String uid) {
this.uid = uid;
}

@JsonProperty("warnings")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getWarnings() {
public List<String> getWarnings() {
return warnings;
}

@JsonProperty("warnings")
public void setWarnings(List<java.lang.String> warnings) {
public void setWarnings(List<String> warnings) {
this.warnings = warnings;
}

Expand All @@ -184,12 +184,12 @@ public AdmissionResponseBuilder toBuilder() {
}

@JsonAnyGetter
public Map<java.lang.String, Object> getAdditionalProperties() {
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(java.lang.String name, Object value) {
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

Expand Down
32 changes: 16 additions & 16 deletions ...c/generated/java/io/fabric8/kubernetes/api/model/admission/v1beta1/AdmissionResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ public class AdmissionResponse implements Editable<AdmissionResponseBuilder> , K
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, String> auditAnnotations = new LinkedHashMap<String, String>();
@JsonProperty("patch")
private java.lang.String patch;
private String patch;
@JsonProperty("patchType")
private java.lang.String patchType;
private String patchType;
@JsonProperty("status")
private Status status;
@JsonProperty("uid")
private java.lang.String uid;
private String uid;
@JsonProperty("warnings")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<java.lang.String> warnings = new ArrayList<java.lang.String>();
private List<String> warnings = new ArrayList<String>();
@JsonIgnore
private Map<java.lang.String, Object> additionalProperties = new LinkedHashMap<java.lang.String, Object>();
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

/**
* No args constructor for use in serialization
Expand All @@ -91,7 +91,7 @@ public class AdmissionResponse implements Editable<AdmissionResponseBuilder> , K
public AdmissionResponse() {
}

public AdmissionResponse(Boolean allowed, Map<String, String> auditAnnotations, java.lang.String patch, java.lang.String patchType, Status status, java.lang.String uid, List<java.lang.String> warnings) {
public AdmissionResponse(Boolean allowed, Map<String, String> auditAnnotations, String patch, String patchType, Status status, String uid, List<String> warnings) {
super();
this.allowed = allowed;
this.auditAnnotations = auditAnnotations;
Expand Down Expand Up @@ -123,22 +123,22 @@ public void setAuditAnnotations(Map<String, String> auditAnnotations) {
}

@JsonProperty("patch")
public java.lang.String getPatch() {
public String getPatch() {
return patch;
}

@JsonProperty("patch")
public void setPatch(java.lang.String patch) {
public void setPatch(String patch) {
this.patch = patch;
}

@JsonProperty("patchType")
public java.lang.String getPatchType() {
public String getPatchType() {
return patchType;
}

@JsonProperty("patchType")
public void setPatchType(java.lang.String patchType) {
public void setPatchType(String patchType) {
this.patchType = patchType;
}

Expand All @@ -153,23 +153,23 @@ public void setStatus(Status status) {
}

@JsonProperty("uid")
public java.lang.String getUid() {
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(java.lang.String uid) {
public void setUid(String uid) {
this.uid = uid;
}

@JsonProperty("warnings")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getWarnings() {
public List<String> getWarnings() {
return warnings;
}

@JsonProperty("warnings")
public void setWarnings(List<java.lang.String> warnings) {
public void setWarnings(List<String> warnings) {
this.warnings = warnings;
}

Expand All @@ -184,12 +184,12 @@ public AdmissionResponseBuilder toBuilder() {
}

@JsonAnyGetter
public Map<java.lang.String, Object> getAdditionalProperties() {
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(java.lang.String name, Object value) {
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

Expand Down
26 changes: 13 additions & 13 deletions ...istration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ public class UserInfo implements Editable<UserInfoBuilder> , KubernetesResource
private Map<String, ArrayList<String>> extra = new LinkedHashMap<String, ArrayList<String>>();
@JsonProperty("groups")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<java.lang.String> groups = new ArrayList<java.lang.String>();
private List<String> groups = new ArrayList<String>();
@JsonProperty("uid")
private java.lang.String uid;
private String uid;
@JsonProperty("username")
private java.lang.String username;
private String username;
@JsonIgnore
private Map<java.lang.String, Object> additionalProperties = new LinkedHashMap<java.lang.String, Object>();
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

/**
* No args constructor for use in serialization
Expand All @@ -81,7 +81,7 @@ public class UserInfo implements Editable<UserInfoBuilder> , KubernetesResource
public UserInfo() {
}

public UserInfo(Map<String, ArrayList<String>> extra, List<java.lang.String> groups, java.lang.String uid, java.lang.String username) {
public UserInfo(Map<String, ArrayList<String>> extra, List<String> groups, String uid, String username) {
super();
this.extra = extra;
this.groups = groups;
Expand All @@ -101,32 +101,32 @@ public void setExtra(Map<String, ArrayList<String>> extra) {

@JsonProperty("groups")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getGroups() {
public List<String> getGroups() {
return groups;
}

@JsonProperty("groups")
public void setGroups(List<java.lang.String> groups) {
public void setGroups(List<String> groups) {
this.groups = groups;
}

@JsonProperty("uid")
public java.lang.String getUid() {
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(java.lang.String uid) {
public void setUid(String uid) {
this.uid = uid;
}

@JsonProperty("username")
public java.lang.String getUsername() {
public String getUsername() {
return username;
}

@JsonProperty("username")
public void setUsername(java.lang.String username) {
public void setUsername(String username) {
this.username = username;
}

Expand All @@ -141,12 +141,12 @@ public UserInfoBuilder toBuilder() {
}

@JsonAnyGetter
public Map<java.lang.String, Object> getAdditionalProperties() {
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(java.lang.String name, Object value) {
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

Expand Down
26 changes: 13 additions & 13 deletions ...erated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ public class SubjectAccessReviewSpec implements Editable<SubjectAccessReviewSpec
private Map<String, ArrayList<String>> extra = new LinkedHashMap<String, ArrayList<String>>();
@JsonProperty("groups")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<java.lang.String> groups = new ArrayList<java.lang.String>();
private List<String> groups = new ArrayList<String>();
@JsonProperty("nonResourceAttributes")
private NonResourceAttributes nonResourceAttributes;
@JsonProperty("resourceAttributes")
private ResourceAttributes resourceAttributes;
@JsonProperty("uid")
private java.lang.String uid;
private String uid;
@JsonProperty("user")
private java.lang.String user;
private String user;
@JsonIgnore
private Map<java.lang.String, Object> additionalProperties = new LinkedHashMap<java.lang.String, Object>();
private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();

/**
* No args constructor for use in serialization
Expand All @@ -87,7 +87,7 @@ public class SubjectAccessReviewSpec implements Editable<SubjectAccessReviewSpec
public SubjectAccessReviewSpec() {
}

public SubjectAccessReviewSpec(Map<String, ArrayList<String>> extra, List<java.lang.String> groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, java.lang.String uid, java.lang.String user) {
public SubjectAccessReviewSpec(Map<String, ArrayList<String>> extra, List<String> groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) {
super();
this.extra = extra;
this.groups = groups;
Expand All @@ -109,12 +109,12 @@ public void setExtra(Map<String, ArrayList<String>> extra) {

@JsonProperty("groups")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public List<java.lang.String> getGroups() {
public List<String> getGroups() {
return groups;
}

@JsonProperty("groups")
public void setGroups(List<java.lang.String> groups) {
public void setGroups(List<String> groups) {
this.groups = groups;
}

Expand All @@ -139,22 +139,22 @@ public void setResourceAttributes(ResourceAttributes resourceAttributes) {
}

@JsonProperty("uid")
public java.lang.String getUid() {
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(java.lang.String uid) {
public void setUid(String uid) {
this.uid = uid;
}

@JsonProperty("user")
public java.lang.String getUser() {
public String getUser() {
return user;
}

@JsonProperty("user")
public void setUser(java.lang.String user) {
public void setUser(String user) {
this.user = user;
}

Expand All @@ -169,12 +169,12 @@ public SubjectAccessReviewSpecBuilder toBuilder() {
}

@JsonAnyGetter
public Map<java.lang.String, Object> getAdditionalProperties() {
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(java.lang.String name, Object value) {
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

Expand Down
Loading

0 comments on commit ea02994

Please sign in to comment.