Rebase and fix deprecation warnings

Signed-off-by: Federico Valeri <[email protected]>
strimzi · Mar 16, 2024 · 46f264c · 46f264c
1 parent 023089a
commit 46f264c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...rc/main/java/io/strimzi/api/kafka/model/kafka/entityoperator/EntityTopicOperatorSpec.java b/...rc/main/java/io/strimzi/api/kafka/model/kafka/entityoperator/EntityTopicOperatorSpec.java
@@ -59,8 +59,8 @@ public class EntityTopicOperatorSpec implements HasConfigurableLogging, HasLiven
     protected String watchedNamespace;
     protected String image;
     protected int reconciliationIntervalSeconds = DEFAULT_FULL_RECONCILIATION_INTERVAL_SECONDS;
-    protected int zookeeperSessionTimeoutSeconds = DEFAULT_ZOOKEEPER_SESSION_TIMEOUT_SECONDS;
-    protected int topicMetadataMaxAttempts = DEFAULT_TOPIC_METADATA_MAX_ATTEMPTS;
+    protected Integer zookeeperSessionTimeoutSeconds;
+    protected Integer topicMetadataMaxAttempts;
     private Probe startupProbe;
     private Probe livenessProbe;
     private Probe readinessProbe;
@@ -104,11 +104,11 @@ public void setReconciliationIntervalSeconds(int reconciliationIntervalSeconds)
     @DeprecatedProperty(description = "This property has been deprecated because ZooKeeper is not used anymore by the Topic Operator.")
     @PresentInVersions("v1alpha1-v1beta2")
     @Deprecated
-    public int getZookeeperSessionTimeoutSeconds() {
+    public Integer getZookeeperSessionTimeoutSeconds() {
         return zookeeperSessionTimeoutSeconds;
     }
 
-    public void setZookeeperSessionTimeoutSeconds(int zookeeperSessionTimeoutSeconds) {
+    public void setZookeeperSessionTimeoutSeconds(Integer zookeeperSessionTimeoutSeconds) {
         this.zookeeperSessionTimeoutSeconds = zookeeperSessionTimeoutSeconds;
     }
 
@@ -118,11 +118,11 @@ public void setZookeeperSessionTimeoutSeconds(int zookeeperSessionTimeoutSeconds
     @DeprecatedProperty(description = "This property has been deprecated because ZooKeeper is not used anymore by the Topic Operator.")
     @PresentInVersions("v1alpha1-v1beta2")
     @Deprecated
-    public int getTopicMetadataMaxAttempts() {
+    public Integer getTopicMetadataMaxAttempts() {
         return topicMetadataMaxAttempts;
     }
 
-    public void setTopicMetadataMaxAttempts(int topicMetadataMaxAttempts) {
+    public void setTopicMetadataMaxAttempts(Integer topicMetadataMaxAttempts) {
         this.topicMetadataMaxAttempts = topicMetadataMaxAttempts;
     }
 

diff --git a/...ter-operator/src/test/java/io/strimzi/operator/cluster/model/EntityTopicOperatorTest.java b/...ter-operator/src/test/java/io/strimzi/operator/cluster/model/EntityTopicOperatorTest.java
@@ -80,8 +80,8 @@ public class EntityTopicOperatorTest {
     private final String toWatchedNamespace = "my-topic-namespace";
     private final String toImage = "my-topic-operator-image";
     private final int toReconciliationInterval = 120;
-    private final int toZookeeperSessionTimeout = 18;
-    private final int toTopicMetadataMaxAttempts = 3;
+    private final Integer toZookeeperSessionTimeout = 18;
+    private final Integer toTopicMetadataMaxAttempts = 3;
 
     private final List<SystemProperty> javaSystemProperties = new ArrayList<>() {{
             add(new SystemPropertyBuilder().withName("javax.net.debug").withValue("verbose").build());