You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/14 18:29:55 UTC

[6/9] cayenne git commit: New DbLoader for dbsync utils - loading process split in independent small steps - DbLoader always return new DataMap, it doesn't accept it from outside

New DbLoader for dbsync utils
 - loading process split in independent small steps
 - DbLoader always return new DataMap, it doesn't accept it from outside

Final clean up of tests


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/17053f9c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/17053f9c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/17053f9c

Branch: refs/heads/master
Commit: 17053f9ca430658a9b8acc86cd04f5a2b877f941
Parents: 4151546
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 12 12:40:02 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 12 12:40:02 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java  | 4 ++--
 .../apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/17053f9c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
index e350b04..8df5aa9 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
@@ -88,7 +88,7 @@ public class DbLoader {
 
     /**
      * Retrieves catalogs for a given connection.
-     * using a static method for catalog loading as we don't need a full DbLoader2 for this operation
+     * using a static method for catalog loading as we don't need a full DbLoader for this operation
      * @return List with the catalog names; empty list if none found.
      */
     public static List<String> loadCatalogs(Connection connection) throws SQLException {
@@ -99,7 +99,7 @@ public class DbLoader {
 
     /**
      * Retrieves the schemas for the given connection.
-     * using a static method for catalog loading as we don't need a full DbLoader2 for this operation
+     * using a static method for catalog loading as we don't need a full DbLoader for this operation
      * @return List with the schema names; empty list if none found.
      */
     public static List<String> loadSchemas(Connection connection) throws SQLException {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/17053f9c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java
index ae694eb..e0b8c67 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderDelegate.java
@@ -50,13 +50,13 @@ public interface DbLoaderDelegate {
     boolean dbRelationshipLoaded(DbEntity entity, DbRelationship relationship);
 
     /**
-     * @deprecated since 4.0 no longer invoked as DbLoader2 does not deal with object layer anymore.
+     * @deprecated since 4.0 no longer invoked as DbLoader does not deal with object layer anymore.
      */
     @Deprecated
     void objEntityAdded(ObjEntity entity);
 
     /**
-     * @deprecated since 4.0 no longer invoked as DbLoader2 does not deal with object layer anymore.
+     * @deprecated since 4.0 no longer invoked as DbLoader does not deal with object layer anymore.
      */
     @Deprecated
     void objEntityRemoved(ObjEntity entity);