Remove serializable from API (strimzi#9997)

Signed-off-by: see-quick <[email protected]>
fvaleri · Apr 20, 2024 · 4a3db17 · 4a3db17
1 parent 956f84d
commit 4a3db17
Show file tree

Hide file tree

Showing 186 changed files with 106 additions and 559 deletions.
diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
@@ -41,7 +41,7 @@
             <property name="specialImportsRegExp" value="^javax\."/>
             <property name="standardPackageRegExp" value="^java\."/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="false"/>
+            <property name="separateLineBetweenGroups" value="true"/>
         </module>
 
         <!-- style -->

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
@@ -23,8 +23,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {
-    private static final long serialVersionUID = 1L;
-
     public static final String FORBIDDEN_PREFIXES = "ssl., bootstrap.servers, sasl., security.";
     public static final String FORBIDDEN_PREFIX_EXCEPTIONS = "ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols";
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeClientSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeClientSpec.java
@@ -11,7 +11,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,10 +23,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
-public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving {
     protected Map<String, Object> config = new HashMap<>(0);
 
     private Map<String, Object> additionalProperties;

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
@@ -25,8 +25,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {
-    private static final long serialVersionUID = 1L;
-
     public static final String FORBIDDEN_PREFIXES = "ssl., bootstrap.servers, group.id, sasl., security.";
     public static final String FORBIDDEN_PREFIX_EXCEPTIONS = "ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols";
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java
@@ -16,7 +16,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,10 +31,7 @@
 @JsonPropertyOrder({"port", "cors"})
 @EqualsAndHashCode
 @ToString
-public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving {
     public static final int HTTP_DEFAULT_PORT = 8080;
     public static final String HTTP_DEFAULT_HOST = "0.0.0.0";
     private int port = HTTP_DEFAULT_PORT;

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpCors.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpCors.java
@@ -14,7 +14,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,9 +29,7 @@
 @JsonPropertyOrder({"allowedOrigins", "allowedMethods"})
 @EqualsAndHashCode
 @ToString
-public class KafkaBridgeHttpCors implements UnknownPropertyPreserving, Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class KafkaBridgeHttpCors implements UnknownPropertyPreserving {
     private List<String> allowedOrigins = null;
     private List<String> allowedMethods = null;
     private Map<String, Object> additionalProperties = new HashMap<>(0);

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
@@ -25,8 +25,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {
-    private static final long serialVersionUID = 1L;
-
     public static final String FORBIDDEN_PREFIXES = "ssl., bootstrap.servers, sasl., security.";
     public static final String FORBIDDEN_PREFIX_EXCEPTIONS = "ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols";
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeSpec.java
@@ -41,7 +41,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeSpec extends Spec implements HasConfigurableLogging, HasLivenessProbe, HasReadinessProbe {
-    private static final long serialVersionUID = 1L;
     private static final int DEFAULT_REPLICAS = 1;
 
     private int replicas = DEFAULT_REPLICAS;

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
@@ -25,8 +25,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeStatus extends Status {
-    private static final long serialVersionUID = 1L;
-
     private String url;
     private int replicas;
     private String labelSelector;

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java b/api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java
@@ -19,7 +19,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,9 +33,7 @@
 @JsonPropertyOrder({"deployment", "pod", "apiService", "podDisruptionBudget", "bridgeContainer", "clusterRoleBinding", "serviceAccount", "initContainer"})
 @EqualsAndHashCode
 @ToString
-public class KafkaBridgeTemplate implements Serializable, UnknownPropertyPreserving {
-    private static final long serialVersionUID = 1L;
-
+public class KafkaBridgeTemplate implements UnknownPropertyPreserving {
     private DeploymentTemplate deployment;
     private PodTemplate pod;
     private InternalServiceTemplate apiService;

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
@@ -24,8 +24,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CertAndKeySecretSource extends CertSecretSource {
-    private static final long serialVersionUID = 1L;
-
     protected String key;
 
     @Description("The name of the private key in the Secret.")

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,10 +26,7 @@
 @JsonPropertyOrder({"secretName", "certificate"})
 @EqualsAndHashCode
 @ToString
-public class CertSecretSource implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class CertSecretSource implements UnknownPropertyPreserving {
     protected String secretName;
     protected String certificate;
 

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,10 +27,7 @@
     "renewalDays", "certificateExpirationPolicy" })
 @EqualsAndHashCode
 @ToString
-public class CertificateAuthority implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class CertificateAuthority implements UnknownPropertyPreserving {
     private int validityDays;
     private boolean generateCertificateAuthority = true;
     private boolean generateSecretOwnerReference = true;

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,9 +30,7 @@
 @JsonPropertyOrder({"trustedCertificates"})
 @EqualsAndHashCode
 @ToString
-public class ClientTls implements UnknownPropertyPreserving, Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class ClientTls implements UnknownPropertyPreserving {
     private List<CertSecretSource> trustedCertificates;
     private Map<String, Object> additionalProperties;
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/Condition.java b/api/src/main/java/io/strimzi/api/kafka/model/common/Condition.java
@@ -11,7 +11,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,9 +24,7 @@
 @JsonPropertyOrder({ "type", "status", "lastTransitionTime", "reason", "message" })
 @EqualsAndHashCode
 @ToString
-public class Condition implements UnknownPropertyPreserving, Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class Condition implements UnknownPropertyPreserving {
     private String status;
     private String reason;
     private String message;

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,10 +26,7 @@
 @JsonPropertyOrder({"name", "value"})
 @EqualsAndHashCode
 @ToString
-public class ContainerEnvVar implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class ContainerEnvVar implements UnknownPropertyPreserving {
     private String name;
     private String value;
     private Map<String, Object> additionalProperties = new HashMap<>(0);

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
@@ -13,7 +13,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,10 +27,7 @@
 @JsonPropertyOrder({"configMapKeyRef"})
 @EqualsAndHashCode
 @ToString
-public class ExternalConfigurationReference implements Serializable, UnknownPropertyPreserving {
-
-    private static final long serialVersionUID = 1L;
-
+public class ExternalConfigurationReference implements UnknownPropertyPreserving {
     private ConfigMapKeySelector configMapKeyRef;
     private Map<String, Object> additionalProperties = new HashMap<>(0);
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/ExternalLogging.java b/api/src/main/java/io/strimzi/api/kafka/model/common/ExternalLogging.java
@@ -25,8 +25,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ExternalLogging extends Logging {
-
-    private static final long serialVersionUID = 1L;
     public static final String TYPE_EXTERNAL = "external";
 
     private ExternalConfigurationReference valueFrom;

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,9 +26,7 @@
 @JsonPropertyOrder({"key", "secretName"})
 @EqualsAndHashCode
 @ToString
-public class GenericSecretSource implements UnknownPropertyPreserving, Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class GenericSecretSource implements UnknownPropertyPreserving {
     protected String secretName;
     protected String key;
 

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/InlineLogging.java b/api/src/main/java/io/strimzi/api/kafka/model/common/InlineLogging.java
@@ -25,9 +25,6 @@
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class InlineLogging extends Logging {
-
-    private static final long serialVersionUID = 1L;
-
     public static final String TYPE_INLINE = "inline";
 
     private Map<String, String> loggers = null;

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
@@ -13,7 +13,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,9 +28,7 @@
 @JsonPropertyOrder({"-XX", "-Xmx", "-Xms", "gcLoggingEnabled", "javaSystemProperties"})
 @EqualsAndHashCode
 @ToString
-public class JvmOptions implements UnknownPropertyPreserving, Serializable {
-    private static final long serialVersionUID = 1L;
-
+public class JvmOptions implements UnknownPropertyPreserving {
     /**
      * Configures the default value for the GC logging configuration. This is used in the model classes when the
      * jvmOptions section is not set at all. Storing it here ensures that the default value is the same when jvmOptions

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/Logging.java b/api/src/main/java/io/strimzi/api/kafka/model/common/Logging.java
@@ -11,7 +11,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,10 +27,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
-public abstract class Logging implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public abstract class Logging implements UnknownPropertyPreserving {
     private Map<String, Object> additionalProperties = new HashMap<>(0);
 
     @Description("Logging type, must be either 'inline' or 'external'.")

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,9 +26,7 @@
 @JsonPropertyOrder({"valueFrom"})
 @EqualsAndHashCode
 @ToString
-public class Password implements Serializable, UnknownPropertyPreserving {
-    private static final long serialVersionUID = 1L;
-
+public class Password implements UnknownPropertyPreserving {
     private PasswordSource valueFrom;
 
     private Map<String, Object> additionalProperties = new HashMap<>(0);

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
@@ -12,7 +12,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,10 +26,7 @@
 @JsonPropertyOrder({"secretName", "password"})
 @EqualsAndHashCode
 @ToString
-public class PasswordSecretSource implements UnknownPropertyPreserving, Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class PasswordSecretSource implements UnknownPropertyPreserving {
     protected String secretName;
     protected String password;
 

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
@@ -13,7 +13,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,9 +27,7 @@
 @JsonPropertyOrder({"secretKeyRef"})
 @EqualsAndHashCode
 @ToString
-public class PasswordSource implements Serializable, UnknownPropertyPreserving {
-    private static final long serialVersionUID = 1L;
-
+public class PasswordSource implements UnknownPropertyPreserving {
     private SecretKeySelector secretKeyRef;
 
     private final Map<String, Object> additionalProperties = new HashMap<>(0);