JIRA WDT-8 Convert WLST value to preferred type (if specified) in a single pass

Author: rakillen

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

@@ -52,7 +52,6 @@
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
 from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
 from wlsdeploy.aliases.model_constants import ARGUMENTS
-from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_START
 
@@ -683,13 +682,10 @@ def convert_from_type(data_type, value, preferred=None, delimiter=None):
     elif value is not None and isinstance(value, ObjectName):
         new_value = value.getKeyProperty('Name')
     else:
-        new_value = _jconvert_to_type(data_type, value, delimiter)
-
+        model_type = data_type
         if preferred:
-            # now put it into the preferred model type, but the model delimiter should ALWAYS be the
-            # model default delimiter
-            delimiter = MODEL_LIST_DELIMITER
-            new_value = _jconvert_to_type(preferred, new_value, delimiter)
+            model_type = preferred
+        new_value = _jconvert_to_type(model_type, value, delimiter)
 
     return new_value
 

core/src/test/python/alias_utils_test.py

@@ -108,6 +108,14 @@ def testWindowsPathSeparators(self):
         self.assertEqual(actual, expected)
         return
 
+    def testDelimitedListToList(self):
+        value = 'one;two;three'
+        actual = alias_utils.convert_from_type("invalid", value, preferred='list', delimiter=';')
+        expected = ['one', 'two', 'three']
+        lists_equal, message = self.__lists_are_equal(actual, expected)
+        self.assertEqual(lists_equal, True, message)
+        return
+
     def __lists_are_equal(self, actual, expected):
         if actual is None and expected is None:
             return True, 'ok'