cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abulat...@apache.org
Subject [cayenne] 03/03: CAY-2539 Import procedures with the help of MergerToken
Date Thu, 04 Jul 2019 08:43:34 GMT
This is an automated email from the ASF dual-hosted git repository.

abulatski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 0527f5d5f5870f949aa3044ea677ceb9191c7d34
Author: Arseni Bulatski <ancarseni@gmail.com>
AuthorDate: Thu Jul 4 11:42:30 2019 +0300

    CAY-2539 Import procedures with the help of MergerToken
---
 .../apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java | 3 ---
 .../apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 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 2130498..baa5030 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
@@ -52,7 +52,6 @@ import org.apache.cayenne.dbsync.reverse.dbload.DbLoaderConfiguration;
 import org.apache.cayenne.dbsync.reverse.dbload.ModelMergeDelegate;
 import org.apache.cayenne.dbsync.reverse.dbload.ProxyModelMergeDelegate;
 import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter;
-import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
 import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DataMap;
@@ -87,7 +86,6 @@ public class DefaultDbImportAction implements DbImportAction {
     private final DataChannelDescriptorLoader dataChannelDescriptorLoader;
     private final DataChannelMetaData metaData;
     private boolean hasChanges;
-    private FiltersConfig filters;
     private Collection<MergerToken> tokens;
     private DataMap loadedDataMap;
 
@@ -212,7 +210,6 @@ public class DefaultDbImportAction implements DbImportAction {
            .build()
            .createMergeTokens(targetDataMap, sourceDataMap);
         tokens = log(sort(reverse(mergerTokenFactory, tokens)));
-        filters = loaderConfig.getFiltersConfig();
 
         hasChanges |= checkDataMapProperties(targetDataMap, config);
         hasChanges |= hasTokensToImport(tokens);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
index f7b1236..c9da444 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
@@ -50,8 +50,8 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
     @Inject
     private DataMap targetMap;
 
-    DataMap sourceDataMap;
-    DbImportConfiguration config;
+    private DataMap sourceDataMap;
+    private DbImportConfiguration config;
 
     private DbLoadResultDialog resultDialog;
     private boolean hasTokenToMerge;


Mime
View raw message