Supports describing AcceptableMediaTypes from annotations

src/Microsoft.OpenApi.OData.Reader/Edm/EdmAnnotationExtensions.cs

@@ -196,7 +196,7 @@ public static IEnumerable<string> GetCollection(this IEdmModel model, IEdmVocabu
                     }
                 }
 
-                return value.ToList();
+                return value?.ToList();
             });
         }
 

src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetPostOperationHandler.cs

@@ -116,15 +116,28 @@ private IDictionary<string, OpenApiMediaType> GetContentDescription()
 
             if (EntitySet.EntityType().HasStream)
             {
-                // TODO: Read the AcceptableMediaType annotation from model
-                content.Add(Constants.ApplicationOctetStreamMediaType, new OpenApiMediaType
+                IEnumerable<string> mediaTypes = Context.Model.GetCollection(EntitySet.EntityType(),
+                    CapabilitiesConstants.AcceptableMediaTypes);
+
+                if (mediaTypes != null)
                 {
-                    Schema = new OpenApiSchema
+                    foreach (string item in mediaTypes)
                     {
-                        Type = "string",
-                        Format = "binary"
+                        content.Add(item, null);
                     }
-                });                
+                }
+                else
+                {
+                    // Default content type
+                    content.Add(Constants.ApplicationOctetStreamMediaType, new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchema
+                        {
+                            Type = "string",
+                            Format = "binary"
+                        }
+                    });
+                }
             }
 
             content.Add(Constants.ApplicationJsonMediaType, new OpenApiMediaType

src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityGetOperationHandler.cs

@@ -9,7 +9,6 @@
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Generator;
 using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Microsoft.OpenApi.OData.Operation
@@ -65,20 +64,7 @@ protected override void SetResponses(OpenApiOperation operation)
                     new OpenApiResponse
                     {
                         Description = "Retrieved media content",
-                        Content = new Dictionary<string, OpenApiMediaType>
-                        {
-                            {
-                                Constants.ApplicationOctetStreamMediaType,
-                                new OpenApiMediaType
-                                {
-                                    Schema = new OpenApiSchema
-                                    {
-                                        Type = "string",
-                                        Format = "binary"
-                                    }
-                                }
-                            }
-                        }
+                        Content = GetContentDescription()
                     }
                 }
             };

src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs

@@ -4,10 +4,12 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
+using Microsoft.OData.Edm.Vocabularies;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
+using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -83,18 +85,18 @@ protected override void SetExtensions(OpenApiOperation operation)
         /// <returns></returns>
         protected string GetOperationId(string prefix, string identifier)
         {
-            Utils.CheckArgumentNull(prefix, nameof(prefix));
-            Utils.CheckArgumentNull(identifier, nameof(identifier));
+            Utils.CheckArgumentNullOrEmpty(prefix, nameof(prefix));
+            Utils.CheckArgumentNullOrEmpty(identifier, nameof(identifier));
 
             IList<string> items = new List<string>
             {
                 NavigationSource.Name
             };
 
-            var lastpath = Path.Segments.Last(c => c is ODataStreamContentSegment || c is ODataStreamPropertySegment);
-            foreach (var segment in Path.Segments.Skip(1))
+            ODataSegment lastSegment = Path.Segments.Last(c => c is ODataStreamContentSegment || c is ODataStreamPropertySegment);
+            foreach (ODataSegment segment in Path.Segments.Skip(1))
             {
-                if (segment == lastpath)
+                if (segment == lastSegment)
                 {
                     items.Add(prefix + Utils.UpperFirstChar(identifier));
                     break;
@@ -110,5 +112,77 @@ protected string GetOperationId(string prefix, string identifier)
 
             return string.Join(".", items);
         }
+
+        /// <summary>
+        /// Gets a media entity content description.
+        /// </summary>
+        /// <returns>The entity content description.</returns>
+        protected IDictionary<string, OpenApiMediaType> GetContentDescription()
+        {
+            var content = new Dictionary<string, OpenApiMediaType>();
+
+            OpenApiSchema schema = new OpenApiSchema
+            {
+                Type = "string",
+                Format = "binary"
+            };
+
+            IEdmVocabularyAnnotatable annotatableElement = null;
+            IEdmEntityType entityType = EntitySet != null ? EntitySet.EntityType() : Singleton.EntityType();
+            ODataSegment lastSegmentStreamProp = Path.Segments.LastOrDefault(c => c is ODataStreamPropertySegment);
+
+            if (lastSegmentStreamProp != null)
+            {
+                // Get the annotatable stream property
+                // The stream property can either be a structural type or navigation type property
+                IEdmProperty property = GetStructuralProperty(entityType, lastSegmentStreamProp.Identifier);
+                if (property == null)
+                {
+                    property = GetNavigationProperty(entityType, lastSegmentStreamProp.Identifier);
+                }
+
+                annotatableElement = property;
+            }
+            else
+            {
+                annotatableElement = entityType;
+            }
+
+            // Fetch the respective AcceptableMediaTypes
+            IEnumerable<string> mediaTypes = null;
+            if (annotatableElement != null)
+            {
+                mediaTypes = Context.Model.GetCollection(annotatableElement,
+                    CapabilitiesConstants.AcceptableMediaTypes);
+            }
+
+            if (mediaTypes != null)
+            {
+                foreach (string item in mediaTypes)
+                {
+                    content.Add(item, null);
+                }
+            }
+            else
+            {
+                // Default content type
+                content.Add(Constants.ApplicationOctetStreamMediaType, new OpenApiMediaType
+                {
+                    Schema = schema
+                });
+            };
+
+            return content;
+        }
+
+        private IEdmStructuralProperty GetStructuralProperty(IEdmEntityType entityType, string identifier)
+        {
+            return entityType.DeclaredStructuralProperties().FirstOrDefault(x => x.Name.Equals(identifier));
+        }
+
+        private IEdmNavigationProperty GetNavigationProperty(IEdmEntityType entityType, string identifier)
+        {
+            return entityType.DeclaredNavigationProperties().FirstOrDefault(x => x.Name.Equals(identifier));
+        }
     }
 }

