fix fabric8io#3625: removing default objectmeta

shawkins · May 25, 2022 · 28ade31 · 28ade31
1 parent 760d980
commit 28ade31
Show file tree

Hide file tree

Showing 288 changed files with 817 additions and 1,302 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ And Store.getKey can be used rather than directly referencing static Cache funct
 * Fix #4142: Added patch() and patch(PatchContext) methods for use with resource and load
 * Fix #4146: ManagedKubernetesClient and ManagedOpenShiftClient as delayed OSGi services
 * Fix #4093: adding a possibility to get a log as an `InputStream` from the `Loggable` resources
+* Fix #3625: adds default maps to mostly prevent the need for null checks on things like annotations and labels.
 
 #### Dependency Upgrade
 * Fix #3788: Point CamelK Extension model to latest released version v1.8.0

diff --git a/doc/MIGRATION-v6.md b/doc/MIGRATION-v6.md
@@ -1,7 +1,7 @@
 # Migration from 5.x to 6.x
 
 ## Contents:
-- [ObjectMetadata](#objectmetadata)
+- [Default Maps](#default-maps)
 - [Backwards Compatibility Interceptor](#backwards-compatibility-interceptor)
 - [Namespace Changes](#namespace-changes)
 - [API/Impl split](#api-impl-split)
@@ -20,14 +20,21 @@
 - [Delete Behavior](#delete-behavior)
 - [Stream Changes](#stream-changes)
 
-## ObjectMetadata
+## Default Maps
 
-ObjectMetadata will default to a non-null value.  All Maps in the generated object models, including ObjectMetadata.annotations and labels will also be non-null by default.  A small behavioral difference is that the default value will be omitted from serialization, previously if you did something like 
+All Maps in the generated object models, including ObjectMetadata.annotations and labels will also be non-null by default.  A small behavioral difference is that the default value will be omitted from serialization, previously if you did something like: 
+
+```
+Pod p = new PodBuilder().withNewMetadata().withLabels(new HashMap()).endMetadata().build();
 ```
-Pod p = new Pod();
-p.setMetadata(new ObjectMetadata());
+p would serialize with 
+
 ```
-p would serialize with "metadata: {}" - that will now be omitted.
+metadata: 
+  labels: {}
+```
+
+That empty map will now be omitted - which is the same as the existing behavior for arrays.
 
 ## Backwards Compatibility Interceptor
 

diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java
@@ -75,7 +75,6 @@
 public abstract class CustomResource<S, T> implements HasMetadata {
   private static final Logger LOG = LoggerFactory.getLogger(CustomResource.class);
 
-  @JsonInclude(value = Include.CUSTOM, valueFilter = ObjectMeta.class)
   private ObjectMeta metadata = new ObjectMeta();
 
   @JsonProperty("spec")

diff --git a/...-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/...-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
@@ -129,8 +129,7 @@ public class KubeSchema {
     @JsonProperty("MutatingWebhookConfigurationList")
     private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList;
     @JsonProperty("ObjectMeta")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta;
     @JsonProperty("Patch")
     private Patch patch;
     @JsonProperty("PatchOptions")

diff --git a/...o/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java b/...o/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java
@@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata
     @JsonProperty("kind")
     private String kind = "MutatingWebhookConfiguration";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("webhooks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<MutatingWebhook> webhooks = new ArrayList<MutatingWebhook>();

diff --git a/...fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java b/...fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java
@@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata
     @JsonProperty("kind")
     private String kind = "ValidatingWebhookConfiguration";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("webhooks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<ValidatingWebhook> webhooks = new ArrayList<ValidatingWebhook>();

diff --git a/...ric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java b/...ric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java
@@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata
     @JsonProperty("kind")
     private String kind = "MutatingWebhookConfiguration";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("webhooks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<MutatingWebhook> webhooks = new ArrayList<MutatingWebhook>();

diff --git a/...c8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java b/...c8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java
@@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata
     @JsonProperty("kind")
     private String kind = "ValidatingWebhookConfiguration";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("webhooks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<ValidatingWebhook> webhooks = new ArrayList<ValidatingWebhook>();

diff --git a/...ration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java b/...ration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java
@@ -75,8 +75,7 @@ public class TokenReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "TokenReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private TokenReviewSpec spec;
     @JsonProperty("status")

diff --git a/...rated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java b/...rated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java
@@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced
     @JsonProperty("kind")
     private String kind = "LocalSubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SubjectAccessReviewSpec spec;
     @JsonProperty("status")

diff --git a/...erated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java b/...erated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java
@@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SelfSubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SelfSubjectAccessReviewSpec spec;
     @JsonProperty("status")

diff --git a/...nerated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java b/...nerated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java
@@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SelfSubjectRulesReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SelfSubjectRulesReviewSpec spec;
     @JsonProperty("status")

diff --git a/.../generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java b/.../generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java
@@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SubjectAccessReviewSpec spec;
     @JsonProperty("status")

diff --git a/.../java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java b/.../java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java
@@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced
     @JsonProperty("kind")
     private String kind = "LocalSubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SubjectAccessReviewSpec spec;
     @JsonProperty("status")

diff --git a/...d/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java b/...d/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java
@@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SelfSubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SelfSubjectAccessReviewSpec spec;
     @JsonProperty("status")

diff --git a/...ed/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java b/...ed/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java
@@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SelfSubjectRulesReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SelfSubjectRulesReviewSpec spec;
     @JsonProperty("status")

diff --git a/...rated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java b/...rated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java
@@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata
     @JsonProperty("kind")
     private String kind = "SubjectAccessReview";
     @JsonProperty("metadata")
-    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
-    private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
+    private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
     @JsonProperty("spec")
     private SubjectAccessReviewSpec spec;
     @JsonProperty("status")