From 8a98cce3db70202418486de4962e32eaaf5c6ed9 Mon Sep 17 00:00:00 2001
From: Adrian Maghear <adrian.maghear@sellics.com>
Date: Fri, 17 Jul 2020 15:13:57 +0200
Subject: [PATCH] [BAEL4288] remove mysql flow

---
 .../flyway-repair/docker-compose/.env         |  1 -
 .../docker-compose/docker-compose.yaml        |  8 ----
 .../flyway-repair/docker-compose/mysql.env    |  5 ---
 persistence-modules/flyway-repair/pom.xml     | 43 ++++---------------
 .../application-callbacks.properties          |  2 +-
 .../resources/application-mysql.properties    |  3 --
 .../src/main/resources/application.properties |  3 --
 .../afterMigrateError__repair.sql}            |  0
 ..._add_table_one.sql => V1_0__add_table.sql} |  0
 ..._add_table_two.sql => V1_1__add_table.sql} |  0
 ...dd_table_three.sql => V1_2__add_table.sql} |  0
 .../db/migration/V1_3__add_table.sql          |  2 +-
 12 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 persistence-modules/flyway-repair/docker-compose/mysql.env
 delete mode 100644 persistence-modules/flyway-repair/src/main/resources/application-mysql.properties
 rename persistence-modules/flyway-repair/src/main/resources/db/{callbacks/afterMigrateError.sql => callback/afterMigrateError__repair.sql} (100%)
 rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_0__add_table_one.sql => V1_0__add_table.sql} (100%)
 rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_1__add_table_two.sql => V1_1__add_table.sql} (100%)
 rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_2__add_table_three.sql => V1_2__add_table.sql} (100%)

diff --git a/persistence-modules/flyway-repair/docker-compose/.env b/persistence-modules/flyway-repair/docker-compose/.env
index 52bd0d6510..69785c6e5c 100644
--- a/persistence-modules/flyway-repair/docker-compose/.env
+++ b/persistence-modules/flyway-repair/docker-compose/.env
@@ -1,2 +1 @@
-MYSQL_PORT=3316
 POSTGRES_PORT=5431
\ No newline at end of file
diff --git a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml
index 23270c043d..b3502f8775 100644
--- a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml
+++ b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml
@@ -1,14 +1,6 @@
 version: '3.0'
 
 services:
-  mysql-test:
-    image: mysql:8.0.17
-    ports:
-      - ${MYSQL_PORT}:3306
-    env_file:
-      - mysql.env
-    networks:
-      - baeldung
 
   postgres-test:
     image: postgres:11.5
diff --git a/persistence-modules/flyway-repair/docker-compose/mysql.env b/persistence-modules/flyway-repair/docker-compose/mysql.env
deleted file mode 100644
index 597344d88c..0000000000
--- a/persistence-modules/flyway-repair/docker-compose/mysql.env
+++ /dev/null
@@ -1,5 +0,0 @@
-MYSQL_ROOT_PASSWORD=password
-MYSQL_RANDOM_ROOT_PASSWORD=yes
-MYSQL_USER=testuser
-MYSQL_PASSWORD=password
-MYSQL_DATABASE=testdb
\ No newline at end of file
diff --git a/persistence-modules/flyway-repair/pom.xml b/persistence-modules/flyway-repair/pom.xml
index f9d62d5dad..4d61bd5c0e 100644
--- a/persistence-modules/flyway-repair/pom.xml
+++ b/persistence-modules/flyway-repair/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>${flyway-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -31,37 +30,23 @@
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
-                <version>${flyway-maven-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>*.properties</include>
-                    <include>db/**/*.sql</include>
-                </includes>
-            </resource>
-        </resources>
     </build>
 
-    <properties>
-        <flyway-core.version>6.5.0</flyway-core.version>
-        <flyway-maven-plugin.version>6.5.0</flyway-maven-plugin.version>
-        <flyway.configFiles>src/main/resources/application-${db.engine}.properties</flyway.configFiles>
-    </properties>
-
     <profiles>
 
         <profile>
             <id>h2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
-                <db.engine>h2</db.engine>
+                <spring-boot.run.profiles>h2</spring-boot.run.profiles>
             </properties>
             <dependencies>
                 <dependency>
@@ -72,24 +57,10 @@
             </dependencies>
         </profile>
 
-        <profile>
-            <id>mysql</id>
-            <properties>
-                <db.engine>mysql</db.engine>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
         <profile>
             <id>postgres</id>
             <properties>
-                <db.engine>postgres</db.engine>
+                <spring-boot.run.profiles>postgres</spring-boot.run.profiles>
             </properties>
             <dependencies>
                 <dependency>
@@ -102,4 +73,8 @@
 
     </profiles>
 
+    <properties>
+        <flyway.configFiles>src/main/resources/application-${spring-boot.run.profiles}.properties</flyway.configFiles>
+    </properties>
+
 </project>
diff --git a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties
index 2c10fc711f..7fb3124764 100644
--- a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties
+++ b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties
@@ -1 +1 @@
-flyway.locations=db/migration,db/callbacks
\ No newline at end of file
+spring.flyway.locations=classpath:db/migration,classpath:db/callback
\ No newline at end of file
diff --git a/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties b/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties
deleted file mode 100644
index 341f978068..0000000000
--- a/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-flyway.url=jdbc:mysql://127.0.0.1:3316/testdb
-flyway.user=testuser
-flyway.password=password
\ No newline at end of file
diff --git a/persistence-modules/flyway-repair/src/main/resources/application.properties b/persistence-modules/flyway-repair/src/main/resources/application.properties
index 3fae835eb1..da666d3cc2 100644
--- a/persistence-modules/flyway-repair/src/main/resources/application.properties
+++ b/persistence-modules/flyway-repair/src/main/resources/application.properties
@@ -1,6 +1,3 @@
-spring.profiles.include=@db.engine@
-
 spring.datasource.url=${flyway.url}
 spring.datasource.username=${flyway.user}
 spring.datasource.password=${flyway.password}
-spring.flyway.locations=${flyway.locations:db/migration}
\ No newline at end of file
diff --git a/persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql b/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql
similarity index 100%
rename from persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql
rename to persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql
diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql
similarity index 100%
rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql
rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql
diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql
similarity index 100%
rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql
rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql
diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql
similarity index 100%
rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql
rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql
diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql
index ec434dd5b2..cf89d5f308 100644
--- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql
+++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql
@@ -1,3 +1,3 @@
-create table table_one (
+create table table_four (
   id numeric primary key
 );
\ No newline at end of file