Feature/liquibase configuration #340
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.devonfw.module.test.common.base.clean; | ||
|
|
||
| import javax.inject.Inject; | ||
| import liquibase.Liquibase; | ||
|
|
||
| /** | ||
| * @author ayudixit | ||
| * | ||
| */ | ||
| public class TestCleanerPluginLiquibase implements TestCleanerPlugin { | ||
|
|
||
| @Inject | ||
| private Liquibase liquibase; | ||
|
|
||
| /** | ||
| * The constructor. | ||
| */ | ||
| public TestCleanerPluginLiquibase() { | ||
|
|
||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * The constructor. | ||
| * | ||
| * @param liquibase the {@link Liquibase} instance. | ||
| */ | ||
| public TestCleanerPluginLiquibase(Liquibase liquibase) { | ||
|
|
||
| super(); | ||
| this.liquibase = liquibase; | ||
| } | ||
|
|
||
| @Override | ||
| public void cleanup() { | ||
|
|
||
| try { | ||
| this.liquibase.dropAll(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
|
Member
There was a problem hiding this comment. never use
Contributor
Author
There was a problem hiding this comment. I will change it to rethrow this exception |
||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,73 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
|
Member
There was a problem hiding this comment. what has been changed here? |
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>com.devonfw</groupId> | ||
| <artifactId>maven-parent</artifactId> | ||
| <version>6</version> | ||
| </parent> | ||
|
|
||
| <groupId>com.devonfw.java.dev</groupId> | ||
| <artifactId>devon4j</artifactId> | ||
| <version>dev-SNAPSHOT</version> | ||
|
|
||
| <!-- This POM will never be released --> | ||
| <packaging>pom</packaging> | ||
| <name>${project.artifactId}</name> | ||
| <description>Java stack of devonfw.com (devon4j): develop Java apps standardized, faster and with less risk.</description> | ||
|
|
||
| <inceptionYear>2014</inceptionYear> | ||
|
|
||
| <modules> | ||
| <module>boms</module> | ||
| <module>modules</module> | ||
| <module>starters</module> | ||
| <module>templates</module> | ||
| <module>documentation</module> | ||
| </modules> | ||
|
|
||
| <properties> | ||
| <revision>dev-SNAPSHOT</revision> | ||
| <github.repository>devon4j</github.repository> | ||
| <devon4j.version>${revision}</devon4j.version> | ||
| <spring.boot.version>2.4.4</spring.boot.version> | ||
| <!-- Spring boot and spring cloud version has to match --> | ||
| <spring.cloud.dependencies.version>2020.0.0</spring.cloud.dependencies.version> | ||
| <jackson.version>2.12.2</jackson.version> | ||
| <!-- Overriding Jackson for fixing vulnerabilities --> | ||
| <guava.version>30.1.1-jre</guava.version> | ||
| <junit.version>5.7.1</junit.version> | ||
| <cxf.version>3.4.3</cxf.version> | ||
| <mmm.util.version>8.7.0</mmm.util.version> | ||
| <slf4j.version>1.7.30</slf4j.version> | ||
| <sonar.host.url>https://sonarcloud.io</sonar.host.url> | ||
| <sonar.organization>devonfw</sonar.organization> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <!-- avoid version in local war files, exclude development properties from WARs --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <configuration> | ||
| <packagingExcludes>WEB-INF/classes/config/application.properties,*.jsp</packagingExcludes> | ||
| <warName>${project.artifactId}</warName> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-maven-plugin</artifactId> | ||
| <version>${spring.boot.version}</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| </project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
Contributor
Author
There was a problem hiding this comment. I will review it again and restore the file if changes not required |
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.devonfw.java.dev</groupId> | ||
| <artifactId>devon4j</artifactId> | ||
| <version>dev-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>devon4j-templates</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>${project.artifactId}</name> | ||
| <description>Templates (maven archetypes) of devon4j.</description> | ||
| <modules> | ||
| <module>server</module> | ||
| </modules> | ||
| </project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,73 @@ | ||
| package ${package}.general.batch.base.test; | ||
|
Member
There was a problem hiding this comment. again the diff is not readable. IMHO you have a general problem with your setup of git and are changing all EOLs accidentally. Can you please change and fix this?
Contributor
Author
There was a problem hiding this comment. I will fix this setup issue and will make it work. |
||
|
|
||
| import javax.inject.Inject; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.batch.core.Job; | ||
| import org.springframework.batch.core.launch.JobLauncher; | ||
| import org.springframework.batch.test.JobLauncherTestUtils; | ||
| import ${package}.general.common.base.test.TestUtil; | ||
| import com.devonfw.module.test.common.base.ComponentTest; | ||
| #if ($dbMigration == 'liquibase') | ||
| import liquibase.Liquibase; | ||
| #else | ||
| import org.flywaydb.core.Flyway; | ||
| #end | ||
|
|
||
|
hohwille marked this conversation as resolved.
|
||
| /** | ||
| * Base class for all spring batch integration tests. It helps to do End-to-End job tests. | ||
| */ | ||
| public abstract class SpringBatchIntegrationTest extends ComponentTest { | ||
|
|
||
| @Inject | ||
| private JobLauncher jobLauncher; | ||
|
|
||
| #if ($dbMigration == 'liquibase') | ||
| @Inject | ||
| private Liquibase liquibase; | ||
| #else | ||
| @Inject | ||
| private Flyway flyway; | ||
| #end | ||
|
Member
There was a problem hiding this comment. indendation with velocity is tricky: every whitespace will be written to the output. That is " " before the |
||
|
|
||
| #if ($dbMigration == 'liquibase') | ||
| @Override | ||
| protected void doSetUp() { | ||
| super.doSetUp(); | ||
| try { | ||
| this.liquibase.dropAll(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
|
Member
There was a problem hiding this comment. see |
||
| } | ||
| } | ||
| #else | ||
| @Override | ||
| protected void doSetUp() { | ||
|
|
||
| super.doSetUp(); | ||
| this.flyway.clean(); | ||
| this.flyway.migrate(); | ||
| } | ||
| #end | ||
|
|
||
|
|
||
| @Override | ||
| protected void doTearDown() { | ||
|
|
||
| super.doTearDown(); | ||
| TestUtil.logout(); | ||
| } | ||
|
|
||
| /** | ||
| * @param job job to configure | ||
| * @return jobLauncherTestUtils | ||
| */ | ||
| public JobLauncherTestUtils getJobLauncherTestUtils(Job job) { | ||
|
|
||
| JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils(); | ||
| jobLauncherTestUtils.setJob(job); | ||
| jobLauncherTestUtils.setJobLauncher(this.jobLauncher); | ||
|
|
||
| return jobLauncherTestUtils; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.