You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/02/16 14:20:17 UTC
cayenne git commit: Manually validate configuration of Maven tasks as
default validation confusing IDE
Repository: cayenne
Updated Branches:
refs/heads/master e909b5abb -> 3d2b091b6
Manually validate configuration of Maven tasks as default validation confusing IDE
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3d2b091b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3d2b091b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3d2b091b
Branch: refs/heads/master
Commit: 3d2b091b6cb327ddffe874078e2c5d30279a8074
Parents: e909b5a
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Feb 16 17:20:07 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Feb 16 17:20:07 2017 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/tools/DbGeneratorMojo.java | 6 +++++-
.../cayenne/tools/DbImportDataSourceConfig.java | 14 ++++++++++++++
.../java/org/apache/cayenne/tools/DbImporterMojo.java | 5 ++++-
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3d2b091b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index 6125b9c..fa88296 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -73,7 +73,7 @@ public class DbGeneratorMojo extends AbstractMojo {
* @see DbImportDataSourceConfig
* @since 4.0
*/
- @Parameter(required = true)
+ @Parameter
private DbImportDataSourceConfig dataSource = new DbImportDataSourceConfig();
/**
@@ -120,6 +120,10 @@ public class DbGeneratorMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
Log logger = new MavenLogger(this);
+
+ // check missing data source parameters
+ dataSource.validate();
+
Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger));
AdhocObjectFactory objectFactory = injector.getInstance(AdhocObjectFactory.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3d2b091b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImportDataSourceConfig.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImportDataSourceConfig.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImportDataSourceConfig.java
index 8fa4b56..897127c 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImportDataSourceConfig.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImportDataSourceConfig.java
@@ -19,6 +19,8 @@
package org.apache.cayenne.tools;
+import org.apache.maven.plugin.MojoExecutionException;
+
/**
* @since 4.0
*/
@@ -44,6 +46,18 @@ public class DbImportDataSourceConfig {
*/
private String password;
+ public void validate() throws MojoExecutionException {
+ if(driver == null && url == null && username == null && password == null) {
+ throw new MojoExecutionException("Missing <dataSource> configuration.");
+ }
+ if(driver == null) {
+ throw new MojoExecutionException("Missing <driver> parameter in <dataSource>.");
+ }
+ if(url == null) {
+ throw new MojoExecutionException("Missing <url> parameter in <dataSource>.");
+ }
+ }
+
public String getDriver() {
return driver;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3d2b091b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index e9bb38a..e64de29 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -61,7 +61,7 @@ public class DbImporterMojo extends AbstractMojo {
* @see DbImportDataSourceConfig
* @since 4.0
*/
- @Parameter(required = true)
+ @Parameter
private DbImportDataSourceConfig dataSource = new DbImportDataSourceConfig();
/**
@@ -105,6 +105,9 @@ public class DbImporterMojo extends AbstractMojo {
Log logger = new MavenLogger(this);
+ // check missing data source parameters
+ dataSource.validate();
+
DbImportConfiguration config = createConfig(logger);
Injector injector = DIBootstrap.createInjector(
new DbSyncModule(), new ToolsModule(logger), new DbImportModule());