Add support for Edm.Untyped

Author: millicentachieng

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiEdmTypeSchemaGenerator.cs

@@ -72,6 +72,9 @@ public static OpenApiSchema CreateEdmTypeSchema(this ODataContext context, IEdmT
                 case EdmTypeKind.EntityReference:
                     return context.CreateTypeDefinitionSchema(edmTypeReference.AsTypeDefinition());
 
+                case EdmTypeKind.Untyped:
+                    return new OpenApiSchema();
+
                 case EdmTypeKind.None:
                 default:
                     throw Error.NotSupported(String.Format(SRResource.NotSupportedEdmTypeKind, edmTypeReference.TypeKind()));

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiExampleGenerator.cs

@@ -180,6 +180,8 @@ private static IOpenApiAny GetTypeNameForExample(IEdmTypeReference edmTypeRefere
                     return GetTypeNameForExample(new EdmPrimitiveTypeReference(typedef.UnderlyingType, edmTypeReference.IsNullable));
 
                 case EdmTypeKind.Untyped:
+                    return new OpenApiObject();
+
                 case EdmTypeKind.EntityReference:
                 default:
                     throw new OpenApiException("Not support for the type kind " + edmTypeReference.TypeKind());

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs

@@ -700,10 +700,12 @@ private static IOpenApiAny GetTypeNameForExample(ODataContext context, IEdmTypeR
                     return array;
 
                 case EdmTypeKind.Untyped:
+                    return new OpenApiObject();
+
                 case EdmTypeKind.TypeDefinition:
                 case EdmTypeKind.EntityReference:
                 default:
-                    throw new OpenApiException("Not support for the type kind " + edmTypeReference.TypeKind());
+                    throw new OpenApiException("No support for the type kind " + edmTypeReference.TypeKind());
             }
         }
 

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OData.xml

@@ -207,6 +207,8 @@
 				<Property Name="Budget" Type="Edm.Single" Nullable="false" />
 				<Property Name="Description" Type="Edm.String" />
 				<Property Name="Tags" Type="Collection(Edm.String)" />
+				<Property Name="TripData" Type="Edm.Untyped" />
+				<Property Name="DestinationInfo" Type="Collection(Edm.Untyped)" />
 				<Property Name="StartsAt" Type="Edm.DateTimeOffset" Nullable="false" />
 				<Property Name="EndsAt" Type="Edm.DateTimeOffset" Nullable="false" />
 				<NavigationProperty Name="PlanItems" Type="Collection(Microsoft.OData.Service.Sample.TrippinInMemory.Models.PlanItem)" >

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json

@@ -30590,6 +30590,11 @@
             "type": "string"
           }
         },
+        "TripData": {},
+        "DestinationInfo": {
+          "type": "array",
+          "items": {}
+        },
         "StartsAt": {
           "format": "date-time",
           "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$",

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml

@@ -20754,6 +20754,10 @@ definitions:
         type: array
         items:
           type: string
+      TripData: { }
+      DestinationInfo:
+        type: array
+        items: { }
       StartsAt:
         format: date-time
         pattern: '^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$'

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json

@@ -34196,6 +34196,11 @@
               "nullable": true
             }
           },
+          "TripData": {},
+          "DestinationInfo": {
+            "type": "array",
+            "items": {}
+          },
           "StartsAt": {
             "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$",
             "type": "string",
@@ -35296,6 +35301,9 @@
         "value": {
           "Budget": 0,
           "Description": "String",
+          "DestinationInfo": [
+            {}
+          ],
           "EndsAt": "0001-01-01T00:00:00.0000000+00:00",
           "Name": "String",
           "PlanItems": [
@@ -35308,6 +35316,7 @@
           "Tags": [
             "String"
           ],
+          "TripData": {},
           "TripId": 0
         }
       },

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml

@@ -23041,6 +23041,10 @@ components:
           items:
             type: string
             nullable: true
+        TripData: {}
+        DestinationInfo:
+          type: array
+          items: {}
         StartsAt:
           pattern: '^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$'
           type: string
@@ -23737,6 +23741,8 @@ components:
       value:
         Budget: 0
         Description: String
+        DestinationInfo:
+          - { }
         EndsAt: '0001-01-01T00:00:00.0000000+00:00'
         Name: String
         PlanItems:
@@ -23745,6 +23751,7 @@ components:
         StartsAt: '0001-01-01T00:00:00.0000000+00:00'
         Tags:
           - String
+        TripData: { }
         TripId: 0
     Microsoft.OData.Service.Sample.TrippinInMemory.Models.PlanItem:
       value: