#9734 - added toString to whole model, including Password, PasswordSe…

api/pom.xml

@@ -63,10 +63,6 @@
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-model-apiextensions</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -78,6 +74,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.sundr</groupId>

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

@@ -6,9 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;
@@ -21,6 +19,7 @@
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.HashMap;
 import java.util.List;
@@ -82,6 +81,7 @@
 @EqualsAndHashCode
 @Version(Constants.V1BETA2)
 @Group(Constants.RESOURCE_GROUP_NAME)
+@ToString
 public class KafkaBridge extends CustomResource<KafkaBridgeSpec, KafkaBridgeStatus> implements Namespaced, UnknownPropertyPreserving {
     private static final long serialVersionUID = 1L;
 
@@ -140,16 +140,6 @@ public void setAdditionalProperty(String name, Object value) {
         this.additionalProperties.put(name, value);
     }
 
-    @Override
-    public String toString() {
-        YAMLMapper mapper = new YAMLMapper();
-        try {
-            return mapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     /**
      * Returns a predicate that determines if KafkaBridge is ready. A KafkaBridge CRD is
      * ready if the observedGeneration of its status is equal to the generation of its metadata

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -18,6 +19,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,6 +9,7 @@
 import io.strimzi.api.kafka.model.common.UnknownPropertyPreserving;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -22,6 +23,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
+@ToString
 public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -10,6 +10,7 @@
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -20,6 +21,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {
     private static final long serialVersionUID = 1L;
 

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

@@ -14,6 +14,7 @@
 import io.strimzi.crdgenerator.annotations.Minimum;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -30,6 +31,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({"port", "cors"})
 @EqualsAndHashCode
+@ToString
 public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -12,6 +12,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -28,6 +29,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({"allowedOrigins", "allowedMethods"})
 @EqualsAndHashCode
+@ToString
 public class KafkaBridgeHttpCors implements UnknownPropertyPreserving, Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -67,13 +69,4 @@ public Map<String, Object> getAdditionalProperties() {
     public void setAdditionalProperty(String name, Object value) {
         this.additionalProperties.put(name, value);
     }
-
-    @Override
-    public String toString() {
-        return "KafkaBridgeHttpCors{" +
-            "allowedOrigins=" + allowedOrigins +
-            ", allowedMethods=" + allowedMethods +
-            ", additionalProperties=" + additionalProperties +
-            '}';
-    }
 }

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

@@ -10,6 +10,7 @@
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -20,6 +21,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {
     private static final long serialVersionUID = 1L;
 

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

@@ -26,6 +26,7 @@
 import io.strimzi.crdgenerator.annotations.Minimum;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @DescriptionFile
 @Buildable(
@@ -37,7 +38,8 @@
     "replicas", "image", "bootstrapServers", "tls", "authentication", "http", "adminClient", "consumer",
     "producer", "resources", "jvmOptions", "logging", "clientRackInitImage", "rack",
     "enableMetrics", "livenessProbe", "readinessProbe", "template", "tracing"})
-@EqualsAndHashCode
+@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;

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

@@ -22,7 +22,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({ "conditions", "observedGeneration", "url" })
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class KafkaBridgeStatus extends Status {
     private static final long serialVersionUID = 1L;

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

@@ -17,6 +17,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -32,6 +33,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({"deployment", "pod", "apiService", "podDisruptionBudget", "bridgeContainer", "clusterRoleBinding", "serviceAccount", "initContainer"})
 @EqualsAndHashCode
+@ToString
 public class KafkaBridgeTemplate implements Serializable, UnknownPropertyPreserving {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Represents a certificate and private key pair inside a Secret
@@ -19,6 +20,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class CertAndKeySecretSource extends CertSecretSource {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -23,6 +24,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
+@ToString
 public class CertSecretSource implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -10,6 +10,7 @@
 import io.strimzi.crdgenerator.annotations.Minimum;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -25,6 +26,7 @@
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 @JsonPropertyOrder({ "generateCertificateAuthority", "generateSecretOwnerReference", "validityDays", "renewalDays" })
 @EqualsAndHashCode
+@ToString
 public class CertificateAuthority implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.DescriptionFile;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -27,6 +28,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
+@ToString
 public class ClientTls implements UnknownPropertyPreserving, Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -23,6 +24,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 @EqualsAndHashCode
+@ToString
 public class ContainerEnvVar implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -10,6 +10,7 @@
 import io.strimzi.crdgenerator.annotations.KubeLink;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -24,6 +25,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 @EqualsAndHashCode
+@ToString
 public class ExternalConfigurationReference implements Serializable, UnknownPropertyPreserving {
 
     private static final long serialVersionUID = 1L;

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

@@ -9,6 +9,8 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.strimzi.crdgenerator.annotations.PresentInVersions;
 import io.sundr.builder.annotations.Buildable;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Logging config comes from an existing, user-supplied config map
@@ -20,6 +22,8 @@
 @JsonPropertyOrder({"type", "valueFrom"})
 @JsonInclude(JsonInclude.Include.NON_NULL)
 // TODO remove this Note OneOf constraint declared on superclass
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class ExternalLogging extends Logging {
 
     private static final long serialVersionUID = 1L;

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

@@ -9,6 +9,7 @@
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -23,6 +24,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
+@ToString
 public class GenericSecretSource implements UnknownPropertyPreserving, Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -8,6 +8,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.strimzi.crdgenerator.annotations.Description;
 import io.sundr.builder.annotations.Buildable;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -20,6 +22,8 @@
 )
 @JsonPropertyOrder({"type", "loggers"})
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class InlineLogging extends Logging {
 
     private static final long serialVersionUID = 1L;

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

@@ -10,6 +10,7 @@
 import io.strimzi.crdgenerator.annotations.Pattern;
 import io.sundr.builder.annotations.Buildable;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -25,6 +26,7 @@
 )
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 @EqualsAndHashCode
+@ToString
 public class JvmOptions implements UnknownPropertyPreserving, Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.strimzi.crdgenerator.annotations.Description;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -26,6 +27,7 @@
 })
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
+@ToString
 public abstract class Logging implements UnknownPropertyPreserving, Serializable {
 
     private static final long serialVersionUID = 1L;