Process newly added elements recursively for extract domain resource (#1142)

* Process newly added elements recursively for extract domain resource

* Use get_element method with default value to reduce cognitive complexity

Author: rakillen

core/src/main/python/wlsdeploy/tool/util/targets/output_file_helper.py

@@ -140,16 +140,16 @@ def _update_dictionary(output_dictionary, model_dictionary, schema_folder, schem
 
         value = _convert_value(value, element_type)
 
-        if key not in output_dictionary:
-            output_dictionary[key] = value
-        elif isinstance(value, dict):
+        if isinstance(value, dict):
+            output_dictionary[key] = dictionary_utils.get_element(output_dictionary, key, PyOrderedDict())
             next_schema_path = wko_schema_helper.append_path(schema_path, key)
             _update_dictionary(output_dictionary[key], value, property_folder, next_schema_path, output_file_path)
         elif isinstance(value, list):
             if not value:
                 # if the model has an empty list, override output value
                 output_dictionary[key] = value
             else:
+                output_dictionary[key] = dictionary_utils.get_element(output_dictionary, key, [])
                 next_schema_path = wko_schema_helper.append_path(schema_path, key)
                 _update_list(output_dictionary[key], value, property_folder, next_schema_path, output_file_path)
         else:

core/src/main/python/wlsdeploy/util/dictionary_utils.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 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.
 """
 import java.util.Properties as JProperties
@@ -57,15 +57,16 @@ def is_empty_dictionary_element(dictionary, element_name):
     return result
 
 
-def get_element(dictionary, element_name):
+def get_element(dictionary, element_name, default_value=None):
     """
     Retrieve the value for the provided element name from the dictionary.
-    Return None if name is not in the dictionary.
+    Return default value or None if name is not in the dictionary.
     :param dictionary: to find the element name
     :param element_name: for which to retrieve the value
-    :return: value from the dictionary
+    :param default_value: value to return if key is not in dictionary
+    :return: value from the dictionary, or default_value
     """
-    result = None
+    result = default_value
     if element_name in dictionary:
         result = dictionary[element_name]
     return result