From 751a2fa6ee1983a93ca813d7040f64f4f34b58ac Mon Sep 17 00:00:00 2001 From: The Milk Man Date: Mon, 11 Oct 2021 14:07:33 +0100 Subject: [PATCH] All Gradle tasks return their result object --- .../org/flywaydb/gradle/task/FlywayBaselineTask.java | 3 +-- .../java/org/flywaydb/gradle/task/FlywayCleanTask.java | 3 +-- .../java/org/flywaydb/gradle/task/FlywayInfoTask.java | 2 +- .../org/flywaydb/gradle/task/FlywayRepairTask.java | 3 +-- .../org/flywaydb/gradle/task/FlywayValidateTask.java | 10 +++++----- .../src/main/java/org/flywaydb/maven/BaselineMojo.java | 2 +- .../src/main/java/org/flywaydb/maven/CleanMojo.java | 2 +- .../src/main/java/org/flywaydb/maven/MigrateMojo.java | 2 +- .../src/main/java/org/flywaydb/maven/RepairMojo.java | 2 +- .../src/main/java/org/flywaydb/maven/ValidateMojo.java | 2 +- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayBaselineTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayBaselineTask.java index fa9acd750d..4ff42d0e27 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayBaselineTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayBaselineTask.java @@ -25,7 +25,6 @@ public FlywayBaselineTask() { @Override protected Object run(Flyway flyway) { - flyway.baseline(); - return null; + return flyway.baseline(); } } \ No newline at end of file diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayCleanTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayCleanTask.java index 973c3fd419..bca7760136 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayCleanTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayCleanTask.java @@ -25,7 +25,6 @@ public FlywayCleanTask() { @Override protected Object run(Flyway flyway) { - flyway.clean(); - return null; + return flyway.clean(); } } \ No newline at end of file diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java index c591ca2aea..9c48bd5034 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java @@ -34,6 +34,6 @@ protected Object run(Flyway flyway) { MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion(); System.out.println("Schema version: " + currentSchemaVersion); System.out.println(MigrationInfoDumper.dumpToAsciiTable(info.all())); - return null; + return info; } } \ No newline at end of file diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayRepairTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayRepairTask.java index 1516023b6a..ba335bf4ff 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayRepairTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayRepairTask.java @@ -32,7 +32,6 @@ public FlywayRepairTask() { @Override protected Object run(Flyway flyway) { - flyway.repair(); - return null; + return flyway.repair(); } } \ No newline at end of file diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayValidateTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayValidateTask.java index 967605cc6d..86c1a19ade 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayValidateTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayValidateTask.java @@ -32,11 +32,11 @@ public class FlywayValidateTask extends AbstractFlywayTask { public FlywayValidateTask() { super(); - setDescription("Validate applied migrations against resolved ones (on the filesystem or classpath)" + - " to detect accidental changes that may prevent the schema(s) from being recreated exactly." + - " Validation fails if differences in migration names, types or checksums are found, " + - "versions have been applied that aren\"t resolved locally anymore or" + - " versions have been resolved that haven\"t been applied yet"); + setDescription("Validate applied migrations against resolved ones (on the filesystem or classpath) " + + "to detect accidental changes that may prevent the schema(s) from being recreated exactly. " + + "Validation fails if differences in migration names, types or checksums are found, " + + "versions have been applied that aren\"t resolved locally anymore or " + + "versions have been resolved that haven\"t been applied yet"); } @Override diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/BaselineMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/BaselineMojo.java index 19115b56ba..676a33f026 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/BaselineMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/BaselineMojo.java @@ -29,7 +29,7 @@ threadSafe = true) public class BaselineMojo extends AbstractFlywayMojo { @Override - protected void doExecute(Flyway flyway) throws Exception { + protected void doExecute(Flyway flyway) { flyway.baseline(); } } \ No newline at end of file diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/CleanMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/CleanMojo.java index a1a17ac60f..36ea211d74 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/CleanMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/CleanMojo.java @@ -31,7 +31,7 @@ threadSafe = true) public class CleanMojo extends AbstractFlywayMojo { @Override - protected void doExecute(Flyway flyway) throws Exception { + protected void doExecute(Flyway flyway) { flyway.clean(); } } \ No newline at end of file diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/MigrateMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/MigrateMojo.java index 8fbc93b0af..d310817fe1 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/MigrateMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/MigrateMojo.java @@ -31,7 +31,7 @@ threadSafe = true) public class MigrateMojo extends AbstractFlywayMojo { @Override - protected void doExecute(Flyway flyway) throws Exception { + protected void doExecute(Flyway flyway) { flyway.migrate(); MigrationInfo current = flyway.info().current(); diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/RepairMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/RepairMojo.java index 3030107305..76ba449154 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/RepairMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/RepairMojo.java @@ -34,7 +34,7 @@ threadSafe = true) public class RepairMojo extends AbstractFlywayMojo { @Override - protected void doExecute(Flyway flyway) throws Exception { + protected void doExecute(Flyway flyway) { flyway.repair(); } } \ No newline at end of file diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/ValidateMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/ValidateMojo.java index 92b824393d..023ff92b51 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/ValidateMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/ValidateMojo.java @@ -39,7 +39,7 @@ threadSafe = true) public class ValidateMojo extends AbstractFlywayMojo { @Override - protected void doExecute(Flyway flyway) throws Exception { + protected void doExecute(Flyway flyway) { flyway.validate(); } } \ No newline at end of file