From 30dc3b658db3d24a4d6d232545aeafc05a34f7b2 Mon Sep 17 00:00:00 2001
From: Timo Bryant <t.bryant@insiders-technologies.de>
Date: Fri, 29 Dec 2023 20:45:30 +0100
Subject: [PATCH] cleanup

---
 .../main/kotlin/de/itkl/core_api/coreApiModule.kt    |  2 ++
 .../core_api/implementation/ProgressInputStream.kt   |  2 +-
 .../itkl/core_api/implementation/ProgressResource.kt |  2 +-
 .../de/itkl/fileprocessing/ProcessingPipeline.kt     | 12 ++++--------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libraries/core-api/src/main/kotlin/de/itkl/core_api/coreApiModule.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/coreApiModule.kt
index 93c8805..5439ea3 100644
--- a/libraries/core-api/src/main/kotlin/de/itkl/core_api/coreApiModule.kt
+++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/coreApiModule.kt
@@ -1,9 +1,11 @@
 package de.itkl.core_api
 
 import de.itkl.core_api.interfaces.NoopResourceReadDecorator
+import de.itkl.core_api.interfaces.ResourceFactory
 import de.itkl.core_api.interfaces.ResourceReadDecorator
 import org.koin.dsl.module
 
 val coreApiModule = module {
+    single<ResourceFactory> { ResourceFactory()}
     single<ResourceReadDecorator> { NoopResourceReadDecorator() }
 }
\ No newline at end of file
diff --git a/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressInputStream.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressInputStream.kt
index 857227c..475b339 100644
--- a/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressInputStream.kt
+++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressInputStream.kt
@@ -10,7 +10,7 @@ import java.io.InputStream
  * @property updateOp The operation to be executed when the number of bytes read changes.
  * @property bytesRead The number of bytes read from the input stream.
  */
-class ProgressInputStream(
+internal class ProgressInputStream(
     private val inputStream: InputStream,
     private val progressBar: ProgressBar
 ) : InputStream() {
diff --git a/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressResource.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressResource.kt
index 6b5f469..e62c760 100644
--- a/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressResource.kt
+++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/implementation/ProgressResource.kt
@@ -5,7 +5,7 @@ import de.itkl.core_api.interfaces.ProgressBarFactory
 import de.itkl.core_api.interfaces.Resource
 import java.io.InputStream
 
-class ProgressResource(
+internal class ProgressResource(
     private val resource: Resource,
     private val progressBarFactory: ProgressBarFactory
 ) : Resource by resource
diff --git a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt b/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt
index af2a043..32edfc2 100644
--- a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt
+++ b/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt
@@ -1,9 +1,7 @@
 package de.itkl.fileprocessing
 
-import de.itkl.core_api.implementation.FileResource
-import de.itkl.core_api.implementation.ProgressResource
 import de.itkl.core_api.interfaces.FileProcessor
-import de.itkl.core_api.interfaces.ProgressBarFactory
+import de.itkl.core_api.interfaces.ResourceFactory
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -13,10 +11,9 @@ import kotlin.io.path.exists
 private val Log = KotlinLogging.logger { }
 
 abstract class FileProcessingPipeline(private val force: Boolean = false) : KoinComponent {
-
+    private val resourceFactory: ResourceFactory by inject()
 
     protected abstract val fileProcessor: List<FileProcessor>
-    private val progressBarFactory: ProgressBarFactory by inject()
     suspend fun input(file: File) {
         var currentFile = file
         fileProcessor.forEach { processor ->
@@ -25,9 +22,8 @@ abstract class FileProcessingPipeline(private val force: Boolean = false) : Koin
                 Log.info { "$target exists. Skipping" } 
             } else {
                 Log.info { "$target does not exists. Creating" }
-                val resource = FileResource(currentFile)
-                val progress = ProgressResource(resource, progressBarFactory)
-                processor.process(progress)
+                val resource = resourceFactory.file(currentFile)
+                processor.process(resource)
                 Log.info { "File created: $target" } 
             }
             currentFile = target.toFile()