Merge branch 'jira-wdt-872-optional-features' into 'main'

Remove empty optional feature entries from the model

See merge request weblogic-cloud/weblogic-deploy-tooling!1685

Author: robertpatrick

core/src/main/python/wlsdeploy/tool/discover/global_resources_discoverer.py

@@ -9,10 +9,12 @@
 
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import OPTIONAL_FEATURE
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.discoverer import Discoverer
+from wlsdeploy.util import dictionary_utils
 
 _class_name = 'GlobalResourcesDiscoverer'
 _logger = PlatformLogger(discoverer.get_discover_logger_name())
@@ -308,5 +310,11 @@ def get_optional_feature_deployment(self):
             self._populate_model_parameters(result, location)
             self._discover_subfolders(result, location)
 
+        # remove entries with no attributes
+        features_dict = dictionary_utils.get_dictionary_element(result, OPTIONAL_FEATURE)
+        for key in list(features_dict.keys()):
+            if not features_dict[key]:
+                del features_dict[key]
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name)
         return model_top_folder_name, result