JIRA WDT-47 Create provider MBean from model, set attributes, revise logging

Author: rakillen

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * The Universal Permissive License (UPL), Version 1.0
+ */
+package oracle.weblogic.deploy.util;
+
+/**
+ * Utility methods related to data type conversion.
+ */
+public final class ConvertUtils {
+
+    private ConvertUtils() {
+        // hide the constructor for this utility class
+    }
+
+    /**
+     * Convert the specified value to the specified type.
+     * The conversions and available types are specific to user-defined custom mbeans.
+     *
+     * @param value the value to be converted
+     * @param dataType the class representing the target type
+     * @return the value converted to the new type, or null if conversion failed
+     */
+    public static Object convertValue(Object value, Class<?> dataType) {
+        // TODO: fill in data types
+
+        if(dataType.equals(String.class)) {
+            return value;
+        }
+
+        return null;
+    }
+}

core/src/main/python/wlsdeploy/tool/util/custom_folder_helper.py

@@ -2,9 +2,14 @@
 Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
+from java.lang import IllegalArgumentException, IllegalAccessException
+from java.lang.reflect import InvocationTargetException
+from oracle.weblogic.deploy.util import ConvertUtils
 
+from wlsdeploy.exception import exception_helper
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
+from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
 
 class CustomFolderHelper(object):
@@ -18,6 +23,7 @@ def __init__(self, aliases, logger, exception_type):
         self.logger = logger
         self.exception_type = exception_type
         self.alias_helper = AliasHelper(aliases, self.logger, self.exception_type)
+        self.weblogic_helper = WebLogicHelper(self.logger)
         self.wlst_helper = WlstHelper(self.logger, self.exception_type)
 
     def update_security_folder(self, location, model_category, model_type, model_name, model_nodes):
@@ -39,7 +45,80 @@ def update_security_folder(self, location, model_category, model_type, model_nam
         self.logger.info('WLSDPLY-12124', model_category, model_name, model_type, location_path,
                          class_name=self.__class_name, method_name=_method_name)
 
+        create_path = self.alias_helper.get_wlst_subfolders_path(location)
+        self.wlst_helper.cd(create_path)
+
+        # TODO for updateDomain: check for existing provider, just cd if present
+
         # create the MBean using the model name, model_type, category
 
-        # wlst.create(model_name, model_type, category)
-        # wlst.create('RAK-SAML', 'SAMLAuthenticator', 'AuthenticationProvider')
+        self.wlst_helper.create(model_name, model_type, model_category)
+
+        provider_path = create_path + '/' + model_category + '/' + model_name
+        provider_mbean = self.wlst_helper.cd(provider_path)
+
+        interface_name = model_type + 'MBean'
+        bean_info = self.weblogic_helper.get_bean_info_for_interface(interface_name)
+        if bean_info is None:
+            ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12125', interface_name)
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+
+        property_map = dict()
+        for property_descriptor in bean_info.getPropertyDescriptors():
+            self.logger.finer('WLSDPLY-12126', str(property_descriptor), class_name=self.__class_name,
+                              method_name=_method_name)
+            property_map[property_descriptor.getName()] = property_descriptor
+
+        for model_key in model_nodes:
+            model_value = model_nodes[model_key]
+            property_descriptor = property_map.get(model_key)
+
+            if not property_descriptor:
+                ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12128', model_key)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
+
+            # find the setter method for the attribute
+
+            method = property_descriptor.writeMethod
+            if not method:
+                # this must be a read-only attribute, just log it and continue with next attribute
+                self.logger.info('WLSDPLY-12129', str(model_key), class_name=self.__class_name,
+                                 method_name=_method_name)
+                continue
+
+            self.logger.finer('WLSDPLY-12127', str(model_key), str(model_value), class_name=self.__class_name,
+                              method_name=_method_name)
+
+            # determine the data type from the set method
+
+            parameter_types = method.getParameterTypes()
+            parameter_count = len(parameter_types)
+
+            if parameter_count != 1:
+                ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12130', model_key,
+                                                       parameter_count)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
+
+            property_type = parameter_types[0]
+
+            # convert the model value to the target type
+
+            set_value = ConvertUtils.convertValue(model_value, property_type)
+            if set_value is None:
+                ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12131', str(model_value),
+                                                       str(property_type), model_key)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex
+
+            # call the setter with the target value
+
+            try:
+                method.invoke(provider_mbean, [set_value])
+            except (IllegalAccessException, IllegalArgumentException, InvocationTargetException), ex:
+                ex = exception_helper.create_exception(self.exception_type, 'WLSDPLY-12132', str(method),
+                                                       str(set_value), ex.getLocalizedMessage(), error=ex)
+                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                raise ex

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -950,6 +950,14 @@ WLSDPLY-12122=The attribute {0} in model location {1} has value {2} that referen
 # The WLSDPLY-12123 resource is used for messages returned from aliases.is_version_valid_location()
 WLSDPLY-12123={0}
 WLSDPLY-12124=Updating {0} "{1}" ({2}) at location {3}
+WLSDPLY-12125=Unable to load bean information for interface {0}
+WLSDPLY-12126=Property descriptor {0}
+WLSDPLY-12127=Updating attribute {0} to {1}
+WLSDPLY-12128=No property descriptor found for attribute {0}
+WLSDPLY-12129=Skipping read-only attribute {0}
+WLSDPLY-12130=The set method for attribute {0} has {1} arguments
+WLSDPLY-12131=Unable to convert value {0} to type {1} for attribute {2}
+WLSDPLY-12132=Unable to invoke method {0} with argument {1}: {2}
 
 # domain_creator.py
 WLSDPLY-12200={0} did not find the required {1} section in the model file {2}