cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/44665ce7 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/44665ce7 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/44665ce7 Branch: refs/heads/master Commit: 44665ce78eafa14fbb9bd644b40de92ec0805d54 Parents: 814f82a Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Apr 10 10:47:55 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Apr 10 10:47:55 2017 +0300 ---------------------------------------------------------------------- .../validation/DbRelationshipValidator.java | 72 +++++++------------- 1 file changed, 26 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/44665ce7/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java index 23a92bc..5bf6d49 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java @@ -40,15 +40,13 @@ class DbRelationshipValidator extends ConfigurationNodeValidator { relationship, "DbRelationship '%s' has no target entity", toString(relationship)); - } - else if (relationship.getJoins().isEmpty()) { + } else if (relationship.getJoins().isEmpty()) { addFailure( validationResult, relationship, "DbRelationship '%s' has no joins", toString(relationship)); - } - else { + } else { // validate joins for (DbJoin join : relationship.getJoins()) { if (join.getSource() == null && join.getTarget() == null) { @@ -57,15 +55,13 @@ class DbRelationshipValidator extends ConfigurationNodeValidator { relationship, "DbRelationship '%s' has a join with no source and target attributes selected", toString(relationship)); - } - else if (join.getSource() == null) { + } else if (join.getSource() == null) { addFailure( validationResult, relationship, "DbRelationship '%s' has a join with no source attribute selected", toString(relationship)); - } - else if (join.getTarget() == null) { + } else if (join.getTarget() == null) { addFailure( validationResult, relationship, @@ -77,20 +73,16 @@ class DbRelationshipValidator extends ConfigurationNodeValidator { if (Util.isEmptyString(relationship.getName())) { addFailure(validationResult, relationship, "Unnamed DbRelationship"); - } - // check if there are attributes having the same name - else if (relationship.getSourceEntity().getAttribute(relationship.getName()) != null) { + } else if (relationship.getSourceEntity().getAttribute(relationship.getName()) != null) { + // check if there are attributes having the same name addFailure( validationResult, relationship, "Name of DbRelationship '%s' conflicts with the name of one of DbAttributes in the same entity", toString(relationship)); - } - else { + } else { NameValidationHelper helper = NameValidationHelper.getInstance(); - String invalidChars = helper.invalidCharsInDbPathComponent(relationship - .getName()); - + String invalidChars = helper.invalidCharsInDbPathComponent(relationship.getName()); if (invalidChars != null) { addFailure( validationResult, @@ -136,25 +128,23 @@ class DbRelationshipValidator extends ConfigurationNodeValidator { "." + getJoins(relationship); - if (dbRelationshipPath != null) { - DbEntity entity = (DbEntity) relationship.getSourceEntity(); - - for (DbRelationship comparisonRelationship : entity.getRelationships()) { - if (relationship != comparisonRelationship) { - String comparisonDbRelationshipPath = - comparisonRelationship.getTargetEntityName() + - "." + - getJoins(comparisonRelationship); - - if (dbRelationshipPath.equals(comparisonDbRelationshipPath)) { - addFailure(validationResult, - relationship, - "DbEntity '%s' contains a duplicate DbRelationship mapping ('%s' -> '%s')", - entity.getName(), - relationship.getName(), - dbRelationshipPath); - return; // Duplicate found, stop. - } + DbEntity entity = relationship.getSourceEntity(); + + for (DbRelationship comparisonRelationship : entity.getRelationships()) { + if (relationship != comparisonRelationship) { + String comparisonDbRelationshipPath = + comparisonRelationship.getTargetEntityName() + + "." + + getJoins(comparisonRelationship); + + if (dbRelationshipPath.equals(comparisonDbRelationshipPath)) { + addFailure(validationResult, + relationship, + "DbEntity '%s' contains a duplicate DbRelationship mapping ('%s' -> '%s')", + entity.getName(), + relationship.getName(), + dbRelationshipPath); + return; // Duplicate found, stop. } } } @@ -163,19 +153,9 @@ class DbRelationshipValidator extends ConfigurationNodeValidator { private String getJoins(DbRelationship relationship) { List<String> joins = new ArrayList<>(); - for (DbJoin join : relationship.getJoins()) { - StringBuilder builder = new StringBuilder(); - - builder.append("["); - builder.append("source=").append(join.getSourceName()); - builder.append(","); - builder.append("target=").append(join.getTargetName()); - builder.append("]"); - - joins.add(builder.toString()); + joins.add("[source=" + join.getSourceName() + ",target=" + join.getTargetName() + "]"); } - Collections.sort(joins); return Util.join(joins, ",");
