remove wlstModule usage and compress 3 wlst helper classes into 1 (#528)

* remove wlstModule usage and compress 3 wlst helper classes into 1

* fix for method arguments missed in first rount

* another jrf related method mismatch

* encrypt and variable_inject fixes

Author: CarolynRountree

core/src/main/python/create.py

@@ -40,19 +40,19 @@
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
+from wlsdeploy.tool.util.wlst_helper import WlstHelper
+from wlsdeploy.tool.util import wlst_helper
 from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.util import cla_helper
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
-from wlsdeploy.util import wlst_extended
-from wlsdeploy.util import wlst_helper
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.cla_utils import TOOL_TYPE_CREATE
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 from wlsdeploy.tool.create import atp_helper
 
-wlst_extended.wlst_functions = globals()
+wlst_helper.wlst_functions = globals()
 
 _program_name = CREATE_DOMAIN
 
@@ -379,7 +379,7 @@ def main(args):
     for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
-    wlst_helper.silence()
+    WlstHelper(ExceptionType.CREATE).silence()
 
     exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
 

core/src/main/python/deploy.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, 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.
 
 The entry point for the deployApps tool.
@@ -33,24 +33,24 @@
 from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util.string_output_stream import StringOutputStream
+from wlsdeploy.tool.util import wlst_helper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.util import cla_helper
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
-from wlsdeploy.util import wlst_extended
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
-wlst_extended.wlst_functions = globals()
+wlst_helper.wlst_functions = globals()
 
 
 _program_name = 'deployApps'
 _class_name = 'deploy'
 __logger = PlatformLogger('wlsdeploy.deploy')
 __wls_helper = WebLogicHelper(__logger)
-__wlst_helper = WlstHelper(__logger, ExceptionType.DEPLOY)
+__wlst_helper = WlstHelper(ExceptionType.DEPLOY)
 __wlst_mode = WlstModes.OFFLINE
 
 __required_arguments = [

core/src/main/python/discover.py

@@ -31,6 +31,7 @@
 
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.deployments_discoverer import DeploymentsDiscoverer
@@ -41,18 +42,18 @@
 from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util.variable_injector import VariableInjector
+from wlsdeploy.tool.util import wlst_helper
+from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import model_translator
 from wlsdeploy.util import path_utils
 from wlsdeploy.util import tool_exit
-from wlsdeploy.util import wlst_extended
-from wlsdeploy.util import wlst_helper
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
-wlst_extended.wlst_functions = globals()
+wlst_helper.wlst_functions = globals()
 
 _program_name = 'discoverDomain'
 _class_name = 'discover'
@@ -216,19 +217,23 @@ def __process_java_home(optional_arg_map):
         __logger.info('WLSDPLY-06027', java_home_name, iae.getLocalizedMessage(),
                       class_name=_class_name, method_name=_method_name)
 
-def __discover(model_context, aliases, injector):
+
+def __discover(model_context, aliases, injector, helper):
     """
     Populate the model from the domain.
     :param model_context: the model context
+    :param aliases: aliases instance for discover
+    :param injector: variable injector instance
+    :param helper: wlst_helper instance
     :return: the fully-populated model
     :raises DiscoverException: if an error occurred while discover the domain
     """
     _method_name = '__discover'
     model = Model()
     base_location = LocationContext()
-    __connect_to_domain(model_context)
+    __connect_to_domain(model_context, helper)
     try:
-        _add_domain_name(base_location, aliases)
+        _add_domain_name(base_location, aliases, helper)
         DomainInfoDiscoverer(model_context, model.get_model_domain_info(), base_location, wlst_mode=__wlst_mode,
                              aliases=aliases, variable_injector=injector).discover()
         TopologyDiscoverer(model_context, model.get_model_topology(), base_location, wlst_mode=__wlst_mode,
@@ -247,15 +252,15 @@ def __discover(model_context, aliases, injector):
         __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
         raise ex
 
-    __disconnect_domain()
+    __disconnect_domain(helper)
     return model
 
 
-def _add_domain_name(location, aliases):
+def _add_domain_name(location, aliases, helper):
     _method_name = '_get_domain_name'
     try:
-        wlst_helper.cd('/')
-        domain_name = wlst_helper.get(model_constants.DOMAIN_NAME)
+        helper.cd('/')
+        domain_name = helper.get(model_constants.DOMAIN_NAME)
     except PyWLSTException, pe:
         de = exception_helper.create_discover_exception('WLSDPLY-06020', pe.getLocalizedMessage())
         __logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
@@ -281,19 +286,20 @@ def __discover_multi_tenant(model, model_context, base_location, aliases, inject
     return
 
 
-def __connect_to_domain(model_context):
+def __connect_to_domain(model_context, helper):
     """
     Connects WLST to the domain by either connecting to the Admin Server or reading the domain from disk.
     :param model_context: the model context
+    :param helper: wlst helper instance
     :raises DiscoverException: if a WLST error occurs while connecting to or reading the domain
     """
     _method_name = '__connect_to_domain'
 
     __logger.entering(class_name=_class_name, method_name=_method_name)
     if __wlst_mode == WlstModes.ONLINE:
         try:
-            wlst_helper.connect(model_context.get_admin_user(), model_context.get_admin_password(),
-                                model_context.get_admin_url())
+            helper.connect(model_context.get_admin_user(), model_context.get_admin_password(),
+                           model_context.get_admin_url())
         except PyWLSTException, wlst_ex:
             ex = exception_helper.create_discover_exception('WLSDPLY-06001', model_context.get_admin_url(),
                                                             model_context.get_admin_user(),
@@ -302,7 +308,7 @@ def __connect_to_domain(model_context):
             raise ex
     else:
         try:
-            wlst_helper.read_domain(model_context.get_domain_home())
+            helper.read_domain(model_context.get_domain_home())
         except PyWLSTException, wlst_ex:
             wls_version = WebLogicHelper(__logger).get_actual_weblogic_version()
             ex = exception_helper.create_discover_exception('WLSDPLY-06002', model_context.get_domain_home(),
@@ -354,25 +360,26 @@ def __close_archive(model_context):
     return
 
 
-def __disconnect_domain():
+def __disconnect_domain(helper):
     """
     Disconnects WLST from the domain by either disconnecting from the Admin Server or closing the domain read from disk.
+    :param helper: wlst_helper instance
     :raises DiscoverException: if a WLST error occurred while disconnecting or closing the domain
     """
     _method_name = '__disconnect_domain'
 
     __logger.entering(class_name=_class_name, method_name=_method_name)
     if __wlst_mode == WlstModes.ONLINE:
         try:
-            wlst_helper.disconnect()
+            helper.disconnect()
         except PyWLSTException, wlst_ex:
             ex = exception_helper.create_discover_exception('WLSDPLY-06006',
                                                             wlst_ex.getLocalizedMessage(), error=wlst_ex)
             __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
             raise ex
     else:
         try:
-            wlst_helper.close_domain()
+            helper.close_domain()
         except PyWLSTException, wlst_ex:
             ex = exception_helper.create_discover_exception('WLSDPLY-06007',
                                                             wlst_ex.getLocalizedMessage(), error=wlst_ex)
@@ -494,7 +501,8 @@ def main(args):
     for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
-    wlst_helper.silence()
+    helper = WlstHelper(ExceptionType.DISCOVER)
+    helper.silence()
 
     exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
 
@@ -528,7 +536,7 @@ def main(args):
     else:
         __logger.info('WLSDPLY-06024', class_name=_class_name, method_name=_method_name)
     try:
-        model = __discover(model_context, aliases, discover_injector)
+        model = __discover(model_context, aliases, discover_injector, helper)
     except DiscoverException, ex:
         __logger.severe('WLSDPLY-06011', _program_name, model_context.get_domain_name(),
                         model_context.get_domain_home(), ex.getLocalizedMessage(),

core/src/main/python/encrypt.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, 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.
 
 The main module for the WLSDeploy tool to encrypt passwords.
@@ -30,12 +30,14 @@
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import variables as variable_helper
-from wlsdeploy.util import wlst_helper
+from wlsdeploy.tool.util import wlst_helper
+from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.model_translator import PythonToFile
 
+wlst_helper.wlst_functions = globals()
 
 _program_name = 'encryptModel'
 _class_name = 'encrypt'
@@ -279,7 +281,7 @@ def main(args):
     for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
-    wlst_helper.silence()
+    WlstHelper(ExceptionType.ENCRYPTION).silence()
     exit_code = _process_request(args)
     __logger.exiting(class_name=_class_name, method_name=_method_name, result=exit_code)
     sys.exit(exit_code)

core/src/main/python/update.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, 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.
 
 The entry point for the updateDomain tool.
@@ -33,25 +33,25 @@
 from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.tool.util import model_context_helper
+from wlsdeploy.tool.util import wlst_helper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.tool.util.string_output_stream import StringOutputStream
 from wlsdeploy.util import cla_helper
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
-from wlsdeploy.util import wlst_extended
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 from wlsdeploy.util import model as model_helper
 
-wlst_extended.wlst_functions = globals()
+wlst_helper.wlst_functions = globals()
 
 _program_name = UPDATE_DOMAIN
 _class_name = 'update'
 __logger = PlatformLogger('wlsdeploy.update')
 __wls_helper = WebLogicHelper(__logger)
-__wlst_helper = WlstHelper(__logger, ExceptionType.DEPLOY)
+__wlst_helper = WlstHelper(ExceptionType.DEPLOY)
 __wlst_mode = WlstModes.OFFLINE
 
 __required_arguments = [

core/src/main/python/variable_inject.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2018, 2020, 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.
 
 The entry point for the discoverDomain tool.
@@ -23,10 +23,11 @@
 import wlsdeploy.tool.util.variable_injector as variable_injector
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.util.variable_injector import VariableInjector
-from wlsdeploy.util import wlst_helper
+from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.util import model_translator
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.model import Model
@@ -271,8 +272,6 @@ def main(args):
     for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
-    wlst_helper.silence()
-
     exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
 
     model_context = None

core/src/main/python/wlsdeploy/exception/exception_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, 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.
 """
 import sys
@@ -46,6 +46,12 @@
     ExceptionType.YAML:                  'create_yaml_exception'
 }
 
+
+def get_exception_class(exception_type):
+    ex = create_exception(exception_type, 'Find the class')
+    return ex.getClass()
+
+
 def create_exception(exception_type, key, *args, **kwargs):
     """
     Create an exception of the specified type.
@@ -124,6 +130,7 @@ def create_deploy_exception(key, *args, **kwargs):
             ex = DeployException(key)
     return ex
 
+
 def create_discover_exception(key, *args, **kwargs):
     """
     Create a DiscoverException from a message id, list of message parameters and Throwable error.
@@ -366,6 +373,7 @@ def create_encryption_exception(key, *args, **kwargs):
         ex = JEncryptionException(key)
     return ex
 
+
 def convert_error_to_exception():
     """
     Convert a Python built-in error to a proper bundle-aware Java exception

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -34,7 +34,7 @@ def __init__(self, model, model_context, aliases, exception_type=ExceptionType.C
         self.aliases = aliases
         self._exception_type = exception_type
         self.alias_helper = AliasHelper(self.aliases, self.logger, exception_type)
-        self.wlst_helper = WlstHelper(self.logger, exception_type)
+        self.wlst_helper = WlstHelper(exception_type)
         self.model = Model(model)
         self.model_context = model_context
         self.wls_helper = WebLogicHelper(self.logger)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2019, 2020, 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.
 """
 from java.lang import IllegalArgumentException
@@ -28,7 +28,7 @@ def __init__(self, aliases, logger, model_context, exception_type):
         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)
+        self.wlst_helper = WlstHelper(self.exception_type)
 
     def update_security_folder(self, location, model_type, model_subtype, model_name, model_nodes):
         """