Fix model warnings

api/src/main/java/io/strimzi/api/kafka/Crds.java

@@ -320,7 +320,7 @@ public static <T extends CustomResource> List<String> apiVersions(Class<T> cls)
 
             List<String> versions;
             try {
-                versions = singletonList(group + "/" + (String) cls.getField("VERSION").get(null));
+                versions = singletonList(group + "/" + cls.getField("VERSION").get(null));
             } catch (NoSuchFieldException e) {
                 versions = ((List<String>) cls.getField("VERSIONS").get(null)).stream().map(v ->
                         group + "/" + v).collect(Collectors.toList());

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridge.java

@@ -26,8 +26,6 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import static java.util.Collections.emptyMap;
-
 @JsonDeserialize
 @Crd(
     spec = @Crd.Spec(
@@ -106,7 +104,7 @@ public class KafkaBridge extends CustomResource<KafkaBridgeSpec, KafkaBridgeStat
     private String apiVersion;
     private String kind;
 
-    private final Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     public KafkaBridge() {
         super();
@@ -132,11 +130,14 @@ public KafkaBridgeStatus getStatus() {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties != null ? this.additionalProperties : emptyMap();
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
 
@@ -152,5 +153,4 @@ public void setAdditionalProperty(String name, Object value) {
     public static Predicate<KafkaBridge> isReady() {
         return CustomResourceConditions.isReady();
     }
-
 }

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeAdminClientSpec.java

@@ -29,6 +29,6 @@ public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {
     @Override
     @Description("The Kafka AdminClient configuration used for AdminClient instances created by the bridge.")
     public Map<String, Object> getConfig() {
-        return config;
+        return this.config != null ? this.config : Map.of();
     }
 }

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeClientSpec.java

@@ -14,8 +14,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static java.util.Collections.emptyMap;
-
 @Buildable(
         editableEnabled = false,
         builderPackage = Constants.FABRIC8_KUBERNETES_API
@@ -24,12 +22,11 @@
 @EqualsAndHashCode
 @ToString
 public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving {
-    protected Map<String, Object> config = new HashMap<>(0);
-
+    protected Map<String, Object> config;
     private Map<String, Object> additionalProperties;
 
     public Map<String, Object> getConfig() {
-        return config;
+        return this.config != null ? this.config : Map.of();
     }
 
     public void setConfig(Map<String, Object> config) {
@@ -38,13 +35,13 @@ public void setConfig(Map<String, Object> config) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties != null ? this.additionalProperties : emptyMap();
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
         if (this.additionalProperties == null) {
-            this.additionalProperties = new HashMap<>(1);
+            this.additionalProperties = new HashMap<>(2);
         }
         this.additionalProperties.put(name, value);
     }

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java

@@ -36,7 +36,7 @@ public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {
     @Override
     @Description("The Kafka consumer configuration used for consumer instances created by the bridge. Properties with the following prefixes cannot be set: " + FORBIDDEN_PREFIXES + " (with the exception of: " + FORBIDDEN_PREFIX_EXCEPTIONS + ").")
     public Map<String, Object> getConfig() {
-        return config;
+        return this.config != null ? this.config : Map.of();
     }
 
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java

@@ -36,7 +36,7 @@ public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving {
     public static final String HTTP_DEFAULT_HOST = "0.0.0.0";
     private int port = HTTP_DEFAULT_PORT;
     private KafkaBridgeHttpCors cors;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     public KafkaBridgeHttpConfig() {
     }
@@ -68,11 +68,14 @@ public void setCors(KafkaBridgeHttpCors cors) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
 }

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpCors.java

@@ -32,7 +32,7 @@
 public class KafkaBridgeHttpCors implements UnknownPropertyPreserving {
     private List<String> allowedOrigins = null;
     private List<String> allowedMethods = null;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     @Description("List of allowed origins. " +
             "Java regular expressions can be used.")
@@ -59,11 +59,14 @@ public void setAllowedMethods(List<String> allowedMethods) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
 }

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java

@@ -33,7 +33,7 @@ public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {
     @Override
     @Description("The Kafka producer configuration used for producer instances created by the bridge. Properties with the following prefixes cannot be set: " + FORBIDDEN_PREFIXES + " (with the exception of: " + FORBIDDEN_PREFIX_EXCEPTIONS + ").")
     public Map<String, Object> getConfig() {
-        return config;
+        return this.config != null ? this.config : Map.of();
     }
 
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java

@@ -42,7 +42,7 @@ public class KafkaBridgeTemplate implements UnknownPropertyPreserving {
     private ContainerTemplate initContainer;
     private ResourceTemplate clusterRoleBinding;
     private ResourceTemplate serviceAccount;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     @Description("Template for Kafka Bridge `Deployment`.")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -126,11 +126,14 @@ public void setServiceAccount(ResourceTemplate serviceAccount) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
 }

api/src/main/java/io/strimzi/api/kafka/model/common/CertAndKeySecretSource.java

@@ -30,7 +30,6 @@ public class CertAndKeySecretSource implements UnknownPropertyPreserving {
     private String secretName;
     private String certificate;
     private String key;
-
     private Map<String, Object> additionalProperties;
 
     @Description("The name of the Secret containing the certificate.")
@@ -65,13 +64,13 @@ public void setKey(String key) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
         if (this.additionalProperties == null) {
-            this.additionalProperties = new HashMap<>(1);
+            this.additionalProperties = new HashMap<>(2);
         }
         this.additionalProperties.put(name, value);
     }

api/src/main/java/io/strimzi/api/kafka/model/common/CertSecretSource.java

@@ -32,7 +32,6 @@ public class CertSecretSource implements UnknownPropertyPreserving {
     private String secretName;
     private String certificate;
     private String pattern;
-
     private Map<String, Object> additionalProperties;
 
     @Description("The name of the Secret containing the certificate.")
@@ -67,13 +66,13 @@ public void setPattern(String pattern) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
         if (this.additionalProperties == null) {
-            this.additionalProperties = new HashMap<>(1);
+            this.additionalProperties = new HashMap<>(2);
         }
         this.additionalProperties.put(name, value);
     }

api/src/main/java/io/strimzi/api/kafka/model/common/CertificateAuthority.java

@@ -28,16 +28,15 @@
 @EqualsAndHashCode
 @ToString
 public class CertificateAuthority implements UnknownPropertyPreserving {
+    public static final int DEFAULT_CERTS_VALIDITY_DAYS = 365;
+    public static final int DEFAULT_CERTS_RENEWAL_DAYS = 30;
+
     private int validityDays;
     private boolean generateCertificateAuthority = true;
     private boolean generateSecretOwnerReference = true;
     private int renewalDays;
     private CertificateExpirationPolicy certificateExpirationPolicy;
-
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
-
-    public static final int DEFAULT_CERTS_VALIDITY_DAYS = 365;
-    public static final int DEFAULT_CERTS_RENEWAL_DAYS = 30;
+    private Map<String, Object> additionalProperties;
 
     @Description("The number of days generated certificates should be valid for. The default is 365.")
     @Minimum(1)
@@ -100,14 +99,17 @@ public CertificateExpirationPolicy getCertificateExpirationPolicy() {
     public void setCertificateExpirationPolicy(CertificateExpirationPolicy certificateExpirationPolicy) {
         this.certificateExpirationPolicy = certificateExpirationPolicy;
     }
-    
+
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
 }

api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java

@@ -16,8 +16,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.emptyMap;
-
 /**
  * Represent the TLS configuration for all the Clients(KafkaConnect, KafkaBridge, KafkaMirrorMaker, KafkaMirrorMaker2).
  */
@@ -45,13 +43,13 @@ public void setTrustedCertificates(List<CertSecretSource> trustedCertificates) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties != null ? this.additionalProperties : emptyMap();
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
         if (this.additionalProperties == null) {
-            this.additionalProperties = new HashMap<>(1);
+            this.additionalProperties = new HashMap<>(2);
         }
         this.additionalProperties.put(name, value);
     }

api/src/main/java/io/strimzi/api/kafka/model/common/Condition.java

@@ -14,8 +14,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static java.util.Collections.emptyMap;
-
 @Buildable(
         editableEnabled = false,
         builderPackage = Constants.FABRIC8_KUBERNETES_API
@@ -81,13 +79,13 @@ public void setMessage(String message) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties != null ? this.additionalProperties : emptyMap();
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
         if (this.additionalProperties == null) {
-            this.additionalProperties = new HashMap<>(1);
+            this.additionalProperties = new HashMap<>(2);
         }
         this.additionalProperties.put(name, value);
     }

api/src/main/java/io/strimzi/api/kafka/model/common/ContainerEnvVar.java

@@ -29,7 +29,7 @@
 public class ContainerEnvVar implements UnknownPropertyPreserving {
     private String name;
     private String value;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     @Description("The environment variable key.")
     public String getName() {
@@ -51,12 +51,14 @@ public void setValue(String value) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
-
 }

api/src/main/java/io/strimzi/api/kafka/model/common/CustomResourceConditions.java

@@ -30,7 +30,6 @@
  * </pre>
  */
 public class CustomResourceConditions {
-
     private CustomResourceConditions() {
     }
 

api/src/main/java/io/strimzi/api/kafka/model/common/ExternalConfigurationReference.java

@@ -29,7 +29,7 @@
 @ToString
 public class ExternalConfigurationReference implements UnknownPropertyPreserving {
     private ConfigMapKeySelector configMapKeyRef;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
+    private Map<String, Object> additionalProperties;
 
     @Description("Reference to the key in the ConfigMap containing the configuration.")
     @KubeLink(group = "core", version = "v1", kind = "configmapkeyselector")
@@ -44,13 +44,15 @@ public void setConfigMapKeyRef(ConfigMapKeySelector configMapKeyRef) {
 
     @Override
     public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
+        return this.additionalProperties != null ? this.additionalProperties : Map.of();
     }
 
     @Override
     public void setAdditionalProperty(String name, Object value) {
+        if (this.additionalProperties == null) {
+            this.additionalProperties = new HashMap<>(2);
+        }
         this.additionalProperties.put(name, value);
     }
-
 }