You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/12/04 16:02:25 UTC
git commit: Renamed multiplicity enum
Updated Branches:
refs/heads/PocEdmAnnotationsExtension e7a17fe9a -> a73d1975c
Renamed multiplicity enum
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/a73d1975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/a73d1975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/a73d1975
Branch: refs/heads/PocEdmAnnotationsExtension
Commit: a73d1975c6106ad2e5f11f2a0ff07f7ce77ba43d
Parents: e7a17fe
Author: Michael Bolz <mi...@apache.org>
Authored: Wed Dec 4 16:02:15 2013 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed Dec 4 16:02:15 2013 +0100
----------------------------------------------------------------------
.../olingo/odata2/core/annotation/edm/AnnotationHelper.java | 2 +-
.../odata2/api/annotation/edm/EdmNavigationProperty.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a73d1975/odata2-edm-annotation/edm-annotation-core/src/main/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationHelper.java
----------------------------------------------------------------------
diff --git a/odata2-edm-annotation/edm-annotation-core/src/main/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationHelper.java b/odata2-edm-annotation/edm-annotation-core/src/main/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationHelper.java
index d1dd7cc..2b6675f 100644
--- a/odata2-edm-annotation/edm-annotation-core/src/main/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationHelper.java
+++ b/odata2-edm-annotation/edm-annotation-core/src/main/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationHelper.java
@@ -690,7 +690,7 @@ public class AnnotationHelper {
public EdmMultiplicity mapMultiplicity(Multiplicity multiplicity) {
switch (multiplicity) {
- case ZERO_TO_ONE: return EdmMultiplicity.ZERO_TO_ONE;
+ case ZERO_OR_ONE: return EdmMultiplicity.ZERO_TO_ONE;
case ONE: return EdmMultiplicity.ONE;
case MANY: return EdmMultiplicity.MANY;
default: throw new ODataRuntimeException("Unknown type '" + multiplicity + "' for mapping to EdmMultiplicity.");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a73d1975/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
index 168784c..14b304b 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
@@ -35,15 +35,14 @@ public @interface EdmNavigationProperty {
* <p>EdmMultiplicity indicates the number of entity type instances
* an association end can relate to:
* <dl>
- * <dt>0..1</dt><dd>one or none</dd>
- * <dt> 1</dt><dd>exactly one</dd>
- * <dt> *</dt><dd>many</dd>
+ * <dt>ZERO_OR_ONE (0..1)</dt><dd>value is exactly one but can be null (i.e. <code>nullable = true</code>)</dd>
+ * <dt>ONE (1)</dt><dd>value is exactly one (i.e. <code>nullable = false</code>)</dd>
+ * <dt>MANY (*)</dt><dd>many values (which includes zero values (e.g. empty collection))</dd>
* </dl>
* </p>
- *
*/
public enum Multiplicity {
- ZERO_TO_ONE, ONE, MANY;
+ ZERO_OR_ONE, ONE, MANY;
}