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/01/30 15:03:25 UTC
cayenne git commit: CAY-2213 correctly detect old config of cdbimport
and throw exception
Repository: cayenne
Updated Branches:
refs/heads/master 5d7507f64 -> a148a2895
CAY-2213 correctly detect old config of cdbimport and throw exception
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a148a289
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a148a289
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a148a289
Branch: refs/heads/master
Commit: a148a289523c817fea9cdc383cb265ca1b206539
Parents: 5d7507f
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jan 30 18:03:17 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jan 30 18:03:17 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/tools/DbImporterMojo.java | 161 ++++++-------------
1 file changed, 50 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a148a289/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index 088bb52..9c9cddf 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -72,8 +72,33 @@ public class DbImporterMojo extends AbstractMojo {
/**
* An object that contains reverse engineering rules.
*/
- @Parameter(property = "dbimport", alias = "dbImport")
- private ReverseEngineering reverseEngineering = new ReverseEngineering();
+ @Parameter(name = "dbimport", property = "dbimport", alias = "dbImport")
+ private ReverseEngineering dbImportConfig = new ReverseEngineering();
+
+ /**
+ * @deprecated use {@code <dataSource>} tag to set connection properties
+ */
+ @Deprecated @Parameter(name = "url", property = "url")
+ private final String oldUrl = ""; // TODO remove in 4.0.BETA
+
+ /**
+ * @deprecated moved to {@code <dbimport>} section
+ */
+ @Deprecated @Parameter(name = "meaningfulPkTables", property = "meaningfulPkTables")
+ private final String oldMeaningfulPkTables = ""; // TODO remove in 4.0.BETA
+
+ /**
+ * @deprecated use {@code <dataSource>} tag to set connection properties
+ */
+ @Deprecated @Parameter(name = "driver", property = "driver")
+ private final String oldDriver = ""; // TODO remove in 4.0.BETA
+
+ /**
+ * @deprecated moved to {@code <dbimport>} section
+ */
+ @Deprecated @Parameter(name = "defaultPackage", property = "defaultPackage")
+ private final String oldDefaultPackage = ""; // TODO remove in 4.0.BETA
+
public void execute() throws MojoExecutionException, MojoFailureException {
@@ -84,7 +109,7 @@ public class DbImporterMojo extends AbstractMojo {
new DbSyncModule(), new ToolsModule(logger), new DbImportModule());
DbImportConfigurationValidator validator = new DbImportConfigurationValidator(
- reverseEngineering, config, injector);
+ dbImportConfig, config, injector);
try {
validator.validate();
} catch (Exception ex) {
@@ -111,23 +136,23 @@ public class DbImporterMojo extends AbstractMojo {
DbImportConfiguration config = new DbImportConfiguration();
config.setAdapter(adapter);
- config.setDefaultPackage(reverseEngineering.getDefaultPackage());
+ config.setDefaultPackage(dbImportConfig.getDefaultPackage());
config.setDriver(dataSource.getDriver());
- config.setFiltersConfig(new FiltersConfigBuilder(reverseEngineering).build());
- config.setForceDataMapCatalog(reverseEngineering.isForceDataMapCatalog());
- config.setForceDataMapSchema(reverseEngineering.isForceDataMapSchema());
+ config.setFiltersConfig(new FiltersConfigBuilder(dbImportConfig).build());
+ config.setForceDataMapCatalog(dbImportConfig.isForceDataMapCatalog());
+ config.setForceDataMapSchema(dbImportConfig.isForceDataMapSchema());
config.setLogger(logger);
- config.setMeaningfulPkTables(reverseEngineering.getMeaningfulPkTables());
- config.setNamingStrategy(reverseEngineering.getNamingStrategy());
+ config.setMeaningfulPkTables(dbImportConfig.getMeaningfulPkTables());
+ config.setNamingStrategy(dbImportConfig.getNamingStrategy());
config.setPassword(dataSource.getPassword());
- config.setSkipRelationshipsLoading(reverseEngineering.getSkipRelationshipsLoading());
- config.setSkipPrimaryKeyLoading(reverseEngineering.getSkipPrimaryKeyLoading());
- config.setStripFromTableNames(reverseEngineering.getStripFromTableNames());
- config.setTableTypes(reverseEngineering.getTableTypes());
+ config.setSkipRelationshipsLoading(dbImportConfig.getSkipRelationshipsLoading());
+ config.setSkipPrimaryKeyLoading(dbImportConfig.getSkipPrimaryKeyLoading());
+ config.setStripFromTableNames(dbImportConfig.getStripFromTableNames());
+ config.setTableTypes(dbImportConfig.getTableTypes());
config.setTargetDataMap(map);
config.setUrl(dataSource.getUrl());
config.setUsername(dataSource.getUsername());
- config.setUsePrimitives(reverseEngineering.isUsePrimitives());
+ config.setUsePrimitives(dbImportConfig.isUsePrimitives());
return config;
}
@@ -136,137 +161,51 @@ public class DbImporterMojo extends AbstractMojo {
return map;
}
+ /**
+ * Used only in tests, Maven will inject value directly into the "map" field
+ */
public void setMap(File map) {
this.map = map;
}
/**
- * This setter is used by Maven
+ * This setter is used by Maven when defined {@code <dbimport>} tag
*/
- public void setDbimport(ReverseEngineering reverseEngineering) {
- this.reverseEngineering = reverseEngineering;
+ public void setDbimport(ReverseEngineering dbImportConfig) {
+ this.dbImportConfig = dbImportConfig;
}
/**
- * This setter is used by Maven
+ * This setter is used by Maven {@code <dbImport>} tag
*/
- public void setDbImport(ReverseEngineering reverseEngineering) {
- this.reverseEngineering = reverseEngineering;
+ public void setDbImport(ReverseEngineering dbImportConfig) {
+ this.dbImportConfig = dbImportConfig;
}
public ReverseEngineering getReverseEngineering() {
- return reverseEngineering;
+ return dbImportConfig;
}
- // \u2b07\u2b07\u2b07 All following setters should be removed in 4.0.BETA \u2b07\u2b07\u2b07 //
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
+ // TODO \u2b07\u2b07\u2b07 All following setters should be removed in 4.0.BETA \u2b07\u2b07\u2b07
@Deprecated
public void setUrl(String url) {
throw new UnsupportedOperationException("Connection properties were replaced with <dataSource> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
}
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setUser(String user) {
- throw new UnsupportedOperationException("Connection properties were replaced with <dataSource> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setPassword(String password) {
- throw new UnsupportedOperationException("Connection properties were replaced with <dataSource> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
@Deprecated
public void setDriver(String driver) {
throw new UnsupportedOperationException("Connection properties were replaced with <dataSource> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
}
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setForceDataMapCatalog(boolean forceDataMapCatalog) {
- throw new UnsupportedOperationException("forceDataMapCatalog property has been moved to <dbimport> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setForceDataMapSchema(boolean forceDataMapSchema) {
- throw new UnsupportedOperationException("forceDataMapSchema property has been moved to <dbimport> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
@Deprecated
public void setMeaningfulPkTables(String meaningfulPkTables) {
throw new UnsupportedOperationException("meaningfulPkTables property has been moved to <dbimport> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
}
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setNamingStrategy(String namingStrategy) {
- throw new UnsupportedOperationException("namingStrategy property has been moved to <dbimport> tag since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
@Deprecated
public void setDefaultPackage(String defaultPackage) {
throw new UnsupportedOperationException("defaultPackage property has been deprecated since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
}
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setStripFromTableNames(String stripFromTableNames) {
- throw new UnsupportedOperationException("stripFromTableNames property has been deprecated since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setUsePrimitives(boolean usePrimitives) {
- throw new UnsupportedOperationException("usePrimitives property has been deprecated since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
-
- /**
- * Setter to catch old styled configuration
- * @deprecated to be removed in 4.0.BETA
- */
- @Deprecated
- public void setReverseEngineering(ReverseEngineering reverseEngineering) {
- throw new UnsupportedOperationException("<reverseEngineering> tag has been replaced with <dbimport> since 4.0.M5.\n\tFor additional information see http://cayenne.apache.org/docs/4.0/cayenne-guide/including-cayenne-in-project.html#maven-projects");
- }
}