Repository: cayenne Updated Branches: refs/heads/master e67194068 -> 9aeeab3fb
CAY-2116 Split schema synchronization code in a separate module * removing remaining object layer code from DbLoader Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9aeeab3f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9aeeab3f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9aeeab3f Branch: refs/heads/master Commit: 9aeeab3fb3f1bc6c8ac1321fc3f560b8196c6be3 Parents: e671940 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Fri Nov 4 12:10:24 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Fri Nov 4 12:14:38 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/reverse/db/DbLoader.java | 10 -------- .../dbsync/reverse/db/DbLoaderDelegate.java | 20 ++++++++++------ .../dbsync/reverse/db/DbTableLoader.java | 11 --------- .../dbimport/DbImportDbLoaderDelegateTest.java | 25 -------------------- 4 files changed, 13 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/9aeeab3f/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 9e447c6..02de407 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 @@ -31,7 +31,6 @@ import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.DbJoin; import org.apache.cayenne.map.DbRelationship; -import org.apache.cayenne.map.ObjEntity; import org.apache.cayenne.map.Procedure; import org.apache.cayenne.map.ProcedureParameter; import org.apache.cayenne.util.EqualsBuilder; @@ -43,7 +42,6 @@ import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -340,14 +338,6 @@ public class DbLoader { LOGGER.info("Skip relation: '" + key + "' because table '" + tableName + "' not found"); } - private void fireObjEntitiesAddedEvents(Collection<ObjEntity> loadedObjEntities) { - for (ObjEntity curEntity : loadedObjEntities) { - // notify delegate - if (delegate != null) { - delegate.objEntityAdded(curEntity); - } - } - } protected String[] getTableTypes(DbLoaderConfiguration config) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/9aeeab3f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java index e85059f..8516c23 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java @@ -24,9 +24,7 @@ import org.apache.cayenne.map.DbRelationship; import org.apache.cayenne.map.ObjEntity; /** - * DbLoaderDelegate defines API that allows to control the behavior of DbLoader - * during the database reverse-engineering. Delegate is also notified of the - * progress of reverse-engineering. + * Defines API for progress tracking and altering the folow of reverse-engineering. */ public interface DbLoaderDelegate { @@ -36,23 +34,31 @@ public interface DbLoaderDelegate { /** * Called before relationship loading for db-entity - * @param entity * + * @param entity * @return true in case you want process relationships for this entity - * false otherwise + * false otherwise */ boolean dbRelationship(DbEntity entity); /** * Called before relationship will be added into db-entity but after it was loaded from db - * @param entity * + * @param entity * @return true in case you want add this relationship into entity - * false otherwise + * false otherwise */ boolean dbRelationshipLoaded(DbEntity entity, DbRelationship relationship); + /** + * @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 DbLoader does not deal with object layer anymore. + */ + @Deprecated void objEntityRemoved(ObjEntity entity); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/9aeeab3f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbTableLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbTableLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbTableLoader.java index 1bea9c0..f3476af 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbTableLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbTableLoader.java @@ -24,7 +24,6 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.DetectedDbEntity; -import org.apache.cayenne.map.ObjEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,7 +32,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -133,15 +131,6 @@ public class DbTableLoader { for (DbEntity dbEntity : tables) { DbEntity oldEnt = map.getDbEntity(dbEntity.getName()); if (oldEnt != null) { - Collection<ObjEntity> oldObjEnt = map.getMappedEntities(oldEnt); - if (!oldObjEnt.isEmpty()) { - for (ObjEntity objEntity : oldObjEnt) { - LOGGER.debug("Delete ObjEntity: " + objEntity.getName()); - map.removeObjEntity(objEntity.getName(), true); - delegate.objEntityRemoved(objEntity); - } - } - LOGGER.debug("Overwrite DbEntity: " + oldEnt.getName()); map.removeDbEntity(oldEnt.getName(), true); delegate.dbEntityRemoved(oldEnt); http://git-wip-us.apache.org/repos/asf/cayenne/blob/9aeeab3f/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java index 52bae8a..6e0858d 100644 --- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java +++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java @@ -74,29 +74,4 @@ public class DbImportDbLoaderDelegateTest { assertEquals(Arrays.asList(dbEntity), delegate.getRemovedDbEntities()); } - - @Test - public void testObjEntityAdded() { - delegate.objEntityAdded(objEntity); - - List<ObjEntity> entities = Arrays.asList(objEntity); - - assertEquals(1, dataMap.getObjEntities().size()); - assertTrue(dataMap.getObjEntities().containsAll(entities)); - - assertEquals(entities, delegate.getAddedObjEntities()); - } - - @Test - public void testObjEntityRemoved() { - // Make sure the entity is in the datamap to start. - dataMap.addObjEntity(objEntity); - - delegate.objEntityRemoved(objEntity); - - // The entity should no longer be in the map. - assertEquals(0, dataMap.getObjEntities().size()); - - assertEquals(Arrays.asList(objEntity), delegate.getRemovedObjEntities()); - } }
