Cleanup of ListNode

Author: darrelmiller

src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs

@@ -26,42 +26,33 @@ public ListNode(ParsingContext context, OpenApiDiagnostic diagnostic, YamlSequen
 
         public override List<T> CreateList<T>(Func<MapNode, T> map)
         {
-            var yamlSequence = _nodeList;
-            if (yamlSequence == null)
+            if (_nodeList == null)
             {
                 throw new OpenApiException(
                     $"Expected list at line {_nodeList.Start.Line} while parsing {typeof(T).Name}");
             }
 
-            return yamlSequence.Select(n => map(new MapNode(Context, Diagnostic, n as YamlMappingNode)))
+            return _nodeList.Select(n => map(new MapNode(Context, Diagnostic, n as YamlMappingNode)))
                 .Where(i => i != null)
                 .ToList();
         }
 
         public override List<IOpenApiAny> CreateListOfAny()
         {
-            var yamlSequence = _nodeList;
-            if (yamlSequence == null)
-            {
-                throw new OpenApiException(
-                    $"Expected list at line {_nodeList.Start.Line}");
-            }
-
-            return yamlSequence.Select(n => ParseNode.Create(Context, Diagnostic,n).CreateAny())
+            return _nodeList.Select(n => ParseNode.Create(Context, Diagnostic,n).CreateAny())
                 .Where(i => i != null)
                 .ToList();
         }
 
         public override List<T> CreateSimpleList<T>(Func<ValueNode, T> map)
         {
-            var yamlSequence = _nodeList;
-            if (yamlSequence == null)
+            if (_nodeList == null)
             {
                 throw new OpenApiException(
                     $"Expected list at line {_nodeList.Start.Line} while parsing {typeof(T).Name}");
             }
 
-            return yamlSequence.Select(n => map(new ValueNode(Context, Diagnostic, (YamlScalarNode)n))).ToList();
+            return _nodeList.Select(n => map(new ValueNode(Context, Diagnostic, (YamlScalarNode)n))).ToList();
         }
 
         public IEnumerator<ParseNode> GetEnumerator()
@@ -88,10 +79,5 @@ public override IOpenApiAny CreateAny()
 
             return array;
         }
-
-        //public override string GetScalarValue()
-        //{
-        //    throw new OpenApiException()
-        //}
     }
 }

src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs

@@ -109,7 +109,8 @@ internal static partial class OpenApiV3Deserializer
             {
                 "enum", (o, n) =>
                 {
-                    o.Enum = n.CreateListOfAny();                }
+                    o.Enum = n.CreateListOfAny();
+                }
             },
             {
                 "type", (o, n) =>