src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityPutOperationHandler.cs

@@ -3,7 +3,6 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
@@ -58,48 +57,11 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         /// <inheritdoc/>
         protected override void SetRequestBody(OpenApiOperation operation)
         {
-            OpenApiSchema schema = null;
-
-            if (Context.Settings.EnableDerivedTypesReferencesForRequestBody)
-            {
-                schema = EdmModelHelper.GetDerivedTypesReferenceSchema(EntitySet.EntityType(), Context.Model);
-            }
-
-            if (schema == null)
-            {
-                schema = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = EntitySet != null ? EntitySet.EntityType().FullName() : Singleton.EntityType().FullName()
-                    }
-                };
-            }
-
             operation.RequestBody = new OpenApiRequestBody
             {
                 Required = true,
                 Description = "New media content.",
-                Content = new Dictionary<string, OpenApiMediaType>
-                {
-                    {
-                        Constants.ApplicationOctetStreamMediaType, new OpenApiMediaType
-                        {
-                            Schema = new OpenApiSchema
-                            {
-                                Type = "string",
-                                Format = "binary"
-                            }
-                        }
-                    },
-                    {
-                        Constants.ApplicationJsonMediaType, new OpenApiMediaType
-                        {
-                            Schema = schema
-                        }
-                    }
-                }
+                Content = GetContentDescription()
             };
 
             base.SetRequestBody(operation);

src/Microsoft.OpenApi.OData.Reader/Vocabulary/Capabilities/CapabilitiesConstants.cs

@@ -94,5 +94,10 @@ internal class CapabilitiesConstants
         /// Org.OData.Capabilities.V1.KeyAsSegmentSupported
         /// </summary>
         public const string KeyAsSegmentSupported = "Org.OData.Capabilities.V1.KeyAsSegmentSupported";
+
+        /// <summary>
+        /// Org.OData.Core.V1.AcceptableMediaTypes
+        /// </summary>
+        public const string AcceptableMediaTypes = "Org.OData.Core.V1.AcceptableMediaTypes";
     }
 }

test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EntitySetGetOperationHandlerTests.cs

@@ -326,12 +326,12 @@ public void CreateEntitySetGetOperationReturnsSecurityForReadRestrictions(bool e
             }
         }
 
-        public static IEdmModel GetEdmModel(string annotation, bool hasStream = false)
+        public static IEdmModel GetEdmModel(string annotation)
         {
             const string template = @"<edmx:Edmx Version=""4.0"" xmlns:edmx=""http://docs.oasis-open.org/odata/ns/edmx"">
   <edmx:DataServices>
     <Schema Namespace=""NS"" xmlns=""http://docs.oasis-open.org/odata/ns/edm"">
-      <EntityType Name=""Customer"" HasStream=""{0}"">
+      <EntityType Name=""Customer"">
         <Key>
           <PropertyRef Name=""ID"" />
         </Key>
@@ -341,17 +341,14 @@ public static IEdmModel GetEdmModel(string annotation, bool hasStream = false)
          <EntitySet Name=""Customers"" EntityType=""NS.Customer"" />
       </EntityContainer>
       <Annotations Target=""NS.Default/Customers"">
-        {1}
+        {0}
       </Annotations>
     </Schema>
   </edmx:DataServices>
 </edmx:Edmx>";
-            string modelText = string.Format(template, hasStream, annotation);
 
-            IEdmModel model;
-            IEnumerable<EdmError> errors;
-
-            bool result = CsdlReader.TryParse(XElement.Parse(modelText).CreateReader(), out model, out errors);
+            string modelText = string.Format(template, annotation);
+            bool result = CsdlReader.TryParse(XElement.Parse(modelText).CreateReader(), out IEdmModel model, out _);
             Assert.True(result);
             return model;
         }