From 83b3360e0085fe943939db313b3d6dbcbd598472 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Thu, 24 May 2018 15:07:12 +0200
Subject: [PATCH] TSK-502: further refactoring

---
 .../taskana/database/TestDataGenerator.java   | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/lib/taskana-core/src/test/java/pro/taskana/database/TestDataGenerator.java b/lib/taskana-core/src/test/java/pro/taskana/database/TestDataGenerator.java
index 9e7957d18..2a1f3d628 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/database/TestDataGenerator.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/database/TestDataGenerator.java
@@ -14,6 +14,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Stream;
 
 import javax.sql.DataSource;
 
@@ -69,27 +70,13 @@ public class TestDataGenerator {
                 sqlReplacer = new SQLReplacer(connection.getMetaData().getDatabaseProductName());
             }
 
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.classificationSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.workbasketSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.taskSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.workbasketAccessListSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.distributionTargetSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.objectReferenceSql.getBytes(StandardCharsets.UTF_8))));
-            runner.runScript(
-                new InputStreamReader(new ByteArrayInputStream(
-                    sqlReplacer.attachmentSql.getBytes(StandardCharsets.UTF_8))));
+            Stream.of(sqlReplacer.classificationSql, sqlReplacer.workbasketSql, sqlReplacer.taskSql,
+                sqlReplacer.workbasketAccessListSql, sqlReplacer.distributionTargetSql, sqlReplacer.objectReferenceSql,
+                sqlReplacer.attachmentSql)
+                .map(s -> s.getBytes(StandardCharsets.UTF_8))
+                .map(ByteArrayInputStream::new)
+                .map(InputStreamReader::new)
+                .forEach(runner::runScript);
 
         } finally {
             runner.closeConnection();