Repository: cayenne Updated Branches: refs/heads/master f0c0326f3 -> 2dc30c8a1
cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2dc30c8a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2dc30c8a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2dc30c8a Branch: refs/heads/master Commit: 2dc30c8a133f9f84429290f46df10d13ca6bd2ab Parents: f0c0326 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Fri Nov 4 14:11:45 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Fri Nov 4 14:11:45 2016 +0300 ---------------------------------------------------------------------- .../apache/cayenne/tools/dbimport/DbImportConfiguration.java | 6 +++--- .../apache/cayenne/tools/dbimport/DefaultDbImportAction.java | 4 ++-- .../cayenne/tools/dbimport/DefaultDbImportActionTest.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/2dc30c8a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java index 82410aa..04c241d 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java @@ -135,10 +135,10 @@ public class DbImportConfiguration { public DbLoader createLoader(DbAdapter adapter, Connection connection, DbLoaderDelegate loaderDelegate) throws InstantiationException, IllegalAccessException, ClassNotFoundException { - return new DbLoader(connection, adapter, loaderDelegate, getNameGenerator()); + return new DbLoader(connection, adapter, loaderDelegate, createNameGenerator()); } - public NameFilter getMeaningfulPKFilter() { + public NameFilter createMeaningfulPKFilter() { if (meaningfulPkTables == null) { return NamePatternMatcher.EXCLUDE_ALL; @@ -154,7 +154,7 @@ public class DbImportConfiguration { return new NamePatternMatcher(patterns, new Pattern[0]); } - public ObjectNameGenerator getNameGenerator() { + public ObjectNameGenerator createNameGenerator() { // TODO: load via DI AdhocObjectFactory http://git-wip-us.apache.org/repos/asf/cayenne/blob/2dc30c8a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java index 5e1abcf..05fd502 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java @@ -182,8 +182,8 @@ public class DefaultDbImportAction implements DbImportAction { hasChanges |= applyTokens(config.createMergeDelegate(), targetDataMap, log(sort(reverse(mergerTokenFactory, tokens))), - config.getNameGenerator(), - config.getMeaningfulPKFilter(), + config.createNameGenerator(), + config.createMeaningfulPKFilter(), config.isUsePrimitives()); hasChanges |= syncProcedures(targetDataMap, sourceDataMap, loaderConfig.getFiltersConfig()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/2dc30c8a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java index aa2a561..4d16193 100644 --- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java +++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java @@ -126,8 +126,8 @@ public class DefaultDbImportActionTest { when(config.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate()); when(config.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration()); when(config.getTargetDataMap()).thenReturn(new File("xyz.map.xml")); - when(config.getNameGenerator()).thenReturn(new DefaultObjectNameGenerator()); - when(config.getMeaningfulPKFilter()).thenReturn(NamePatternMatcher.EXCLUDE_ALL); + when(config.createNameGenerator()).thenReturn(new DefaultObjectNameGenerator()); + when(config.createMeaningfulPKFilter()).thenReturn(NamePatternMatcher.EXCLUDE_ALL); final boolean[] haveWeTriedToSave = {false}; DefaultDbImportAction action = buildDbImportAction(new FileProjectSaver() { @@ -170,8 +170,8 @@ public class DefaultDbImportActionTest { when(params.getTargetDataMap()).thenReturn(FILE_STUB); when(params.createMergeDelegate()).thenReturn(new DefaultModelMergeDelegate()); when(params.getDbLoaderConfig()).thenReturn(new DbLoaderConfiguration()); - when(params.getNameGenerator()).thenReturn(new DefaultObjectNameGenerator()); - when(params.getMeaningfulPKFilter()).thenReturn(NamePatternMatcher.EXCLUDE_ALL); + when(params.createNameGenerator()).thenReturn(new DefaultObjectNameGenerator()); + when(params.createMeaningfulPKFilter()).thenReturn(NamePatternMatcher.EXCLUDE_ALL); final boolean[] haveWeTriedToSave = {false}; DefaultDbImportAction action = buildDbImportAction(new FileProjectSaver() {
