Decouple Strimzi Kafka CR from core functionality (#895)

* Decouple Strimzi Kafka CR from core functionality --------- Signed-off-by: Michael Edgar <[email protected]>
streamshub · Jul 18, 2024 · 98a326d · 98a326d
1 parent c231f52
commit 98a326d
Show file tree

Hide file tree

Showing 43 changed files with 1,573 additions and 537 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -179,11 +179,6 @@
             <artifactId>docker-java-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>strimzi-test-container</artifactId>

diff --git a/api/src/main/java/com/github/streamshub/console/api/Annotations.java b/api/src/main/java/com/github/streamshub/console/api/Annotations.java
@@ -14,17 +14,7 @@ public enum Annotations {
      * Annotation to identify a listener in Strimzi Kafka resources to be used for
      * connections directly from the Console API.
      */
-    CONSOLE_LISTENER("console-listener"),
-
-    /**
-     * Annotation to identify a listener in Strimzi Kafka resources to be used for
-     * public connections. This may be used to differentiate a listener to be
-     * exposed via the KafkaCluster resource and published in the UI.
-     *
-     * @deprecated
-     */
-    @Deprecated(forRemoval = true)
-    EXPOSED_LISTENER("exposed-listener");
+    CONSOLE_LISTENER("console-listener");
 
     private static final String NAMESPACE = "streamshub.github.com";
     private final String value;

diff --git a/api/src/main/java/com/github/streamshub/console/api/BrokersResource.java b/api/src/main/java/com/github/streamshub/console/api/BrokersResource.java
@@ -1,7 +1,6 @@
 package com.github.streamshub.console.api;
 
 import java.util.concurrent.CompletionStage;
-import java.util.function.Supplier;
 
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
@@ -11,7 +10,6 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.apache.kafka.clients.admin.Admin;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
@@ -24,9 +22,6 @@
 @Tag(name = "Kafka Cluster Resources")
 public class BrokersResource {
 
-    @Inject
-    Supplier<Admin> clientSupplier;
-
     @Inject
     BrokerService brokerService;