Repository: cayenne Updated Branches: refs/heads/master 1b58b2ed0 -> f4907c8cf
CAY-2116 Split schema synchronization code in a separate module * cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f4907c8c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f4907c8c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f4907c8c Branch: refs/heads/master Commit: f4907c8cf357e2598519bf0fd62ef0871b58bec7 Parents: 1b58b2e Author: Andrus Adamchik <[email protected]> Authored: Wed Nov 2 19:04:44 2016 +0300 Committer: Andrus Adamchik <[email protected]> Committed: Wed Nov 2 19:21:41 2016 +0300 ---------------------------------------------------------------------- .../dbsync/merge/CreateTableToModel.java | 2 +- .../dbsync/merge/EntityMergeSupport.java | 21 --------------- .../cayenne/dbsync/merge/MergerContext.java | 28 ++++++++------------ .../modeler/action/DbEntitySyncAction.java | 10 +++---- 4 files changed, 17 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f4907c8c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java index b5c508a..8352a27 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java @@ -63,7 +63,7 @@ public class CreateTableToModel extends AbstractToModelToken.Entity { objEntity.setName(NameBuilder .builder(objEntity, dbEntity.getDataMap()) - .baseName(context.getEntityMergeSupport().getNameGenerator().objEntityName(dbEntity)) + .baseName(context.getNameGenerator().objEntityName(dbEntity)) .name()); objEntity.setDbEntity(getEntity()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/f4907c8c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/EntityMergeSupport.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/EntityMergeSupport.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/EntityMergeSupport.java index 978ba41..aaf96a9 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/EntityMergeSupport.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/EntityMergeSupport.java @@ -439,13 +439,6 @@ public class EntityMergeSupport { } /** - * Returns registered listeners - */ - public EntityMergeListener[] getEntityMergeListeners() { - return listeners.toArray(new EntityMergeListener[listeners.size()]); - } - - /** * Notifies all listeners that an ObjAttribute was added */ protected void fireAttributeAdded(ObjAttribute attr) { @@ -462,18 +455,4 @@ public class EntityMergeSupport { listener.objRelationshipAdded(rel); } } - - /** - * @return a strategy for naming object layer artifacts based on their DB names. - */ - public ObjectNameGenerator getNameGenerator() { - return nameGenerator; - } - - /** - * @since 4.0 - */ - public boolean isUsingPrimitives() { - return usingPrimitives; - } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/f4907c8c/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java index 1ae9337..b5b6a2a 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java @@ -41,6 +41,7 @@ public class MergerContext { private ValidationResult validationResult; private ModelMergeDelegate delegate; private EntityMergeSupport entityMergeSupport; + private ObjectNameGenerator nameGenerator; protected MergerContext() { } @@ -53,14 +54,6 @@ public class MergerContext { } /** - * @deprecated since 4.0 use {@link #getDataNode()} and its {@link DataNode#getAdapter()} method. - */ - @Deprecated - public DbAdapter getAdapter() { - return getDataNode().getAdapter(); - } - - /** * @since 4.0 */ public EntityMergeSupport getEntityMergeSupport() { @@ -95,17 +88,15 @@ public class MergerContext { } /** - * @deprecated since 4.0 in favor of {@link #getDelegate()}. + * @since 4.0 */ - @Deprecated - public ModelMergeDelegate getModelMergeDelegate() { - return getDelegate(); + public ObjectNameGenerator getNameGenerator() { + return nameGenerator; } public static class Builder { private MergerContext context; - private ObjectNameGenerator nameGenerator; private boolean usingPrimitives; private NameFilter meaningfulPKsFilter; @@ -127,15 +118,18 @@ public class MergerContext { dataNode(new DataNode()); } - if(nameGenerator == null) { - nameGenerator = new DefaultObjectNameGenerator(); + if(context.nameGenerator == null) { + context.nameGenerator = new DefaultObjectNameGenerator(); } if(meaningfulPKsFilter == null) { meaningfulPKsFilter = NamePatternMatcher.EXCLUDE_ALL; } - context.entityMergeSupport = new EntityMergeSupport(nameGenerator, meaningfulPKsFilter, true, usingPrimitives); + context.entityMergeSupport = new EntityMergeSupport(context.nameGenerator, + meaningfulPKsFilter, + true, + usingPrimitives); return context; } @@ -146,7 +140,7 @@ public class MergerContext { } public Builder nameGenerator(ObjectNameGenerator nameGenerator) { - this.nameGenerator = Objects.requireNonNull(nameGenerator); + this.context.nameGenerator = Objects.requireNonNull(nameGenerator); return this; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/f4907c8c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java index b8495df..9fec428 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java @@ -32,7 +32,7 @@ import org.apache.cayenne.modeler.undo.DbEntitySyncUndoableEdit; import org.apache.cayenne.modeler.util.CayenneAction; import java.awt.event.ActionEvent; -import java.util.Iterator; +import java.util.Collection; /** * Action that synchronizes all ObjEntities with the current state of the @@ -66,8 +66,8 @@ public class DbEntitySyncAction extends CayenneAction { if (dbEntity != null) { - Iterator it = dbEntity.getDataMap().getMappedEntities(dbEntity).iterator(); - if (!it.hasNext()) { + Collection<ObjEntity> entities = dbEntity.getDataMap().getMappedEntities(dbEntity); + if (entities.isEmpty()) { return; } @@ -81,8 +81,8 @@ public class DbEntitySyncAction extends CayenneAction { DbEntitySyncUndoableEdit undoableEdit = new DbEntitySyncUndoableEdit((DataChannelDescriptor) mediator .getProject().getRootNode(), mediator.getCurrentDataMap()); - while (it.hasNext()) { - ObjEntity entity = (ObjEntity) it.next(); + + for(ObjEntity entity : entities) { DbEntitySyncUndoableEdit.EntitySyncUndoableListener listener = undoableEdit.new EntitySyncUndoableListener( entity);
