This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 67e7b06fa2e2e43d21f9b9d7e7b40c7fd68e1a02 Author: Arseni Bulatski <ancars...@gmail.com> AuthorDate: Thu Jul 11 16:32:46 2019 +0300 Cleanup dbImport action logs. (cherry picked from commit 400cabe27c23e9f82997fa56888fe0487f443b36) --- .../cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java index 79253b8..c5bb4af 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java @@ -191,7 +191,8 @@ public class DefaultDbImportAction implements DbImportAction { putReverseEngineeringToConfig(dataMapReverseEngineering, config); } if ((dataMapReverseEngineering != null) && (!config.isUseDataMapReverseEngineering())) { - logger.warn("Found several dbimport configs. Configuration selected from 'build.gradle' file."); + logger.warn("Found several dbimport configs. DataMap dbimport config was skipped. " + + "Configuration selected from build file"); } if ((dataMapReverseEngineering == null) && (config.isUseDataMapReverseEngineering())) { logger.warn("Missing dbimport config. Database is imported completely."); @@ -243,8 +244,7 @@ public class DefaultDbImportAction implements DbImportAction { config.setMeaningfulPkTables(reverseEngineering.getMeaningfulPkTables()); config.setNamingStrategy(reverseEngineering.getNamingStrategy()); config.setFiltersConfig(new FiltersConfigBuilder( - new ReverseEngineering(reverseEngineering)) - .build()); + new ReverseEngineering(reverseEngineering)).build()); config.setForceDataMapCatalog(reverseEngineering.isForceDataMapCatalog()); config.setForceDataMapSchema(reverseEngineering.isForceDataMapSchema()); config.setDefaultPackage(reverseEngineering.getDefaultPackage());