From 5b7f82b42377d017471306a0c200657309758c1e Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Fri, 7 Oct 2022 17:08:17 -0500 Subject: [PATCH 1/3] Fix for flattened folders without tokens in location --- .../src/test/python/aliastest/verify/verifier_helper.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/alias-test/src/test/python/aliastest/verify/verifier_helper.py b/alias-test/src/test/python/aliastest/verify/verifier_helper.py index e81713301..e2b2c085e 100644 --- a/alias-test/src/test/python/aliastest/verify/verifier_helper.py +++ b/alias-test/src/test/python/aliastest/verify/verifier_helper.py @@ -326,6 +326,11 @@ def verify_attributes(self, attributes, location): :param location: current location in aliases """ _method_name = 'verify_attributes' + flattened_info = self._helper.aliases().get_wlst_flattened_folder_info(location) + if flattened_info is not None: + path_token = flattened_info.get_path_token() + mbean_name = flattened_info.get_mbean_name() + location.add_name_token(path_token, mbean_name) model_name_map = self._model_attribute_map(location) _logger.fine('WLSDPLYST-01211', location.get_folder_path(), model_name_map, class_name=CLASS_NAME, method_name=_method_name) @@ -973,6 +978,9 @@ def check_dictionary_against_model_list(self, location, dictionary, folder_map): if flattened_info is not None: _logger.finer('WLSDPLYST-01203', location.get_folder_path(), class_name=CLASS_NAME, method_name=_method_name) + path_token = flattened_info.get_path_token() + mbean_name = flattened_info.get_mbean_name() + location.add_name_token(path_token, mbean_name) else: keys = folder_map.keys() lower_case_map = all_utils.get_lower_case_dict(dictionary.keys()) From 228f36934a32e03d882367dd412fc2238496d015 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Mon, 10 Oct 2022 14:20:46 -0500 Subject: [PATCH 2/3] change code to not generate duplicate zip file entries for overrides --- .../java/oracle/weblogic/deploy/util/WLSDeployArchive.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java b/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java index aca36b397..b7ef97f23 100644 --- a/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java +++ b/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java @@ -1883,9 +1883,6 @@ private String walkDownFolders(String zipPrefix, File zipPath) throws WLSDeployA if (fileList != null) { for (File item : fileList) { newSourceName = addItemToZip(zipPrefix, item); - if (item.isDirectory()) { - walkDownFolders(zipPrefix + "/" + item.getName(), item); - } } } } From 86fd25a75b1717fa2de1f53035814b7986715404 Mon Sep 17 00:00:00 2001 From: Carolyn Rountree Date: Mon, 10 Oct 2022 14:35:06 -0500 Subject: [PATCH 3/3] push out of wrong branch --- .../src/test/python/aliastest/verify/verifier_helper.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/alias-test/src/test/python/aliastest/verify/verifier_helper.py b/alias-test/src/test/python/aliastest/verify/verifier_helper.py index e2b2c085e..e81713301 100644 --- a/alias-test/src/test/python/aliastest/verify/verifier_helper.py +++ b/alias-test/src/test/python/aliastest/verify/verifier_helper.py @@ -326,11 +326,6 @@ def verify_attributes(self, attributes, location): :param location: current location in aliases """ _method_name = 'verify_attributes' - flattened_info = self._helper.aliases().get_wlst_flattened_folder_info(location) - if flattened_info is not None: - path_token = flattened_info.get_path_token() - mbean_name = flattened_info.get_mbean_name() - location.add_name_token(path_token, mbean_name) model_name_map = self._model_attribute_map(location) _logger.fine('WLSDPLYST-01211', location.get_folder_path(), model_name_map, class_name=CLASS_NAME, method_name=_method_name) @@ -978,9 +973,6 @@ def check_dictionary_against_model_list(self, location, dictionary, folder_map): if flattened_info is not None: _logger.finer('WLSDPLYST-01203', location.get_folder_path(), class_name=CLASS_NAME, method_name=_method_name) - path_token = flattened_info.get_path_token() - mbean_name = flattened_info.get_mbean_name() - location.add_name_token(path_token, mbean_name) else: keys = folder_map.keys() lower_case_map = all_utils.get_lower_case_dict(dictionary.keys())