From 54b1cbde9c74dcd21782d6e3c19ed5c89fe13d51 Mon Sep 17 00:00:00 2001
From: usbharu <i@usbharu.dev>
Date: Mon, 15 Apr 2024 15:05:51 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3=20map=E3=81=AB?=
 =?UTF-8?q?=E6=A0=BC=E7=B4=8D=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AE?=
 =?UTF-8?q?=E3=82=AD=E3=83=BC=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt   | 2 --
 .../kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt  | 4 +---
 .../main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt    | 2 +-
 .../src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt | 2 +-
 .../src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt | 7 ++++---
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt
index d8a8aad..0670500 100644
--- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt
+++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt
@@ -16,8 +16,6 @@
 
 package dev.usbharu.owl.consumer
 
-import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest
-import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner
 import dev.usbharu.owl.*
 import dev.usbharu.owl.Uuid.UUID
 import dev.usbharu.owl.common.property.PropertySerializeUtils
diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt
index 0c430a2..2bdfd87 100644
--- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt
+++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt
@@ -16,7 +16,6 @@
 
 package dev.usbharu.owl.consumer
 
-import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner
 import dev.usbharu.owl.AssignmentTaskServiceGrpcKt
 import dev.usbharu.owl.SubscribeTaskServiceGrpcKt
 import dev.usbharu.owl.TaskResultServiceGrpcKt
@@ -50,8 +49,7 @@ class StandaloneConsumer(
 
     private val taskRunnerMap = ServiceLoader
         .load(TaskRunner::class.java)
-        .associateBy { it::class.qualifiedName!! }
-        .filterNot { it.key.isBlank() }
+        .associateBy { it.name }
 
     private val consumer = Consumer(
         subscribeStub,
diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt
index d66e9a7..db3a3e4 100644
--- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt
+++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.dev.usbharu.owl.consumer
+package dev.usbharu.owl.consumer
 
 import dev.usbharu.owl.common.property.PropertyValue
 import java.time.Instant
diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt
index 20858a9..0c4f5d3 100644
--- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt
+++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.usbharu.dev.usbharu.owl.consumer
+package dev.usbharu.owl.consumer
 
 import dev.usbharu.owl.common.property.PropertyValue
 
diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt
index 44513ec..b772101 100644
--- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt
+++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package dev.usbharu.dev.usbharu.owl.consumer
+package dev.usbharu.owl.consumer
 
-fun interface TaskRunner {
-    suspend fun run(taskRequest: TaskRequest):TaskResult
+interface TaskRunner {
+    val name: String
+    suspend fun run(taskRequest: TaskRequest): TaskResult
 }
\ No newline at end of file