reduce the number of messages for no property file (#1119)

* reduce the number of messages for no property file

* refine the messages

* fix system test

* fix system test

Author: CarolynRountree

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

@@ -763,12 +763,6 @@ def __validate_variable_substitution(self, tokenized_value, model_folder_path):
                         logger_method = _info_logger.info
 
                     variables_file_name = self._model_context.get_variable_file()
-                    if variables_file_name is None:
-                        logger_method('WLSDPLY-05021', model_folder_path, property_name,
-                                      class_name=_class_name, method_name=_method_name)
-                    else:
-                        logger_method('WLSDPLY-05022', model_folder_path, property_name, variables_file_name,
-                                      class_name=_class_name, method_name=_method_name)
 
         self._logger.exiting(class_name=_class_name, method_name=_method_name, result=untokenized_value)
         return untokenized_value

core/src/main/python/wlsdeploy/util/variables.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 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.
 """
 import os
@@ -260,7 +260,11 @@ def _substitute(text, variables, model_context, error_info, attribute_name=None)
             # log, or throw an exception if key is not found.
             if key not in variables:
                 allow_unresolved = validation_config.allow_unresolved_variable_tokens()
-                _report_token_issue('WLSDPLY-01732', method_name, allow_unresolved, key)
+                if model_context.get_variable_file() is not None:
+                    _report_token_issue('WLSDPLY-01732', method_name, allow_unresolved, key)
+                else:
+                    _report_token_issue('WLSDPLY-01734', method_name, allow_unresolved, key)
+
                 _increment_error_count(error_info, allow_unresolved)
                 problem_found = True
                 continue

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

@@ -342,6 +342,7 @@ WLSDPLY-01730=Failed to load variables file {0}: {1}
 WLSDPLY-01731=NOT USED
 WLSDPLY-01732=Variable "{0}" is not found in properties file
 WLSDPLY-01733=Variable file {0} cannot be read: {1}
+WLSDPLY-01734=Variable "{0}" is a property and no properties file was provided
 WLSDPLY-01735=Assignment in {0} is not formatted as X=Y: {1}
 WLSDPLY-01736=Default variable file name {0}
 WLSDPLY-01737=Environment variable "{0}" was not found

system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

@@ -745,7 +745,7 @@ void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exception
                 + " -oracle_home " + mwhome_12213
                 + " -model_file " + getSampleModelFile("1");
             CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
-            verifyErrorMsg(result, ", but no variables file was specified");
+            verifyErrorMsg(result, " and no properties file was provided");
         }
     }