diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fa4feb2187..70b35f3ed90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ #### Bugs * Fix #5729: ensure that kind is set for generic resource lists * Fix #3032: JUnit5 Kubernetes Extension works with Nested tests +* Fix #5759: Don't annotate KubeSchema and ValidationSchema classes #### Improvements * Fix #5701: Owner reference validity check regarding scope and namespace @@ -19,6 +20,8 @@ * Fix #5711: Kube API Test - Kubernetes API Server JUnit Test Support #### _**Note**_: Breaking changes +* KubeSchema and Validation Schema generated classes are no longer annotated with Jackson, Lombok, and Sundrio annotations. + This implies that builders will no longer be generated for these classes and that they won't have special deserialization/serialization behavior. ### 6.10.0 (2024-01-10) diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4983b47eb59..ed5f27a85b4 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,245 +7,77 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "K8sLocalSubjectAccessReview", - "K8sSubjectAccessReview", - "ListOptions", - "MutatingWebhookConfiguration", - "MutatingWebhookConfigurationList", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Rule", - "RuleWithOperations", - "SelfSubjectAccessReview", - "SelfSubjectReview", - "SelfSubjectRulesReview", - "ServiceReference", - "Status", - "Time", - "TokenRequest", - "TokenReview", - "TypeMeta", - "UpdateOptions", - "V1AdmissionRequest", - "V1AdmissionResponse", - "V1AdmissionReview", - "V1Beta1AdmissionRequest", - "V1Beta1AdmissionResponse", - "V1Beta1AdmissionReview", - "V1Beta1Operation", - "V1Beta1PatchType", - "V1Beta1SelfSubjectReview", - "V1Beta1ValidatingAdmissionPolicy", - "V1Beta1ValidatingAdmissionPolicyBinding", - "V1Beta1ValidatingAdmissionPolicyBindingList", - "V1Beta1ValidatingAdmissionPolicyList", - "V1MutatingWebhookConfiguration", - "V1MutatingWebhookConfigurationList", - "V1Operation", - "V1PatchType", - "V1Rule", - "V1RuleWithOperations", - "V1SelfSubjectReview", - "V1ServiceReference", - "V1ValidatingWebhookConfiguration", - "V1ValidatingWebhookConfigurationList", - "V1beta1K8sLocalSubjectAccessReview", - "V1beta1K8sSubjectAccessReview", - "V1beta1SelfSubjectAccessReview", - "V1beta1SelfSubjectRulesReview", - "ValidatingAdmissionPolicies", - "ValidatingAdmissionPoliciesList", - "ValidatingAdmissionPolicyBinding", - "ValidatingAdmissionPolicyBindingList", - "ValidatingWebhookConfiguration", - "ValidatingWebhookConfigurationList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("K8sLocalSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview; - @JsonProperty("K8sSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration; - @JsonProperty("MutatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Rule") private Rule rule; - @JsonProperty("RuleWithOperations") private RuleWithOperations ruleWithOperations; - @JsonProperty("SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview; - @JsonProperty("SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview; - @JsonProperty("SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview; - @JsonProperty("ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TokenRequest") private TokenRequest tokenRequest; - @JsonProperty("TokenReview") private TokenReview tokenReview; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1AdmissionRequest") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest; - @JsonProperty("V1AdmissionResponse") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse; - @JsonProperty("V1AdmissionReview") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview; - @JsonProperty("V1Beta1AdmissionRequest") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest; - @JsonProperty("V1Beta1AdmissionResponse") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse; - @JsonProperty("V1Beta1AdmissionReview") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview; - @JsonProperty("V1Beta1Operation") private java.lang.String v1Beta1Operation; - @JsonProperty("V1Beta1PatchType") private java.lang.String v1Beta1PatchType; - @JsonProperty("V1Beta1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; - @JsonProperty("V1Beta1ValidatingAdmissionPolicy") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; - @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; - @JsonProperty("V1MutatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList; - @JsonProperty("V1Operation") private java.lang.String v1Operation; - @JsonProperty("V1PatchType") private java.lang.String v1PatchType; - @JsonProperty("V1Rule") private Rule v1Rule; - @JsonProperty("V1RuleWithOperations") private RuleWithOperations v1RuleWithOperations; - @JsonProperty("V1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; - @JsonProperty("V1ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference; - @JsonProperty("V1ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration; - @JsonProperty("V1ValidatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList; - @JsonProperty("V1beta1K8sLocalSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview; - @JsonProperty("V1beta1K8sSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview; - @JsonProperty("V1beta1SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview; - @JsonProperty("V1beta1SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview; - @JsonProperty("ValidatingAdmissionPolicies") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies; - @JsonProperty("ValidatingAdmissionPoliciesList") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; - @JsonProperty("ValidatingAdmissionPolicyBinding") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; - @JsonProperty("ValidatingAdmissionPolicyBindingList") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; - @JsonProperty("ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; - @JsonProperty("ValidatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -257,7 +89,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -444,12 +276,12 @@ public void setMutatingWebhookConfigurationList(io.fabric8.kubernetes.api.model. } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -943,16 +775,6 @@ public void setValidatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode this.validatingWebhookConfigurationList = validatingWebhookConfigurationList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 240f287fd15..dbb3f735a73 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,245 +7,77 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "K8sLocalSubjectAccessReview", - "K8sSubjectAccessReview", - "ListOptions", - "MutatingWebhookConfiguration", - "MutatingWebhookConfigurationList", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Rule", - "RuleWithOperations", - "SelfSubjectAccessReview", - "SelfSubjectReview", - "SelfSubjectRulesReview", - "ServiceReference", - "Status", - "Time", - "TokenRequest", - "TokenReview", - "TypeMeta", - "UpdateOptions", - "V1AdmissionRequest", - "V1AdmissionResponse", - "V1AdmissionReview", - "V1Beta1AdmissionRequest", - "V1Beta1AdmissionResponse", - "V1Beta1AdmissionReview", - "V1Beta1Operation", - "V1Beta1PatchType", - "V1Beta1SelfSubjectReview", - "V1Beta1ValidatingAdmissionPolicy", - "V1Beta1ValidatingAdmissionPolicyBinding", - "V1Beta1ValidatingAdmissionPolicyBindingList", - "V1Beta1ValidatingAdmissionPolicyList", - "V1MutatingWebhookConfiguration", - "V1MutatingWebhookConfigurationList", - "V1Operation", - "V1PatchType", - "V1Rule", - "V1RuleWithOperations", - "V1SelfSubjectReview", - "V1ServiceReference", - "V1ValidatingWebhookConfiguration", - "V1ValidatingWebhookConfigurationList", - "V1beta1K8sLocalSubjectAccessReview", - "V1beta1K8sSubjectAccessReview", - "V1beta1SelfSubjectAccessReview", - "V1beta1SelfSubjectRulesReview", - "ValidatingAdmissionPolicies", - "ValidatingAdmissionPoliciesList", - "ValidatingAdmissionPolicyBinding", - "ValidatingAdmissionPolicyBindingList", - "ValidatingWebhookConfiguration", - "ValidatingWebhookConfigurationList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("K8sLocalSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview; - @JsonProperty("K8sSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration; - @JsonProperty("MutatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Rule") private Rule rule; - @JsonProperty("RuleWithOperations") private RuleWithOperations ruleWithOperations; - @JsonProperty("SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview; - @JsonProperty("SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview; - @JsonProperty("SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview; - @JsonProperty("ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TokenRequest") private TokenRequest tokenRequest; - @JsonProperty("TokenReview") private TokenReview tokenReview; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1AdmissionRequest") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest; - @JsonProperty("V1AdmissionResponse") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse; - @JsonProperty("V1AdmissionReview") private io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview; - @JsonProperty("V1Beta1AdmissionRequest") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest; - @JsonProperty("V1Beta1AdmissionResponse") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse; - @JsonProperty("V1Beta1AdmissionReview") private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview; - @JsonProperty("V1Beta1Operation") private java.lang.String v1Beta1Operation; - @JsonProperty("V1Beta1PatchType") private java.lang.String v1Beta1PatchType; - @JsonProperty("V1Beta1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; - @JsonProperty("V1Beta1ValidatingAdmissionPolicy") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList; - @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; - @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; - @JsonProperty("V1MutatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList; - @JsonProperty("V1Operation") private java.lang.String v1Operation; - @JsonProperty("V1PatchType") private java.lang.String v1PatchType; - @JsonProperty("V1Rule") private Rule v1Rule; - @JsonProperty("V1RuleWithOperations") private RuleWithOperations v1RuleWithOperations; - @JsonProperty("V1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; - @JsonProperty("V1ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference; - @JsonProperty("V1ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration; - @JsonProperty("V1ValidatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList; - @JsonProperty("V1beta1K8sLocalSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview; - @JsonProperty("V1beta1K8sSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview; - @JsonProperty("V1beta1SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview; - @JsonProperty("V1beta1SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview; - @JsonProperty("ValidatingAdmissionPolicies") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies; - @JsonProperty("ValidatingAdmissionPoliciesList") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; - @JsonProperty("ValidatingAdmissionPolicyBinding") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; - @JsonProperty("ValidatingAdmissionPolicyBindingList") private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; - @JsonProperty("ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; - @JsonProperty("ValidatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -257,7 +89,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -444,12 +276,12 @@ public void setMutatingWebhookConfigurationList(io.fabric8.kubernetes.api.model. } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -943,16 +775,6 @@ public void setValidatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode this.validatingWebhookConfigurationList = validatingWebhookConfigurationList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json index 292aa908590..56c9063e8bb 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json @@ -4555,7 +4555,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -4568,12 +4568,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4653,14 +4653,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -4669,8 +4668,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" } }, "matchPolicy": { @@ -4711,7 +4710,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -4727,8 +4726,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" } } }, @@ -5156,7 +5155,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5169,12 +5168,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5182,12 +5181,12 @@ "selfsubjectaccessreviewspec": { "properties": { "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" } }, "additionalProperties": true @@ -5228,7 +5227,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5241,12 +5240,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus" } }, "additionalProperties": true @@ -5710,7 +5709,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1alpha1", "required": true }, "kind": { @@ -5723,8 +5722,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingSpec" } }, "additionalProperties": true @@ -5759,12 +5758,12 @@ "validatingadmissionpolicybindingspec": { "properties": { "matchResources": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" }, "paramRef": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamRef", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamRef" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" }, "policyName": { "type": "string" @@ -5812,8 +5811,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation" } }, "failurePolicy": { @@ -5823,32 +5822,32 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" } }, "matchConstraints": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" }, "paramKind": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamKind" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind" }, "validations": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation" } }, "variables": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable" } } }, @@ -5934,7 +5933,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -5950,8 +5949,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 08533748e5c..fbcf8e61a3f 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,154 +7,45 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "CustomResourceDefinition", - "CustomResourceDefinitionCondition", - "CustomResourceDefinitionList", - "CustomResourceDefinitionNames", - "CustomResourceDefinitionSpec", - "CustomResourceDefinitionStatus", - "DeleteOptions", - "GetOptions", - "Info", - "JSONSchemaPropsOrStringArray", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1ConversionReview", - "V1CustomResourceDefinition", - "V1CustomResourceDefinitionCondition", - "V1CustomResourceDefinitionList", - "V1CustomResourceDefinitionNames", - "V1CustomResourceDefinitionSpec", - "V1CustomResourceDefinitionStatus", - "V1JSONSchemaPropsOrStringArray" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("CustomResourceDefinition") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition; - @JsonProperty("CustomResourceDefinitionCondition") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition; - @JsonProperty("CustomResourceDefinitionList") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList; - @JsonProperty("CustomResourceDefinitionNames") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames; - @JsonProperty("CustomResourceDefinitionSpec") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec; - @JsonProperty("CustomResourceDefinitionStatus") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("JSONSchemaPropsOrStringArray") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1ConversionReview") private ConversionReview v1ConversionReview; - @JsonProperty("V1CustomResourceDefinition") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition; - @JsonProperty("V1CustomResourceDefinitionCondition") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition; - @JsonProperty("V1CustomResourceDefinitionList") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList; - @JsonProperty("V1CustomResourceDefinitionNames") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames; - @JsonProperty("V1CustomResourceDefinitionSpec") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec; - @JsonProperty("V1CustomResourceDefinitionStatus") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus; - @JsonProperty("V1JSONSchemaPropsOrStringArray") private io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -166,7 +57,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -354,22 +245,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -533,16 +424,6 @@ public void setV1JSONSchemaPropsOrStringArray(io.fabric8.kubernetes.api.model.ap this.v1JSONSchemaPropsOrStringArray = v1JSONSchemaPropsOrStringArray; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a15a9d56ba7..e612e99f504 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,154 +7,45 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "CustomResourceDefinition", - "CustomResourceDefinitionCondition", - "CustomResourceDefinitionList", - "CustomResourceDefinitionNames", - "CustomResourceDefinitionSpec", - "CustomResourceDefinitionStatus", - "DeleteOptions", - "GetOptions", - "Info", - "JSONSchemaPropsOrStringArray", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1ConversionReview", - "V1CustomResourceDefinition", - "V1CustomResourceDefinitionCondition", - "V1CustomResourceDefinitionList", - "V1CustomResourceDefinitionNames", - "V1CustomResourceDefinitionSpec", - "V1CustomResourceDefinitionStatus", - "V1JSONSchemaPropsOrStringArray" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("CustomResourceDefinition") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition; - @JsonProperty("CustomResourceDefinitionCondition") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition; - @JsonProperty("CustomResourceDefinitionList") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList; - @JsonProperty("CustomResourceDefinitionNames") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames; - @JsonProperty("CustomResourceDefinitionSpec") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec; - @JsonProperty("CustomResourceDefinitionStatus") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("JSONSchemaPropsOrStringArray") private io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1ConversionReview") private ConversionReview v1ConversionReview; - @JsonProperty("V1CustomResourceDefinition") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition; - @JsonProperty("V1CustomResourceDefinitionCondition") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition; - @JsonProperty("V1CustomResourceDefinitionList") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList; - @JsonProperty("V1CustomResourceDefinitionNames") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames; - @JsonProperty("V1CustomResourceDefinitionSpec") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec; - @JsonProperty("V1CustomResourceDefinitionStatus") private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus; - @JsonProperty("V1JSONSchemaPropsOrStringArray") private io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -166,7 +57,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -354,22 +245,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -533,16 +424,6 @@ public void setV1JSONSchemaPropsOrStringArray(io.fabric8.kubernetes.api.model.ap this.v1JSONSchemaPropsOrStringArray = v1JSONSchemaPropsOrStringArray; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index 4d9451ce779..67a3f14c540 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -2628,7 +2628,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "kind": { @@ -2641,12 +2641,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2676,14 +2676,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition" } }, "kind": { @@ -2819,12 +2819,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -3194,8 +3194,8 @@ "type": "boolean" }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3209,8 +3209,8 @@ } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 7152996aff1..98edc8c58dd 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.apps.ControllerRevision; import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList; import io.fabric8.kubernetes.api.model.apps.DaemonSet; @@ -30,209 +19,65 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.api.model.apps.StatefulSetList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Binding", - "ComponentStatusList", - "ConfigMap", - "ConfigMapList", - "ContainerStatus", - "ControllerRevision", - "ControllerRevisionList", - "CreateOptions", - "DaemonSet", - "DaemonSetList", - "DeleteOptions", - "Deployment", - "DeploymentList", - "EndpointPort", - "Endpoints", - "EndpointsList", - "EnvVar", - "GetOptions", - "Info", - "LimitRangeList", - "ListOptions", - "Namespace", - "NamespaceList", - "Node", - "NodeList", - "ObjectMeta", - "Patch", - "PatchOptions", - "PersistentVolume", - "PersistentVolumeClaim", - "PersistentVolumeClaimList", - "PersistentVolumeList", - "PodList", - "PodTemplateList", - "Quantity", - "ReplicaSet", - "ReplicaSetList", - "ReplicationControllerList", - "ResourceQuota", - "ResourceQuotaList", - "RootPaths", - "Secret", - "SecretList", - "ServiceAccount", - "ServiceAccountList", - "ServiceList", - "StatefulSet", - "StatefulSetList", - "Status", - "Time", - "Toleration", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Binding") private Binding binding; - @JsonProperty("ComponentStatusList") private ComponentStatusList componentStatusList; - @JsonProperty("ConfigMap") private ConfigMap configMap; - @JsonProperty("ConfigMapList") private ConfigMapList configMapList; - @JsonProperty("ContainerStatus") private ContainerStatus containerStatus; - @JsonProperty("ControllerRevision") private ControllerRevision controllerRevision; - @JsonProperty("ControllerRevisionList") private ControllerRevisionList controllerRevisionList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DaemonSet") private DaemonSet daemonSet; - @JsonProperty("DaemonSetList") private DaemonSetList daemonSetList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("DeploymentList") private DeploymentList deploymentList; - @JsonProperty("EndpointPort") private EndpointPort endpointPort; - @JsonProperty("Endpoints") private Endpoints endpoints; - @JsonProperty("EndpointsList") private EndpointsList endpointsList; - @JsonProperty("EnvVar") private EnvVar envVar; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("Namespace") private Namespace namespace; - @JsonProperty("NamespaceList") private NamespaceList namespaceList; - @JsonProperty("Node") private Node node; - @JsonProperty("NodeList") private NodeList nodeList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PersistentVolume") private PersistentVolume persistentVolume; - @JsonProperty("PersistentVolumeClaim") - private io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim; - @JsonProperty("PersistentVolumeClaimList") + private PersistentVolumeClaim persistentVolumeClaim; private PersistentVolumeClaimList persistentVolumeClaimList; - @JsonProperty("PersistentVolumeList") private PersistentVolumeList persistentVolumeList; - @JsonProperty("PodList") private PodList podList; - @JsonProperty("PodTemplateList") private PodTemplateList podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicaSet") private ReplicaSet replicaSet; - @JsonProperty("ReplicaSetList") private ReplicaSetList replicaSetList; - @JsonProperty("ReplicationControllerList") private ReplicationControllerList replicationControllerList; - @JsonProperty("ResourceQuota") private ResourceQuota resourceQuota; - @JsonProperty("ResourceQuotaList") private ResourceQuotaList resourceQuotaList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Secret") private Secret secret; - @JsonProperty("SecretList") private SecretList secretList; - @JsonProperty("ServiceAccount") private ServiceAccount serviceAccount; - @JsonProperty("ServiceAccountList") private ServiceAccountList serviceAccountList; - @JsonProperty("ServiceList") private ServiceList serviceList; - @JsonProperty("StatefulSet") private StatefulSet statefulSet; - @JsonProperty("StatefulSetList") private StatefulSetList statefulSetList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Toleration") private Toleration toleration; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -244,7 +89,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -585,12 +430,12 @@ public void setNodeList(NodeList nodeList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -625,12 +470,12 @@ public void setPersistentVolume(PersistentVolume persistentVolume) { } @JsonProperty("PersistentVolumeClaim") - public io.fabric8.kubernetes.api.model.PersistentVolumeClaim getPersistentVolumeClaim() { + public PersistentVolumeClaim getPersistentVolumeClaim() { return persistentVolumeClaim; } @JsonProperty("PersistentVolumeClaim") - public void setPersistentVolumeClaim(io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim) { + public void setPersistentVolumeClaim(PersistentVolumeClaim persistentVolumeClaim) { this.persistentVolumeClaim = persistentVolumeClaim; } @@ -864,16 +709,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 19d9fcfd61a..10999580287 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.apps.ControllerRevision; import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList; import io.fabric8.kubernetes.api.model.apps.DaemonSet; @@ -30,209 +19,65 @@ import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.api.model.apps.StatefulSetList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Binding", - "ComponentStatusList", - "ConfigMap", - "ConfigMapList", - "ContainerStatus", - "ControllerRevision", - "ControllerRevisionList", - "CreateOptions", - "DaemonSet", - "DaemonSetList", - "DeleteOptions", - "Deployment", - "DeploymentList", - "EndpointPort", - "Endpoints", - "EndpointsList", - "EnvVar", - "GetOptions", - "Info", - "LimitRangeList", - "ListOptions", - "Namespace", - "NamespaceList", - "Node", - "NodeList", - "ObjectMeta", - "Patch", - "PatchOptions", - "PersistentVolume", - "PersistentVolumeClaim", - "PersistentVolumeClaimList", - "PersistentVolumeList", - "PodList", - "PodTemplateList", - "Quantity", - "ReplicaSet", - "ReplicaSetList", - "ReplicationControllerList", - "ResourceQuota", - "ResourceQuotaList", - "RootPaths", - "Secret", - "SecretList", - "ServiceAccount", - "ServiceAccountList", - "ServiceList", - "StatefulSet", - "StatefulSetList", - "Status", - "Time", - "Toleration", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Binding") private Binding binding; - @JsonProperty("ComponentStatusList") private ComponentStatusList componentStatusList; - @JsonProperty("ConfigMap") private ConfigMap configMap; - @JsonProperty("ConfigMapList") private ConfigMapList configMapList; - @JsonProperty("ContainerStatus") private ContainerStatus containerStatus; - @JsonProperty("ControllerRevision") private ControllerRevision controllerRevision; - @JsonProperty("ControllerRevisionList") private ControllerRevisionList controllerRevisionList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DaemonSet") private DaemonSet daemonSet; - @JsonProperty("DaemonSetList") private DaemonSetList daemonSetList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("DeploymentList") private DeploymentList deploymentList; - @JsonProperty("EndpointPort") private EndpointPort endpointPort; - @JsonProperty("Endpoints") private Endpoints endpoints; - @JsonProperty("EndpointsList") private EndpointsList endpointsList; - @JsonProperty("EnvVar") private EnvVar envVar; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("Namespace") private Namespace namespace; - @JsonProperty("NamespaceList") private NamespaceList namespaceList; - @JsonProperty("Node") private Node node; - @JsonProperty("NodeList") private NodeList nodeList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PersistentVolume") private PersistentVolume persistentVolume; - @JsonProperty("PersistentVolumeClaim") - private io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim; - @JsonProperty("PersistentVolumeClaimList") + private PersistentVolumeClaim persistentVolumeClaim; private PersistentVolumeClaimList persistentVolumeClaimList; - @JsonProperty("PersistentVolumeList") private PersistentVolumeList persistentVolumeList; - @JsonProperty("PodList") private PodList podList; - @JsonProperty("PodTemplateList") private PodTemplateList podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicaSet") private ReplicaSet replicaSet; - @JsonProperty("ReplicaSetList") private ReplicaSetList replicaSetList; - @JsonProperty("ReplicationControllerList") private ReplicationControllerList replicationControllerList; - @JsonProperty("ResourceQuota") private ResourceQuota resourceQuota; - @JsonProperty("ResourceQuotaList") private ResourceQuotaList resourceQuotaList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Secret") private Secret secret; - @JsonProperty("SecretList") private SecretList secretList; - @JsonProperty("ServiceAccount") private ServiceAccount serviceAccount; - @JsonProperty("ServiceAccountList") private ServiceAccountList serviceAccountList; - @JsonProperty("ServiceList") private ServiceList serviceList; - @JsonProperty("StatefulSet") private StatefulSet statefulSet; - @JsonProperty("StatefulSetList") private StatefulSetList statefulSetList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Toleration") private Toleration toleration; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -244,7 +89,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -585,12 +430,12 @@ public void setNodeList(NodeList nodeList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -625,12 +470,12 @@ public void setPersistentVolume(PersistentVolume persistentVolume) { } @JsonProperty("PersistentVolumeClaim") - public io.fabric8.kubernetes.api.model.PersistentVolumeClaim getPersistentVolumeClaim() { + public PersistentVolumeClaim getPersistentVolumeClaim() { return persistentVolumeClaim; } @JsonProperty("PersistentVolumeClaim") - public void setPersistentVolumeClaim(io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim) { + public void setPersistentVolumeClaim(PersistentVolumeClaim persistentVolumeClaim) { this.persistentVolumeClaim = persistentVolumeClaim; } @@ -864,16 +709,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 739d91b31ca..8c82e6a460d 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,134 +7,38 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.autoscaling.v1.Scale; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Scale", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1HorizontalPodAutoscaler", - "V1HorizontalPodAutoscalerList", - "V2HorizontalPodAutoscaler", - "V2HorizontalPodAutoscalerList", - "V2beta1HorizontalPodAutoscaler", - "V2beta1HorizontalPodAutoscalerList", - "V2beta2HorizontalPodAutoscaler", - "V2beta2HorizontalPodAutoscalerList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Scale") private Scale scale; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; - @JsonProperty("V1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; - @JsonProperty("V2HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; - @JsonProperty("V2HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; - @JsonProperty("V2beta1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; - @JsonProperty("V2beta1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList; - @JsonProperty("V2beta2HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; - @JsonProperty("V2beta2HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -146,7 +50,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -257,12 +161,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -436,16 +340,6 @@ public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.mode this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index f0462aa3c85..32acbb4002f 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,134 +7,38 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.autoscaling.v1.Scale; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Scale", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1HorizontalPodAutoscaler", - "V1HorizontalPodAutoscalerList", - "V2HorizontalPodAutoscaler", - "V2HorizontalPodAutoscalerList", - "V2beta1HorizontalPodAutoscaler", - "V2beta1HorizontalPodAutoscalerList", - "V2beta2HorizontalPodAutoscaler", - "V2beta2HorizontalPodAutoscalerList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Scale") private Scale scale; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; - @JsonProperty("V1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; - @JsonProperty("V2HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; - @JsonProperty("V2HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; - @JsonProperty("V2beta1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; - @JsonProperty("V2beta1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList; - @JsonProperty("V2beta2HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; - @JsonProperty("V2beta2HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -146,7 +50,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -257,12 +161,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -436,16 +340,6 @@ public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.mode this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index 48af17fe80f..e32841ca67e 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json @@ -2779,8 +2779,8 @@ "type": "string" }, "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" @@ -2868,13 +2868,20 @@ }, "externalmetricsource": { "properties": { - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "metricSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "targetValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -2935,7 +2942,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v1", + "default": "autoscaling/v2", "required": true }, "kind": { @@ -2948,12 +2955,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2961,12 +2968,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" } }, "additionalProperties": true @@ -2996,14 +3003,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2", + "default": "autoscaling/v2beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler" } }, "kind": { @@ -3020,37 +3027,35 @@ }, "horizontalpodautoscalerspec": { "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" + }, "maxReplicas": { "type": "integer" }, + "metrics": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" + } + }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" - }, - "targetCPUUtilizationPercentage": { - "type": "integer" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" } }, "additionalProperties": true }, "horizontalpodautoscalerstatus": { "properties": { - "conditions": { - "type": "array", - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerCondition" - } - }, - "currentMetrics": { - "type": "array", - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricStatus" - } + "currentCPUUtilizationPercentage": { + "type": "integer" }, "currentReplicas": { "type": "integer" @@ -3089,8 +3094,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3306,24 +3311,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricSource" }, "type": { "type": "string" @@ -3334,24 +3339,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricStatus" }, "type": { "type": "string" @@ -3573,12 +3578,12 @@ "podsmetricsource": { "properties": { "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true @@ -3623,12 +3628,9 @@ "name": { "type": "string" }, - "targetAverageUtilization": { - "type": "integer" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true @@ -3636,8 +3638,8 @@ "resourcemetricstatus": { "properties": { "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index c4c2af0174a..07f0c4e5ab5 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,129 +7,37 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "CronJob", - "CronJobList", - "DeleteOptions", - "GetOptions", - "Info", - "Job", - "JobList", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "PodTemplateList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1CronJob", - "V1CronJobList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("CronJob") private io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob; - @JsonProperty("CronJobList") private io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Job") private Job job; - @JsonProperty("JobList") private JobList jobList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodTemplateList") private PodTemplate podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1CronJob") private io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob; - @JsonProperty("V1CronJobList") private io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -141,7 +49,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -290,12 +198,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -409,16 +317,6 @@ public void setV1CronJobList(io.fabric8.kubernetes.api.model.batch.v1.CronJobLis this.v1CronJobList = v1CronJobList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a7f48225c21..5a7ce91bcd8 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,129 +7,37 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "CronJob", - "CronJobList", - "DeleteOptions", - "GetOptions", - "Info", - "Job", - "JobList", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "PodTemplateList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1CronJob", - "V1CronJobList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("CronJob") private io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob; - @JsonProperty("CronJobList") private io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Job") private Job job; - @JsonProperty("JobList") private JobList jobList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodTemplateList") private PodTemplate podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1CronJob") private io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob; - @JsonProperty("V1CronJobList") private io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -141,7 +49,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -290,12 +198,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -409,16 +317,6 @@ public void setV1CronJobList(io.fabric8.kubernetes.api.model.batch.v1.CronJobLis this.v1CronJobList = v1CronJobList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json index c5b96df21b6..6a7d14884b9 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json @@ -5183,8 +5183,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" }, "schedule": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 616abe4798d..6ce21ab4d9b 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,144 +7,42 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle; import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CertificateSigningRequest", - "CertificateSigningRequestCondition", - "CertificateSigningRequestList", - "CertificateSigningRequestSpec", - "CertificateSigningRequestStatus", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Alpha1ClusterTrustBundle", - "V1Alpha1ClusterTrustBundleList", - "V1Beta1CertificateSigningRequest", - "V1Beta1CertificateSigningRequestCondition", - "V1Beta1CertificateSigningRequestList", - "V1Beta1CertificateSigningRequestSpec", - "V1Beta1CertificateSigningRequestStatus" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest; - @JsonProperty("CertificateSigningRequestCondition") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition; - @JsonProperty("CertificateSigningRequestList") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList; - @JsonProperty("CertificateSigningRequestSpec") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec; - @JsonProperty("CertificateSigningRequestStatus") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Alpha1ClusterTrustBundle") private ClusterTrustBundle v1Alpha1ClusterTrustBundle; - @JsonProperty("V1Alpha1ClusterTrustBundleList") private ClusterTrustBundleList v1Alpha1ClusterTrustBundleList; - @JsonProperty("V1Beta1CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest; - @JsonProperty("V1Beta1CertificateSigningRequestCondition") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition; - @JsonProperty("V1Beta1CertificateSigningRequestList") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList; - @JsonProperty("V1Beta1CertificateSigningRequestSpec") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec; - @JsonProperty("V1Beta1CertificateSigningRequestStatus") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -156,7 +54,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -320,12 +218,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -479,16 +377,6 @@ public void setV1Beta1CertificateSigningRequestStatus(io.fabric8.kubernetes.api. this.v1Beta1CertificateSigningRequestStatus = v1Beta1CertificateSigningRequestStatus; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 83e984274da..ef070f2dcd6 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,144 +7,42 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle; import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CertificateSigningRequest", - "CertificateSigningRequestCondition", - "CertificateSigningRequestList", - "CertificateSigningRequestSpec", - "CertificateSigningRequestStatus", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Alpha1ClusterTrustBundle", - "V1Alpha1ClusterTrustBundleList", - "V1Beta1CertificateSigningRequest", - "V1Beta1CertificateSigningRequestCondition", - "V1Beta1CertificateSigningRequestList", - "V1Beta1CertificateSigningRequestSpec", - "V1Beta1CertificateSigningRequestStatus" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest; - @JsonProperty("CertificateSigningRequestCondition") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition; - @JsonProperty("CertificateSigningRequestList") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList; - @JsonProperty("CertificateSigningRequestSpec") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec; - @JsonProperty("CertificateSigningRequestStatus") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Alpha1ClusterTrustBundle") private ClusterTrustBundle v1Alpha1ClusterTrustBundle; - @JsonProperty("V1Alpha1ClusterTrustBundleList") private ClusterTrustBundleList v1Alpha1ClusterTrustBundleList; - @JsonProperty("V1Beta1CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest; - @JsonProperty("V1Beta1CertificateSigningRequestCondition") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition; - @JsonProperty("V1Beta1CertificateSigningRequestList") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList; - @JsonProperty("V1Beta1CertificateSigningRequestSpec") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec; - @JsonProperty("V1Beta1CertificateSigningRequestStatus") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -156,7 +54,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -320,12 +218,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -479,16 +377,6 @@ public void setV1Beta1CertificateSigningRequestStatus(io.fabric8.kubernetes.api. this.v1Beta1CertificateSigningRequestStatus = v1Beta1CertificateSigningRequestStatus; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 896b272f46b..30ec529442c 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,114 +7,32 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.coordination.v1.Lease; import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "Lease", - "LeaseList", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Lease") private Lease lease; - @JsonProperty("LeaseList") private LeaseList leaseList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -126,7 +44,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -250,12 +168,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -339,16 +257,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index e71eaa975b5..65bb6bd1a76 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,114 +7,32 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.coordination.v1.Lease; import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "Lease", - "LeaseList", - "ListOptions", - "ObjectMeta", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Lease") private Lease lease; - @JsonProperty("LeaseList") private LeaseList leaseList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -126,7 +44,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -250,12 +168,12 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -339,16 +257,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 3b4405726ea..34142b5fc3d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,228 +7,75 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIResource", - "APIResourceList", - "APIService", - "APIServiceList", - "Binding", - "ComponentStatus", - "ComponentStatusList", - "Condition", - "Config", - "ConfigMap", - "ConfigMapList", - "ContainerStatus", - "CreateOptions", - "DeleteOptions", - "EndpointPort", - "Endpoints", - "EndpointsList", - "EnvVar", - "Event", - "EventList", - "EventSeries", - "EventSource", - "GetOptions", - "GroupKind", - "GroupVersionKind", - "GroupVersionResource", - "Info", - "KubernetesList", - "LimitRangeList", - "ListOptions", - "MicroTime", - "Namespace", - "NamespaceList", - "Node", - "NodeList", - "ObjectMeta", - "Patch", - "PatchOptions", - "PersistentVolume", - "PersistentVolumeClaim", - "PersistentVolumeClaimList", - "PersistentVolumeList", - "PodExecOptions", - "PodList", - "PodTemplateList", - "Quantity", - "ReplicationControllerList", - "ResourceQuota", - "ResourceQuotaList", - "RootPaths", - "Secret", - "SecretList", - "ServiceAccount", - "ServiceAccountList", - "ServiceList", - "Status", - "Time", - "Toleration", - "TopologySelectorTerm", - "TypeMeta", - "UpdateOptions", - "WatchEvent" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIResource") private APIResource aPIResource; - @JsonProperty("APIResourceList") private APIResourceList aPIResourceList; - @JsonProperty("APIService") private APIService aPIService; - @JsonProperty("APIServiceList") private APIServiceList aPIServiceList; - @JsonProperty("Binding") private Binding binding; - @JsonProperty("ComponentStatus") private ComponentStatus componentStatus; - @JsonProperty("ComponentStatusList") private ComponentStatusList componentStatusList; - @JsonProperty("Condition") private Condition condition; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigMap") private ConfigMap configMap; - @JsonProperty("ConfigMapList") private ConfigMapList configMapList; - @JsonProperty("ContainerStatus") private ContainerStatus containerStatus; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("EndpointPort") private EndpointPort endpointPort; - @JsonProperty("Endpoints") private Endpoints endpoints; - @JsonProperty("EndpointsList") private EndpointsList endpointsList; - @JsonProperty("EnvVar") private EnvVar envVar; - @JsonProperty("Event") private Event event; - @JsonProperty("EventList") private EventList eventList; - @JsonProperty("EventSeries") private EventSeries eventSeries; - @JsonProperty("EventSource") private EventSource eventSource; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("GroupKind") private GroupKind groupKind; - @JsonProperty("GroupVersionKind") private GroupVersionKind groupVersionKind; - @JsonProperty("GroupVersionResource") private GroupVersionResource groupVersionResource; - @JsonProperty("Info") private Info info; - @JsonProperty("KubernetesList") private KubernetesList kubernetesList; - @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("MicroTime") private MicroTime microTime; - @JsonProperty("Namespace") private Namespace namespace; - @JsonProperty("NamespaceList") private NamespaceList namespaceList; - @JsonProperty("Node") private Node node; - @JsonProperty("NodeList") private NodeList nodeList; - @JsonProperty("ObjectMeta") private ObjectMeta objectMeta; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PersistentVolume") private PersistentVolume persistentVolume; - @JsonProperty("PersistentVolumeClaim") private PersistentVolumeClaim persistentVolumeClaim; - @JsonProperty("PersistentVolumeClaimList") private PersistentVolumeClaimList persistentVolumeClaimList; - @JsonProperty("PersistentVolumeList") private PersistentVolumeList persistentVolumeList; - @JsonProperty("PodExecOptions") private PodExecOptions podExecOptions; - @JsonProperty("PodList") private PodList podList; - @JsonProperty("PodTemplateList") private PodTemplateList podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicationControllerList") private ReplicationControllerList replicationControllerList; - @JsonProperty("ResourceQuota") private ResourceQuota resourceQuota; - @JsonProperty("ResourceQuotaList") private ResourceQuotaList resourceQuotaList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Secret") private Secret secret; - @JsonProperty("SecretList") private SecretList secretList; - @JsonProperty("ServiceAccount") private ServiceAccount serviceAccount; - @JsonProperty("ServiceAccountList") private ServiceAccountList serviceAccountList; - @JsonProperty("ServiceList") private ServiceList serviceList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Toleration") private Toleration toleration; - @JsonProperty("TopologySelectorTerm") private TopologySelectorTerm topologySelectorTerm; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("WatchEvent") private WatchEvent watchEvent; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -948,16 +795,6 @@ public void setWatchEvent(WatchEvent watchEvent) { this.watchEvent = watchEvent; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 64bdb8f3884..e883ee0f35e 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,228 +7,75 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIResource", - "APIResourceList", - "APIService", - "APIServiceList", - "Binding", - "ComponentStatus", - "ComponentStatusList", - "Condition", - "Config", - "ConfigMap", - "ConfigMapList", - "ContainerStatus", - "CreateOptions", - "DeleteOptions", - "EndpointPort", - "Endpoints", - "EndpointsList", - "EnvVar", - "Event", - "EventList", - "EventSeries", - "EventSource", - "GetOptions", - "GroupKind", - "GroupVersionKind", - "GroupVersionResource", - "Info", - "KubernetesList", - "LimitRangeList", - "ListOptions", - "MicroTime", - "Namespace", - "NamespaceList", - "Node", - "NodeList", - "ObjectMeta", - "Patch", - "PatchOptions", - "PersistentVolume", - "PersistentVolumeClaim", - "PersistentVolumeClaimList", - "PersistentVolumeList", - "PodExecOptions", - "PodList", - "PodTemplateList", - "Quantity", - "ReplicationControllerList", - "ResourceQuota", - "ResourceQuotaList", - "RootPaths", - "Secret", - "SecretList", - "ServiceAccount", - "ServiceAccountList", - "ServiceList", - "Status", - "Time", - "Toleration", - "TopologySelectorTerm", - "TypeMeta", - "UpdateOptions", - "WatchEvent" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIResource") private APIResource aPIResource; - @JsonProperty("APIResourceList") private APIResourceList aPIResourceList; - @JsonProperty("APIService") private APIService aPIService; - @JsonProperty("APIServiceList") private APIServiceList aPIServiceList; - @JsonProperty("Binding") private Binding binding; - @JsonProperty("ComponentStatus") private ComponentStatus componentStatus; - @JsonProperty("ComponentStatusList") private ComponentStatusList componentStatusList; - @JsonProperty("Condition") private Condition condition; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigMap") private ConfigMap configMap; - @JsonProperty("ConfigMapList") private ConfigMapList configMapList; - @JsonProperty("ContainerStatus") private ContainerStatus containerStatus; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("EndpointPort") private EndpointPort endpointPort; - @JsonProperty("Endpoints") private Endpoints endpoints; - @JsonProperty("EndpointsList") private EndpointsList endpointsList; - @JsonProperty("EnvVar") private EnvVar envVar; - @JsonProperty("Event") private Event event; - @JsonProperty("EventList") private EventList eventList; - @JsonProperty("EventSeries") private EventSeries eventSeries; - @JsonProperty("EventSource") private EventSource eventSource; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("GroupKind") private GroupKind groupKind; - @JsonProperty("GroupVersionKind") private GroupVersionKind groupVersionKind; - @JsonProperty("GroupVersionResource") private GroupVersionResource groupVersionResource; - @JsonProperty("Info") private Info info; - @JsonProperty("KubernetesList") private KubernetesList kubernetesList; - @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("MicroTime") private MicroTime microTime; - @JsonProperty("Namespace") private Namespace namespace; - @JsonProperty("NamespaceList") private NamespaceList namespaceList; - @JsonProperty("Node") private Node node; - @JsonProperty("NodeList") private NodeList nodeList; - @JsonProperty("ObjectMeta") private ObjectMeta objectMeta; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PersistentVolume") private PersistentVolume persistentVolume; - @JsonProperty("PersistentVolumeClaim") private PersistentVolumeClaim persistentVolumeClaim; - @JsonProperty("PersistentVolumeClaimList") private PersistentVolumeClaimList persistentVolumeClaimList; - @JsonProperty("PersistentVolumeList") private PersistentVolumeList persistentVolumeList; - @JsonProperty("PodExecOptions") private PodExecOptions podExecOptions; - @JsonProperty("PodList") private PodList podList; - @JsonProperty("PodTemplateList") private PodTemplateList podTemplateList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicationControllerList") private ReplicationControllerList replicationControllerList; - @JsonProperty("ResourceQuota") private ResourceQuota resourceQuota; - @JsonProperty("ResourceQuotaList") private ResourceQuotaList resourceQuotaList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Secret") private Secret secret; - @JsonProperty("SecretList") private SecretList secretList; - @JsonProperty("ServiceAccount") private ServiceAccount serviceAccount; - @JsonProperty("ServiceAccountList") private ServiceAccountList serviceAccountList; - @JsonProperty("ServiceList") private ServiceList serviceList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Toleration") private Toleration toleration; - @JsonProperty("TopologySelectorTerm") private TopologySelectorTerm topologySelectorTerm; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("WatchEvent") private WatchEvent watchEvent; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -948,16 +795,6 @@ public void setWatchEvent(WatchEvent watchEvent) { this.watchEvent = watchEvent; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 72f198ef7d0..3165292ad39 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,124 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "DiscoveryEndpointPort", - "EndpointSlice", - "EndpointSliceList", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1EndpointSlice", - "V1EndpointSliceList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("DiscoveryEndpointPort") private EndpointPort discoveryEndpointPort; - @JsonProperty("EndpointSlice") private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice; - @JsonProperty("EndpointSliceList") private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1EndpointSlice") private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; - @JsonProperty("V1EndpointSliceList") private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -136,7 +47,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -274,22 +185,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -393,16 +304,6 @@ public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1. this.v1EndpointSliceList = v1EndpointSliceList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 9fe2ecaf5a9..22b8a8563eb 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,124 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "DiscoveryEndpointPort", - "EndpointSlice", - "EndpointSliceList", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1EndpointSlice", - "V1EndpointSliceList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("DiscoveryEndpointPort") private EndpointPort discoveryEndpointPort; - @JsonProperty("EndpointSlice") private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice; - @JsonProperty("EndpointSliceList") private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1EndpointSlice") private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; - @JsonProperty("V1EndpointSliceList") private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -136,7 +47,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -274,22 +185,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -393,16 +304,6 @@ public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1. this.v1EndpointSliceList = v1EndpointSliceList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json index ea82eca8fb1..c4218fed07a 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json @@ -1390,19 +1390,12 @@ } }, "conditions": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointConditions", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions" - }, - "deprecatedTopology": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointConditions" }, "hints": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointHints" }, "hostname": { "type": "string" @@ -1414,8 +1407,12 @@ "$ref": "#/definitions/kubernetes_core_ObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" }, - "zone": { - "type": "string" + "topology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" } }, "additionalProperties": true @@ -1440,8 +1437,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_ForZone", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.ForZone" + "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" } } }, @@ -1506,14 +1503,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1", + "default": "discovery.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index af394dc517d..6b5bbf49e30 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,126 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Beta1Event", - "V1Beta1EventList", - "V1Beta1EventSeries", - "V1Event", - "V1EventList", - "V1EventSeries" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Beta1Event") private io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event; - @JsonProperty("V1Beta1EventList") private io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList; - @JsonProperty("V1Beta1EventSeries") private io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries; - @JsonProperty("V1Event") private io.fabric8.kubernetes.api.model.events.v1.Event v1Event; - @JsonProperty("V1EventList") private io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList; - @JsonProperty("V1EventSeries") private io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -138,7 +47,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -247,22 +156,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -406,16 +315,6 @@ public void setV1EventSeries(io.fabric8.kubernetes.api.model.events.v1.EventSeri this.v1EventSeries = v1EventSeries; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 32c0e8b2651..3f14f3d65be 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,126 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Beta1Event", - "V1Beta1EventList", - "V1Beta1EventSeries", - "V1Event", - "V1EventList", - "V1EventSeries" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Beta1Event") private io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event; - @JsonProperty("V1Beta1EventList") private io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList; - @JsonProperty("V1Beta1EventSeries") private io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries; - @JsonProperty("V1Event") private io.fabric8.kubernetes.api.model.events.v1.Event v1Event; - @JsonProperty("V1EventList") private io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList; - @JsonProperty("V1EventSeries") private io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -138,7 +47,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -247,22 +156,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -406,16 +315,6 @@ public void setV1EventSeries(io.fabric8.kubernetes.api.model.events.v1.EventSeri this.v1EventSeries = v1EventSeries; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json index 44aa0eaa2be..0f8c704fbb8 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json @@ -1286,7 +1286,7 @@ }, "apiVersion": { "type": "string", - "default": "events.k8s.io/v1beta1", + "default": "events.k8s.io/v1", "required": true }, "deprecatedCount": { @@ -1338,8 +1338,8 @@ "type": "string" }, "series": { - "$ref": "#/definitions/kubernetes_events_v1beta1_EventSeries", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries" + "$ref": "#/definitions/kubernetes_events_v1_EventSeries", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.EventSeries" }, "type": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 8828c600b58..a69e1fe7013 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.extensions.DaemonSet; import io.fabric8.kubernetes.api.model.extensions.DaemonSetList; import io.fabric8.kubernetes.api.model.extensions.Deployment; @@ -31,128 +20,38 @@ import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DaemonSet", - "DaemonSetList", - "DeleteOptions", - "Deployment", - "DeploymentList", - "DeploymentRollback", - "GetOptions", - "Info", - "Ingress", - "IngressList", - "ListOptions", - "NetworkPolicy", - "NetworkPolicyList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "ReplicaSet", - "ReplicaSetList", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DaemonSet") private DaemonSet daemonSet; - @JsonProperty("DaemonSetList") private DaemonSetList daemonSetList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("DeploymentList") private DeploymentList deploymentList; - @JsonProperty("DeploymentRollback") private DeploymentRollback deploymentRollback; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Ingress") private Ingress ingress; - @JsonProperty("IngressList") private IngressList ingressList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NetworkPolicy") private NetworkPolicy networkPolicy; - @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicaSet") private ReplicaSet replicaSet; - @JsonProperty("ReplicaSetList") private ReplicaSetList replicaSetList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -164,7 +63,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -368,22 +267,22 @@ public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -487,16 +386,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 4638233acd7..512c38b77e8 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.extensions.DaemonSet; import io.fabric8.kubernetes.api.model.extensions.DaemonSetList; import io.fabric8.kubernetes.api.model.extensions.Deployment; @@ -31,128 +20,38 @@ import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DaemonSet", - "DaemonSetList", - "DeleteOptions", - "Deployment", - "DeploymentList", - "DeploymentRollback", - "GetOptions", - "Info", - "Ingress", - "IngressList", - "ListOptions", - "NetworkPolicy", - "NetworkPolicyList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "ReplicaSet", - "ReplicaSetList", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DaemonSet") private DaemonSet daemonSet; - @JsonProperty("DaemonSetList") private DaemonSetList daemonSetList; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("DeploymentList") private DeploymentList deploymentList; - @JsonProperty("DeploymentRollback") private DeploymentRollback deploymentRollback; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Ingress") private Ingress ingress; - @JsonProperty("IngressList") private IngressList ingressList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NetworkPolicy") private NetworkPolicy networkPolicy; - @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("ReplicaSet") private ReplicaSet replicaSet; - @JsonProperty("ReplicaSetList") private ReplicaSetList replicaSetList; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -164,7 +63,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -368,22 +267,22 @@ public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -487,16 +386,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 66938c76705..ae15bb23347 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,111 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion; import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "V1Alpha1StorageVersion", - "V1Alpha1StorageVersionList", - "V1FlowSchema", - "V1FlowSchemaList", - "V1PriorityLevelConfiguration", - "V1PriorityLevelConfigurationList", - "V1beta1FlowSchema", - "V1beta1FlowSchemaList", - "V1beta1PriorityLevelConfiguration", - "V1beta1PriorityLevelConfigurationList", - "V1beta2FlowSchema", - "V1beta2FlowSchemaList", - "V1beta2PriorityLevelConfiguration", - "V1beta2PriorityLevelConfigurationList", - "V1beta3FlowSchema", - "V1beta3FlowSchemaList", - "V1beta3PriorityLevelConfiguration", - "V1beta3PriorityLevelConfigurationList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("V1Alpha1StorageVersion") private StorageVersion v1Alpha1StorageVersion; - @JsonProperty("V1Alpha1StorageVersionList") private StorageVersionList v1Alpha1StorageVersionList; - @JsonProperty("V1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema; - @JsonProperty("V1FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList; - @JsonProperty("V1PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration; - @JsonProperty("V1PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList; - @JsonProperty("V1beta1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema; - @JsonProperty("V1beta1FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList; - @JsonProperty("V1beta1PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; - @JsonProperty("V1beta1PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; - @JsonProperty("V1beta2FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema; - @JsonProperty("V1beta2FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList; - @JsonProperty("V1beta2PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration; - @JsonProperty("V1beta2PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList; - @JsonProperty("V1beta3FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema; - @JsonProperty("V1beta3FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList; - @JsonProperty("V1beta3PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration; - @JsonProperty("V1beta3PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -325,16 +244,6 @@ public void setV1beta3PriorityLevelConfigurationList(io.fabric8.kubernetes.api.m this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 24df6afb686..d75e77fd348 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,111 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion; import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "V1Alpha1StorageVersion", - "V1Alpha1StorageVersionList", - "V1FlowSchema", - "V1FlowSchemaList", - "V1PriorityLevelConfiguration", - "V1PriorityLevelConfigurationList", - "V1beta1FlowSchema", - "V1beta1FlowSchemaList", - "V1beta1PriorityLevelConfiguration", - "V1beta1PriorityLevelConfigurationList", - "V1beta2FlowSchema", - "V1beta2FlowSchemaList", - "V1beta2PriorityLevelConfiguration", - "V1beta2PriorityLevelConfigurationList", - "V1beta3FlowSchema", - "V1beta3FlowSchemaList", - "V1beta3PriorityLevelConfiguration", - "V1beta3PriorityLevelConfigurationList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("V1Alpha1StorageVersion") private StorageVersion v1Alpha1StorageVersion; - @JsonProperty("V1Alpha1StorageVersionList") private StorageVersionList v1Alpha1StorageVersionList; - @JsonProperty("V1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema; - @JsonProperty("V1FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList; - @JsonProperty("V1PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration; - @JsonProperty("V1PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList; - @JsonProperty("V1beta1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema; - @JsonProperty("V1beta1FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList; - @JsonProperty("V1beta1PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; - @JsonProperty("V1beta1PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; - @JsonProperty("V1beta2FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema; - @JsonProperty("V1beta2FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList; - @JsonProperty("V1beta2PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration; - @JsonProperty("V1beta2PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList; - @JsonProperty("V1beta3FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema; - @JsonProperty("V1beta3FlowSchemaList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList; - @JsonProperty("V1beta3PriorityLevelConfiguration") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration; - @JsonProperty("V1beta3PriorityLevelConfigurationList") private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -325,16 +244,6 @@ public void setV1beta3PriorityLevelConfigurationList(io.fabric8.kubernetes.api.m this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json index 581a4238266..d38a5782e38 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json @@ -2576,7 +2576,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "kind": { @@ -2589,12 +2589,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_FlowSchemaSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaStatus" } }, "additionalProperties": true @@ -2649,22 +2649,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" } } }, @@ -2676,8 +2676,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaCondition" } } }, @@ -2693,6 +2693,9 @@ }, "limitedprioritylevelconfiguration": { "properties": { + "assuredConcurrencyShares": { + "type": "integer" + }, "borrowingLimitPercent": { "type": "integer" }, @@ -2700,11 +2703,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.LimitResponse" - }, - "nominalConcurrencyShares": { - "type": "integer" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitResponse" } }, "additionalProperties": true @@ -2712,8 +2712,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.QueuingConfiguration" }, "type": { "type": "string" @@ -2891,23 +2891,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.Subject" } } }, @@ -2917,7 +2917,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "default": "flowcontrol.apiserver.k8s.io/v1", "required": true }, "kind": { @@ -2930,12 +2930,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationStatus" } }, "additionalProperties": true @@ -2965,14 +2965,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "default": "flowcontrol.apiserver.k8s.io/v1beta3", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration" } }, "kind": { @@ -2998,12 +2998,12 @@ "prioritylevelconfigurationspec": { "properties": { "exempt": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration" }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -3017,8 +3017,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" } } }, @@ -3214,19 +3214,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e8f1b0a0a69..6210130f76f 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicy; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicyList; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRoute; @@ -31,137 +18,41 @@ import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRouteList; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRoute; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRouteList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "BackendTLSPolicy", - "BackendTLSPolicyList", - "GRPCRoute", - "GRPCRouteList", - "Gateway", - "GatewayClass", - "GatewayClassList", - "GatewayList", - "HTTPRoute", - "HTTPRouteList", - "ReferenceGrant", - "ReferenceGrantList", - "TCPRoute", - "TCPRouteList", - "TLSRoute", - "TLSRouteList", - "UDPRoute", - "UDPRouteList", - "V1Beta1Gateway", - "V1Beta1GatewayClass", - "V1Beta1GatewayClassList", - "V1Beta1GatewayList", - "V1Beta1HTTPRoute", - "V1Beta1HTTPRouteList", - "V1Beta1ReferenceGrant", - "V1Beta1ReferenceGrantList", - "V1Gateway", - "V1GatewayClass", - "V1GatewayClassList", - "V1GatewayList", - "V1HTTPRoute", - "V1HTTPRouteList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("BackendTLSPolicy") private BackendTLSPolicy backendTLSPolicy; - @JsonProperty("BackendTLSPolicyList") private BackendTLSPolicyList backendTLSPolicyList; - @JsonProperty("GRPCRoute") private GRPCRoute gRPCRoute; - @JsonProperty("GRPCRouteList") private GRPCRouteList gRPCRouteList; - @JsonProperty("Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway; - @JsonProperty("GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass; - @JsonProperty("GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList; - @JsonProperty("GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList; - @JsonProperty("HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute; - @JsonProperty("HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList; - @JsonProperty("ReferenceGrant") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant; - @JsonProperty("ReferenceGrantList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList; - @JsonProperty("TCPRoute") private TCPRoute tCPRoute; - @JsonProperty("TCPRouteList") private TCPRouteList tCPRouteList; - @JsonProperty("TLSRoute") private TLSRoute tLSRoute; - @JsonProperty("TLSRouteList") private TLSRouteList tLSRouteList; - @JsonProperty("UDPRoute") private UDPRoute uDPRoute; - @JsonProperty("UDPRouteList") private UDPRouteList uDPRouteList; - @JsonProperty("V1Beta1Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway; - @JsonProperty("V1Beta1GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass; - @JsonProperty("V1Beta1GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList; - @JsonProperty("V1Beta1GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList; - @JsonProperty("V1Beta1HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute; - @JsonProperty("V1Beta1HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList; - @JsonProperty("V1Beta1ReferenceGrant") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant; - @JsonProperty("V1Beta1ReferenceGrantList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList; - @JsonProperty("V1Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway; - @JsonProperty("V1GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass; - @JsonProperty("V1GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList; - @JsonProperty("V1GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList; - @JsonProperty("V1HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute; - @JsonProperty("V1HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -529,16 +420,6 @@ public void setV1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTT this.v1HTTPRouteList = v1HTTPRouteList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index ca4afdf8319..05b535c5f4f 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicy; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicyList; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRoute; @@ -31,137 +18,41 @@ import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRouteList; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRoute; import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRouteList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "BackendTLSPolicy", - "BackendTLSPolicyList", - "GRPCRoute", - "GRPCRouteList", - "Gateway", - "GatewayClass", - "GatewayClassList", - "GatewayList", - "HTTPRoute", - "HTTPRouteList", - "ReferenceGrant", - "ReferenceGrantList", - "TCPRoute", - "TCPRouteList", - "TLSRoute", - "TLSRouteList", - "UDPRoute", - "UDPRouteList", - "V1Beta1Gateway", - "V1Beta1GatewayClass", - "V1Beta1GatewayClassList", - "V1Beta1GatewayList", - "V1Beta1HTTPRoute", - "V1Beta1HTTPRouteList", - "V1Beta1ReferenceGrant", - "V1Beta1ReferenceGrantList", - "V1Gateway", - "V1GatewayClass", - "V1GatewayClassList", - "V1GatewayList", - "V1HTTPRoute", - "V1HTTPRouteList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("BackendTLSPolicy") private BackendTLSPolicy backendTLSPolicy; - @JsonProperty("BackendTLSPolicyList") private BackendTLSPolicyList backendTLSPolicyList; - @JsonProperty("GRPCRoute") private GRPCRoute gRPCRoute; - @JsonProperty("GRPCRouteList") private GRPCRouteList gRPCRouteList; - @JsonProperty("Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway; - @JsonProperty("GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass; - @JsonProperty("GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList; - @JsonProperty("GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList; - @JsonProperty("HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute; - @JsonProperty("HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList; - @JsonProperty("ReferenceGrant") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant; - @JsonProperty("ReferenceGrantList") private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList; - @JsonProperty("TCPRoute") private TCPRoute tCPRoute; - @JsonProperty("TCPRouteList") private TCPRouteList tCPRouteList; - @JsonProperty("TLSRoute") private TLSRoute tLSRoute; - @JsonProperty("TLSRouteList") private TLSRouteList tLSRouteList; - @JsonProperty("UDPRoute") private UDPRoute uDPRoute; - @JsonProperty("UDPRouteList") private UDPRouteList uDPRouteList; - @JsonProperty("V1Beta1Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway; - @JsonProperty("V1Beta1GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass; - @JsonProperty("V1Beta1GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList; - @JsonProperty("V1Beta1GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList; - @JsonProperty("V1Beta1HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute; - @JsonProperty("V1Beta1HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList; - @JsonProperty("V1Beta1ReferenceGrant") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant; - @JsonProperty("V1Beta1ReferenceGrantList") private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList; - @JsonProperty("V1Gateway") private io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway; - @JsonProperty("V1GatewayClass") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass; - @JsonProperty("V1GatewayClassList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList; - @JsonProperty("V1GatewayList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList; - @JsonProperty("V1HTTPRoute") private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute; - @JsonProperty("V1HTTPRouteList") private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -529,16 +420,6 @@ public void setV1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTT this.v1HTTPRouteList = v1HTTPRouteList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index b4a64b1205a..27dafd0344d 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json @@ -3178,7 +3178,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1", "required": true }, "kind": { @@ -3205,14 +3205,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_GatewayClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass" } }, "kind": { @@ -3285,14 +3285,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_Gateway", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java index 9b1c73b994b..59773db08a7 100644 --- a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java +++ b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java @@ -59,6 +59,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; public class KubernetesCoreTypeAnnotator extends Jackson2Annotator { @@ -72,8 +73,11 @@ public class KubernetesCoreTypeAnnotator extends Jackson2Annotator { protected static final String KIND = "kind"; protected static final String DEFAULT = "default"; protected static final String INTERFACE_TYPE_PROPERTY = "interfaceType"; - public static final String CORE_PACKAGE = "core"; - public static final String OPENSHIFT_PACKAGE = "openshift"; + private static final Set IGNORED_CLASSES = ConcurrentHashMap.newKeySet(); + static { + IGNORED_CLASSES.add("io.fabric8.kubernetes.api.model.KubeSchema"); + IGNORED_CLASSES.add("io.fabric8.kubernetes.api.model.ValidationSchema"); + } protected final Map pendingResources = new HashMap<>(); protected final Map pendingLists = new HashMap<>(); @@ -86,9 +90,10 @@ public KubernetesCoreTypeAnnotator(GenerationConfig generationConfig) { @Override public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) { // ensure every class is only processed once - if (handledClasses.contains(clazz.fullName())) { + if (handledClasses.contains(clazz.fullName()) || IGNORED_CLASSES.contains(clazz.fullName())) { return; } + handledClasses.add(clazz.fullName()); JAnnotationArrayMember annotationValue = clazz.annotate(JsonPropertyOrder.class).paramArray(ANNOTATION_VALUE); @@ -165,6 +170,9 @@ private void annotate(JDefinedClass clazz, String apiVersion, String apiGroup) { @Override public void propertyInclusion(JDefinedClass clazz, JsonNode schema) { + if (IGNORED_CLASSES.contains(clazz.fullName())) { + return; + } if (schema.has("serializer")) { annotateSerde(clazz, JsonSerialize.class, schema.get("serializer").asText()); } @@ -204,6 +212,9 @@ public void generate(JFormatter f) { @Override public void propertyField(JFieldVar field, JDefinedClass clazz, String propertyName, JsonNode propertyNode) { + if (IGNORED_CLASSES.contains(clazz.fullName())) { + return; + } super.propertyField(field, clazz, propertyName, propertyNode); if (propertyNode.has("javaOmitEmpty") && propertyNode.get("javaOmitEmpty").asBoolean(false)) { diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 85c3a7fa791..99d534306c8 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,39 +7,12 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.kustomize.v1beta1.Kustomization; -import io.sundr.builder.annotations.Buildable; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "Kustomization" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("Kustomization") private Kustomization kustomization; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,16 +39,6 @@ public void setKustomization(Kustomization kustomization) { this.kustomization = kustomization; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 7dfbe3f76a2..3d72a1dc3f5 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,39 +7,12 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.kustomize.v1beta1.Kustomization; -import io.sundr.builder.annotations.Buildable; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "Kustomization" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("Kustomization") private Kustomization kustomization; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,16 +39,6 @@ public void setKustomization(Kustomization kustomization) { this.kustomization = kustomization; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index a85488338f7..e1d09763dbb 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,124 +7,37 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.metrics.v1beta1.NodeMetrics; import io.fabric8.kubernetes.api.model.metrics.v1beta1.NodeMetricsList; import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetrics; import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetricsList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "NodeMetrics", - "NodeMetricsList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "PodMetrics", - "PodMetricsList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NodeMetrics") private NodeMetrics nodeMetrics; - @JsonProperty("NodeMetricsList") private NodeMetricsList nodeMetricsList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodMetrics") private PodMetrics podMetrics; - @JsonProperty("PodMetricsList") private PodMetricsList podMetricsList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -136,7 +49,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -263,22 +176,22 @@ public void setNodeMetricsList(NodeMetricsList nodeMetricsList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -382,16 +295,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 6ef0c1b7805..dd14ede7bf1 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,124 +7,37 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.metrics.v1beta1.NodeMetrics; import io.fabric8.kubernetes.api.model.metrics.v1beta1.NodeMetricsList; import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetrics; import io.fabric8.kubernetes.api.model.metrics.v1beta1.PodMetricsList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "NodeMetrics", - "NodeMetricsList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "PodMetrics", - "PodMetricsList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NodeMetrics") private NodeMetrics nodeMetrics; - @JsonProperty("NodeMetricsList") private NodeMetricsList nodeMetricsList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodMetrics") private PodMetrics podMetrics; - @JsonProperty("PodMetricsList") private PodMetricsList podMetricsList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -136,7 +49,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -263,22 +176,22 @@ public void setNodeMetricsList(NodeMetricsList nodeMetricsList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -382,16 +295,6 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e916255f808..ea7fbea114a 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress; @@ -26,137 +15,41 @@ import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDR; import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDRList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "Ingress", - "IngressClass", - "IngressClassList", - "IngressList", - "ListOptions", - "NetworkPolicy", - "NetworkPolicyList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Alpha1IPAddress", - "V1Alpha1IPAddressList", - "V1Alpha1ServiceCIDR", - "V1Alpha1ServiceCIDRList", - "V1Ingress", - "V1IngressClass", - "V1IngressClassList", - "V1IngressList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Ingress") private io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress; - @JsonProperty("IngressClass") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass; - @JsonProperty("IngressClassList") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList; - @JsonProperty("IngressList") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NetworkPolicy") private NetworkPolicy networkPolicy; - @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Alpha1IPAddress") private IPAddress v1Alpha1IPAddress; - @JsonProperty("V1Alpha1IPAddressList") private IPAddressList v1Alpha1IPAddressList; - @JsonProperty("V1Alpha1ServiceCIDR") private ServiceCIDR v1Alpha1ServiceCIDR; - @JsonProperty("V1Alpha1ServiceCIDRList") private ServiceCIDRList v1Alpha1ServiceCIDRList; - @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; - @JsonProperty("V1IngressClass") private io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass; - @JsonProperty("V1IngressClassList") private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; - @JsonProperty("V1IngressList") private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -168,7 +61,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -345,22 +238,22 @@ public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -524,16 +417,6 @@ public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.Ingre this.v1IngressList = v1IngressList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 2d3db753679..04650401ca8 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress; @@ -26,137 +15,41 @@ import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDR; import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDRList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "Ingress", - "IngressClass", - "IngressClassList", - "IngressList", - "ListOptions", - "NetworkPolicy", - "NetworkPolicyList", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Alpha1IPAddress", - "V1Alpha1IPAddressList", - "V1Alpha1ServiceCIDR", - "V1Alpha1ServiceCIDRList", - "V1Ingress", - "V1IngressClass", - "V1IngressClassList", - "V1IngressList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("Ingress") private io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress; - @JsonProperty("IngressClass") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass; - @JsonProperty("IngressClassList") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList; - @JsonProperty("IngressList") private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("NetworkPolicy") private NetworkPolicy networkPolicy; - @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Alpha1IPAddress") private IPAddress v1Alpha1IPAddress; - @JsonProperty("V1Alpha1IPAddressList") private IPAddressList v1Alpha1IPAddressList; - @JsonProperty("V1Alpha1ServiceCIDR") private ServiceCIDR v1Alpha1ServiceCIDR; - @JsonProperty("V1Alpha1ServiceCIDRList") private ServiceCIDRList v1Alpha1ServiceCIDRList; - @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; - @JsonProperty("V1IngressClass") private io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass; - @JsonProperty("V1IngressClassList") private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; - @JsonProperty("V1IngressList") private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -168,7 +61,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -345,22 +238,22 @@ public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -524,16 +417,6 @@ public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.Ingre this.v1IngressList = v1IngressList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json index 13b41f1179c..ae0e8372ff4 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json @@ -2507,12 +2507,9 @@ "$ref": "#/definitions/kubernetes_core_TypedLocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.TypedLocalObjectReference" }, - "serviceName": { - "type": "string" - }, - "servicePort": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", - "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + "service": { + "$ref": "#/definitions/kubernetes_networking_v1_IngressServiceBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressServiceBackend" } }, "additionalProperties": true @@ -2544,14 +2541,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass" + "$ref": "#/definitions/kubernetes_networking_v1_IngressClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClass" } }, "kind": { @@ -2592,8 +2589,8 @@ "type": "string" }, "parameters": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressClassParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClassParametersReference" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClassParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassParametersReference" } }, "additionalProperties": true @@ -2602,14 +2599,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1_Ingress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_Ingress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress" } }, "kind": { @@ -2705,9 +2702,9 @@ }, "ingressspec": { "properties": { - "defaultBackend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "backend": { + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "ingressClassName": { "type": "string" @@ -2716,16 +2713,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressRule" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressRule" } }, "tls": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressTLS", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressTLS" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressTLS", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressTLS" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 489891a4ac3..ae7e5db80f4 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,93 +7,24 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "ObjectReference", - "Quantity", - "Status", - "TypeMeta", - "V1RuntimeClass", - "V1RuntimeClassList", - "V1alpha1RuntimeClass", - "V1alpha1RuntimeClassList", - "V1beta1RuntimeClass", - "V1beta1RuntimeClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Quantity") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Quantity quantity; - @JsonProperty("Status") private Status status; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass; - @JsonProperty("V1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList; - @JsonProperty("V1alpha1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass; - @JsonProperty("V1alpha1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList; - @JsonProperty("V1beta1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass; - @JsonProperty("V1beta1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -105,7 +36,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { + public KubeSchema(KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { super(); this.baseKubernetesList = baseKubernetesList; this.info = info; @@ -143,22 +74,22 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -252,16 +183,6 @@ public void setV1beta1RuntimeClassList(io.fabric8.kubernetes.api.model.node.v1be this.v1beta1RuntimeClassList = v1beta1RuntimeClassList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index dc8bb2985be..c0719bbb3cb 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,93 +7,24 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "ObjectReference", - "Quantity", - "Status", - "TypeMeta", - "V1RuntimeClass", - "V1RuntimeClassList", - "V1alpha1RuntimeClass", - "V1alpha1RuntimeClassList", - "V1beta1RuntimeClass", - "V1beta1RuntimeClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Quantity") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Quantity quantity; - @JsonProperty("Status") private Status status; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass; - @JsonProperty("V1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList; - @JsonProperty("V1alpha1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass; - @JsonProperty("V1alpha1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList; - @JsonProperty("V1beta1RuntimeClass") private io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass; - @JsonProperty("V1beta1RuntimeClassList") private io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -105,7 +36,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { + public ValidationSchema(KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { super(); this.baseKubernetesList = baseKubernetesList; this.info = info; @@ -143,22 +74,22 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -252,16 +183,6 @@ public void setV1beta1RuntimeClassList(io.fabric8.kubernetes.api.model.node.v1be this.v1beta1RuntimeClassList = v1beta1RuntimeClassList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 0bbe272923d..47b54508524 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,126 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "Eviction", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "PodDisruptionBudget", - "PodDisruptionBudgetList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Eviction", - "V1PodDisruptionBudget", - "V1PodDisruptionBudgetList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Eviction") private io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodDisruptionBudget") private io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget; - @JsonProperty("PodDisruptionBudgetList") private io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Eviction") private io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction; - @JsonProperty("V1PodDisruptionBudget") private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget; - @JsonProperty("V1PodDisruptionBudgetList") private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -138,7 +47,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -257,22 +166,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -406,16 +315,6 @@ public void setV1PodDisruptionBudgetList(io.fabric8.kubernetes.api.model.policy. this.v1PodDisruptionBudgetList = v1PodDisruptionBudgetList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 5781c0af04e..02d4ee06300 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,126 +7,35 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "Eviction", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "PodDisruptionBudget", - "PodDisruptionBudgetList", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Eviction", - "V1PodDisruptionBudget", - "V1PodDisruptionBudgetList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("Eviction") private io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodDisruptionBudget") private io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget; - @JsonProperty("PodDisruptionBudgetList") private io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Eviction") private io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction; - @JsonProperty("V1PodDisruptionBudget") private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget; - @JsonProperty("V1PodDisruptionBudgetList") private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -138,7 +47,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -257,22 +166,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -406,16 +315,6 @@ public void setV1PodDisruptionBudgetList(io.fabric8.kubernetes.api.model.policy. this.v1PodDisruptionBudgetList = v1PodDisruptionBudgetList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 201217c2c2b..70efc35fd11 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.rbac.AggregationRule; import io.fabric8.kubernetes.api.model.rbac.ClusterRole; import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding; @@ -30,68 +17,18 @@ import io.fabric8.kubernetes.api.model.rbac.RoleBinding; import io.fabric8.kubernetes.api.model.rbac.RoleBindingList; import io.fabric8.kubernetes.api.model.rbac.RoleList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "AggregationRule", - "ClusterRole", - "ClusterRoleBinding", - "ClusterRoleBindingList", - "ClusterRoleList", - "Role", - "RoleBinding", - "RoleBindingList", - "RoleList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("AggregationRule") private AggregationRule aggregationRule; - @JsonProperty("ClusterRole") private ClusterRole clusterRole; - @JsonProperty("ClusterRoleBinding") private ClusterRoleBinding clusterRoleBinding; - @JsonProperty("ClusterRoleBindingList") private ClusterRoleBindingList clusterRoleBindingList; - @JsonProperty("ClusterRoleList") private ClusterRoleList clusterRoleList; - @JsonProperty("Role") private Role role; - @JsonProperty("RoleBinding") private RoleBinding roleBinding; - @JsonProperty("RoleBindingList") private RoleBindingList roleBindingList; - @JsonProperty("RoleList") private RoleList roleList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -206,16 +143,6 @@ public void setRoleList(RoleList roleList) { this.roleList = roleList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 9a4249a88b9..e3856cdbcc0 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.rbac.AggregationRule; import io.fabric8.kubernetes.api.model.rbac.ClusterRole; import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding; @@ -30,68 +17,18 @@ import io.fabric8.kubernetes.api.model.rbac.RoleBinding; import io.fabric8.kubernetes.api.model.rbac.RoleBindingList; import io.fabric8.kubernetes.api.model.rbac.RoleList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "AggregationRule", - "ClusterRole", - "ClusterRoleBinding", - "ClusterRoleBindingList", - "ClusterRoleList", - "Role", - "RoleBinding", - "RoleBindingList", - "RoleList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("AggregationRule") private AggregationRule aggregationRule; - @JsonProperty("ClusterRole") private ClusterRole clusterRole; - @JsonProperty("ClusterRoleBinding") private ClusterRoleBinding clusterRoleBinding; - @JsonProperty("ClusterRoleBindingList") private ClusterRoleBindingList clusterRoleBindingList; - @JsonProperty("ClusterRoleList") private ClusterRoleList clusterRoleList; - @JsonProperty("Role") private Role role; - @JsonProperty("RoleBinding") private RoleBinding roleBinding; - @JsonProperty("RoleBindingList") private RoleBindingList roleBindingList; - @JsonProperty("RoleList") private RoleList roleList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -206,16 +143,6 @@ public void setRoleList(RoleList roleList) { this.roleList = roleList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 688f7de73c3..e02dd7a58f4 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; @@ -28,65 +15,17 @@ import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "PodSchedulingContext", - "PodSchedulingContextList", - "ResourceClaim", - "ResourceClaimList", - "ResourceClaimTemplate", - "ResourceClaimTemplateList", - "ResourceClass", - "ResourceClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("PodSchedulingContext") private PodSchedulingContext podSchedulingContext; - @JsonProperty("PodSchedulingContextList") private PodSchedulingContextList podSchedulingContextList; - @JsonProperty("ResourceClaim") private ResourceClaim resourceClaim; - @JsonProperty("ResourceClaimList") private ResourceClaimList resourceClaimList; - @JsonProperty("ResourceClaimTemplate") private ResourceClaimTemplate resourceClaimTemplate; - @JsonProperty("ResourceClaimTemplateList") private ResourceClaimTemplateList resourceClaimTemplateList; - @JsonProperty("ResourceClass") private ResourceClaim resourceClass; - @JsonProperty("ResourceClassList") private ResourceClassList resourceClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -190,16 +129,6 @@ public void setResourceClassList(ResourceClassList resourceClassList) { this.resourceClassList = resourceClassList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index ad38634d573..342fc7c5a50 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,20 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; @@ -28,65 +15,17 @@ import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "PodSchedulingContext", - "PodSchedulingContextList", - "ResourceClaim", - "ResourceClaimList", - "ResourceClaimTemplate", - "ResourceClaimTemplateList", - "ResourceClass", - "ResourceClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("PodSchedulingContext") private PodSchedulingContext podSchedulingContext; - @JsonProperty("PodSchedulingContextList") private PodSchedulingContextList podSchedulingContextList; - @JsonProperty("ResourceClaim") private ResourceClaim resourceClaim; - @JsonProperty("ResourceClaimList") private ResourceClaimList resourceClaimList; - @JsonProperty("ResourceClaimTemplate") private ResourceClaimTemplate resourceClaimTemplate; - @JsonProperty("ResourceClaimTemplateList") private ResourceClaimTemplateList resourceClaimTemplateList; - @JsonProperty("ResourceClass") private ResourceClaim resourceClass; - @JsonProperty("ResourceClassList") private ResourceClassList resourceClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -190,16 +129,6 @@ public void setResourceClassList(ResourceClassList resourceClassList) { this.resourceClassList = resourceClassList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 2c5df210f3f..79af32cdacf 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,120 +7,33 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Beta1PriorityClass", - "V1Beta1PriorityClassList", - "V1PriorityClass", - "V1PriorityClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Beta1PriorityClass") private io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass; - @JsonProperty("V1Beta1PriorityClassList") private io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList; - @JsonProperty("V1PriorityClass") private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass; - @JsonProperty("V1PriorityClassList") private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -132,7 +45,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -239,22 +152,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -378,16 +291,6 @@ public void setV1PriorityClassList(io.fabric8.kubernetes.api.model.scheduling.v1 this.v1PriorityClassList = v1PriorityClassList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 4afaf9b8275..5233f119bbe 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,120 +7,33 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "Time", - "TypeMeta", - "UpdateOptions", - "V1Beta1PriorityClass", - "V1Beta1PriorityClassList", - "V1PriorityClass", - "V1PriorityClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1Beta1PriorityClass") private io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass; - @JsonProperty("V1Beta1PriorityClassList") private io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList; - @JsonProperty("V1PriorityClass") private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass; - @JsonProperty("V1PriorityClassList") private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -132,7 +45,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -239,22 +152,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -378,16 +291,6 @@ public void setV1PriorityClassList(io.fabric8.kubernetes.api.model.scheduling.v1 this.v1PriorityClassList = v1PriorityClassList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4062e63a1d5..835f3f32520 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.fabric8.kubernetes.api.model.storage.StorageClassList; import io.fabric8.kubernetes.api.model.storage.VolumeAttachment; @@ -26,149 +15,45 @@ import io.fabric8.kubernetes.api.model.storage.v1alpha1.VolumeAttributesClass; import io.fabric8.kubernetes.api.model.storage.v1alpha1.VolumeAttributesClassList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CSIDriver", - "CSIDriverList", - "CSINode", - "CSINodeList", - "CSIStorageCapacity", - "CSIStorageCapacityList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "StorageClass", - "StorageClassList", - "Time", - "TypeMeta", - "UpdateOptions", - "V1CSIDriver", - "V1CSIDriverList", - "V1CSINode", - "V1CSINodeList", - "V1CSIStorageCapacity", - "V1CSIStorageCapacityList", - "VolumeAttachment", - "VolumeAttachmentList", - "VolumeAttributesClass", - "VolumeAttributesClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CSIDriver") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver; - @JsonProperty("CSIDriverList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList; - @JsonProperty("CSINode") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode; - @JsonProperty("CSINodeList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList; - @JsonProperty("CSIStorageCapacity") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity; - @JsonProperty("CSIStorageCapacityList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("StorageClass") private StorageClass storageClass; - @JsonProperty("StorageClassList") private StorageClassList storageClassList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1CSIDriver") private io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver; - @JsonProperty("V1CSIDriverList") private io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList; - @JsonProperty("V1CSINode") private io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode; - @JsonProperty("V1CSINodeList") private io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList; - @JsonProperty("V1CSIStorageCapacity") private io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity; - @JsonProperty("V1CSIStorageCapacityList") private io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList; - @JsonProperty("VolumeAttachment") private VolumeAttachment volumeAttachment; - @JsonProperty("VolumeAttachmentList") private VolumeAttachmentList volumeAttachmentList; - @JsonProperty("VolumeAttributesClass") private VolumeAttributesClass volumeAttributesClass; - @JsonProperty("VolumeAttributesClassList") private VolumeAttributesClassList volumeAttributesClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -180,7 +65,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList, VolumeAttributesClass volumeAttributesClass, VolumeAttributesClassList volumeAttributesClassList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList, VolumeAttributesClass volumeAttributesClass, VolumeAttributesClassList volumeAttributesClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -361,22 +246,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -580,16 +465,6 @@ public void setVolumeAttributesClassList(VolumeAttributesClassList volumeAttribu this.volumeAttributesClassList = volumeAttributesClassList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 930ceddcac6..e6829280cd1 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.fabric8.kubernetes.api.model.storage.StorageClassList; import io.fabric8.kubernetes.api.model.storage.VolumeAttachment; @@ -26,149 +15,45 @@ import io.fabric8.kubernetes.api.model.storage.v1alpha1.VolumeAttributesClass; import io.fabric8.kubernetes.api.model.storage.v1alpha1.VolumeAttributesClassList; import io.fabric8.kubernetes.api.model.version.Info; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CSIDriver", - "CSIDriverList", - "CSINode", - "CSINodeList", - "CSIStorageCapacity", - "CSIStorageCapacityList", - "CreateOptions", - "DeleteOptions", - "GetOptions", - "Info", - "ListOptions", - "ObjectMeta", - "ObjectReference", - "Patch", - "PatchOptions", - "Quantity", - "RootPaths", - "Status", - "StorageClass", - "StorageClassList", - "Time", - "TypeMeta", - "UpdateOptions", - "V1CSIDriver", - "V1CSIDriverList", - "V1CSINode", - "V1CSINodeList", - "V1CSIStorageCapacity", - "V1CSIStorageCapacityList", - "VolumeAttachment", - "VolumeAttachmentList", - "VolumeAttributesClass", - "VolumeAttributesClassList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CSIDriver") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver; - @JsonProperty("CSIDriverList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList; - @JsonProperty("CSINode") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode; - @JsonProperty("CSINodeList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList; - @JsonProperty("CSIStorageCapacity") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity; - @JsonProperty("CSIStorageCapacityList") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("ObjectReference") - private io.fabric8.kubernetes.api.model.ObjectReference objectReference; - @JsonProperty("Patch") + private ObjectMeta objectMeta; + private ObjectReference objectReference; private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Status") private Status status; - @JsonProperty("StorageClass") private StorageClass storageClass; - @JsonProperty("StorageClassList") private StorageClassList storageClassList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("V1CSIDriver") private io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver; - @JsonProperty("V1CSIDriverList") private io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList; - @JsonProperty("V1CSINode") private io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode; - @JsonProperty("V1CSINodeList") private io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList; - @JsonProperty("V1CSIStorageCapacity") private io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity; - @JsonProperty("V1CSIStorageCapacityList") private io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList; - @JsonProperty("VolumeAttachment") private VolumeAttachment volumeAttachment; - @JsonProperty("VolumeAttachmentList") private VolumeAttachmentList volumeAttachmentList; - @JsonProperty("VolumeAttributesClass") private VolumeAttributesClass volumeAttributesClass; - @JsonProperty("VolumeAttributesClassList") private VolumeAttributesClassList volumeAttributesClassList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -180,7 +65,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList, VolumeAttributesClass volumeAttributesClass, VolumeAttributesClassList volumeAttributesClassList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList, VolumeAttributesClass volumeAttributesClass, VolumeAttributesClassList volumeAttributesClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -361,22 +246,22 @@ public void setListOptions(ListOptions listOptions) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @JsonProperty("ObjectReference") - public io.fabric8.kubernetes.api.model.ObjectReference getObjectReference() { + public ObjectReference getObjectReference() { return objectReference; } @JsonProperty("ObjectReference") - public void setObjectReference(io.fabric8.kubernetes.api.model.ObjectReference objectReference) { + public void setObjectReference(ObjectReference objectReference) { this.objectReference = objectReference; } @@ -580,16 +465,6 @@ public void setVolumeAttributesClassList(VolumeAttributesClassList volumeAttribu this.volumeAttributesClassList = volumeAttributesClassList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 257c2752c3e..f3680441c32 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.clusterautoscaling.v1.ClusterAutoscaler; import io.fabric8.openshift.api.model.clusterautoscaling.v1.ClusterAutoscalerList; import io.fabric8.openshift.api.model.clusterautoscaling.v1beta1.MachineAutoscaler; import io.fabric8.openshift.api.model.clusterautoscaling.v1beta1.MachineAutoscalerList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ClusterAutoscaler", - "ClusterAutoscalerList", - "Info", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta", - "V1beta1MachineAutoscaler", - "V1beta1MachineAutoscalerList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ClusterAutoscaler") private ClusterAutoscaler clusterAutoscaler; - @JsonProperty("ClusterAutoscalerList") private ClusterAutoscalerList clusterAutoscalerList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1beta1MachineAutoscaler") private MachineAutoscaler v1beta1MachineAutoscaler; - @JsonProperty("V1beta1MachineAutoscalerList") private MachineAutoscalerList v1beta1MachineAutoscalerList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -188,12 +118,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setV1beta1MachineAutoscalerList(MachineAutoscalerList v1beta1Machine this.v1beta1MachineAutoscalerList = v1beta1MachineAutoscalerList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index dd2df8c5e88..c89e77168ab 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.clusterautoscaling.v1.ClusterAutoscaler; import io.fabric8.openshift.api.model.clusterautoscaling.v1.ClusterAutoscalerList; import io.fabric8.openshift.api.model.clusterautoscaling.v1beta1.MachineAutoscaler; import io.fabric8.openshift.api.model.clusterautoscaling.v1beta1.MachineAutoscalerList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ClusterAutoscaler", - "ClusterAutoscalerList", - "Info", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta", - "V1beta1MachineAutoscaler", - "V1beta1MachineAutoscalerList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ClusterAutoscaler") private ClusterAutoscaler clusterAutoscaler; - @JsonProperty("ClusterAutoscalerList") private ClusterAutoscalerList clusterAutoscalerList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1beta1MachineAutoscaler") private MachineAutoscaler v1beta1MachineAutoscaler; - @JsonProperty("V1beta1MachineAutoscalerList") private MachineAutoscalerList v1beta1MachineAutoscalerList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -188,12 +118,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setV1beta1MachineAutoscalerList(MachineAutoscalerList v1beta1Machine this.v1beta1MachineAutoscalerList = v1beta1MachineAutoscalerList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 89733e83967..93ad093dcde 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.config.v1.APIServer; @@ -66,203 +54,63 @@ import io.fabric8.openshift.api.model.config.v1.SchedulerList; import io.fabric8.openshift.api.model.config.v1.SecretNameReference; import io.fabric8.openshift.api.model.config.v1.TLSProfileSpec; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIServer", - "APIServerList", - "Authentication", - "AuthenticationList", - "BaseKubernetesList", - "Build", - "BuildList", - "ClusterOperator", - "ClusterOperatorList", - "ClusterVersion", - "ClusterVersionList", - "ConfigMapFileReference", - "Console", - "ConsoleList", - "DNS", - "DNSList", - "DNSZone", - "FeatureGate", - "FeatureGateList", - "Image", - "ImageContentPolicy", - "ImageContentPolicyList", - "ImageDigestMirrorSet", - "ImageDigestMirrorSetList", - "ImageList", - "ImageTagMirrorSet", - "ImageTagMirrorSetList", - "Info", - "Infrastructure", - "InfrastructureList", - "Ingress", - "IngressList", - "Network", - "NetworkList", - "OAuth", - "OAuthList", - "ObjectMeta", - "OperatorHub", - "OperatorHubList", - "Patch", - "Project", - "ProjectList", - "Proxy", - "ProxyList", - "ResourceAttributes", - "Scheduler", - "SchedulerList", - "SecretNameReference", - "Status", - "TLSProfileSpec", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIServer") private APIServer aPIServer; - @JsonProperty("APIServerList") private APIServerList aPIServerList; - @JsonProperty("Authentication") private Authentication authentication; - @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Build") private Build build; - @JsonProperty("BuildList") private BuildList buildList; - @JsonProperty("ClusterOperator") private ClusterOperator clusterOperator; - @JsonProperty("ClusterOperatorList") private ClusterOperatorList clusterOperatorList; - @JsonProperty("ClusterVersion") private ClusterVersion clusterVersion; - @JsonProperty("ClusterVersionList") private ClusterVersionList clusterVersionList; - @JsonProperty("ConfigMapFileReference") private ConfigMapFileReference configMapFileReference; - @JsonProperty("Console") private Console console; - @JsonProperty("ConsoleList") private ConsoleList consoleList; - @JsonProperty("DNS") private DNS dns; - @JsonProperty("DNSList") private DNSList dNSList; - @JsonProperty("DNSZone") private DNSZone dNSZone; - @JsonProperty("FeatureGate") private FeatureGate featureGate; - @JsonProperty("FeatureGateList") private FeatureGateList featureGateList; - @JsonProperty("Image") private Image image; - @JsonProperty("ImageContentPolicy") private ImageContentPolicy imageContentPolicy; - @JsonProperty("ImageContentPolicyList") private ImageContentPolicyList imageContentPolicyList; - @JsonProperty("ImageDigestMirrorSet") private ImageDigestMirrorSet imageDigestMirrorSet; - @JsonProperty("ImageDigestMirrorSetList") private ImageDigestMirrorSetList imageDigestMirrorSetList; - @JsonProperty("ImageList") private ImageList imageList; - @JsonProperty("ImageTagMirrorSet") private ImageTagMirrorSet imageTagMirrorSet; - @JsonProperty("ImageTagMirrorSetList") private ImageTagMirrorSetList imageTagMirrorSetList; - @JsonProperty("Info") private Info info; - @JsonProperty("Infrastructure") private Infrastructure infrastructure; - @JsonProperty("InfrastructureList") private InfrastructureList infrastructureList; - @JsonProperty("Ingress") private Ingress ingress; - @JsonProperty("IngressList") private IngressList ingressList; - @JsonProperty("Network") private Network network; - @JsonProperty("NetworkList") private NetworkList networkList; - @JsonProperty("OAuth") private OAuth oAuth; - @JsonProperty("OAuthList") private OAuthList oAuthList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OperatorHub") + private ObjectMeta objectMeta; private OperatorHub operatorHub; - @JsonProperty("OperatorHubList") private OperatorHubList operatorHubList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Project") private Project project; - @JsonProperty("ProjectList") private ProjectList projectList; - @JsonProperty("Proxy") private Proxy proxy; - @JsonProperty("ProxyList") private ProxyList proxyList; - @JsonProperty("ResourceAttributes") private ResourceAttributes resourceAttributes; - @JsonProperty("Scheduler") private Scheduler scheduler; - @JsonProperty("SchedulerList") private SchedulerList schedulerList; - @JsonProperty("SecretNameReference") private SecretNameReference secretNameReference; - @JsonProperty("Status") private Status status; - @JsonProperty("TLSProfileSpec") private TLSProfileSpec tLSProfileSpec; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -274,7 +122,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageDigestMirrorSet imageDigestMirrorSet, ImageDigestMirrorSetList imageDigestMirrorSetList, ImageList imageList, ImageTagMirrorSet imageTagMirrorSet, ImageTagMirrorSetList imageTagMirrorSetList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageDigestMirrorSet imageDigestMirrorSet, ImageDigestMirrorSetList imageDigestMirrorSetList, ImageList imageList, ImageTagMirrorSet imageTagMirrorSet, ImageTagMirrorSetList imageTagMirrorSetList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -713,12 +561,12 @@ public void setOAuthList(OAuthList oAuthList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -872,16 +720,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index c3739c8e6f8..f0e67353415 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.config.v1.APIServer; @@ -66,203 +54,63 @@ import io.fabric8.openshift.api.model.config.v1.SchedulerList; import io.fabric8.openshift.api.model.config.v1.SecretNameReference; import io.fabric8.openshift.api.model.config.v1.TLSProfileSpec; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIServer", - "APIServerList", - "Authentication", - "AuthenticationList", - "BaseKubernetesList", - "Build", - "BuildList", - "ClusterOperator", - "ClusterOperatorList", - "ClusterVersion", - "ClusterVersionList", - "ConfigMapFileReference", - "Console", - "ConsoleList", - "DNS", - "DNSList", - "DNSZone", - "FeatureGate", - "FeatureGateList", - "Image", - "ImageContentPolicy", - "ImageContentPolicyList", - "ImageDigestMirrorSet", - "ImageDigestMirrorSetList", - "ImageList", - "ImageTagMirrorSet", - "ImageTagMirrorSetList", - "Info", - "Infrastructure", - "InfrastructureList", - "Ingress", - "IngressList", - "Network", - "NetworkList", - "OAuth", - "OAuthList", - "ObjectMeta", - "OperatorHub", - "OperatorHubList", - "Patch", - "Project", - "ProjectList", - "Proxy", - "ProxyList", - "ResourceAttributes", - "Scheduler", - "SchedulerList", - "SecretNameReference", - "Status", - "TLSProfileSpec", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIServer") private APIServer aPIServer; - @JsonProperty("APIServerList") private APIServerList aPIServerList; - @JsonProperty("Authentication") private Authentication authentication; - @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Build") private Build build; - @JsonProperty("BuildList") private BuildList buildList; - @JsonProperty("ClusterOperator") private ClusterOperator clusterOperator; - @JsonProperty("ClusterOperatorList") private ClusterOperatorList clusterOperatorList; - @JsonProperty("ClusterVersion") private ClusterVersion clusterVersion; - @JsonProperty("ClusterVersionList") private ClusterVersionList clusterVersionList; - @JsonProperty("ConfigMapFileReference") private ConfigMapFileReference configMapFileReference; - @JsonProperty("Console") private Console console; - @JsonProperty("ConsoleList") private ConsoleList consoleList; - @JsonProperty("DNS") private DNS dns; - @JsonProperty("DNSList") private DNSList dNSList; - @JsonProperty("DNSZone") private DNSZone dNSZone; - @JsonProperty("FeatureGate") private FeatureGate featureGate; - @JsonProperty("FeatureGateList") private FeatureGateList featureGateList; - @JsonProperty("Image") private Image image; - @JsonProperty("ImageContentPolicy") private ImageContentPolicy imageContentPolicy; - @JsonProperty("ImageContentPolicyList") private ImageContentPolicyList imageContentPolicyList; - @JsonProperty("ImageDigestMirrorSet") private ImageDigestMirrorSet imageDigestMirrorSet; - @JsonProperty("ImageDigestMirrorSetList") private ImageDigestMirrorSetList imageDigestMirrorSetList; - @JsonProperty("ImageList") private ImageList imageList; - @JsonProperty("ImageTagMirrorSet") private ImageTagMirrorSet imageTagMirrorSet; - @JsonProperty("ImageTagMirrorSetList") private ImageTagMirrorSetList imageTagMirrorSetList; - @JsonProperty("Info") private Info info; - @JsonProperty("Infrastructure") private Infrastructure infrastructure; - @JsonProperty("InfrastructureList") private InfrastructureList infrastructureList; - @JsonProperty("Ingress") private Ingress ingress; - @JsonProperty("IngressList") private IngressList ingressList; - @JsonProperty("Network") private Network network; - @JsonProperty("NetworkList") private NetworkList networkList; - @JsonProperty("OAuth") private OAuth oAuth; - @JsonProperty("OAuthList") private OAuthList oAuthList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OperatorHub") + private ObjectMeta objectMeta; private OperatorHub operatorHub; - @JsonProperty("OperatorHubList") private OperatorHubList operatorHubList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Project") private Project project; - @JsonProperty("ProjectList") private ProjectList projectList; - @JsonProperty("Proxy") private Proxy proxy; - @JsonProperty("ProxyList") private ProxyList proxyList; - @JsonProperty("ResourceAttributes") private ResourceAttributes resourceAttributes; - @JsonProperty("Scheduler") private Scheduler scheduler; - @JsonProperty("SchedulerList") private SchedulerList schedulerList; - @JsonProperty("SecretNameReference") private SecretNameReference secretNameReference; - @JsonProperty("Status") private Status status; - @JsonProperty("TLSProfileSpec") private TLSProfileSpec tLSProfileSpec; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -274,7 +122,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageDigestMirrorSet imageDigestMirrorSet, ImageDigestMirrorSetList imageDigestMirrorSetList, ImageList imageList, ImageTagMirrorSet imageTagMirrorSet, ImageTagMirrorSetList imageTagMirrorSetList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageDigestMirrorSet imageDigestMirrorSet, ImageDigestMirrorSetList imageDigestMirrorSetList, ImageList imageList, ImageTagMirrorSet imageTagMirrorSet, ImageTagMirrorSetList imageTagMirrorSetList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -713,12 +561,12 @@ public void setOAuthList(OAuthList oAuthList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -872,16 +720,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 532f4b6ed77..237882e8928 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.console.v1.ConsoleCLIDownload; @@ -35,113 +23,33 @@ import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample; import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList; import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ConsoleCLIDownload", - "ConsoleCLIDownloadList", - "ConsoleExternalLogLink", - "ConsoleExternalLogLinkList", - "ConsoleLink", - "ConsoleLinkList", - "ConsoleNotification", - "ConsoleNotificationList", - "ConsolePlugin", - "ConsolePluginList", - "ConsoleQuickStart", - "ConsoleQuickStartList", - "ConsoleYAMLSample", - "ConsoleYAMLSampleList", - "Info", - "ObjectMeta", - "Patch", - "ResourceAttributes", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ConsoleCLIDownload") private ConsoleCLIDownload consoleCLIDownload; - @JsonProperty("ConsoleCLIDownloadList") private ConsoleCLIDownloadList consoleCLIDownloadList; - @JsonProperty("ConsoleExternalLogLink") private ConsoleExternalLogLink consoleExternalLogLink; - @JsonProperty("ConsoleExternalLogLinkList") private ConsoleExternalLogLinkList consoleExternalLogLinkList; - @JsonProperty("ConsoleLink") private ConsoleLink consoleLink; - @JsonProperty("ConsoleLinkList") private ConsoleLinkList consoleLinkList; - @JsonProperty("ConsoleNotification") private ConsoleNotification consoleNotification; - @JsonProperty("ConsoleNotificationList") private ConsoleNotificationList consoleNotificationList; - @JsonProperty("ConsolePlugin") private ConsolePluginList consolePlugin; - @JsonProperty("ConsolePluginList") private ConsolePluginList consolePluginList; - @JsonProperty("ConsoleQuickStart") private ConsoleQuickStart consoleQuickStart; - @JsonProperty("ConsoleQuickStartList") private ConsoleQuickStartList consoleQuickStartList; - @JsonProperty("ConsoleYAMLSample") private ConsoleYAMLSample consoleYAMLSample; - @JsonProperty("ConsoleYAMLSampleList") private ConsoleYAMLSampleList consoleYAMLSampleList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("ResourceAttributes") private ResourceAttributes resourceAttributes; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -153,7 +61,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -362,12 +270,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -421,16 +329,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 14e338fa981..f5226ea4ef2 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.console.v1.ConsoleCLIDownload; @@ -35,113 +23,33 @@ import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample; import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList; import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ConsoleCLIDownload", - "ConsoleCLIDownloadList", - "ConsoleExternalLogLink", - "ConsoleExternalLogLinkList", - "ConsoleLink", - "ConsoleLinkList", - "ConsoleNotification", - "ConsoleNotificationList", - "ConsolePlugin", - "ConsolePluginList", - "ConsoleQuickStart", - "ConsoleQuickStartList", - "ConsoleYAMLSample", - "ConsoleYAMLSampleList", - "Info", - "ObjectMeta", - "Patch", - "ResourceAttributes", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ConsoleCLIDownload") private ConsoleCLIDownload consoleCLIDownload; - @JsonProperty("ConsoleCLIDownloadList") private ConsoleCLIDownloadList consoleCLIDownloadList; - @JsonProperty("ConsoleExternalLogLink") private ConsoleExternalLogLink consoleExternalLogLink; - @JsonProperty("ConsoleExternalLogLinkList") private ConsoleExternalLogLinkList consoleExternalLogLinkList; - @JsonProperty("ConsoleLink") private ConsoleLink consoleLink; - @JsonProperty("ConsoleLinkList") private ConsoleLinkList consoleLinkList; - @JsonProperty("ConsoleNotification") private ConsoleNotification consoleNotification; - @JsonProperty("ConsoleNotificationList") private ConsoleNotificationList consoleNotificationList; - @JsonProperty("ConsolePlugin") private ConsolePluginList consolePlugin; - @JsonProperty("ConsolePluginList") private ConsolePluginList consolePluginList; - @JsonProperty("ConsoleQuickStart") private ConsoleQuickStart consoleQuickStart; - @JsonProperty("ConsoleQuickStartList") private ConsoleQuickStartList consoleQuickStartList; - @JsonProperty("ConsoleYAMLSample") private ConsoleYAMLSample consoleYAMLSample; - @JsonProperty("ConsoleYAMLSampleList") private ConsoleYAMLSampleList consoleYAMLSampleList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("ResourceAttributes") private ResourceAttributes resourceAttributes; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -153,7 +61,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -362,12 +270,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -421,16 +329,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index cf6edc53aef..3f40f2bbec5 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition; import io.fabric8.openshift.api.model.hive.v1.Checkpoint; import io.fabric8.openshift.api.model.hive.v1.CheckpointList; @@ -54,182 +43,56 @@ import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderList; import io.fabric8.openshift.api.model.hive.v1.SyncSet; import io.fabric8.openshift.api.model.hive.v1.SyncSetList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AzureOSDisk", - "BaseKubernetesList", - "Checkpoint", - "CheckpointList", - "ClusterClaim", - "ClusterClaimList", - "ClusterDeployment", - "ClusterDeploymentList", - "ClusterDeprovision", - "ClusterDeprovisionList", - "ClusterImageSet", - "ClusterImageSetList", - "ClusterOperatorStatusCondition", - "ClusterPool", - "ClusterPoolList", - "ClusterProvision", - "ClusterProvisionList", - "ClusterRelocate", - "ClusterRelocateList", - "ClusterState", - "ClusterStateList", - "DNSZone", - "DNSZoneList", - "GcpOSDisk", - "HiveConfig", - "HiveConfigList", - "LocalObjectReference", - "MachinePool", - "MachinePoolList", - "MachinePoolNameLease", - "MachinePoolNameLeaseList", - "ObjectMeta", - "Patch", - "SelectorSyncIdentityProvider", - "SelectorSyncIdentityProviderList", - "SelectorSyncSet", - "SelectorSyncSetList", - "Status", - "SyncIdentityProvider", - "SyncIdentityProviderList", - "SyncSet", - "SyncSetList", - "Time", - "TypeMeta", - "VsphereOSDisk" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AzureOSDisk") private io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Checkpoint") private Checkpoint checkpoint; - @JsonProperty("CheckpointList") private CheckpointList checkpointList; - @JsonProperty("ClusterClaim") private ClusterClaim clusterClaim; - @JsonProperty("ClusterClaimList") private ClusterClaimList clusterClaimList; - @JsonProperty("ClusterDeployment") private ClusterDeployment clusterDeployment; - @JsonProperty("ClusterDeploymentList") private ClusterDeploymentList clusterDeploymentList; - @JsonProperty("ClusterDeprovision") private ClusterDeprovision clusterDeprovision; - @JsonProperty("ClusterDeprovisionList") private ClusterDeprovisionList clusterDeprovisionList; - @JsonProperty("ClusterImageSet") private ClusterImageSet clusterImageSet; - @JsonProperty("ClusterImageSetList") private ClusterImageSetList clusterImageSetList; - @JsonProperty("ClusterOperatorStatusCondition") private ClusterOperatorStatusCondition clusterOperatorStatusCondition; - @JsonProperty("ClusterPool") private ClusterPool clusterPool; - @JsonProperty("ClusterPoolList") private ClusterPoolList clusterPoolList; - @JsonProperty("ClusterProvision") private ClusterProvision clusterProvision; - @JsonProperty("ClusterProvisionList") private ClusterProvisionList clusterProvisionList; - @JsonProperty("ClusterRelocate") private ClusterRelocate clusterRelocate; - @JsonProperty("ClusterRelocateList") private ClusterRelocateList clusterRelocateList; - @JsonProperty("ClusterState") private ClusterState clusterState; - @JsonProperty("ClusterStateList") private ClusterStateList clusterStateList; - @JsonProperty("DNSZone") private DNSZone dNSZone; - @JsonProperty("DNSZoneList") private DNSZoneList dNSZoneList; - @JsonProperty("GcpOSDisk") private io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk; - @JsonProperty("HiveConfig") private HiveConfig hiveConfig; - @JsonProperty("HiveConfigList") private HiveConfigList hiveConfigList; - @JsonProperty("LocalObjectReference") - private io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference; - @JsonProperty("MachinePool") + private LocalObjectReference localObjectReference; private MachinePool machinePool; - @JsonProperty("MachinePoolList") private MachinePoolList machinePoolList; - @JsonProperty("MachinePoolNameLease") private MachinePoolNameLease machinePoolNameLease; - @JsonProperty("MachinePoolNameLeaseList") private MachinePoolNameLeaseList machinePoolNameLeaseList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("SelectorSyncIdentityProvider") private SelectorSyncIdentityProvider selectorSyncIdentityProvider; - @JsonProperty("SelectorSyncIdentityProviderList") private SelectorSyncIdentityProviderList selectorSyncIdentityProviderList; - @JsonProperty("SelectorSyncSet") private SelectorSyncSet selectorSyncSet; - @JsonProperty("SelectorSyncSetList") private SelectorSyncSetList selectorSyncSetList; - @JsonProperty("Status") private Status status; - @JsonProperty("SyncIdentityProvider") private SyncIdentityProvider syncIdentityProvider; - @JsonProperty("SyncIdentityProviderList") private SyncIdentityProviderList syncIdentityProviderList; - @JsonProperty("SyncSet") private SyncSet syncSet; - @JsonProperty("SyncSetList") private SyncSetList syncSetList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("VsphereOSDisk") private io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -241,7 +104,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -573,12 +436,12 @@ public void setHiveConfigList(HiveConfigList hiveConfigList) { } @JsonProperty("LocalObjectReference") - public io.fabric8.kubernetes.api.model.LocalObjectReference getLocalObjectReference() { + public LocalObjectReference getLocalObjectReference() { return localObjectReference; } @JsonProperty("LocalObjectReference") - public void setLocalObjectReference(io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference) { + public void setLocalObjectReference(LocalObjectReference localObjectReference) { this.localObjectReference = localObjectReference; } @@ -623,12 +486,12 @@ public void setMachinePoolNameLeaseList(MachinePoolNameLeaseList machinePoolName } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -762,16 +625,6 @@ public void setVsphereOSDisk(io.fabric8.openshift.api.model.hive.vsphere.v1.OSDi this.vsphereOSDisk = vsphereOSDisk; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 7413ad9fb99..d01b4f84608 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,18 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition; import io.fabric8.openshift.api.model.hive.v1.Checkpoint; import io.fabric8.openshift.api.model.hive.v1.CheckpointList; @@ -54,182 +43,56 @@ import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderList; import io.fabric8.openshift.api.model.hive.v1.SyncSet; import io.fabric8.openshift.api.model.hive.v1.SyncSetList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AzureOSDisk", - "BaseKubernetesList", - "Checkpoint", - "CheckpointList", - "ClusterClaim", - "ClusterClaimList", - "ClusterDeployment", - "ClusterDeploymentList", - "ClusterDeprovision", - "ClusterDeprovisionList", - "ClusterImageSet", - "ClusterImageSetList", - "ClusterOperatorStatusCondition", - "ClusterPool", - "ClusterPoolList", - "ClusterProvision", - "ClusterProvisionList", - "ClusterRelocate", - "ClusterRelocateList", - "ClusterState", - "ClusterStateList", - "DNSZone", - "DNSZoneList", - "GcpOSDisk", - "HiveConfig", - "HiveConfigList", - "LocalObjectReference", - "MachinePool", - "MachinePoolList", - "MachinePoolNameLease", - "MachinePoolNameLeaseList", - "ObjectMeta", - "Patch", - "SelectorSyncIdentityProvider", - "SelectorSyncIdentityProviderList", - "SelectorSyncSet", - "SelectorSyncSetList", - "Status", - "SyncIdentityProvider", - "SyncIdentityProviderList", - "SyncSet", - "SyncSetList", - "Time", - "TypeMeta", - "VsphereOSDisk" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AzureOSDisk") private io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Checkpoint") private Checkpoint checkpoint; - @JsonProperty("CheckpointList") private CheckpointList checkpointList; - @JsonProperty("ClusterClaim") private ClusterClaim clusterClaim; - @JsonProperty("ClusterClaimList") private ClusterClaimList clusterClaimList; - @JsonProperty("ClusterDeployment") private ClusterDeployment clusterDeployment; - @JsonProperty("ClusterDeploymentList") private ClusterDeploymentList clusterDeploymentList; - @JsonProperty("ClusterDeprovision") private ClusterDeprovision clusterDeprovision; - @JsonProperty("ClusterDeprovisionList") private ClusterDeprovisionList clusterDeprovisionList; - @JsonProperty("ClusterImageSet") private ClusterImageSet clusterImageSet; - @JsonProperty("ClusterImageSetList") private ClusterImageSetList clusterImageSetList; - @JsonProperty("ClusterOperatorStatusCondition") private ClusterOperatorStatusCondition clusterOperatorStatusCondition; - @JsonProperty("ClusterPool") private ClusterPool clusterPool; - @JsonProperty("ClusterPoolList") private ClusterPoolList clusterPoolList; - @JsonProperty("ClusterProvision") private ClusterProvision clusterProvision; - @JsonProperty("ClusterProvisionList") private ClusterProvisionList clusterProvisionList; - @JsonProperty("ClusterRelocate") private ClusterRelocate clusterRelocate; - @JsonProperty("ClusterRelocateList") private ClusterRelocateList clusterRelocateList; - @JsonProperty("ClusterState") private ClusterState clusterState; - @JsonProperty("ClusterStateList") private ClusterStateList clusterStateList; - @JsonProperty("DNSZone") private DNSZone dNSZone; - @JsonProperty("DNSZoneList") private DNSZoneList dNSZoneList; - @JsonProperty("GcpOSDisk") private io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk; - @JsonProperty("HiveConfig") private HiveConfig hiveConfig; - @JsonProperty("HiveConfigList") private HiveConfigList hiveConfigList; - @JsonProperty("LocalObjectReference") - private io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference; - @JsonProperty("MachinePool") + private LocalObjectReference localObjectReference; private MachinePool machinePool; - @JsonProperty("MachinePoolList") private MachinePoolList machinePoolList; - @JsonProperty("MachinePoolNameLease") private MachinePoolNameLease machinePoolNameLease; - @JsonProperty("MachinePoolNameLeaseList") private MachinePoolNameLeaseList machinePoolNameLeaseList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("SelectorSyncIdentityProvider") private SelectorSyncIdentityProvider selectorSyncIdentityProvider; - @JsonProperty("SelectorSyncIdentityProviderList") private SelectorSyncIdentityProviderList selectorSyncIdentityProviderList; - @JsonProperty("SelectorSyncSet") private SelectorSyncSet selectorSyncSet; - @JsonProperty("SelectorSyncSetList") private SelectorSyncSetList selectorSyncSetList; - @JsonProperty("Status") private Status status; - @JsonProperty("SyncIdentityProvider") private SyncIdentityProvider syncIdentityProvider; - @JsonProperty("SyncIdentityProviderList") private SyncIdentityProviderList syncIdentityProviderList; - @JsonProperty("SyncSet") private SyncSet syncSet; - @JsonProperty("SyncSetList") private SyncSetList syncSetList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("VsphereOSDisk") private io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -241,7 +104,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -573,12 +436,12 @@ public void setHiveConfigList(HiveConfigList hiveConfigList) { } @JsonProperty("LocalObjectReference") - public io.fabric8.kubernetes.api.model.LocalObjectReference getLocalObjectReference() { + public LocalObjectReference getLocalObjectReference() { return localObjectReference; } @JsonProperty("LocalObjectReference") - public void setLocalObjectReference(io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference) { + public void setLocalObjectReference(LocalObjectReference localObjectReference) { this.localObjectReference = localObjectReference; } @@ -623,12 +486,12 @@ public void setMachinePoolNameLeaseList(MachinePoolNameLeaseList machinePoolName } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -762,16 +625,6 @@ public void setVsphereOSDisk(io.fabric8.openshift.api.model.hive.vsphere.v1.OSDi this.vsphereOSDisk = vsphereOSDisk; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index fcb13d83c3f..4b199ffd314 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,112 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.installer.v1.InstallConfig; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AlibabaCloudMachinePool", - "AwsMachinePool", - "AzureMachinePool", - "BaremetalMachinePool", - "BaseKubernetesList", - "GcpMachinePool", - "IBMCloudMachinePool", - "InstallConfig", - "LibvirtMachinePool", - "ObjectMeta", - "OpenStackMachinePool", - "OvirtMachinePool", - "Patch", - "Status", - "Time", - "TypeMeta", - "VSphereMachinePool" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AlibabaCloudMachinePool") private io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool; - @JsonProperty("AwsMachinePool") private io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool; - @JsonProperty("AzureMachinePool") private io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool; - @JsonProperty("BaremetalMachinePool") private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("GcpMachinePool") private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; - @JsonProperty("IBMCloudMachinePool") private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool; - @JsonProperty("InstallConfig") private InstallConfig installConfig; - @JsonProperty("LibvirtMachinePool") private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenStackMachinePool") + private ObjectMeta objectMeta; private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool; - @JsonProperty("OvirtMachinePool") private io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("VSphereMachinePool") private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -124,7 +42,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -258,12 +176,12 @@ public void setLibvirtMachinePool(io.fabric8.openshift.api.model.installer.libvi } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -337,16 +255,6 @@ public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphe this.vSphereMachinePool = vSphereMachinePool; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a82501e602f..a5076f8d34c 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,112 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.installer.v1.InstallConfig; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AlibabaCloudMachinePool", - "AwsMachinePool", - "AzureMachinePool", - "BaremetalMachinePool", - "BaseKubernetesList", - "GcpMachinePool", - "IBMCloudMachinePool", - "InstallConfig", - "LibvirtMachinePool", - "ObjectMeta", - "OpenStackMachinePool", - "OvirtMachinePool", - "Patch", - "Status", - "Time", - "TypeMeta", - "VSphereMachinePool" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AlibabaCloudMachinePool") private io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool; - @JsonProperty("AwsMachinePool") private io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool; - @JsonProperty("AzureMachinePool") private io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool; - @JsonProperty("BaremetalMachinePool") private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("GcpMachinePool") private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; - @JsonProperty("IBMCloudMachinePool") private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool; - @JsonProperty("InstallConfig") private InstallConfig installConfig; - @JsonProperty("LibvirtMachinePool") private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenStackMachinePool") + private ObjectMeta objectMeta; private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool; - @JsonProperty("OvirtMachinePool") private io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("VSphereMachinePool") private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -124,7 +42,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -258,12 +176,12 @@ public void setLibvirtMachinePool(io.fabric8.openshift.api.model.installer.libvi } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -337,16 +255,6 @@ public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphe this.vSphereMachinePool = vSphereMachinePool; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 391d8a5e4c7..9b0546fe29c 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSet; import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSetList; @@ -33,104 +21,30 @@ import io.fabric8.openshift.api.model.machine.v1beta1.MachineList; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ControlPlaneMachineSet", - "ControlPlaneMachineSetList", - "Info", - "Machine", - "MachineHealthCheck", - "MachineHealthCheckList", - "MachineList", - "MachineSet", - "MachineSetList", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta", - "V1Alpha1OpenStackProviderSpec", - "V1Alpha1SubnetFilter", - "V1NutanixCategory", - "V1NutanixResourceIdentifier" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ControlPlaneMachineSet") private ControlPlaneMachineSet controlPlaneMachineSet; - @JsonProperty("ControlPlaneMachineSetList") private ControlPlaneMachineSetList controlPlaneMachineSetList; - @JsonProperty("Info") private Info info; - @JsonProperty("Machine") private Machine machine; - @JsonProperty("MachineHealthCheck") private MachineHealthCheck machineHealthCheck; - @JsonProperty("MachineHealthCheckList") private MachineHealthCheckList machineHealthCheckList; - @JsonProperty("MachineList") private MachineList machineList; - @JsonProperty("MachineSet") private MachineSet machineSet; - @JsonProperty("MachineSetList") private MachineSetList machineSetList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1Alpha1OpenStackProviderSpec") private OpenstackProviderSpec v1Alpha1OpenStackProviderSpec; - @JsonProperty("V1Alpha1SubnetFilter") private SubnetFilter v1Alpha1SubnetFilter; - @JsonProperty("V1NutanixCategory") private NutanixCategory v1NutanixCategory; - @JsonProperty("V1NutanixResourceIdentifier") private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -142,7 +56,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -288,12 +202,12 @@ public void setMachineSetList(MachineSetList machineSetList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -377,16 +291,6 @@ public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixRe this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 50af6fecf85..a8b17f6c8d0 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSet; import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSetList; @@ -33,104 +21,30 @@ import io.fabric8.openshift.api.model.machine.v1beta1.MachineList; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ControlPlaneMachineSet", - "ControlPlaneMachineSetList", - "Info", - "Machine", - "MachineHealthCheck", - "MachineHealthCheckList", - "MachineList", - "MachineSet", - "MachineSetList", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta", - "V1Alpha1OpenStackProviderSpec", - "V1Alpha1SubnetFilter", - "V1NutanixCategory", - "V1NutanixResourceIdentifier" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ControlPlaneMachineSet") private ControlPlaneMachineSet controlPlaneMachineSet; - @JsonProperty("ControlPlaneMachineSetList") private ControlPlaneMachineSetList controlPlaneMachineSetList; - @JsonProperty("Info") private Info info; - @JsonProperty("Machine") private Machine machine; - @JsonProperty("MachineHealthCheck") private MachineHealthCheck machineHealthCheck; - @JsonProperty("MachineHealthCheckList") private MachineHealthCheckList machineHealthCheckList; - @JsonProperty("MachineList") private MachineList machineList; - @JsonProperty("MachineSet") private MachineSet machineSet; - @JsonProperty("MachineSetList") private MachineSetList machineSetList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("V1Alpha1OpenStackProviderSpec") private OpenstackProviderSpec v1Alpha1OpenStackProviderSpec; - @JsonProperty("V1Alpha1SubnetFilter") private SubnetFilter v1Alpha1SubnetFilter; - @JsonProperty("V1NutanixCategory") private NutanixCategory v1NutanixCategory; - @JsonProperty("V1NutanixResourceIdentifier") private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -142,7 +56,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -288,12 +202,12 @@ public void setMachineSetList(MachineSetList machineSetList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -377,16 +291,6 @@ public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixRe this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bf6bccf90fa..5c6b8d51480 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; @@ -31,98 +19,28 @@ import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ContainerRuntimeConfig", - "ContainerRuntimeConfigList", - "ControllerConfig", - "ControllerConfigList", - "Info", - "KubeletConfig", - "KubeletConfigList", - "MachineConfig", - "MachineConfigList", - "MachineConfigPool", - "MachineConfigPoolList", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ContainerRuntimeConfig") private ContainerRuntimeConfig containerRuntimeConfig; - @JsonProperty("ContainerRuntimeConfigList") private ContainerRuntimeConfigList containerRuntimeConfigList; - @JsonProperty("ControllerConfig") private ControllerConfig controllerConfig; - @JsonProperty("ControllerConfigList") private ControllerConfigList controllerConfigList; - @JsonProperty("Info") private Info info; - @JsonProperty("KubeletConfig") private KubeletConfig kubeletConfig; - @JsonProperty("KubeletConfigList") private KubeletConfigList kubeletConfigList; - @JsonProperty("MachineConfig") private MachineConfig machineConfig; - @JsonProperty("MachineConfigList") private MachineConfigList machineConfigList; - @JsonProperty("MachineConfigPool") private MachineConfigPool machineConfigPool; - @JsonProperty("MachineConfigPoolList") private MachineConfigPoolList machineConfigPoolList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -134,7 +52,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -298,12 +216,12 @@ public void setMachineConfigPoolList(MachineConfigPoolList machineConfigPoolList } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -347,16 +265,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 30c6b4403fe..ad2f0ce8866 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; @@ -31,98 +19,28 @@ import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "ContainerRuntimeConfig", - "ContainerRuntimeConfigList", - "ControllerConfig", - "ControllerConfigList", - "Info", - "KubeletConfig", - "KubeletConfigList", - "MachineConfig", - "MachineConfigList", - "MachineConfigPool", - "MachineConfigPoolList", - "ObjectMeta", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("ContainerRuntimeConfig") private ContainerRuntimeConfig containerRuntimeConfig; - @JsonProperty("ContainerRuntimeConfigList") private ContainerRuntimeConfigList containerRuntimeConfigList; - @JsonProperty("ControllerConfig") private ControllerConfig controllerConfig; - @JsonProperty("ControllerConfigList") private ControllerConfigList controllerConfigList; - @JsonProperty("Info") private Info info; - @JsonProperty("KubeletConfig") private KubeletConfig kubeletConfig; - @JsonProperty("KubeletConfigList") private KubeletConfigList kubeletConfigList; - @JsonProperty("MachineConfig") private MachineConfig machineConfig; - @JsonProperty("MachineConfigList") private MachineConfigList machineConfigList; - @JsonProperty("MachineConfigPool") private MachineConfigPool machineConfigPool; - @JsonProperty("MachineConfigPoolList") private MachineConfigPoolList machineConfigPoolList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -134,7 +52,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -298,12 +216,12 @@ public void setMachineConfigPoolList(MachineConfigPoolList machineConfigPoolList } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -347,16 +265,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bef8e5adfc8..e9d39dcada8 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; @@ -39,122 +27,36 @@ import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIRequestCount", - "APIRequestCountList", - "BareMetalHost", - "BareMetalHostList", - "BaseKubernetesList", - "Config", - "ConfigList", - "CredentialsRequest", - "CredentialsRequestList", - "EgressRouter", - "EgressRouterList", - "Info", - "Metal3Remediation", - "Metal3RemediationList", - "Metal3RemediationTemplate", - "Metal3RemediationTemplateList", - "NetworkAttachmentDefinition", - "NetworkAttachmentDefinitionList", - "ObjectMeta", - "OperatorPKI", - "OperatorPKIList", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIRequestCount") private APIRequestCount aPIRequestCount; - @JsonProperty("APIRequestCountList") private APIRequestCountList aPIRequestCountList; - @JsonProperty("BareMetalHost") private BareMetalHost bareMetalHost; - @JsonProperty("BareMetalHostList") private BareMetalHostList bareMetalHostList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigList") private ConfigList configList; - @JsonProperty("CredentialsRequest") private CredentialsRequest credentialsRequest; - @JsonProperty("CredentialsRequestList") private CredentialsRequestList credentialsRequestList; - @JsonProperty("EgressRouter") private EgressRouter egressRouter; - @JsonProperty("EgressRouterList") private EgressRouterList egressRouterList; - @JsonProperty("Info") private Info info; - @JsonProperty("Metal3Remediation") private Metal3Remediation metal3Remediation; - @JsonProperty("Metal3RemediationList") private Metal3RemediationList metal3RemediationList; - @JsonProperty("Metal3RemediationTemplate") private Metal3RemediationTemplate metal3RemediationTemplate; - @JsonProperty("Metal3RemediationTemplateList") private Metal3RemediationTemplateList metal3RemediationTemplateList; - @JsonProperty("NetworkAttachmentDefinition") private NetworkAttachmentDefinition networkAttachmentDefinition; - @JsonProperty("NetworkAttachmentDefinitionList") private NetworkAttachmentDefinitionList networkAttachmentDefinitionList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OperatorPKI") + private ObjectMeta objectMeta; private OperatorPKI operatorPKI; - @JsonProperty("OperatorPKIList") private OperatorPKIList operatorPKIList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -166,7 +68,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -398,12 +300,12 @@ public void setNetworkAttachmentDefinitionList(NetworkAttachmentDefinitionList n } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -467,16 +369,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b4a7a8ed307..7424346216d 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; @@ -39,122 +27,36 @@ import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "APIRequestCount", - "APIRequestCountList", - "BareMetalHost", - "BareMetalHostList", - "BaseKubernetesList", - "Config", - "ConfigList", - "CredentialsRequest", - "CredentialsRequestList", - "EgressRouter", - "EgressRouterList", - "Info", - "Metal3Remediation", - "Metal3RemediationList", - "Metal3RemediationTemplate", - "Metal3RemediationTemplateList", - "NetworkAttachmentDefinition", - "NetworkAttachmentDefinitionList", - "ObjectMeta", - "OperatorPKI", - "OperatorPKIList", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("APIRequestCount") private APIRequestCount aPIRequestCount; - @JsonProperty("APIRequestCountList") private APIRequestCountList aPIRequestCountList; - @JsonProperty("BareMetalHost") private BareMetalHost bareMetalHost; - @JsonProperty("BareMetalHostList") private BareMetalHostList bareMetalHostList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigList") private ConfigList configList; - @JsonProperty("CredentialsRequest") private CredentialsRequest credentialsRequest; - @JsonProperty("CredentialsRequestList") private CredentialsRequestList credentialsRequestList; - @JsonProperty("EgressRouter") private EgressRouter egressRouter; - @JsonProperty("EgressRouterList") private EgressRouterList egressRouterList; - @JsonProperty("Info") private Info info; - @JsonProperty("Metal3Remediation") private Metal3Remediation metal3Remediation; - @JsonProperty("Metal3RemediationList") private Metal3RemediationList metal3RemediationList; - @JsonProperty("Metal3RemediationTemplate") private Metal3RemediationTemplate metal3RemediationTemplate; - @JsonProperty("Metal3RemediationTemplateList") private Metal3RemediationTemplateList metal3RemediationTemplateList; - @JsonProperty("NetworkAttachmentDefinition") private NetworkAttachmentDefinition networkAttachmentDefinition; - @JsonProperty("NetworkAttachmentDefinitionList") private NetworkAttachmentDefinitionList networkAttachmentDefinitionList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OperatorPKI") + private ObjectMeta objectMeta; private OperatorPKI operatorPKI; - @JsonProperty("OperatorPKIList") private OperatorPKIList operatorPKIList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -166,7 +68,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -398,12 +300,12 @@ public void setNetworkAttachmentDefinitionList(NetworkAttachmentDefinitionList n } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -467,16 +369,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 3b6add0290e..7437559a33f 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.monitoring.v1.Alertmanager; import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerList; @@ -37,116 +25,34 @@ import io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerList; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfig; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfigList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "Alertmanager", - "AlertmanagerConfig", - "AlertmanagerConfigList", - "AlertmanagerList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "PodMonitor", - "PodMonitorList", - "Probe", - "ProbeList", - "Prometheus", - "PrometheusList", - "PrometheusRule", - "PrometheusRuleList", - "ServiceMonitor", - "ServiceMonitorList", - "Status", - "ThanosRuler", - "ThanosRulerList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("Alertmanager") private Alertmanager alertmanager; - @JsonProperty("AlertmanagerConfig") private AlertmanagerConfig alertmanagerConfig; - @JsonProperty("AlertmanagerConfigList") private AlertmanagerConfigList alertmanagerConfigList; - @JsonProperty("AlertmanagerList") private AlertmanagerList alertmanagerList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PodMonitor") private PodMonitor podMonitor; - @JsonProperty("PodMonitorList") private PodMonitorList podMonitorList; - @JsonProperty("Probe") private Probe probe; - @JsonProperty("ProbeList") private ProbeList probeList; - @JsonProperty("Prometheus") private Prometheus prometheus; - @JsonProperty("PrometheusList") private PrometheusList prometheusList; - @JsonProperty("PrometheusRule") private PrometheusRule prometheusRule; - @JsonProperty("PrometheusRuleList") private PrometheusRuleList prometheusRuleList; - @JsonProperty("ServiceMonitor") private ServiceMonitor serviceMonitor; - @JsonProperty("ServiceMonitorList") private ServiceMonitorList serviceMonitorList; - @JsonProperty("Status") private Status status; - @JsonProperty("ThanosRuler") private ThanosRuler thanosRuler; - @JsonProperty("ThanosRulerList") private ThanosRulerList thanosRulerList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -158,7 +64,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -268,12 +174,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -437,16 +343,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index d6ded5ee67e..36d6e270e15 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.monitoring.v1.Alertmanager; import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerList; @@ -37,116 +25,34 @@ import io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerList; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfig; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfigList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "Alertmanager", - "AlertmanagerConfig", - "AlertmanagerConfigList", - "AlertmanagerList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "PodMonitor", - "PodMonitorList", - "Probe", - "ProbeList", - "Prometheus", - "PrometheusList", - "PrometheusRule", - "PrometheusRuleList", - "ServiceMonitor", - "ServiceMonitorList", - "Status", - "ThanosRuler", - "ThanosRulerList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("Alertmanager") private Alertmanager alertmanager; - @JsonProperty("AlertmanagerConfig") private AlertmanagerConfig alertmanagerConfig; - @JsonProperty("AlertmanagerConfigList") private AlertmanagerConfigList alertmanagerConfigList; - @JsonProperty("AlertmanagerList") private AlertmanagerList alertmanagerList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("PodMonitor") private PodMonitor podMonitor; - @JsonProperty("PodMonitorList") private PodMonitorList podMonitorList; - @JsonProperty("Probe") private Probe probe; - @JsonProperty("ProbeList") private ProbeList probeList; - @JsonProperty("Prometheus") private Prometheus prometheus; - @JsonProperty("PrometheusList") private PrometheusList prometheusList; - @JsonProperty("PrometheusRule") private PrometheusRule prometheusRule; - @JsonProperty("PrometheusRuleList") private PrometheusRuleList prometheusRuleList; - @JsonProperty("ServiceMonitor") private ServiceMonitor serviceMonitor; - @JsonProperty("ServiceMonitorList") private ServiceMonitorList serviceMonitorList; - @JsonProperty("Status") private Status status; - @JsonProperty("ThanosRuler") private ThanosRuler thanosRuler; - @JsonProperty("ThanosRulerList") private ThanosRulerList thanosRulerList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -158,7 +64,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -268,12 +174,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -437,16 +343,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index b7375410e62..d4fbc99e767 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.config.v1.ConfigMapFileReference; import io.fabric8.openshift.api.model.config.v1.SecretNameReference; @@ -71,221 +59,69 @@ import io.fabric8.openshift.api.model.operator.v1.StorageList; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "Authentication", - "AuthenticationList", - "BaseKubernetesList", - "CSISnapshotController", - "CSISnapshotControllerList", - "CloudCredential", - "CloudCredentialList", - "ClusterCSIDriver", - "ClusterCSIDriverList", - "Config", - "ConfigList", - "ConfigMapFileReference", - "Console", - "ConsoleList", - "DNS", - "DNSList", - "DNSRecord", - "DNSRecordList", - "Etcd", - "EtcdList", - "ImageContentSourcePolicy", - "ImageContentSourcePolicyList", - "ImagePruner", - "ImagePrunerList", - "Info", - "IngressController", - "IngressControllerList", - "KubeAPIServer", - "KubeAPIServerList", - "KubeControllerManager", - "KubeControllerManagerList", - "KubeScheduler", - "KubeSchedulerList", - "KubeStorageVersionMigrator", - "KubeStorageVersionMigratorList", - "Network", - "NetworkList", - "ObjectMeta", - "OpenShiftAPIServer", - "OpenShiftAPIServerList", - "OpenShiftContollerManager", - "OpenShiftControllerManagerList", - "Patch", - "PodNetworkConnectivityCheck", - "PodNetworkConnectivityCheckList", - "Quantity", - "SecretNameReference", - "ServiceCA", - "ServiceCAList", - "ServiceCatalogAPIServer", - "ServiceCatalogAPIServerList", - "ServiceCatalogControllerManager", - "ServiceCatalogControllerManagerList", - "Status", - "Storage", - "StorageList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("Authentication") private Authentication authentication; - @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CSISnapshotController") private CSISnapshotController cSISnapshotController; - @JsonProperty("CSISnapshotControllerList") private CSISnapshotControllerList cSISnapshotControllerList; - @JsonProperty("CloudCredential") private CloudCredential cloudCredential; - @JsonProperty("CloudCredentialList") private CloudCredentialList cloudCredentialList; - @JsonProperty("ClusterCSIDriver") private ClusterCSIDriver clusterCSIDriver; - @JsonProperty("ClusterCSIDriverList") private ClusterCSIDriverList clusterCSIDriverList; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigList") private ConfigList configList; - @JsonProperty("ConfigMapFileReference") private ConfigMapFileReference configMapFileReference; - @JsonProperty("Console") private Console console; - @JsonProperty("ConsoleList") private ConsoleList consoleList; - @JsonProperty("DNS") private DNS dns; - @JsonProperty("DNSList") private DNSList dNSList; - @JsonProperty("DNSRecord") private DNSRecord dNSRecord; - @JsonProperty("DNSRecordList") private DNSRecordList dNSRecordList; - @JsonProperty("Etcd") private Etcd etcd; - @JsonProperty("EtcdList") private EtcdList etcdList; - @JsonProperty("ImageContentSourcePolicy") private ImageContentSourcePolicy imageContentSourcePolicy; - @JsonProperty("ImageContentSourcePolicyList") private ImageContentSourcePolicyList imageContentSourcePolicyList; - @JsonProperty("ImagePruner") private ImagePruner imagePruner; - @JsonProperty("ImagePrunerList") private ImagePrunerList imagePrunerList; - @JsonProperty("Info") private Info info; - @JsonProperty("IngressController") private IngressController ingressController; - @JsonProperty("IngressControllerList") private IngressControllerList ingressControllerList; - @JsonProperty("KubeAPIServer") private KubeAPIServer kubeAPIServer; - @JsonProperty("KubeAPIServerList") private KubeAPIServerList kubeAPIServerList; - @JsonProperty("KubeControllerManager") private KubeControllerManager kubeControllerManager; - @JsonProperty("KubeControllerManagerList") private KubeControllerManagerList kubeControllerManagerList; - @JsonProperty("KubeScheduler") private KubeScheduler kubeScheduler; - @JsonProperty("KubeSchedulerList") private KubeSchedulerList kubeSchedulerList; - @JsonProperty("KubeStorageVersionMigrator") private KubeStorageVersionMigrator kubeStorageVersionMigrator; - @JsonProperty("KubeStorageVersionMigratorList") private KubeStorageVersionMigratorList kubeStorageVersionMigratorList; - @JsonProperty("Network") private Network network; - @JsonProperty("NetworkList") private NetworkList networkList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenShiftAPIServer") + private ObjectMeta objectMeta; private OpenShiftAPIServer openShiftAPIServer; - @JsonProperty("OpenShiftAPIServerList") private OpenShiftAPIServerList openShiftAPIServerList; - @JsonProperty("OpenShiftContollerManager") private OpenShiftControllerManager openShiftContollerManager; - @JsonProperty("OpenShiftControllerManagerList") private OpenShiftControllerManagerList openShiftControllerManagerList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PodNetworkConnectivityCheck") private PodNetworkConnectivityCheck podNetworkConnectivityCheck; - @JsonProperty("PodNetworkConnectivityCheckList") private PodNetworkConnectivityCheckList podNetworkConnectivityCheckList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("SecretNameReference") private SecretNameReference secretNameReference; - @JsonProperty("ServiceCA") private ServiceCA serviceCA; - @JsonProperty("ServiceCAList") private ServiceCAList serviceCAList; - @JsonProperty("ServiceCatalogAPIServer") private ServiceCatalogAPIServer serviceCatalogAPIServer; - @JsonProperty("ServiceCatalogAPIServerList") private ServiceCatalogAPIServerList serviceCatalogAPIServerList; - @JsonProperty("ServiceCatalogControllerManager") private ServiceCatalogControllerManager serviceCatalogControllerManager; - @JsonProperty("ServiceCatalogControllerManagerList") private ServiceCatalogControllerManagerList serviceCatalogControllerManagerList; - @JsonProperty("Status") private Status status; - @JsonProperty("Storage") private Storage storage; - @JsonProperty("StorageList") private StorageList storageList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -297,7 +133,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -752,12 +588,12 @@ public void setNetworkList(NetworkList networkList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -961,16 +797,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 539a48df23e..c1712fd1c43 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.config.v1.ConfigMapFileReference; import io.fabric8.openshift.api.model.config.v1.SecretNameReference; @@ -71,221 +59,69 @@ import io.fabric8.openshift.api.model.operator.v1.StorageList; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "Authentication", - "AuthenticationList", - "BaseKubernetesList", - "CSISnapshotController", - "CSISnapshotControllerList", - "CloudCredential", - "CloudCredentialList", - "ClusterCSIDriver", - "ClusterCSIDriverList", - "Config", - "ConfigList", - "ConfigMapFileReference", - "Console", - "ConsoleList", - "DNS", - "DNSList", - "DNSRecord", - "DNSRecordList", - "Etcd", - "EtcdList", - "ImageContentSourcePolicy", - "ImageContentSourcePolicyList", - "ImagePruner", - "ImagePrunerList", - "Info", - "IngressController", - "IngressControllerList", - "KubeAPIServer", - "KubeAPIServerList", - "KubeControllerManager", - "KubeControllerManagerList", - "KubeScheduler", - "KubeSchedulerList", - "KubeStorageVersionMigrator", - "KubeStorageVersionMigratorList", - "Network", - "NetworkList", - "ObjectMeta", - "OpenShiftAPIServer", - "OpenShiftAPIServerList", - "OpenShiftContollerManager", - "OpenShiftControllerManagerList", - "Patch", - "PodNetworkConnectivityCheck", - "PodNetworkConnectivityCheckList", - "Quantity", - "SecretNameReference", - "ServiceCA", - "ServiceCAList", - "ServiceCatalogAPIServer", - "ServiceCatalogAPIServerList", - "ServiceCatalogControllerManager", - "ServiceCatalogControllerManagerList", - "Status", - "Storage", - "StorageList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("Authentication") private Authentication authentication; - @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CSISnapshotController") private CSISnapshotController cSISnapshotController; - @JsonProperty("CSISnapshotControllerList") private CSISnapshotControllerList cSISnapshotControllerList; - @JsonProperty("CloudCredential") private CloudCredential cloudCredential; - @JsonProperty("CloudCredentialList") private CloudCredentialList cloudCredentialList; - @JsonProperty("ClusterCSIDriver") private ClusterCSIDriver clusterCSIDriver; - @JsonProperty("ClusterCSIDriverList") private ClusterCSIDriverList clusterCSIDriverList; - @JsonProperty("Config") private Config config; - @JsonProperty("ConfigList") private ConfigList configList; - @JsonProperty("ConfigMapFileReference") private ConfigMapFileReference configMapFileReference; - @JsonProperty("Console") private Console console; - @JsonProperty("ConsoleList") private ConsoleList consoleList; - @JsonProperty("DNS") private DNS dns; - @JsonProperty("DNSList") private DNSList dNSList; - @JsonProperty("DNSRecord") private DNSRecord dNSRecord; - @JsonProperty("DNSRecordList") private DNSRecordList dNSRecordList; - @JsonProperty("Etcd") private Etcd etcd; - @JsonProperty("EtcdList") private EtcdList etcdList; - @JsonProperty("ImageContentSourcePolicy") private ImageContentSourcePolicy imageContentSourcePolicy; - @JsonProperty("ImageContentSourcePolicyList") private ImageContentSourcePolicyList imageContentSourcePolicyList; - @JsonProperty("ImagePruner") private ImagePruner imagePruner; - @JsonProperty("ImagePrunerList") private ImagePrunerList imagePrunerList; - @JsonProperty("Info") private Info info; - @JsonProperty("IngressController") private IngressController ingressController; - @JsonProperty("IngressControllerList") private IngressControllerList ingressControllerList; - @JsonProperty("KubeAPIServer") private KubeAPIServer kubeAPIServer; - @JsonProperty("KubeAPIServerList") private KubeAPIServerList kubeAPIServerList; - @JsonProperty("KubeControllerManager") private KubeControllerManager kubeControllerManager; - @JsonProperty("KubeControllerManagerList") private KubeControllerManagerList kubeControllerManagerList; - @JsonProperty("KubeScheduler") private KubeScheduler kubeScheduler; - @JsonProperty("KubeSchedulerList") private KubeSchedulerList kubeSchedulerList; - @JsonProperty("KubeStorageVersionMigrator") private KubeStorageVersionMigrator kubeStorageVersionMigrator; - @JsonProperty("KubeStorageVersionMigratorList") private KubeStorageVersionMigratorList kubeStorageVersionMigratorList; - @JsonProperty("Network") private Network network; - @JsonProperty("NetworkList") private NetworkList networkList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenShiftAPIServer") + private ObjectMeta objectMeta; private OpenShiftAPIServer openShiftAPIServer; - @JsonProperty("OpenShiftAPIServerList") private OpenShiftAPIServerList openShiftAPIServerList; - @JsonProperty("OpenShiftContollerManager") private OpenShiftControllerManager openShiftContollerManager; - @JsonProperty("OpenShiftControllerManagerList") private OpenShiftControllerManagerList openShiftControllerManagerList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PodNetworkConnectivityCheck") private PodNetworkConnectivityCheck podNetworkConnectivityCheck; - @JsonProperty("PodNetworkConnectivityCheckList") private PodNetworkConnectivityCheckList podNetworkConnectivityCheckList; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("SecretNameReference") private SecretNameReference secretNameReference; - @JsonProperty("ServiceCA") private ServiceCA serviceCA; - @JsonProperty("ServiceCAList") private ServiceCAList serviceCAList; - @JsonProperty("ServiceCatalogAPIServer") private ServiceCatalogAPIServer serviceCatalogAPIServer; - @JsonProperty("ServiceCatalogAPIServerList") private ServiceCatalogAPIServerList serviceCatalogAPIServerList; - @JsonProperty("ServiceCatalogControllerManager") private ServiceCatalogControllerManager serviceCatalogControllerManager; - @JsonProperty("ServiceCatalogControllerManagerList") private ServiceCatalogControllerManagerList serviceCatalogControllerManagerList; - @JsonProperty("Status") private Status status; - @JsonProperty("Storage") private Storage storage; - @JsonProperty("StorageList") private StorageList storageList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -297,7 +133,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -752,12 +588,12 @@ public void setNetworkList(NetworkList networkList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -961,16 +797,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bd0f5470ec6..b5e682d9587 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.rbac.PolicyRule; @@ -42,134 +30,40 @@ import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanList; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CatalogSource", - "CatalogSourceList", - "ClusterServiceVersion", - "ClusterServiceVersionList", - "Deployment", - "Info", - "InstallPlan", - "InstallPlanList", - "OLMConfig", - "OLMConfigList", - "ObjectMeta", - "Operator", - "OperatorCondition", - "OperatorConditionList", - "OperatorGroup", - "OperatorGroupList", - "OperatorList", - "PackageManifest", - "PackageManifestList", - "Patch", - "PolicyRule", - "Quantity", - "RuleWithOperations", - "Status", - "Subscription", - "SubscriptionList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CatalogSource") private CatalogSource catalogSource; - @JsonProperty("CatalogSourceList") private CatalogSourceList catalogSourceList; - @JsonProperty("ClusterServiceVersion") private ClusterServiceVersion clusterServiceVersion; - @JsonProperty("ClusterServiceVersionList") private ClusterServiceVersionList clusterServiceVersionList; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("Info") private Info info; - @JsonProperty("InstallPlan") private InstallPlan installPlan; - @JsonProperty("InstallPlanList") private InstallPlanList installPlanList; - @JsonProperty("OLMConfig") private OLMConfig oLMConfig; - @JsonProperty("OLMConfigList") private OLMConfigList oLMConfigList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Operator") + private ObjectMeta objectMeta; private Operator operator; - @JsonProperty("OperatorCondition") private OperatorCondition operatorCondition; - @JsonProperty("OperatorConditionList") private OperatorConditionList operatorConditionList; - @JsonProperty("OperatorGroup") private OperatorGroup operatorGroup; - @JsonProperty("OperatorGroupList") private OperatorGroupList operatorGroupList; - @JsonProperty("OperatorList") private OperatorList operatorList; - @JsonProperty("PackageManifest") private PackageManifest packageManifest; - @JsonProperty("PackageManifestList") private PackageManifestList packageManifestList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PolicyRule") private PolicyRule policyRule; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RuleWithOperations") private RuleWithOperations ruleWithOperations; - @JsonProperty("Status") private Status status; - @JsonProperty("Subscription") private Subscription subscription; - @JsonProperty("SubscriptionList") private SubscriptionList subscriptionList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -181,7 +75,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, OLMConfig oLMConfig, OLMConfigList oLMConfigList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, OLMConfig oLMConfig, OLMConfigList oLMConfigList, ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -347,12 +241,12 @@ public void setOLMConfigList(OLMConfigList oLMConfigList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -526,16 +420,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 7ab913d7cc0..e5b4543a7a2 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.rbac.PolicyRule; @@ -42,134 +30,40 @@ import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanList; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "CatalogSource", - "CatalogSourceList", - "ClusterServiceVersion", - "ClusterServiceVersionList", - "Deployment", - "Info", - "InstallPlan", - "InstallPlanList", - "OLMConfig", - "OLMConfigList", - "ObjectMeta", - "Operator", - "OperatorCondition", - "OperatorConditionList", - "OperatorGroup", - "OperatorGroupList", - "OperatorList", - "PackageManifest", - "PackageManifestList", - "Patch", - "PolicyRule", - "Quantity", - "RuleWithOperations", - "Status", - "Subscription", - "SubscriptionList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("CatalogSource") private CatalogSource catalogSource; - @JsonProperty("CatalogSourceList") private CatalogSourceList catalogSourceList; - @JsonProperty("ClusterServiceVersion") private ClusterServiceVersion clusterServiceVersion; - @JsonProperty("ClusterServiceVersionList") private ClusterServiceVersionList clusterServiceVersionList; - @JsonProperty("Deployment") private Deployment deployment; - @JsonProperty("Info") private Info info; - @JsonProperty("InstallPlan") private InstallPlan installPlan; - @JsonProperty("InstallPlanList") private InstallPlanList installPlanList; - @JsonProperty("OLMConfig") private OLMConfig oLMConfig; - @JsonProperty("OLMConfigList") private OLMConfigList oLMConfigList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Operator") + private ObjectMeta objectMeta; private Operator operator; - @JsonProperty("OperatorCondition") private OperatorCondition operatorCondition; - @JsonProperty("OperatorConditionList") private OperatorConditionList operatorConditionList; - @JsonProperty("OperatorGroup") private OperatorGroup operatorGroup; - @JsonProperty("OperatorGroupList") private OperatorGroupList operatorGroupList; - @JsonProperty("OperatorList") private OperatorList operatorList; - @JsonProperty("PackageManifest") private PackageManifest packageManifest; - @JsonProperty("PackageManifestList") private PackageManifestList packageManifestList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PolicyRule") private PolicyRule policyRule; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RuleWithOperations") private RuleWithOperations ruleWithOperations; - @JsonProperty("Status") private Status status; - @JsonProperty("Subscription") private Subscription subscription; - @JsonProperty("SubscriptionList") private SubscriptionList subscriptionList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -181,7 +75,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, OLMConfig oLMConfig, OLMConfigList oLMConfigList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, OLMConfig oLMConfig, OLMConfigList oLMConfigList, ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -347,12 +241,12 @@ public void setOLMConfigList(OLMConfigList oLMConfigList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -526,16 +420,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index d51cad1193c..6c4b874bed6 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageState; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageStateList; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigration; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "Status", - "StorageState", - "StorageStateList", - "StorageVersionMigration", - "StorageVersionMigrationList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("StorageState") private StorageState storageState; - @JsonProperty("StorageStateList") private StorageStateList storageStateList; - @JsonProperty("StorageVersionMigration") private StorageVersionMigration storageVersionMigration; - @JsonProperty("StorageVersionMigrationList") private StorageVersionMigrationList storageVersionMigrationList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -168,12 +98,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index cea58ab6937..2e97121b8a0 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageState; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageStateList; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigration; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "Status", - "StorageState", - "StorageStateList", - "StorageVersionMigration", - "StorageVersionMigrationList", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("StorageState") private StorageState storageState; - @JsonProperty("StorageStateList") private StorageStateList storageStateList; - @JsonProperty("StorageVersionMigration") private StorageVersionMigration storageVersionMigration; - @JsonProperty("StorageVersionMigrationList") private StorageVersionMigrationList storageVersionMigrationList; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -168,12 +98,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 98243c05473..bf980e7a4ee 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.tuned.v1.Profile; import io.fabric8.openshift.api.model.tuned.v1.ProfileList; import io.fabric8.openshift.api.model.tuned.v1.Tuned; import io.fabric8.openshift.api.model.tuned.v1.TunedList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "Profile", - "ProfileList", - "Status", - "Time", - "Tuned", - "TunedList", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Profile") private Profile profile; - @JsonProperty("ProfileList") private ProfileList profileList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Tuned") private Tuned tuned; - @JsonProperty("TunedList") private TunedList tunedList; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -168,12 +98,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a642297b124..9f270c4c3db 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,98 +7,28 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.tuned.v1.Profile; import io.fabric8.openshift.api.model.tuned.v1.ProfileList; import io.fabric8.openshift.api.model.tuned.v1.Tuned; import io.fabric8.openshift.api.model.tuned.v1.TunedList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "Info", - "ObjectMeta", - "Patch", - "Profile", - "ProfileList", - "Status", - "Time", - "Tuned", - "TunedList", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("Patch") + private ObjectMeta objectMeta; private Patch patch; - @JsonProperty("Profile") private Profile profile; - @JsonProperty("ProfileList") private ProfileList profileList; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("Tuned") private Tuned tuned; - @JsonProperty("TunedList") private TunedList tunedList; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -110,7 +40,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -168,12 +98,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -257,16 +187,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 8dd1a4dcd6c..49764ac6511 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,102 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPAllocation; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPool; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPoolList; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservation; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservationList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "IPAllocation", - "IPPool", - "IPPoolList", - "Info", - "ObjectMeta", - "OverlappingRangeIPReservation", - "OverlappingRangeIPReservationList", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("IPAllocation") private IPAllocation iPAllocation; - @JsonProperty("IPPool") private IPPool iPPool; - @JsonProperty("IPPoolList") private IPPoolList iPPoolList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OverlappingRangeIPReservation") + private ObjectMeta objectMeta; private OverlappingRangeIPReservation overlappingRangeIPReservation; - @JsonProperty("OverlappingRangeIPReservationList") private OverlappingRangeIPReservationList overlappingRangeIPReservationList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -114,7 +42,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -203,12 +131,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -272,16 +200,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 31772097274..7c49269d230 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,102 +7,30 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPAllocation; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPool; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPoolList; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservation; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservationList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "BaseKubernetesList", - "IPAllocation", - "IPPool", - "IPPoolList", - "Info", - "ObjectMeta", - "OverlappingRangeIPReservation", - "OverlappingRangeIPReservationList", - "Patch", - "Status", - "Time", - "TypeMeta" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("IPAllocation") private IPAllocation iPAllocation; - @JsonProperty("IPPool") private IPPool iPPool; - @JsonProperty("IPPoolList") private IPPoolList iPPoolList; - @JsonProperty("Info") private Info info; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OverlappingRangeIPReservation") + private ObjectMeta objectMeta; private OverlappingRangeIPReservation overlappingRangeIPReservation; - @JsonProperty("OverlappingRangeIPReservationList") private OverlappingRangeIPReservationList overlappingRangeIPReservationList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("Status") private Status status; - @JsonProperty("Time") private String time; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -114,7 +42,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -203,12 +131,12 @@ public void setInfo(Info info) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -272,16 +200,6 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index c7c2cc99eff..adbeecd0a45 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.rbac.AggregationRule; import io.fabric8.kubernetes.api.model.version.Info; @@ -109,359 +97,115 @@ import io.fabric8.openshift.api.model.UserList; import io.fabric8.openshift.api.model.UserOAuthAccessToken; import io.fabric8.openshift.api.model.UserOAuthAccessTokenList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AggregationRule", - "AppliedClusterResourceQuota", - "AppliedClusterResourceQuotaList", - "BaseKubernetesList", - "BrokerTemplateInstance", - "BrokerTemplateInstanceList", - "BuildConfigList", - "BuildList", - "BuildRequest", - "ClusterNetwork", - "ClusterNetworkList", - "ClusterResourceQuota", - "ClusterResourceQuotaList", - "Config", - "CreateOptions", - "DeleteOptions", - "DeploymentConfig", - "DeploymentConfigList", - "EgressNetworkPolicy", - "EgressNetworkPolicyList", - "GetOptions", - "Group", - "GroupList", - "HelmChartRepository", - "HelmChartRepositoryList", - "HostSubnet", - "HostSubnetList", - "Identity", - "IdentityList", - "ImageList", - "ImageSignature", - "ImageStreamImage", - "ImageStreamImport", - "ImageStreamList", - "ImageStreamMapping", - "ImageStreamTagList", - "ImageTag", - "ImageTagList", - "Info", - "ListOptions", - "LocalResourceAccessReview", - "LocalSubjectAccessReview", - "NetNamespace", - "NetNamespaceList", - "OAuthAccessToken", - "OAuthAccessTokenList", - "OAuthAuthorizeToken", - "OAuthAuthorizeTokenList", - "OAuthClient", - "OAuthClientAuthorization", - "OAuthClientAuthorizationList", - "OAuthClientList", - "ObjectMeta", - "OpenShiftRoleBindingRestrictionList", - "OpenshiftClusterRole", - "OpenshiftClusterRoleBinding", - "OpenshiftClusterRoleBindingList", - "OpenshiftClusterRoleList", - "OpenshiftClusterRoleScopeRestriction", - "OpenshiftRole", - "OpenshiftRoleBinding", - "OpenshiftRoleBindingList", - "OpenshiftRoleBindingRestriction", - "OpenshiftRoleBindingRestrictionSpec", - "OpenshiftRoleList", - "Patch", - "PatchOptions", - "PodSecurityPolicyReview", - "PodSecurityPolicySelfSubjectReview", - "PodSecurityPolicySubjectReview", - "Project", - "ProjectHelmChartRepository", - "ProjectHelmChartRepositoryList", - "ProjectList", - "ProjectRequest", - "Quantity", - "RangeAllocation", - "RangeAllocationList", - "ResourceAccessReview", - "ResourceAccessReviewResponse", - "RootPaths", - "Route", - "RouteList", - "SecurityContextConstraints", - "SecurityContextConstraintsList", - "SelfSubjectRulesReview", - "Status", - "SubjectAccessReview", - "SubjectAccessReviewResponse", - "SubjectRulesReview", - "TagEvent", - "Template", - "TemplateInstance", - "TemplateInstanceList", - "TemplateList", - "Time", - "TokenReview", - "TypeMeta", - "UpdateOptions", - "User", - "UserIdentityMapping", - "UserList", - "UserOAuthAccessToken", - "UserOAuthAccessTokenList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class KubeSchema implements Editable -{ +public class KubeSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AggregationRule") private AggregationRule aggregationRule; - @JsonProperty("AppliedClusterResourceQuota") private AppliedClusterResourceQuota appliedClusterResourceQuota; - @JsonProperty("AppliedClusterResourceQuotaList") private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("BrokerTemplateInstance") private BrokerTemplateInstance brokerTemplateInstance; - @JsonProperty("BrokerTemplateInstanceList") private BrokerTemplateInstanceList brokerTemplateInstanceList; - @JsonProperty("BuildConfigList") private BuildConfigList buildConfigList; - @JsonProperty("BuildList") private BuildList buildList; - @JsonProperty("BuildRequest") private BuildRequest buildRequest; - @JsonProperty("ClusterNetwork") private ClusterNetwork clusterNetwork; - @JsonProperty("ClusterNetworkList") private ClusterNetworkList clusterNetworkList; - @JsonProperty("ClusterResourceQuota") private ClusterResourceQuota clusterResourceQuota; - @JsonProperty("ClusterResourceQuotaList") private ClusterResourceQuotaList clusterResourceQuotaList; - @JsonProperty("Config") private Config config; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("DeploymentConfig") private DeploymentConfig deploymentConfig; - @JsonProperty("DeploymentConfigList") private DeploymentConfigList deploymentConfigList; - @JsonProperty("EgressNetworkPolicy") private EgressNetworkPolicy egressNetworkPolicy; - @JsonProperty("EgressNetworkPolicyList") private EgressNetworkPolicyList egressNetworkPolicyList; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Group") private Group group; - @JsonProperty("GroupList") private GroupList groupList; - @JsonProperty("HelmChartRepository") private HelmChartRepository helmChartRepository; - @JsonProperty("HelmChartRepositoryList") private HelmChartRepositoryList helmChartRepositoryList; - @JsonProperty("HostSubnet") private HostSubnet hostSubnet; - @JsonProperty("HostSubnetList") private HostSubnetList hostSubnetList; - @JsonProperty("Identity") private Identity identity; - @JsonProperty("IdentityList") private IdentityList identityList; - @JsonProperty("ImageList") private ImageList imageList; - @JsonProperty("ImageSignature") private ImageSignature imageSignature; - @JsonProperty("ImageStreamImage") private ImageStreamImage imageStreamImage; - @JsonProperty("ImageStreamImport") private ImageStreamImport imageStreamImport; - @JsonProperty("ImageStreamList") private ImageStreamList imageStreamList; - @JsonProperty("ImageStreamMapping") private ImageStreamMapping imageStreamMapping; - @JsonProperty("ImageStreamTagList") private ImageStreamTagList imageStreamTagList; - @JsonProperty("ImageTag") private ImageTag imageTag; - @JsonProperty("ImageTagList") private ImageTagList imageTagList; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("LocalResourceAccessReview") private LocalResourceAccessReview localResourceAccessReview; - @JsonProperty("LocalSubjectAccessReview") private LocalSubjectAccessReview localSubjectAccessReview; - @JsonProperty("NetNamespace") private NetNamespace netNamespace; - @JsonProperty("NetNamespaceList") private NetNamespaceList netNamespaceList; - @JsonProperty("OAuthAccessToken") private OAuthAccessToken oAuthAccessToken; - @JsonProperty("OAuthAccessTokenList") private OAuthAccessTokenList oAuthAccessTokenList; - @JsonProperty("OAuthAuthorizeToken") private OAuthAuthorizeToken oAuthAuthorizeToken; - @JsonProperty("OAuthAuthorizeTokenList") private OAuthAuthorizeTokenList oAuthAuthorizeTokenList; - @JsonProperty("OAuthClient") private OAuthClient oAuthClient; - @JsonProperty("OAuthClientAuthorization") private OAuthClientAuthorization oAuthClientAuthorization; - @JsonProperty("OAuthClientAuthorizationList") private OAuthClientAuthorizationList oAuthClientAuthorizationList; - @JsonProperty("OAuthClientList") private OAuthClientList oAuthClientList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenShiftRoleBindingRestrictionList") + private ObjectMeta objectMeta; private RoleBindingRestrictionList openShiftRoleBindingRestrictionList; - @JsonProperty("OpenshiftClusterRole") private ClusterRole openshiftClusterRole; - @JsonProperty("OpenshiftClusterRoleBinding") private ClusterRoleBinding openshiftClusterRoleBinding; - @JsonProperty("OpenshiftClusterRoleBindingList") private ClusterRoleBindingList openshiftClusterRoleBindingList; - @JsonProperty("OpenshiftClusterRoleList") private ClusterRoleList openshiftClusterRoleList; - @JsonProperty("OpenshiftClusterRoleScopeRestriction") private ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction; - @JsonProperty("OpenshiftRole") private Role openshiftRole; - @JsonProperty("OpenshiftRoleBinding") private RoleBinding openshiftRoleBinding; - @JsonProperty("OpenshiftRoleBindingList") private RoleBindingList openshiftRoleBindingList; - @JsonProperty("OpenshiftRoleBindingRestriction") private RoleBindingRestriction openshiftRoleBindingRestriction; - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") private RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec; - @JsonProperty("OpenshiftRoleList") private RoleList openshiftRoleList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodSecurityPolicyReview") private PodSecurityPolicyReview podSecurityPolicyReview; - @JsonProperty("PodSecurityPolicySelfSubjectReview") private PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview; - @JsonProperty("PodSecurityPolicySubjectReview") private PodSecurityPolicySubjectReview podSecurityPolicySubjectReview; - @JsonProperty("Project") private Project project; - @JsonProperty("ProjectHelmChartRepository") private ProjectHelmChartRepository projectHelmChartRepository; - @JsonProperty("ProjectHelmChartRepositoryList") private ProjectHelmChartRepositoryList projectHelmChartRepositoryList; - @JsonProperty("ProjectList") private ProjectList projectList; - @JsonProperty("ProjectRequest") private ProjectRequest projectRequest; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RangeAllocation") private RangeAllocation rangeAllocation; - @JsonProperty("RangeAllocationList") private RangeAllocationList rangeAllocationList; - @JsonProperty("ResourceAccessReview") private ResourceAccessReview resourceAccessReview; - @JsonProperty("ResourceAccessReviewResponse") private ResourceAccessReviewResponse resourceAccessReviewResponse; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Route") private Route route; - @JsonProperty("RouteList") private RouteList routeList; - @JsonProperty("SecurityContextConstraints") private SecurityContextConstraints securityContextConstraints; - @JsonProperty("SecurityContextConstraintsList") private SecurityContextConstraintsList securityContextConstraintsList; - @JsonProperty("SelfSubjectRulesReview") private SelfSubjectRulesReview selfSubjectRulesReview; - @JsonProperty("Status") private Status status; - @JsonProperty("SubjectAccessReview") private SubjectAccessReview subjectAccessReview; - @JsonProperty("SubjectAccessReviewResponse") private SubjectAccessReviewResponse subjectAccessReviewResponse; - @JsonProperty("SubjectRulesReview") private SubjectRulesReview subjectRulesReview; - @JsonProperty("TagEvent") private TagEvent tagEvent; - @JsonProperty("Template") private Template template; - @JsonProperty("TemplateInstance") private TemplateInstance templateInstance; - @JsonProperty("TemplateInstanceList") private TemplateInstanceList templateInstanceList; - @JsonProperty("TemplateList") private TemplateList templateList; - @JsonProperty("Time") private String time; - @JsonProperty("TokenReview") private TokenReview tokenReview; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("User") private User user; - @JsonProperty("UserIdentityMapping") private UserIdentityMapping userIdentityMapping; - @JsonProperty("UserList") private UserList userList; - @JsonProperty("UserOAuthAccessToken") private UserOAuthAccessToken userOAuthAccessToken; - @JsonProperty("UserOAuthAccessTokenList") private UserOAuthAccessTokenList userOAuthAccessTokenList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -473,7 +217,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -1124,12 +868,12 @@ public void setOAuthClientList(OAuthClientList oAuthClientList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -1643,16 +1387,6 @@ public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccess this.userOAuthAccessTokenList = userOAuthAccessTokenList; } - @JsonIgnore - public KubeSchemaBuilder edit() { - return new KubeSchemaBuilder(this); - } - - @JsonIgnore - public KubeSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b87263be0b5..b658820b172 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -7,19 +7,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.rbac.AggregationRule; import io.fabric8.kubernetes.api.model.version.Info; @@ -109,359 +97,115 @@ import io.fabric8.openshift.api.model.UserList; import io.fabric8.openshift.api.model.UserOAuthAccessToken; import io.fabric8.openshift.api.model.UserOAuthAccessTokenList; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "APIGroup", - "APIGroupList", - "AggregationRule", - "AppliedClusterResourceQuota", - "AppliedClusterResourceQuotaList", - "BaseKubernetesList", - "BrokerTemplateInstance", - "BrokerTemplateInstanceList", - "BuildConfigList", - "BuildList", - "BuildRequest", - "ClusterNetwork", - "ClusterNetworkList", - "ClusterResourceQuota", - "ClusterResourceQuotaList", - "Config", - "CreateOptions", - "DeleteOptions", - "DeploymentConfig", - "DeploymentConfigList", - "EgressNetworkPolicy", - "EgressNetworkPolicyList", - "GetOptions", - "Group", - "GroupList", - "HelmChartRepository", - "HelmChartRepositoryList", - "HostSubnet", - "HostSubnetList", - "Identity", - "IdentityList", - "ImageList", - "ImageSignature", - "ImageStreamImage", - "ImageStreamImport", - "ImageStreamList", - "ImageStreamMapping", - "ImageStreamTagList", - "ImageTag", - "ImageTagList", - "Info", - "ListOptions", - "LocalResourceAccessReview", - "LocalSubjectAccessReview", - "NetNamespace", - "NetNamespaceList", - "OAuthAccessToken", - "OAuthAccessTokenList", - "OAuthAuthorizeToken", - "OAuthAuthorizeTokenList", - "OAuthClient", - "OAuthClientAuthorization", - "OAuthClientAuthorizationList", - "OAuthClientList", - "ObjectMeta", - "OpenShiftRoleBindingRestrictionList", - "OpenshiftClusterRole", - "OpenshiftClusterRoleBinding", - "OpenshiftClusterRoleBindingList", - "OpenshiftClusterRoleList", - "OpenshiftClusterRoleScopeRestriction", - "OpenshiftRole", - "OpenshiftRoleBinding", - "OpenshiftRoleBindingList", - "OpenshiftRoleBindingRestriction", - "OpenshiftRoleBindingRestrictionSpec", - "OpenshiftRoleList", - "Patch", - "PatchOptions", - "PodSecurityPolicyReview", - "PodSecurityPolicySelfSubjectReview", - "PodSecurityPolicySubjectReview", - "Project", - "ProjectHelmChartRepository", - "ProjectHelmChartRepositoryList", - "ProjectList", - "ProjectRequest", - "Quantity", - "RangeAllocation", - "RangeAllocationList", - "ResourceAccessReview", - "ResourceAccessReviewResponse", - "RootPaths", - "Route", - "RouteList", - "SecurityContextConstraints", - "SecurityContextConstraintsList", - "SelfSubjectRulesReview", - "Status", - "SubjectAccessReview", - "SubjectAccessReviewResponse", - "SubjectRulesReview", - "TagEvent", - "Template", - "TemplateInstance", - "TemplateInstanceList", - "TemplateList", - "Time", - "TokenReview", - "TypeMeta", - "UpdateOptions", - "User", - "UserIdentityMapping", - "UserList", - "UserOAuthAccessToken", - "UserOAuthAccessTokenList" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) + @Generated("jsonschema2pojo") -public class ValidationSchema implements Editable -{ +public class ValidationSchema { - @JsonProperty("APIGroup") private APIGroup aPIGroup; - @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; - @JsonProperty("AggregationRule") private AggregationRule aggregationRule; - @JsonProperty("AppliedClusterResourceQuota") private AppliedClusterResourceQuota appliedClusterResourceQuota; - @JsonProperty("AppliedClusterResourceQuotaList") private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; - @JsonProperty("BaseKubernetesList") private KubernetesList baseKubernetesList; - @JsonProperty("BrokerTemplateInstance") private BrokerTemplateInstance brokerTemplateInstance; - @JsonProperty("BrokerTemplateInstanceList") private BrokerTemplateInstanceList brokerTemplateInstanceList; - @JsonProperty("BuildConfigList") private BuildConfigList buildConfigList; - @JsonProperty("BuildList") private BuildList buildList; - @JsonProperty("BuildRequest") private BuildRequest buildRequest; - @JsonProperty("ClusterNetwork") private ClusterNetwork clusterNetwork; - @JsonProperty("ClusterNetworkList") private ClusterNetworkList clusterNetworkList; - @JsonProperty("ClusterResourceQuota") private ClusterResourceQuota clusterResourceQuota; - @JsonProperty("ClusterResourceQuotaList") private ClusterResourceQuotaList clusterResourceQuotaList; - @JsonProperty("Config") private Config config; - @JsonProperty("CreateOptions") private CreateOptions createOptions; - @JsonProperty("DeleteOptions") private DeleteOptions deleteOptions; - @JsonProperty("DeploymentConfig") private DeploymentConfig deploymentConfig; - @JsonProperty("DeploymentConfigList") private DeploymentConfigList deploymentConfigList; - @JsonProperty("EgressNetworkPolicy") private EgressNetworkPolicy egressNetworkPolicy; - @JsonProperty("EgressNetworkPolicyList") private EgressNetworkPolicyList egressNetworkPolicyList; - @JsonProperty("GetOptions") private GetOptions getOptions; - @JsonProperty("Group") private Group group; - @JsonProperty("GroupList") private GroupList groupList; - @JsonProperty("HelmChartRepository") private HelmChartRepository helmChartRepository; - @JsonProperty("HelmChartRepositoryList") private HelmChartRepositoryList helmChartRepositoryList; - @JsonProperty("HostSubnet") private HostSubnet hostSubnet; - @JsonProperty("HostSubnetList") private HostSubnetList hostSubnetList; - @JsonProperty("Identity") private Identity identity; - @JsonProperty("IdentityList") private IdentityList identityList; - @JsonProperty("ImageList") private ImageList imageList; - @JsonProperty("ImageSignature") private ImageSignature imageSignature; - @JsonProperty("ImageStreamImage") private ImageStreamImage imageStreamImage; - @JsonProperty("ImageStreamImport") private ImageStreamImport imageStreamImport; - @JsonProperty("ImageStreamList") private ImageStreamList imageStreamList; - @JsonProperty("ImageStreamMapping") private ImageStreamMapping imageStreamMapping; - @JsonProperty("ImageStreamTagList") private ImageStreamTagList imageStreamTagList; - @JsonProperty("ImageTag") private ImageTag imageTag; - @JsonProperty("ImageTagList") private ImageTagList imageTagList; - @JsonProperty("Info") private Info info; - @JsonProperty("ListOptions") private ListOptions listOptions; - @JsonProperty("LocalResourceAccessReview") private LocalResourceAccessReview localResourceAccessReview; - @JsonProperty("LocalSubjectAccessReview") private LocalSubjectAccessReview localSubjectAccessReview; - @JsonProperty("NetNamespace") private NetNamespace netNamespace; - @JsonProperty("NetNamespaceList") private NetNamespaceList netNamespaceList; - @JsonProperty("OAuthAccessToken") private OAuthAccessToken oAuthAccessToken; - @JsonProperty("OAuthAccessTokenList") private OAuthAccessTokenList oAuthAccessTokenList; - @JsonProperty("OAuthAuthorizeToken") private OAuthAuthorizeToken oAuthAuthorizeToken; - @JsonProperty("OAuthAuthorizeTokenList") private OAuthAuthorizeTokenList oAuthAuthorizeTokenList; - @JsonProperty("OAuthClient") private OAuthClient oAuthClient; - @JsonProperty("OAuthClientAuthorization") private OAuthClientAuthorization oAuthClientAuthorization; - @JsonProperty("OAuthClientAuthorizationList") private OAuthClientAuthorizationList oAuthClientAuthorizationList; - @JsonProperty("OAuthClientList") private OAuthClientList oAuthClientList; - @JsonProperty("ObjectMeta") - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; - @JsonProperty("OpenShiftRoleBindingRestrictionList") + private ObjectMeta objectMeta; private RoleBindingRestrictionList openShiftRoleBindingRestrictionList; - @JsonProperty("OpenshiftClusterRole") private ClusterRole openshiftClusterRole; - @JsonProperty("OpenshiftClusterRoleBinding") private ClusterRoleBinding openshiftClusterRoleBinding; - @JsonProperty("OpenshiftClusterRoleBindingList") private ClusterRoleBindingList openshiftClusterRoleBindingList; - @JsonProperty("OpenshiftClusterRoleList") private ClusterRoleList openshiftClusterRoleList; - @JsonProperty("OpenshiftClusterRoleScopeRestriction") private ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction; - @JsonProperty("OpenshiftRole") private Role openshiftRole; - @JsonProperty("OpenshiftRoleBinding") private RoleBinding openshiftRoleBinding; - @JsonProperty("OpenshiftRoleBindingList") private RoleBindingList openshiftRoleBindingList; - @JsonProperty("OpenshiftRoleBindingRestriction") private RoleBindingRestriction openshiftRoleBindingRestriction; - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") private RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec; - @JsonProperty("OpenshiftRoleList") private RoleList openshiftRoleList; - @JsonProperty("Patch") private Patch patch; - @JsonProperty("PatchOptions") private PatchOptions patchOptions; - @JsonProperty("PodSecurityPolicyReview") private PodSecurityPolicyReview podSecurityPolicyReview; - @JsonProperty("PodSecurityPolicySelfSubjectReview") private PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview; - @JsonProperty("PodSecurityPolicySubjectReview") private PodSecurityPolicySubjectReview podSecurityPolicySubjectReview; - @JsonProperty("Project") private Project project; - @JsonProperty("ProjectHelmChartRepository") private ProjectHelmChartRepository projectHelmChartRepository; - @JsonProperty("ProjectHelmChartRepositoryList") private ProjectHelmChartRepositoryList projectHelmChartRepositoryList; - @JsonProperty("ProjectList") private ProjectList projectList; - @JsonProperty("ProjectRequest") private ProjectRequest projectRequest; - @JsonProperty("Quantity") private Quantity quantity; - @JsonProperty("RangeAllocation") private RangeAllocation rangeAllocation; - @JsonProperty("RangeAllocationList") private RangeAllocationList rangeAllocationList; - @JsonProperty("ResourceAccessReview") private ResourceAccessReview resourceAccessReview; - @JsonProperty("ResourceAccessReviewResponse") private ResourceAccessReviewResponse resourceAccessReviewResponse; - @JsonProperty("RootPaths") private RootPaths rootPaths; - @JsonProperty("Route") private Route route; - @JsonProperty("RouteList") private RouteList routeList; - @JsonProperty("SecurityContextConstraints") private SecurityContextConstraints securityContextConstraints; - @JsonProperty("SecurityContextConstraintsList") private SecurityContextConstraintsList securityContextConstraintsList; - @JsonProperty("SelfSubjectRulesReview") private SelfSubjectRulesReview selfSubjectRulesReview; - @JsonProperty("Status") private Status status; - @JsonProperty("SubjectAccessReview") private SubjectAccessReview subjectAccessReview; - @JsonProperty("SubjectAccessReviewResponse") private SubjectAccessReviewResponse subjectAccessReviewResponse; - @JsonProperty("SubjectRulesReview") private SubjectRulesReview subjectRulesReview; - @JsonProperty("TagEvent") private TagEvent tagEvent; - @JsonProperty("Template") private Template template; - @JsonProperty("TemplateInstance") private TemplateInstance templateInstance; - @JsonProperty("TemplateInstanceList") private TemplateInstanceList templateInstanceList; - @JsonProperty("TemplateList") private TemplateList templateList; - @JsonProperty("Time") private String time; - @JsonProperty("TokenReview") private TokenReview tokenReview; - @JsonProperty("TypeMeta") private TypeMeta typeMeta; - @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; - @JsonProperty("User") private User user; - @JsonProperty("UserIdentityMapping") private UserIdentityMapping userIdentityMapping; - @JsonProperty("UserList") private UserList userList; - @JsonProperty("UserOAuthAccessToken") private UserOAuthAccessToken userOAuthAccessToken; - @JsonProperty("UserOAuthAccessTokenList") private UserOAuthAccessTokenList userOAuthAccessTokenList; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -473,7 +217,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -1124,12 +868,12 @@ public void setOAuthClientList(OAuthClientList oAuthClientList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } @@ -1643,16 +1387,6 @@ public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccess this.userOAuthAccessTokenList = userOAuthAccessTokenList; } - @JsonIgnore - public ValidationSchemaBuilder edit() { - return new ValidationSchemaBuilder(this); - } - - @JsonIgnore - public ValidationSchemaBuilder toBuilder() { - return edit(); - } - @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties;