cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [4/4] cayenne git commit: cleanup
Date Tue, 18 Apr 2017 15:35:32 GMT
cleanup


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

Branch: refs/heads/master
Commit: 11154a873a7efb907877f08caa11d5481ef443d4
Parents: 70ace30
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Tue Apr 18 18:28:56 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Tue Apr 18 18:28:56 2017 +0300

----------------------------------------------------------------------
 .../cayenne/project/validation/DbRelationshipValidator.java  | 5 ++---
 docs/doc/src/main/resources/RELEASE-NOTES.txt                | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/11154a87/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 4f435bc..5b84cfc 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
@@ -96,8 +96,7 @@ class DbRelationshipValidator extends ConfigurationNodeValidator {
         checkForDuplicates(relationship, validationResult);
         checkOnGeneratedStrategyConflict(relationship, validationResult);
         checkToMany(relationship, validationResult);
-}
-
+    }
 
     private void checkToMany(DbRelationship relationship, ValidationResult validationResult)
{
         if (relationship != null && relationship.getReverseRelationship() != null)
{
@@ -105,7 +104,7 @@ class DbRelationshipValidator extends ConfigurationNodeValidator {
                 addFailure(
                         validationResult,
                         relationship,
-                        "Relationship '%s' and '%s' ManyToMany is impossible",
+                        "Relationship '%s' and reverse '%s' are both toMany",
                         relationship.getName(), relationship.getReverseRelationship().getName());
             }
         }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/11154a87/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 00a9ef4..eb1166c 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -14,9 +14,10 @@ Date:
 Changes/New Features:
 
 CAY-1873 Move DataDomain cache configuration from the Modeler and into DI
-CAY-1891 Add To-Many / To-One Warnings to Cayenne Modeler
-CAY-2057 Clean up OS X Modeler
-CAY-2109 cayenne-crypto: add value authentication (HMAC)
+CAY-1891 Modeler: Add To-Many Warning
+CAY-1892 Modeler: Add Relationship Data Type Warning
+CAY-2057 Modeler: Clean up OS X version
+CAY-2109 cayenne-crypto: add value authentication (HMAC) 
 CAY-2210 Query cache: incorrect cache key for queries with custom value objects
 CAY-2255 ObjectSelect improvement: columns as full entities
 CAY-2258 DI: type-safe binding of List and Map
@@ -36,7 +37,6 @@ CAY-2278 Extract cayenne-postcommit module from cayenne-lifecycle
 
 Bug Fixes:
 
-CAY-1892 Add Relationship Data Type Warning to Cayenne Modeler
 CAY-2021 cdbimport: detect when same FK constraint is defined twice
 CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter
 CAY-2094 SelectById query doesn't work from ROP client


Mime
View raw message