Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5733C200B92 for ; Wed, 28 Sep 2016 17:51:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 55B30160AD3; Wed, 28 Sep 2016 15:51:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8F246160AB8 for ; Wed, 28 Sep 2016 17:51:00 +0200 (CEST) Received: (qmail 83984 invoked by uid 500); 28 Sep 2016 15:50:59 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 83975 invoked by uid 99); 28 Sep 2016 15:50:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 15:50:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83272DFE61; Wed, 28 Sep 2016 15:50:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cayenne git commit: cleanup, docs Date: Wed, 28 Sep 2016 15:50:59 +0000 (UTC) archived-at: Wed, 28 Sep 2016 15:51:01 -0000 Repository: cayenne Updated Branches: refs/heads/master f7f33b557 -> dacbe043f cleanup, docs Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/dacbe043 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/dacbe043 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/dacbe043 Branch: refs/heads/master Commit: dacbe043f6309f847bb91ba1fdaf3470b37fb7d2 Parents: f7f33b5 Author: Andrus Adamchik Authored: Wed Sep 28 18:47:21 2016 +0300 Committer: Andrus Adamchik Committed: Wed Sep 28 18:50:41 2016 +0300 ---------------------------------------------------------------------- .../apache/cayenne/merge/MergeDirection.java | 7 +++---- .../org/apache/cayenne/merge/MergerContext.java | 16 +++++++--------- .../org/apache/cayenne/merge/MergerToken.java | 20 ++++++++++++++------ 3 files changed, 24 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/dacbe043/cayenne-server/src/main/java/org/apache/cayenne/merge/MergeDirection.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergeDirection.java b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergeDirection.java index 8577549..d0a95c5 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergeDirection.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergeDirection.java @@ -19,8 +19,7 @@ package org.apache.cayenne.merge; /** - * Represent a merge direction that can be one of two. Either from the model to the db or - * from the db to the model. + * Represent a merge direction that can be either from the model to the db or from the db to the model. */ public enum MergeDirection { @@ -36,7 +35,7 @@ public enum MergeDirection { private String name; - private MergeDirection(String name) { + MergeDirection(String name) { this.name = name; } @@ -56,7 +55,7 @@ public enum MergeDirection { public String toString() { return getName(); } - + public MergeDirection reverseDirection() { switch (this) { case TO_DB: http://git-wip-us.apache.org/repos/asf/cayenne/blob/dacbe043/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerContext.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerContext.java b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerContext.java index 011cb09..22628e2 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerContext.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerContext.java @@ -26,18 +26,16 @@ import org.apache.cayenne.validation.ValidationResult; /** * An object passed as an argument to {@link MergerToken#execute(MergerContext)}s that a * {@link MergerToken} can do its work. - * */ public interface MergerContext { - public ModelMergeDelegate getModelMergeDelegate(); - - public DbAdapter getAdapter(); + ModelMergeDelegate getModelMergeDelegate(); - public DataMap getDataMap(); - - public DataNode getDataNode(); - - public ValidationResult getValidationResult(); + DbAdapter getAdapter(); + DataMap getDataMap(); + + DataNode getDataNode(); + + ValidationResult getValidationResult(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/dacbe043/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerToken.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerToken.java b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerToken.java index e438c54..99af419 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerToken.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/merge/MergerToken.java @@ -18,26 +18,34 @@ ****************************************************************/ package org.apache.cayenne.merge; +/** + * Represents a minimal atomic synchronization operation between database and Cayenne model. + */ public interface MergerToken { - public String getTokenName(); + String getTokenName(); - public String getTokenValue(); + String getTokenValue(); /** * The direction of this token. One of {@link MergeDirection#TO_DB} or * {@link MergeDirection#TO_MODEL} */ - public MergeDirection getDirection(); + MergeDirection getDirection(); /** - * Create a token with the reverse direction. AddColumn in one direction becomes + * Create a complimentary token with the reverse direction. AddColumn in one direction becomes * DropColumn in the other direction. *

* Not all tokens are reversible. */ - public MergerToken createReverse(MergerFactory factory); + MergerToken createReverse(MergerFactory factory); - public void execute(MergerContext mergerContext); + /** + * Executes synchronization operation. + * + * @param mergerContext operation context. + */ + void execute(MergerContext mergerContext); }