nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1183: Update to Spring Boot 2.2.6

This commit is contained in:
Holger Hagen 2020-04-13 13:18:01 +02:00
parent e8433ab954
commit 646583f7c1
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
View File

@ -53,6 +53,7 @@ public class SampleDataGenerator {
} }
public void generateSampleData() { public void generateSampleData() {
LOGGER.debug("entry to generateSampleData()");
runScripts( runScripts(
(runner) -> { (runner) -> {
clearDb(); clearDb();
@ -63,31 +64,40 @@ public class SampleDataGenerator {
scripts = SampleDataProvider.getScriptsWithEvents(); scripts = SampleDataProvider.getScriptsWithEvents();
cacheKey = CACHED_EVENTSAMPLE; cacheKey = CACHED_EVENTSAMPLE;
} else { } else {
scripts = SampleDataProvider.getDefaultScripts(); scripts = SampleDataProvider.getSampleDataCreationScripts();
cacheKey = CACHED_SAMPLE; cacheKey = CACHED_SAMPLE;
} }
executeAndCacheScripts(scripts, cacheKey); executeAndCacheScripts(scripts, cacheKey);
}); });
LOGGER.debug("exit from generateSampleData()");
} }
public void generateTestData() { public void generateTestData() {
LOGGER.debug("entry to generateTestData()");
Stream<String> scripts = SampleDataProvider.getTestDataScripts(); Stream<String> scripts = SampleDataProvider.getTestDataScripts();
executeAndCacheScripts(scripts, CACHED_TEST); executeAndCacheScripts(scripts, CACHED_TEST);
LOGGER.debug("exit from generateTestData()");
} }
public void generateMonitorData() { public void generateMonitorData() {
LOGGER.debug("entry to generateMonitorData()");
Stream<String> scripts = SampleDataProvider.getMonitorDataScripts(); Stream<String> scripts = SampleDataProvider.getMonitorDataScripts();
executeAndCacheScripts(scripts, CACHED_MONITOR); executeAndCacheScripts(scripts, CACHED_MONITOR);
LOGGER.debug("exit from generateMonitorData()");
} }
public void clearDb() { public void clearDb() {
LOGGER.debug("entry to clearDb()");
Stream<String> scripts = SampleDataProvider.getScriptsToClearDatabase(); Stream<String> scripts = SampleDataProvider.getScriptsToClearDatabase();
executeAndCacheScripts(scripts, CACHED_CLEARDB); executeAndCacheScripts(scripts, CACHED_CLEARDB);
LOGGER.debug("exit from clearDb()");
} }
public void dropDb() { public void dropDb() {
LOGGER.debug("entry to dropDb()");
Stream<String> scripts = SampleDataProvider.getScriptsToDropDatabase(); Stream<String> scripts = SampleDataProvider.getScriptsToDropDatabase();
executeAndCacheScripts(scripts, CACHED_DROPDB); executeAndCacheScripts(scripts, CACHED_DROPDB);
LOGGER.debug("exit from dropDb()");
} }
boolean tableExists(String table) { boolean tableExists(String table) {
@ -139,6 +149,7 @@ public class SampleDataGenerator {
} }
private void executeAndCacheScripts(Stream<String> scripts, String cacheKey) { private void executeAndCacheScripts(Stream<String> scripts, String cacheKey) {
LOGGER.debug("entry to executeAndCacheScripts(scripts = {}, cacheKey = {})", scripts, cacheKey);
runScripts( runScripts(
runner -> runner ->
cachedScripts.computeIfAbsent(cacheKey, key -> parseScripts(scripts)).stream() cachedScripts.computeIfAbsent(cacheKey, key -> parseScripts(scripts)).stream()
@ -146,6 +157,7 @@ public class SampleDataGenerator {
.map(ByteArrayInputStream::new) .map(ByteArrayInputStream::new)
.map(s -> new InputStreamReader(s, StandardCharsets.UTF_8)) .map(s -> new InputStreamReader(s, StandardCharsets.UTF_8))
.forEach(runner::runScript)); .forEach(runner::runScript));
LOGGER.debug("exit from executeAndCacheScripts()");
} }
private ScriptRunner getScriptRunner( private ScriptRunner getScriptRunner(

9
lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
View File

@ -31,7 +31,7 @@ public final class SampleDataProvider {
private SampleDataProvider() {} private SampleDataProvider() {}
static Stream<String> getDefaultScripts() { static Stream<String> getSampleDataCreationScripts() {
return Stream.of( return Stream.of(
SAMPLE_WORKBASKET, SAMPLE_WORKBASKET,
SAMPLE_DISTRIBUTION_TARGETS, SAMPLE_DISTRIBUTION_TARGETS,
@ -44,15 +44,16 @@ public final class SampleDataProvider {
} }
static Stream<String> getScriptsWithEvents() { static Stream<String> getScriptsWithEvents() {
return Stream.concat(getDefaultScripts(), Stream.of(CLEAR_HISTORY_EVENTS, HISTORY_EVENT)); return Stream.concat(
getSampleDataCreationScripts(), Stream.of(CLEAR_HISTORY_EVENTS, HISTORY_EVENT));
} }
static Stream<String> getScriptsToClearDatabase() { static Stream<String> getScriptsToClearDatabase() {
return Stream.concat(getDefaultScripts(), Stream.of(DB_CLEAR_TABLES_SCRIPT)); return Stream.of(DB_CLEAR_TABLES_SCRIPT);
} }
static Stream<String> getScriptsToDropDatabase() { static Stream<String> getScriptsToDropDatabase() {
return Stream.concat(getDefaultScripts(), Stream.of(DB_DROP_TABLES_SCRIPT)); return Stream.of(DB_DROP_TABLES_SCRIPT);
} }
static Stream<String> getTestDataScripts() { static Stream<String> getTestDataScripts() {

6
lib/taskana-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java
View File

@ -10,19 +10,19 @@ class SampleDataProviderTest {
@Test @Test
void getScriptsNotNull() { void getScriptsNotNull() {
assertThat(SampleDataProvider.getDefaultScripts()).isNotNull(); assertThat(SampleDataProvider.getSampleDataCreationScripts()).isNotNull();
assertThat(SampleDataProvider.getScriptsWithEvents()).isNotNull(); assertThat(SampleDataProvider.getScriptsWithEvents()).isNotNull();
} }
@Test @Test
void getScriptsNotEmpty() { void getScriptsNotEmpty() {
assertThat(SampleDataProvider.getDefaultScripts().count() > 0).isTrue(); assertThat(SampleDataProvider.getSampleDataCreationScripts().count() > 0).isTrue();
assertThat(SampleDataProvider.getScriptsWithEvents().count() > 0).isTrue(); assertThat(SampleDataProvider.getScriptsWithEvents().count() > 0).isTrue();
} }
@Test @Test
void getScriptsFileExists() { void getScriptsFileExists() {
SampleDataProvider.getDefaultScripts() SampleDataProvider.getSampleDataCreationScripts()
.map(SqlReplacer::getScriptBufferedStream) .map(SqlReplacer::getScriptBufferedStream)
.forEach(Assertions::assertNotNull); .forEach(Assertions::assertNotNull);
} }

2
pom.xml
View File

@ -54,7 +54,7 @@
<version.spring>5.2.5.RELEASE</version.spring> <version.spring>5.2.5.RELEASE</version.spring>
<version.spring.security>5.3.1.RELEASE</version.spring.security> <version.spring.security>5.3.1.RELEASE</version.spring.security>
<version.spring.core>2.0.0.RELEASE</version.spring.core> <version.spring.core>2.0.0.RELEASE</version.spring.core>
<version.spring.boot>2.2.5.RELEASE</version.spring.boot> <version.spring.boot>2.2.6.RELEASE</version.spring.boot>
<version.spring.restdocs>2.0.4.RELEASE</version.spring.restdocs> <version.spring.restdocs>2.0.4.RELEASE</version.spring.restdocs>
<version.spring.mybatis>2.0.4</version.spring.mybatis> <version.spring.mybatis>2.0.4</version.spring.mybatis>
<version.spring.hateos>0.24.0.RELEASE</version.spring.hateos> <version.spring.hateos>0.24.0.RELEASE</version.spring.hateos>