From cc0c620da288aa87a5451d4a6a446532a1e6e2ff Mon Sep 17 00:00:00 2001
From: Jules Ivanic <guizmaii@users.noreply.github.com>
Date: Wed, 28 Sep 2022 18:03:44 +0200
Subject: [PATCH] Prefer `org.apache.kafka.clients.admin.Admin` over
 `org.apache.kafka.clients.admin.AdminClient` as recommended in `AdminClient`
 documentation (#497)

---
 .github/workflows/ci.yml                             |  2 +-
 project/plugins.sbt                                  |  2 +-
 .../src/main/scala/zio/kafka/admin/AdminClient.scala | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14c0f4057..ffd3099f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ '8', '11', '17' ]
-        scala: [ '2.12.17', '2.13.8', '3.1.1' ]
+        scala: [ '2.12.17', '2.13.8', '3.1.3' ]
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index dcdd0ae88..a7e84a610 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("org.scalameta"             % "sbt-scalafmt"   % "2.4.6")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"   % "0.3.3")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"   % "0.4.1")
 addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"  % "0.11.0")
 addSbtPlugin("com.github.sbt"            % "sbt-ci-release" % "1.5.10")
 addSbtPlugin("org.scalameta"             % "sbt-mdoc"       % "2.3.3")
diff --git a/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala b/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
index 682ccd548..e23920159 100644
--- a/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
+++ b/zio-kafka/src/main/scala/zio/kafka/admin/AdminClient.scala
@@ -2,7 +2,7 @@ package zio.kafka.admin
 
 import org.apache.kafka.clients.admin.ListOffsetsResult.{ ListOffsetsResultInfo => JListOffsetsResultInfo }
 import org.apache.kafka.clients.admin.{
-  AdminClient => JAdminClient,
+  Admin => JAdmin,
   AlterConsumerGroupOffsetsOptions => JAlterConsumerGroupOffsetsOptions,
   Config => JConfig,
   ConsumerGroupDescription => JConsumerGroupDescription,
@@ -238,7 +238,7 @@ object AdminClient {
    * @param adminClient
    */
   private final class LiveAdminClient(
-    private val adminClient: JAdminClient
+    private val adminClient: JAdmin
   ) extends AdminClient {
 
     /**
@@ -1120,18 +1120,18 @@ object AdminClient {
   def make(settings: AdminClientSettings): ZIO[Scope, Throwable, AdminClient] =
     fromManagedJavaClient(javaClientFromSettings(settings))
 
-  def fromJavaClient(javaClient: JAdminClient): URIO[Any, AdminClient] =
+  def fromJavaClient(javaClient: JAdmin): URIO[Any, AdminClient] =
     ZIO.succeed(new LiveAdminClient(javaClient))
 
   def fromManagedJavaClient[R, E](
-    managedJavaClient: ZIO[R with Scope, E, JAdminClient]
+    managedJavaClient: ZIO[R with Scope, E, JAdmin]
   ): ZIO[R with Scope, E, AdminClient] =
     managedJavaClient.flatMap { javaClient =>
       fromJavaClient(javaClient)
     }
 
-  def javaClientFromSettings(settings: AdminClientSettings): ZIO[Scope, Throwable, JAdminClient] =
-    ZIO.acquireRelease(ZIO.attempt(JAdminClient.create(settings.driverSettings.asJava)))(client =>
+  def javaClientFromSettings(settings: AdminClientSettings): ZIO[Scope, Throwable, JAdmin] =
+    ZIO.acquireRelease(ZIO.attempt(JAdmin.create(settings.driverSettings.asJava)))(client =>
       ZIO.succeed(client.close(settings.closeTimeout))
     )