updated system tests code to update strimzi version to 0.40.0 (kroxyl…

…icious#1089)

* updated code to update strimzi version to 0.40.0

* sort imports

* removed kafka.version property from system tests pom

kroxylicious-systemtests/pom.xml

@@ -23,9 +23,6 @@
         using Strimzi, to simulate a real scenario for end-to-end testing treating Kroxylicious as a black box.
     </description>
 
-    <properties>
-        <kafka.version>3.6.1</kafka.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/ResourceOperation.java

@@ -8,7 +8,7 @@
 
 import java.time.Duration;
 
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 
 import io.kroxylicious.systemtests.Constants;
 

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/manager/ResourceManager.java

@@ -15,9 +15,9 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.strimzi.api.kafka.model.KafkaTopic;
-import io.strimzi.api.kafka.model.Spec;
-import io.strimzi.api.kafka.model.status.Status;
+import io.strimzi.api.kafka.model.common.Spec;
+import io.strimzi.api.kafka.model.kafka.Status;
+import io.strimzi.api.kafka.model.topic.KafkaTopic;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.enums.ConditionStatus;

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/strimzi/KafkaNodePoolResource.java

@@ -7,8 +7,8 @@
 package io.kroxylicious.systemtests.resources.strimzi;
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.strimzi.api.kafka.KafkaNodePoolList;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
+import io.strimzi.api.kafka.model.nodepool.KafkaNodePoolList;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.resources.ResourceType;

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/strimzi/KafkaResource.java

@@ -8,8 +8,8 @@
 
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.strimzi.api.kafka.KafkaList;
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
+import io.strimzi.api.kafka.model.kafka.KafkaList;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.resources.ResourceOperation;

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/strimzi/KafkaUserResource.java

@@ -8,8 +8,8 @@
 
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.strimzi.api.kafka.KafkaUserList;
-import io.strimzi.api.kafka.model.KafkaUser;
+import io.strimzi.api.kafka.model.user.KafkaUser;
+import io.strimzi.api.kafka.model.user.KafkaUserList;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.resources.ResourceType;

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/templates/strimzi/KafkaNodePoolTemplates.java

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePoolBuilder;
 import io.strimzi.api.kafka.model.nodepool.ProcessRoles;
 

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/templates/strimzi/KafkaTemplates.java

@@ -7,10 +7,10 @@
 package io.kroxylicious.systemtests.templates.strimzi;
 
 import io.strimzi.api.ResourceAnnotations;
-import io.strimzi.api.kafka.model.KafkaBuilder;
-import io.strimzi.api.kafka.model.listener.arraylistener.GenericKafkaListenerBuilder;
-import io.strimzi.api.kafka.model.listener.arraylistener.KafkaListenerType;
-import io.strimzi.api.kafka.model.template.ExternalTrafficPolicy;
+import io.strimzi.api.kafka.model.common.template.ExternalTrafficPolicy;
+import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
+import io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerBuilder;
+import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.Environment;

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/templates/strimzi/KafkaUserTemplates.java

@@ -6,7 +6,7 @@
 
 package io.kroxylicious.systemtests.templates.strimzi;
 
-import io.strimzi.api.kafka.model.KafkaUserBuilder;
+import io.strimzi.api.kafka.model.user.KafkaUserBuilder;
 
 import io.kroxylicious.systemtests.Constants;
 

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/KroxyliciousST.java

@@ -16,7 +16,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.Pod;
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 
 import io.kroxylicious.systemtests.extensions.KroxyliciousExtension;
 import io.kroxylicious.systemtests.installation.kroxylicious.Kroxylicious;

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/MetricsST.java

@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import io.fabric8.kubernetes.api.model.Pod;
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 
 import io.kroxylicious.systemtests.enums.ComponentType;
 import io.kroxylicious.systemtests.extensions.KroxyliciousExtension;

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/RecordEncryptionST.java

@@ -19,7 +19,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.Pod;
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 
 import io.kroxylicious.systemtests.extensions.KroxyliciousExtension;
 import io.kroxylicious.systemtests.installation.kroxylicious.Kroxylicious;

pom.xml

@@ -61,7 +61,7 @@
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
 
         <!-- Test dependencies -->
-        <strimzi.version>0.39.0</strimzi.version>
+        <strimzi.version>0.40.0</strimzi.version>
         <kubernetes-client.version>6.10.0</kubernetes-client.version>
         <enforcer.api.version>3.4.1</enforcer.api.version>
         <maven.core.version>3.9.6</maven.core.version>