Use BooleanValue class in filters to put boolean values into YAML; check for bool in 14.1.1

Author: rakillen

core/src/main/java/oracle/weblogic/deploy/util/PyOrderedDict.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, 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.
  */
 package oracle.weblogic.deploy.util;
@@ -521,6 +521,7 @@ private static PyObject doDeepCopy(PyObject orig, PyObject memo) {
             case "NoneType":
             case "str":
             case "unicode":
+            case "BooleanValue":
                 result = orig;
                 break;
 

core/src/main/python/wlsdeploy/tool/util/filters/wko_filter.py

@@ -20,6 +20,7 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.filters.model_traverse import ModelTraverse
 from wlsdeploy.util import dictionary_utils
+from wlsdeploy.util.boolean_value import BooleanValue
 
 _class_name = 'wko_filter'
 _logger = PlatformLogger('wlsdeploy.tool.util')
@@ -68,7 +69,7 @@ def check_clustered_server_ports(model, _model_context):
             if (calculated_listen_ports is None) or alias_utils.convert_boolean(calculated_listen_ports):
                 _logger.info('WLSDPLY-20202', CALCULATED_LISTEN_PORTS, CLUSTER, cluster_name, class_name=_class_name,
                              method_name=_method_name)
-                dynamic_folder[CALCULATED_LISTEN_PORTS] = False
+                dynamic_folder[CALCULATED_LISTEN_PORTS] = BooleanValue(False)
 
     # be sure every server assigned to a cluster has the same listen port
 

core/src/main/python/wlsdeploy/tool/validate/validation_utils.py

@@ -123,7 +123,8 @@ def is_compatible_data_type(expected_data_type, actual_data_type):
     elif expected_data_type == 'long':
         retval = (actual_data_type in ["<type 'int'>", "<type 'long'>", "<type 'str'>", "<type 'unicode'>"])
     elif expected_data_type in ['boolean', 'java.lang.Boolean']:
-        retval = (actual_data_type in ["<type 'int'>", "<type 'str'>", "<type 'long'>", "<type 'unicode'>"])
+        retval = (actual_data_type in ["<type 'int'>", "<type 'str'>", "<type 'long'>", "<type 'unicode'>",
+                                       "<type 'bool'>", "<class 'wlsdeploy.util.boolean_value.BooleanValue'>"])
     elif expected_data_type in ['float', 'double']:
         retval = (actual_data_type in ["<type 'float'>", "<type 'str'>", "<type 'unicode'>"])
     elif expected_data_type == 'properties' or expected_data_type == 'dict':

core/src/main/python/wlsdeploy/yaml/yaml_translator.py

@@ -99,15 +99,6 @@ def parse(self):
         return result_dict
 
 
-def _string_value_is_boolean(value):
-    result = False
-    if value is not None:
-        _lower_case_value = value.lower()
-        if _lower_case_value == 'true' or _lower_case_value == 'false':
-            result = True
-    return result
-
-
 class PythonToJava(object):
     """
     A class that converts a Python dictionary and its contents to the Java types expected by snakeyaml.
@@ -168,14 +159,7 @@ def convert_scalar_to_java_type(self, py_value):
         elif type(py_value) is bool:
             result = JBoolean(py_value is True)
         elif type(py_value) in [str, unicode]:
-            # If the string is a legal boolean value, convert to a java.lang.Boolean
-            # to allow the SnakeYAML dump function to write the value without quotes.
-            #
-            if _string_value_is_boolean(py_value):
-                is_true = py_value.lower() == 'true'
-                result = JBoolean(is_true)
-            else:
-                result = JString(py_value)
+            result = JString(py_value)
         elif type(py_value) is int:
             result = JInteger(py_value)
         elif type(py_value) is long:

core/src/main/targetconfigs/k8s/k8s_operator_filter.py

@@ -9,6 +9,7 @@
 #
 
 from wlsdeploy.aliases import alias_utils
+from wlsdeploy.util.boolean_value import BooleanValue
 
 
 def filter_model(model):
@@ -58,7 +59,7 @@ def __cleanup_topology(model):
             for server_template in server_templates:
                 auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
                 if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
-                    server_templates[server_template]['AutoMigrationEnabled'] = False
+                    server_templates[server_template]['AutoMigrationEnabled'] = BooleanValue(False)
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]

core/src/main/targetconfigs/vz/vz_filter.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -9,6 +9,7 @@
 # Remove machine, node manager, virtual target, migration elements
 
 from wlsdeploy.aliases import alias_utils
+from wlsdeploy.util.boolean_value import BooleanValue
 
 
 def filter_model(model):
@@ -60,7 +61,7 @@ def __cleanup_topology(model):
             for server_template in server_templates:
                 auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
                 if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
-                    server_templates[server_template]['AutoMigrationEnabled'] = False
+                    server_templates[server_template]['AutoMigrationEnabled'] = BooleanValue(False)
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]

core/src/main/targetconfigs/wko/wko_operator_filter.py

@@ -9,6 +9,7 @@
 #
 
 from wlsdeploy.aliases import alias_utils
+from wlsdeploy.util.boolean_value import BooleanValue
 
 
 def filter_model(model):
@@ -58,7 +59,7 @@ def __cleanup_topology(model):
             for server_template in server_templates:
                 auto_migration_enabled = server_templates[server_template]['AutoMigrationEnabled']
                 if auto_migration_enabled is None or alias_utils.convert_boolean(auto_migration_enabled):
-                    server_templates[server_template]['AutoMigrationEnabled'] = False
+                    server_templates[server_template]['AutoMigrationEnabled'] = BooleanValue(False)
                 for delthis in ['ServerStart']:
                     if server_templates[server_template].has_key(delthis):
                         del server_templates[server_template][delthis]