Repository: cayenne Updated Branches: refs/heads/master 6b849c737 -> cd411abc8
cleanup, javadocs Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cd411abc Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cd411abc Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cd411abc Branch: refs/heads/master Commit: cd411abc8e117afe8e1a2b1b5d539af1721fefba Parents: 6b849c7 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Tue Oct 4 13:32:29 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Tue Oct 4 13:32:29 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java | 7 +++---- .../cayenne/dbsync/reverse/db/DbLoaderConfiguration.java | 9 --------- .../apache/cayenne/modeler/dialog/db/ModelerDbLoader.java | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/cd411abc/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java index 7c3778a..2821adb 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java @@ -372,9 +372,8 @@ public class DbLoader { } /** - * Performs database reverse engineering to match the specified catalog, - * schema, table name and table type patterns and fills the specified - * DataMap object with DB and object mapping info. + * Performs database reverse engineering based on provided configuration. Stores the resulting {@link DbEntity} + * and {@link Procedure} objects in provided DataMap. * * @since 4.0 */ @@ -416,7 +415,7 @@ public class DbLoader { * * @since 4.0 */ - public Map<String, Procedure> loadProcedures(DataMap dataMap, DbLoaderConfiguration config) throws SQLException { + protected Map<String, Procedure> loadProcedures(DataMap dataMap, DbLoaderConfiguration config) throws SQLException { Map<String, Procedure> procedures = loadProcedures(config); if (procedures.isEmpty()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/cd411abc/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java index e460cb9..53c1aff 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java @@ -27,7 +27,6 @@ import org.apache.cayenne.dbsync.reverse.filters.PatternFilter; */ public class DbLoaderConfiguration { - private Boolean skipRelationshipsLoading; private Boolean skipPrimaryKeyLoading; @@ -60,18 +59,10 @@ public class DbLoaderConfiguration { return skipRelationshipsLoading != null && skipRelationshipsLoading; } - public Boolean getSkipRelationshipsLoading() { - return skipRelationshipsLoading; - } - public void setSkipRelationshipsLoading(Boolean skipRelationshipsLoading) { this.skipRelationshipsLoading = skipRelationshipsLoading; } - public boolean getSkipPrimaryKeyLoading() { - return skipPrimaryKeyLoading; - } - public boolean isSkipPrimaryKeyLoading() { return skipPrimaryKeyLoading != null && skipPrimaryKeyLoading; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/cd411abc/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java index e238664..a6d6d93 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java @@ -61,7 +61,7 @@ class ModelerDbLoader extends DbLoader { } @Override - public Map<String, Procedure> loadProcedures(DataMap dataMap, DbLoaderConfiguration config) throws SQLException { + protected Map<String, Procedure> loadProcedures(DataMap dataMap, DbLoaderConfiguration config) throws SQLException { Map<String, Procedure> procedures = super.loadProcedures(dataMap, config); addProcedures(procedures); return procedures;