Merge pull request #978 from microsoft/ma/fix-anyOf-oneOf-v2-serialization

Fix anyOf and oneOf v2 serialization

Author: millicentachieng

src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs

@@ -60,7 +60,7 @@ internal static partial class OpenApiV2Deserializer
                     "consumes", (o, n) => {
                         var consumes = n.CreateSimpleList(s => s.GetScalarValue());
                         if (consumes.Count > 0) {
-                        n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
+                            n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
                         }
                     }
                 },

src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs

@@ -107,30 +107,6 @@ private static ReferenceType ParseReferenceType(string referenceTypeName)
             }
         }
 
-        private static string GetReferenceTypeV2Name(ReferenceType referenceType)
-        {
-            switch (referenceType)
-            {
-                case ReferenceType.Schema:
-                    return "definitions";
-
-                case ReferenceType.Parameter:
-                    return "parameters";
-
-                case ReferenceType.Response:
-                    return "responses";
-
-                case ReferenceType.Tag:
-                    return "tags";
-
-                case ReferenceType.SecurityScheme:
-                    return "securityDefinitions";
-
-                default:
-                    throw new ArgumentException();
-            }
-        }
-
         private static ReferenceType GetReferenceTypeV2FromName(string referenceType)
         {
             switch (referenceType)

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -700,12 +700,12 @@ internal void WriteAsSchemaProperties(
             if (AllOf == null || AllOf.Count == 0)
             {
                 // anyOf (Not Supported in V2)  - Write the first schema only as an allOf.
-                writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf.Take(1), (w, s) => s.SerializeAsV2(w));
+                writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf?.Take(1), (w, s) => s.SerializeAsV2(w));
 
                 if (AnyOf == null || AnyOf.Count == 0)
                 {
                     // oneOf (Not Supported in V2) - Write the first schema only as an allOf.
-                    writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf.Take(1), (w, s) => s.SerializeAsV2(w));
+                    writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf?.Take(1), (w, s) => s.SerializeAsV2(w));
                 }
             }