feat: move to the new QueuedAgentMessageSender

EPMDJ-10877
Drill4J · Nov 29, 2024 · d98cfcd · d98cfcd
1 parent 8f82c7e
commit d98cfcd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@ apacheHttpClientVersion = 5.2.3
 aesyDatasizeVersion = 1.0.0
 bytebuddyVersion = 1.14.11
 
-sharedLibsRef = main
+sharedLibsRef = feature/recommended-tests-EPMDJ-10877
 sharedLibsLocalPath = lib-jvm-shared
 nativeAgentLibName = drill-agent
 nativeAgentHookEnabled = false

diff --git a/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/transport/JvmModuleMessageSender.kt b/java-agent/src/jvmMain/kotlin/com/epam/drill/agent/transport/JvmModuleMessageSender.kt
@@ -41,7 +41,7 @@ actual object JvmModuleMessageSender : AgentMessageSender<AgentMessage> {
         messageSender.send(AgentMessageDestination("PUT", "instances"), Configuration.agentMetadata)
     }
 
-    private fun messageSender(): QueuedAgentMessageSender<AgentMessage, ByteArray> {
+    private fun messageSender(): QueuedAgentMessageSender<AgentMessage> {
         val transport = HttpAgentMessageTransport(
             serverAddress = Configuration.parameters[ParameterDefinitions.API_URL],
             apiKey = Configuration.parameters[ParameterDefinitions.API_KEY],
@@ -55,11 +55,9 @@ actual object JvmModuleMessageSender : AgentMessageSender<AgentMessage> {
         } ?: JsonAgentMessageSerializer<AgentMessage>()
         val mapper = HttpAgentMessageDestinationMapper()
         val queue = InMemoryAgentMessageQueue(
-            serializer,
             Configuration.parameters[ParameterDefinitions.MESSAGE_QUEUE_LIMIT].let(::parseBytes)
         )
-        val notifier = RetryingTransportStateNotifier(transport, serializer, queue)
-        return QueuedAgentMessageSender(transport, serializer, mapper, notifier, notifier, queue)
+        return QueuedAgentMessageSender(transport, serializer, mapper, queue)
     }
 
     private fun resolvePath(path: String) = File(path).run {

diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt
@@ -15,13 +15,11 @@
  */
 package com.epam.drill.agent.test2code.coverage
 
-import kotlinx.coroutines.Runnable
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import mu.KotlinLogging
 import com.epam.drill.agent.common.transport.AgentMessageDestination
 import com.epam.drill.agent.common.transport.AgentMessageSender
-import com.epam.drill.agent.common.transport.ResponseStatus
 import com.epam.drill.agent.test2code.common.api.ClassCoverage
 import com.epam.drill.agent.test2code.common.api.toBitSet
 import com.epam.drill.agent.test2code.common.transport.CoveragePayload
@@ -59,6 +57,7 @@ class IntervalCoverageSender(
             scheduledThreadPool.shutdownNow();
         }
         sendProbes(collectProbes())
+        sender.shutdown()
         logger.info { "Coverage sending job is stopped." }
     }
 
@@ -76,10 +75,5 @@ class IntervalCoverageSender(
 }
 
 private class StubSender : AgentMessageSender<CoveragePayload> {
-    override fun send(destination: AgentMessageDestination, message: CoveragePayload) = StubResponseStatus()
-}
-
-private class StubResponseStatus : ResponseStatus {
-    override val success: Boolean = false
-    override val statusObject: Any? = null
+    override fun send(destination: AgentMessageDestination, message: CoveragePayload) {}
 }