TSK-502: further refactoring

This commit is contained in:
Mustapha Zorgati 2018-05-24 15:07:12 +02:00 committed by BerndBreier
parent 172340323d
commit 83b3360e00
1 changed files with 8 additions and 21 deletions

View File

@ -14,6 +14,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream;
import javax.sql.DataSource; import javax.sql.DataSource;
@ -69,27 +70,13 @@ public class TestDataGenerator {
sqlReplacer = new SQLReplacer(connection.getMetaData().getDatabaseProductName()); sqlReplacer = new SQLReplacer(connection.getMetaData().getDatabaseProductName());
} }
runner.runScript( Stream.of(sqlReplacer.classificationSql, sqlReplacer.workbasketSql, sqlReplacer.taskSql,
new InputStreamReader(new ByteArrayInputStream( sqlReplacer.workbasketAccessListSql, sqlReplacer.distributionTargetSql, sqlReplacer.objectReferenceSql,
sqlReplacer.classificationSql.getBytes(StandardCharsets.UTF_8)))); sqlReplacer.attachmentSql)
runner.runScript( .map(s -> s.getBytes(StandardCharsets.UTF_8))
new InputStreamReader(new ByteArrayInputStream( .map(ByteArrayInputStream::new)
sqlReplacer.workbasketSql.getBytes(StandardCharsets.UTF_8)))); .map(InputStreamReader::new)
runner.runScript( .forEach(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))));
} finally { } finally {
runner.closeConnection(); runner.closeConnection();