From e1286e5f661b79ad342a487975b5257898081016 Mon Sep 17 00:00:00 2001
From: Daniel Kavan <dk1844@gmail.com>
Date: Wed, 31 Aug 2022 11:08:26 +0200
Subject: [PATCH 1/2] #1017 small code updates, no change in functionality

---
 .../za/co/absa/spline/testdatagen/GenCLI.scala  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala b/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
index e08013241..711c42915 100644
--- a/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
+++ b/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
@@ -92,7 +92,7 @@ object GenCLI {
 
     val configs: Seq[ExpandedConfig] = config.expand()
 
-    val dispatcher = createDispatcher("file", config)
+    val dispatcher = createDispatcher(config)
 
     configs.foreach(config => {
       val graphType: Graph = Graph(config)
@@ -103,16 +103,15 @@ object GenCLI {
     })
   }
 
-  private def createDispatcher(name: String, config: Config): FileDispatcher = name match {
-    case "file" =>
-      config.customOutputFileName.fold {
-        new FileDispatcher(createDefaultFileName(config))
-      } { customFileName =>
-        new FileDispatcher(customFileName)
-      }
+  private def createDispatcher(config: Config): FileDispatcher = {
+    new FileDispatcher(createDefaultFileName(config))
   }
 
   private def createDefaultFileName(config: Config): String = {
-    s"${config.graphType.name}-lineage-${config.reads}reads-${config.operations}ops-${config.attributes}attr.json.txt"
+    config.customOutputFileName match {
+      case None =>  // default name assembly
+        s"${config.graphType.name}-lineage-${config.reads}reads-${config.operations}ops-${config.attributes}attr.json.txt"
+      case Some(customName) => customName
+    }
   }
 }

From 3b0fa55ce50b0599b5f87c6723a5be4948e95c72 Mon Sep 17 00:00:00 2001
From: Daniel Kavan <dk1844@gmail.com>
Date: Wed, 31 Aug 2022 11:22:31 +0200
Subject: [PATCH 2/2] #1017 small code updates, no change in functionality

---
 .../main/scala/za/co/absa/spline/testdatagen/GenCLI.scala | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala b/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
index 711c42915..248a3d1e1 100644
--- a/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
+++ b/test-data-generator/src/main/scala/za/co/absa/spline/testdatagen/GenCLI.scala
@@ -92,7 +92,7 @@ object GenCLI {
 
     val configs: Seq[ExpandedConfig] = config.expand()
 
-    val dispatcher = createDispatcher(config)
+    val dispatcher = new FileDispatcher(createFileName(config))
 
     configs.foreach(config => {
       val graphType: Graph = Graph(config)
@@ -103,11 +103,7 @@ object GenCLI {
     })
   }
 
-  private def createDispatcher(config: Config): FileDispatcher = {
-    new FileDispatcher(createDefaultFileName(config))
-  }
-
-  private def createDefaultFileName(config: Config): String = {
+  private def createFileName(config: Config): String = {
     config.customOutputFileName match {
       case None =>  // default name assembly
         s"${config.graphType.name}-lineage-${config.reads}reads-${config.operations}ops-${config.attributes}attr.json.txt"