Use Jython directly for encryptModel (#550)

* JIRA-WDT-387 Convert encryptModel to use Jython directly; use shared windows script

* JIRA-WDT-387 Use shared method to verify required arguments

* JIRA-WDT-387 Refine shared functions for Windows; use shared functions for validateModel

* JIRA-WDT-387 Create shared Unix script, refactor validateModel to use this

* JIRA-WDT-387 Combined variable setup methods, clean up comments

* JIRA-WDT-387 Remove extra variable assignment

* JIRA-WDT-387 Revised usage comment

* JIRA-WDT-387 Revised usage comments

* JIRA-WDT-387 Refactor encryptModel to use shared functions

* JIRA-WDT-387 Corrected WLSDEPLOY_PROPERTIES variable name, removed "used directly" comments

* JIRA-WDT-387 Corrected WLSDEPLOY_PROPERTIES description

Author: rakillen

core/src/main/python/encrypt.py

@@ -28,17 +28,14 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.encrypt import encryption_utils
 from wlsdeploy.tool.util.alias_helper import AliasHelper
+from wlsdeploy.util import cla_helper
 from wlsdeploy.util import getcreds
 from wlsdeploy.util import variables as variable_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'
 __logger = PlatformLogger('wlsdeploy.encrypt')
@@ -68,7 +65,7 @@ def __process_args(args):
     cla_util = CommandLineArgUtil(_program_name, __required_arguments, __optional_arguments)
     required_arg_map, optional_arg_map = cla_util.process_args(args)
 
-    __verify_required_args_present(required_arg_map)
+    cla_helper.verify_required_args_present(_program_name, __required_arguments, required_arg_map)
     __validate_mode_args(optional_arg_map)
     __process_passphrase_arg(optional_arg_map)
 
@@ -91,23 +88,6 @@ def __process_args(args):
     return model_context
 
 
-def __verify_required_args_present(required_arg_map):
-    """
-    Verify that the required args are present.
-    :param required_arg_map: the required arguments map
-    :raises CLAException: if one or more of the required arguments are missing
-    """
-    _method_name = '__verify_required_args_present'
-
-    for req_arg in __required_arguments:
-        if req_arg not in required_arg_map:
-            ex = exception_helper.create_cla_exception('WLSDPLY-20005', _program_name, req_arg)
-            ex.setExitCode(CommandLineArgUtil.USAGE_ERROR_EXIT_CODE)
-            __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
-            raise ex
-    return
-
-
 def __validate_mode_args(optional_arg_map):
     """
     Verify that either the model_file or the manual switch was specified.
@@ -281,7 +261,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)
 
-    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)