#2779 CrdGenerator validate @JsonPropertyOrder (#9831)

Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
strimzi · Mar 14, 2024 · 3f9fe6f · 3f9fe6f
1 parent e1855eb
commit 3f9fe6f
Show file tree

Hide file tree

Showing 111 changed files with 3,741 additions and 3,387 deletions.
diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeAdminClientSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeAdminClientSpec.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.bridge;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
@@ -18,6 +19,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"config"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.bridge;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
@@ -20,6 +21,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"config"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.bridge;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
@@ -20,6 +21,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"config"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeStatus.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeStatus.java
@@ -21,7 +21,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({ "conditions", "observedGeneration", "url" })
+@JsonPropertyOrder({ "conditions", "observedGeneration", "url", "replicas", "labelSelector" })
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeStatus extends Status {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/CertAndKeySecretSource.java b/api/src/main/java/io/strimzi/api/kafka/model/common/CertAndKeySecretSource.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -19,6 +20,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"key", "secretName", "certificate"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CertAndKeySecretSource extends CertSecretSource {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/CertSecretSource.java b/api/src/main/java/io/strimzi/api/kafka/model/common/CertSecretSource.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"secretName", "certificate"})
 @EqualsAndHashCode
 @ToString
 public class CertSecretSource implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/CertificateAuthority.java b/api/src/main/java/io/strimzi/api/kafka/model/common/CertificateAuthority.java
@@ -24,7 +24,8 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
-@JsonPropertyOrder({ "generateCertificateAuthority", "generateSecretOwnerReference", "validityDays", "renewalDays" })
+@JsonPropertyOrder({ "generateCertificateAuthority", "generateSecretOwnerReference", "validityDays",
+    "renewalDays", "certificateExpirationPolicy" })
 @EqualsAndHashCode
 @ToString
 public class CertificateAuthority implements UnknownPropertyPreserving, Serializable {
@@ -35,8 +36,10 @@ public class CertificateAuthority implements UnknownPropertyPreserving, Serializ
     private boolean generateCertificateAuthority = true;
     private boolean generateSecretOwnerReference = true;
     private int renewalDays;
-    private Map<String, Object> additionalProperties = new HashMap<>(0);
     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;
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java b/api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
 import io.sundr.builder.annotations.Buildable;
@@ -27,6 +28,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"trustedCertificates"})
 @EqualsAndHashCode
 @ToString
 public class ClientTls implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/ContainerEnvVar.java b/api/src/main/java/io/strimzi/api/kafka/model/common/ContainerEnvVar.java
@@ -6,6 +6,7 @@
 package io.strimzi.api.kafka.model.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"name", "value"})
 @EqualsAndHashCode
 @ToString
 public class ContainerEnvVar implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/ExternalConfigurationReference.java b/api/src/main/java/io/strimzi/api/kafka/model/common/ExternalConfigurationReference.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.fabric8.kubernetes.api.model.ConfigMapKeySelector;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.KubeLink;
@@ -24,6 +25,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"configMapKeyRef"})
 @EqualsAndHashCode
 @ToString
 public class ExternalConfigurationReference implements Serializable, UnknownPropertyPreserving {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/GenericSecretSource.java b/api/src/main/java/io/strimzi/api/kafka/model/common/GenericSecretSource.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"key", "secretName"})
 @EqualsAndHashCode
 @ToString
 public class GenericSecretSource implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/JvmOptions.java b/api/src/main/java/io/strimzi/api/kafka/model/common/JvmOptions.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.Pattern;
 import io.sundr.builder.annotations.Buildable;
@@ -25,6 +26,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"-XX", "-Xmx", "-Xms", "gcLoggingEnabled", "javaSystemProperties"})
 @EqualsAndHashCode
 @ToString
 public class JvmOptions implements UnknownPropertyPreserving, Serializable {
@@ -42,6 +44,7 @@ public class JvmOptions implements UnknownPropertyPreserving, Serializable {
     private boolean gcLoggingEnabled = DEFAULT_GC_LOGGING_ENABLED;
     private List<SystemProperty> javaSystemProperties;
     private Map<String, String> xx;
+
     private Map<String, Object> additionalProperties = new HashMap<>(0);
 
     @JsonProperty("-Xmx")

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/Password.java b/api/src/main/java/io/strimzi/api/kafka/model/common/Password.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"valueFrom"})
 @EqualsAndHashCode
 @ToString
 public class Password implements Serializable, UnknownPropertyPreserving {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/PasswordSecretSource.java b/api/src/main/java/io/strimzi/api/kafka/model/common/PasswordSecretSource.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"secretName", "password"})
 @EqualsAndHashCode
 @ToString
 public class PasswordSecretSource implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/PasswordSource.java b/api/src/main/java/io/strimzi/api/kafka/model/common/PasswordSource.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.fabric8.kubernetes.api.model.SecretKeySelector;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.KubeLink;
