chore: use kotlin autoclosable for schema-registry client in tasks

rudikone · Jan 26, 2024 · d87496e · d87496e
1 parent 706d050
commit d87496e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/plugin-build/plugin/src/main/java/io/github/rudikone/plugin/CompatibilityCheckTask.kt b/plugin-build/plugin/src/main/java/io/github/rudikone/plugin/CompatibilityCheckTask.kt
@@ -58,18 +58,20 @@ abstract class CompatibilityCheckTask : DefaultTask() {
         val schemaName = schemaForCheck.get()
         val subject = topic.get()
 
-        test(client = client, subject = subject, schemaName = schemaName)
+        client.use { test(client = it, subject = subject, schemaName = schemaName) }
     }
 
     private fun checkForAllSchemas() {
         if (subjectToSchema.orNull.isNullOrEmpty()) {
             error("No schema has been announced!")
         }
 
-        val client = CachedSchemaRegistryClient(schemaRegistryUrl.get(), subjectToSchema.get().entries.size)
+        val registryClient = CachedSchemaRegistryClient(schemaRegistryUrl.get(), subjectToSchema.get().entries.size)
 
-        subjectToSchema.get().forEach { (subject, schemaName) ->
-            test(client = client, subject = subject, schemaName = schemaName)
+        registryClient.use { client ->
+            subjectToSchema.get().forEach { (subject, schemaName) ->
+                test(client = client, subject = subject, schemaName = schemaName)
+            }
         }
     }
 

diff --git a/plugin-build/plugin/src/main/java/io/github/rudikone/plugin/RegisterTask.kt b/plugin-build/plugin/src/main/java/io/github/rudikone/plugin/RegisterTask.kt
@@ -34,19 +34,21 @@ abstract class RegisterTask : DefaultTask() {
             error("No schema has been announced!")
         }
 
-        val client = CachedSchemaRegistryClient(schemaRegistryUrl.get(), subjectToSchema.get().entries.size)
-
-        subjectToSchema.get().forEach { (subject, schemaName) ->
-            searchAvroFilesPaths.get().forEach { searchPath ->
-                runCatching {
-                    val avroFile = findAvroFileByName(searchPath = searchPath, schemaName = schemaName)
-                    val schema = AvroSchema(Schema.Parser().parse(avroFile))
-
-                    client.register(subject, schema)
-                }.onSuccess {
-                    logger.lifecycle("$schemaName: $it")
-                }.onFailure {
-                    logger.warn("Failed register $schemaName for $subject!", it)
+        val registryClient = CachedSchemaRegistryClient(schemaRegistryUrl.get(), subjectToSchema.get().entries.size)
+
+        registryClient.use { client ->
+            subjectToSchema.get().forEach { (subject, schemaName) ->
+                searchAvroFilesPaths.get().forEach { searchPath ->
+                    runCatching {
+                        val avroFile = findAvroFileByName(searchPath = searchPath, schemaName = schemaName)
+                        val schema = AvroSchema(Schema.Parser().parse(avroFile))
+
+                        client.register(subject, schema)
+                    }.onSuccess {
+                        logger.lifecycle("$schemaName: $it")
+                    }.onFailure {
+                        logger.warn("Failed register $schemaName for $subject!", it)
+                    }
                 }
             }
         }