Merge pull request #1061 from oracle/empty-yaml-file

make sure that the new Yaml parser returns an empty dictionary when p…

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/yaml/AbstractYamlTranslator.java

@@ -68,6 +68,8 @@ protected PyDictionary parseInternal(InputStream inputStream) throws YamlExcepti
                 }
                 if (docCount == 1) {
                     firstDoc = convertJavaDataStructureToPython(docToConvert);
+                } else if (docCount == 0) {
+                    firstDoc = getNewDictionary();
                 }
             } catch (Exception ex) {
                 YamlException pex = new YamlException("WLSDPLY-18100", ex, this.fileName, ex.getLocalizedMessage());

core/src/test/java/oracle/weblogic/deploy/yaml/YamlTranslatorTest.java

@@ -32,6 +32,16 @@
 
 public class YamlTranslatorTest {
 
+    @Test
+    public void testEmptyModelReturnsPyDictionary() throws Exception {
+        File yamlFile = new File("src/test/resources/yaml/empty.yaml").getAbsoluteFile();
+        YamlTranslator yamlTranslator = new YamlTranslator(yamlFile.getAbsolutePath(), true);
+
+        PyDictionary actual = yamlTranslator.parse();
+
+        assertNotNull(actual, "empty model file should return dict");
+    }
+
     @Test
     public void testFlatMapScalarTypes() throws Exception {
         File yamlFile = new File("src/test/resources/yaml/flat-map-with-scalars.yaml").getAbsoluteFile();

core/src/test/resources/yaml/empty.yaml

@@ -0,0 +1,2 @@
+# Copyright (c) 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.