Issue #275 - Join discovered lists using comma delimiter only; split classpath on comma when adding to archive

Author: rakillen

core/src/main/python/wlsdeploy/aliases/alias_utils.py

@@ -35,6 +35,7 @@
 from wlsdeploy.aliases.alias_constants import JAVA_LANG_BOOLEAN
 from wlsdeploy.aliases.alias_constants import LIST
 from wlsdeploy.aliases.alias_constants import LONG
+from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.alias_constants import PATH_SEPARATOR_DELIMITED_STRING
 from wlsdeploy.aliases.alias_constants import PREFERRED_MODEL_TYPE
 from wlsdeploy.aliases.alias_constants import SECURITY_PROVIDER_FOLDER_PATHS
@@ -663,12 +664,12 @@ def get_number_of_directories_to_strip(desired_path_type, actual_path_type):
 
 def convert_from_type(data_type, value, preferred=None, delimiter=None):
     """
-    Convert from wlst type
-    :param data_type: type of data
-    :param value: value of data
-    :param preferred: how it should be represented
-    :param delimiter: for representation
-    :return: converted type
+    Convert WLST value to model representation type
+    :param data_type: the target data type for the model
+    :param value: value to be converted
+    :param preferred: the preferred data type to be represented in the model (optional)
+    :param delimiter: the delimiter for parsing the WLST representation of the data value (optional)
+    :return: converted value
     """
 
     _method_name = 'convert_from_type'
@@ -835,6 +836,14 @@ def get_dictionary_mode(alias_dict):
 
 
 def _jconvert_to_type(data_type, value, delimiter):
+    """
+    Convert WLST value to model representation type.
+    Assumes that empty values and password data types have been converted elsewhere.
+    :param data_type: the target data type for the model
+    :param value: value to be converted
+    :param delimiter: the delimiter for parsing the WLST representation of the data value (optional)
+    :return: converted value
+    """
     _method_name = '_jconvert_to_type'
     try:
         converted = TypeUtils.convertToType(data_type, value, delimiter)
@@ -857,15 +866,11 @@ def _jconvert_to_type(data_type, value, delimiter):
         elif data_type in (COMMA_DELIMITED_STRING, DELIMITED_STRING, SEMI_COLON_DELIMITED_STRING,
                            SPACE_DELIMITED_STRING, PATH_SEPARATOR_DELIMITED_STRING):
             #
-            # This code intentionally ignores the delimiter value passed in and computes it from the data type.
-            # This is required to handle the special case where the value we read from WLST might have a
-            # different delimiter than the model value.  In this use case, the value passed into the method
-            # is the WLST value delimiter and the data_type is the preferred_model_type, so we compute the
-            # model delimiter from the data_type directly.
+            # Data type value may be the wlst_type, wlst_read_type, or the preferred_model_type from the alias
+            # definition. For any of these, the representation in the model should be comma-separated string.
             #
-            delimiter = compute_delimiter_from_data_type(data_type, converted)
-            if delimiter and converted:
-                converted = delimiter.join(converted)
+            if converted:
+                converted = MODEL_LIST_DELIMITER.join(converted)
     except TypeError, te:
         ex = exception_helper.create_alias_exception('WLSDPLY-08021', value, data_type, delimiter, str(te))
         _logger.throwing(ex, class_name=_class_name, method_name=_method_name)

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

@@ -13,6 +13,7 @@
 
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -296,7 +297,7 @@ def discover_security_configuration(self):
                 self._discover_subfolders(result, location)
             except DiscoverException, de:
                 _logger.warning('WLSDPLY-06200', self._wls_version, de.getLocalizedMessage(),
-                                 class_name=_class_name, method_name=_method_name)
+                                class_name=_class_name, method_name=_method_name)
                 result = OrderedDict()
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
@@ -532,18 +533,25 @@ def _add_classpath_libraries_to_archive(self, model_name, model_value, location)
         _method_name = 'add_classpath_libraries_to_archive'
         server_name = self._get_server_name_from_location(location)
         _logger.entering(server_name, model_name, model_value, class_name=_class_name, method_name=_method_name)
+
         classpath_string = None
         if not StringUtils.isEmpty(model_value):
-            classpath_list = []
-            classpath_entries, separator = path_utils.split_classpath(model_value)
+            classpath = path_utils.fixup_path(model_value)
+
+            # model values are comma-separated
+            classpath_entries = classpath.split(MODEL_LIST_DELIMITER)
+
             if classpath_entries:
+                classpath_list = []
                 for classpath_entry in classpath_entries:
                     new_source_name = self._add_library(server_name, classpath_entry)
                     if new_source_name is not None:
                         classpath_list.append(new_source_name)
-                classpath_string = StringUtils.getStringFromList(classpath_list, separator)
+
+                classpath_string = StringUtils.getStringFromList(classpath_list, MODEL_LIST_DELIMITER)
                 _logger.fine('WLSDPLY-06617', server_name, classpath_string, class_name=_class_name,
                              method_name=_method_name)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=classpath_string)
         return classpath_string