You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/06/27 14:38:27 UTC
git commit: [OLINGO-295] Referential Constraint fix
Repository: olingo-odata2
Updated Branches:
refs/heads/master 12a391f93 -> 5968f1d90
[OLINGO-295] Referential Constraint fix
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/5968f1d9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/5968f1d9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/5968f1d9
Branch: refs/heads/master
Commit: 5968f1d90cfa8c9c2926007ce85137100bd166bf
Parents: 12a391f
Author: Christian Amend <ch...@apache.org>
Authored: Fri Jun 27 14:37:43 2014 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Jun 27 14:37:43 2014 +0200
----------------------------------------------------------------------
.../core/edm/provider/EdmAssociationImplProv.java | 11 ++++++++---
.../core/edm/provider/EdmAssociationImplProvTest.java | 12 +++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/5968f1d9/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
index 01579e6..3124d45 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProv.java
@@ -35,6 +35,7 @@ public class EdmAssociationImplProv extends EdmNamedImplProv implements EdmAssoc
private Association association;
private String namespace;
private EdmAnnotations annotations;
+ private EdmReferentialConstraintImplProv referentialConstraint;
public EdmAssociationImplProv(final EdmImplProv edm, final Association association, final String namespace)
throws EdmException {
@@ -102,8 +103,12 @@ public class EdmAssociationImplProv extends EdmNamedImplProv implements EdmAssoc
@Override
public EdmReferentialConstraint getReferentialConstraint() throws EdmException {
- ReferentialConstraint refConstraint = association.getReferentialConstraint();
- return new EdmReferentialConstraintImplProv(refConstraint);
+ if(referentialConstraint == null){
+ ReferentialConstraint refConstraint = association.getReferentialConstraint();
+ if(refConstraint != null){
+ referentialConstraint = new EdmReferentialConstraintImplProv(refConstraint);
+ }
+ }
+ return referentialConstraint;
}
-
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/5968f1d9/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
index b1dc084..7cde2cb 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
@@ -100,9 +100,15 @@ public class EdmAssociationImplProvTest extends BaseTest {
@Test
public void testReferentialConstraint() throws EdmException {
- EdmAssociation association = associationProv;
- assertEquals("end1Role", association.getReferentialConstraint().getDependent().getRole());
- assertEquals("end2Role", association.getReferentialConstraint().getPrincipal().getRole());
+ assertEquals("end1Role", associationProv.getReferentialConstraint().getDependent().getRole());
+ assertEquals("end2Role", associationProv.getReferentialConstraint().getPrincipal().getRole());
+ }
+
+ @Test
+ public void testReferentialConstraintNull() throws EdmException {
+ Association association = new Association().setName("association");
+ EdmAssociation edmAssociation = new EdmAssociationImplProv(null, association, "ns");
+ assertNull(edmAssociation.getReferentialConstraint());
}
@Test