@@ -24,6 +25,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"secretKeyRef"})
 @EqualsAndHashCode
 @ToString
 public class PasswordSource implements Serializable, UnknownPropertyPreserving {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/Probe.java b/api/src/main/java/io/strimzi/api/kafka/model/common/Probe.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.Minimum;
 import io.sundr.builder.annotations.Buildable;
@@ -24,6 +25,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"initialDelaySeconds", "timeoutSeconds", "periodSeconds", "successThreshold", "failureThreshold"})
 @EqualsAndHashCode
 @ToString
 public class Probe implements UnknownPropertyPreserving, Serializable {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/Rack.java b/api/src/main/java/io/strimzi/api/kafka/model/common/Rack.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
 import io.strimzi.crdgenerator.annotations.Example;
@@ -26,13 +27,15 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"topologyKey"})
 @EqualsAndHashCode
 @ToString
 public class Rack implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;
 
     private String topologyKey;
+
     private Map<String, Object> additionalProperties = new HashMap<>(0);
 
     public Rack() {

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/SystemProperty.java b/api/src/main/java/io/strimzi/api/kafka/model/common/SystemProperty.java
@@ -6,6 +6,7 @@
 package io.strimzi.api.kafka.model.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({"name", "value"})
 @EqualsAndHashCode
 @ToString
 public class SystemProperty implements UnknownPropertyPreserving, Serializable {

diff --git a/...java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationOAuth.java b/...java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationOAuth.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common.authentication;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.CertSecretSource;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.api.kafka.model.common.GenericSecretSource;
@@ -26,6 +27,10 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"type", "clientId", "username", "scope", "audience", "tokenEndpointUri", "connectTimeoutSeconds",
+    "readTimeoutSeconds", "httpRetries", "httpRetryPauseMs", "clientSecret", "passwordSecret", "accessToken",
+    "refreshToken", "tlsTrustedCertificates", "disableTlsHostnameVerification", "maxTokenExpirySeconds",
+    "accessTokenIsJwt", "enableMetrics", "includeAcceptHeader"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaClientAuthenticationOAuth extends KafkaClientAuthentication {

diff --git a/...java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationPlain.java b/...java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationPlain.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common.authentication;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.api.kafka.model.common.PasswordSecretSource;
 import io.strimzi.crdgenerator.annotations.Description;
@@ -22,6 +23,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"type", "username", "passwordSecret"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaClientAuthenticationPlain extends KafkaClientAuthentication {

diff --git a/...o/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationScramSha256.java b/...o/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationScramSha256.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common.authentication;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.api.kafka.model.common.PasswordSecretSource;
 import io.strimzi.crdgenerator.annotations.Description;
@@ -22,6 +23,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"type", "username", "passwordSecret"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaClientAuthenticationScramSha256 extends KafkaClientAuthenticationScram {

diff --git a/...o/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationScramSha512.java b/...o/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationScramSha512.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common.authentication;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.api.kafka.model.common.PasswordSecretSource;
 import io.strimzi.crdgenerator.annotations.Description;
@@ -22,6 +23,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"type", "username", "passwordSecret"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaClientAuthenticationScramSha512 extends KafkaClientAuthenticationScram {

diff --git a/...n/java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationTls.java b/...n/java/io/strimzi/api/kafka/model/common/authentication/KafkaClientAuthenticationTls.java
@@ -5,6 +5,7 @@
 package io.strimzi.api.kafka.model.common.authentication;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.api.kafka.model.common.CertAndKeySecretSource;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.crdgenerator.annotations.Description;
@@ -22,6 +23,7 @@
         builderPackage = Constants.FABRIC8_KUBERNETES_API
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({"type", "certificateAndKey"})
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaClientAuthenticationTls extends KafkaClientAuthentication {