Updated reader

Reader/build.gradle.kts

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha16")
+    implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha17")
     implementation("no.iktdev:exfl:0.0.4-SNAPSHOT")
 
     implementation("com.github.pgreze:kotlin-process:1.3.1")

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt

@@ -1,6 +1,6 @@
 package no.iktdev.streamit.content.reader
 
-import no.iktdev.streamit.content.reader.analyzer.PreferenceReader
+import no.iktdev.streamit.content.reader.analyzer.encoding.PreferenceReader
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.context.ApplicationContext

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt

@@ -15,9 +15,7 @@ class EncodeStreamsMessageParser {
     fun getFileNameFromEvent(records: MutableList<ConsumerRecord<String, Message>>): FileWatcher.FileResult? {
         val file = records.find { it.key() == KnownEvents.EVENT_READER_RECEIVED_FILE.event } ?: return null
         if (file.value().status.statusType != StatusType.SUCCESS) return null
-        return if (file.value().data is String) {
+        return file.value().dataAs(FileWatcher.FileResult::class.java)
-            return Gson().fromJson(file.value().data as String, FileWatcher.FileResult::class.java)
-        } else null
     }
 
     fun getMediaStreamsFromEvent(records: MutableList<ConsumerRecord<String, Message>>): MediaStreams? {

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedStreams.kt

@@ -1,10 +1,8 @@
 package no.iktdev.streamit.content.reader.analyzer
 
-import com.google.gson.Gson
 import no.iktdev.streamit.content.common.CommonConfig
-import no.iktdev.streamit.content.common.streams.MediaStreams
+import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeArgumentSelector
-import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeInformation
+import no.iktdev.streamit.content.reader.analyzer.encoding.dto.EncodeInformation
-import no.iktdev.streamit.content.reader.fileWatcher.FileWatcher
 import no.iktdev.streamit.library.kafka.KnownEvents
 import no.iktdev.streamit.library.kafka.dto.Message
 import no.iktdev.streamit.library.kafka.dto.Status
@@ -18,11 +16,11 @@ import org.springframework.stereotype.Service
 import java.io.File
 
 @Service
-class EncodeStreamsProducer: IPooledEvents.OnEventsReceived {
+class EncodedStreams: IPooledEvents.OnEventsReceived {
 
     val messageProducer = DefaultProducer(CommonConfig.kafkaTopic)
 
-    val defaultConsumer = DefaultConsumer(subId = "0m").apply {
+    val defaultConsumer = DefaultConsumer(subId = "encodedStreams").apply {
         autoCommit = false
     }
 

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeArgumentSelector.kt

@@ -1,13 +1,13 @@
-package no.iktdev.streamit.content.reader.analyzer
+package no.iktdev.streamit.content.reader.analyzer.encoding
 
 import no.iktdev.streamit.content.common.streams.AudioStream
 import no.iktdev.streamit.content.common.streams.MediaStreams
 import no.iktdev.streamit.content.common.streams.SubtitleStream
 import no.iktdev.streamit.content.common.streams.VideoStream
-import no.iktdev.streamit.content.reader.analyzer.encoding.AudioEncodeArguments
+import no.iktdev.streamit.content.reader.analyzer.encoding.dto.AudioEncodeArguments
-import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeInformation
+import no.iktdev.streamit.content.reader.analyzer.encoding.dto.EncodeInformation
-import no.iktdev.streamit.content.reader.analyzer.encoding.SubtitleEncodeArguments
+import no.iktdev.streamit.content.reader.analyzer.encoding.dto.SubtitleEncodeArguments
-import no.iktdev.streamit.content.reader.analyzer.encoding.VideoEncodeArguments
+import no.iktdev.streamit.content.reader.analyzer.encoding.dto.VideoEncodeArguments
 import no.iktdev.streamit.content.reader.preference
 
 class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, val outFileName: String) {

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodingPreference.kt

@@ -1,9 +1,8 @@
-package no.iktdev.streamit.content.reader.analyzer
+package no.iktdev.streamit.content.reader.analyzer.encoding
 
 import com.google.gson.Gson
 import no.iktdev.streamit.content.reader.ReaderEnv
 import org.slf4j.LoggerFactory
-import java.io.File
 
 data class EncodingPreference(
     val video: VideoPreference,

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/AudioEncodeArguments.kt

@@ -1,4 +1,4 @@
-package no.iktdev.streamit.content.reader.analyzer.encoding
+package no.iktdev.streamit.content.reader.analyzer.encoding.dto
 
 import no.iktdev.streamit.content.common.streams.AudioStream
 import no.iktdev.streamit.content.reader.preference

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/EncodeInformation.kt

@@ -1,4 +1,4 @@
-package no.iktdev.streamit.content.reader.analyzer.encoding
+package no.iktdev.streamit.content.reader.analyzer.encoding.dto
 
 data class EncodeInformation(
     val inputFile: String,

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/SubtitleEncodeArguments.kt

@@ -1,4 +1,4 @@
-package no.iktdev.streamit.content.reader.analyzer.encoding
+package no.iktdev.streamit.content.reader.analyzer.encoding.dto
 
 import no.iktdev.streamit.content.common.streams.SubtitleStream
 

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/VideoEncodeArguments.kt

@@ -1,6 +1,5 @@
-package no.iktdev.streamit.content.reader.analyzer.encoding
+package no.iktdev.streamit.content.reader.analyzer.encoding.dto
 
-import no.iktdev.streamit.content.common.streams.AudioStream
 import no.iktdev.streamit.content.common.streams.VideoStream
 import no.iktdev.streamit.content.reader.preference
 

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt

@@ -26,7 +26,7 @@ private val logger = KotlinLogging.logger {}
 @Service
 class FileWatcher: FileWatcherEvents {
     val messageProducer = DefaultProducer(CommonConfig.kafkaTopic)
-    val defaultConsumer = DefaultConsumer(subId = "0a")
+    val defaultConsumer = DefaultConsumer(subId = "fileWatcher")
 
     val queue = FileWatcherQueue()
 

Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt

@@ -24,7 +24,7 @@ private val logger = KotlinLogging.logger {}
 class StreamsReader {
 
     val messageProducer = DefaultProducer(CommonConfig.kafkaTopic)
-    val defaultConsumer = DefaultConsumer(subId = "0a").apply {
+    val defaultConsumer = DefaultConsumer(subId = "streamReader").apply {
        // autoCommit = false
     }
     init {