Issue2467: Support Core.AlternateKeys #2470
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2146,14 +2146,22 @@ public static IEnumerable<IDictionary<string, IEdmProperty>> GetAlternateKeysAnn | |
| /// <param name="model">The model to be used.</param> | ||
| /// <param name="type">Reference to the calling object.</param> | ||
| /// <param name="alternateKey">Dictionary of alias and structural properties for the alternate key.</param> | ||
| /// <param name="useCore">A flag to indicate which alternate term to use. | ||
| /// If ture, 'Org.OData.Core.V1.AlternateKeys' is used, otherwise, 'OData.Community.Keys.V1.AlternateKeys' is used. | ||
| /// </param> | ||
| public static void AddAlternateKeyAnnotation(this EdmModel model, IEdmEntityType type, IDictionary<string, IEdmProperty> alternateKey, bool useCore = false) | ||
| { | ||
| EdmUtil.CheckArgumentNull(model, "model"); | ||
| EdmUtil.CheckArgumentNull(type, "type"); | ||
| EdmUtil.CheckArgumentNull(alternateKey, "alternateKey"); | ||
|
|
||
| IEdmTerm alternateKeysTerm = useCore ? CoreVocabularyModel.AlternateKeysTerm : AlternateKeysVocabularyModel.AlternateKeysTerm; | ||
|
|
||
| IEdmComplexType propertyRefType = useCore ? CoreVocabularyModel.PropertyRefType : AlternateKeysVocabularyModel.PropertyRefType; | ||
|
There was a problem hiding this comment. UT and handling of duplicate entries under each annotation namespace? |
||
| IEdmComplexType alternateKeyType = useCore ? CoreVocabularyModel.AlternateKeyType : AlternateKeysVocabularyModel.AlternateKeyType; | ||
|
|
||
| EdmCollectionExpression annotationValue = null; | ||
| var ann = model.FindVocabularyAnnotations<IEdmVocabularyAnnotation>(type, alternateKeysTerm).FirstOrDefault(); | ||
| if (ann != null) | ||
| { | ||
| annotationValue = ann.Value as EdmCollectionExpression; | ||
|
|
@@ -2166,21 +2174,21 @@ public static void AddAlternateKeyAnnotation(this EdmModel model, IEdmEntityType | |
| foreach (KeyValuePair<string, IEdmProperty> kvp in alternateKey) | ||
| { | ||
| IEdmRecordExpression propertyRef = new EdmRecordExpression( | ||
| new EdmComplexTypeReference(propertyRefType, false), | ||
| new EdmPropertyConstructor("Alias", new EdmStringConstant(kvp.Key)), | ||
| new EdmPropertyConstructor("Name", new EdmPropertyPathExpression(kvp.Value.Name))); | ||
| propertyRefs.Add(propertyRef); | ||
| } | ||
|
|
||
| EdmRecordExpression alternateKeyRecord = new EdmRecordExpression( | ||
| new EdmComplexTypeReference(alternateKeyType, false), | ||
| new EdmPropertyConstructor("Key", new EdmCollectionExpression(propertyRefs))); | ||
|
|
||
| alternateKeysCollection.Add(alternateKeyRecord); | ||
|
|
||
| var annotation = new EdmVocabularyAnnotation( | ||
| type, | ||
| alternateKeysTerm, | ||
| new EdmCollectionExpression(alternateKeysCollection)); | ||
|
|
||
| annotation.SetSerializationLocation(model, EdmVocabularyAnnotationSerializationLocation.Inline); | ||
|
|
@@ -3424,42 +3432,56 @@ internal static bool HasAny<T>(this IEnumerable<T> enumerable) where T : class | |
| private static IEnumerable<IDictionary<string, IEdmProperty>> GetDeclaredAlternateKeysForType(IEdmEntityType type, IEdmModel model) | ||
| { | ||
| IEdmVocabularyAnnotation annotationValue = model.FindVocabularyAnnotations<IEdmVocabularyAnnotation>(type, AlternateKeysVocabularyModel.AlternateKeysTerm).FirstOrDefault(); | ||
| IEdmVocabularyAnnotation coreAnnotationValue = model.FindVocabularyAnnotations<IEdmVocabularyAnnotation>(type, CoreVocabularyModel.AlternateKeysTerm).FirstOrDefault(); | ||
|
|
||
| if (annotationValue != null || coreAnnotationValue != null) | ||
| { | ||
| List<IDictionary<string, IEdmProperty>> declaredAlternateKeys = new List<IDictionary<string, IEdmProperty>>(); | ||
|
|
||
| Action<IEdmVocabularyAnnotation> retrieveAnnotationAction = ann => | ||
|
There was a problem hiding this comment. Define a private static function rather than this action closure which will incur an extra allocation for each call. |
||
| { | ||
| if (ann == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| IEdmCollectionExpression keys = ann.Value as IEdmCollectionExpression; | ||
| Debug.Assert(keys != null, "expected IEdmCollectionExpression for alternate key annotation value"); | ||
|
|
||
| foreach (IEdmRecordExpression key in keys.Elements.OfType<IEdmRecordExpression>()) | ||
| { | ||
| var edmPropertyConstructor = key.Properties.FirstOrDefault(e => e.Name == "Key"); | ||
| if (edmPropertyConstructor != null) | ||
| { | ||
| IEdmCollectionExpression collectionExpression = edmPropertyConstructor.Value as IEdmCollectionExpression; | ||
| Debug.Assert(collectionExpression != null, "expected IEdmCollectionExpression type for Key Property"); | ||
|
|
||
| IDictionary<string, IEdmProperty> alternateKey = new Dictionary<string, IEdmProperty>(); | ||
| foreach (IEdmRecordExpression propertyRef in collectionExpression.Elements.OfType<IEdmRecordExpression>()) | ||
| { | ||
| var aliasProp = propertyRef.Properties.FirstOrDefault(e => e.Name == "Alias"); | ||
| Debug.Assert(aliasProp != null, "expected non null Alias Property"); | ||
| string alias = ((IEdmStringConstantExpression)aliasProp.Value).Value; | ||
|
|
||
| var nameProp = propertyRef.Properties.FirstOrDefault(e => e.Name == "Name"); | ||
| Debug.Assert(nameProp != null, "expected non null Name Property"); | ||
| string propertyName = ((IEdmPathExpression)nameProp.Value).PathSegments.FirstOrDefault(); | ||
|
|
||
| alternateKey[alias] = type.FindProperty(propertyName); | ||
| } | ||
|
|
||
| if (alternateKey.Any()) | ||
| { | ||
| declaredAlternateKeys.Add(alternateKey); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| // For backwards-compability, we merge the alternate keys from community and core vocabulary annotations. | ||
|
|
||
| retrieveAnnotationAction(annotationValue); | ||
|
There was a problem hiding this comment. The output of
The alternate keys are not "merged" as the comment line 3483 calls out, it's instead an union that occurs. |
||
| retrieveAnnotationAction(coreAnnotationValue); | ||
|
|
||
| return declaredAlternateKeys; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo