[RequireGradleProperty] Use rule.message when rule.regexMessage is no…

…t present. Fixes #14
kordamp · Oct 30, 2020 · f46eb86 · f46eb86
1 parent d59621d
commit f46eb86
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/enforcer-rules/src/main/groovy/enforcer/rules/AbstractPropertyEnforcerRule.groovy b/core/enforcer-rules/src/main/groovy/enforcer/rules/AbstractPropertyEnforcerRule.groovy
@@ -55,8 +55,12 @@ abstract class AbstractPropertyEnforcerRule extends AbstractStandardEnforcerRule
 
         if (regex.present && !propValue.toString().matches(regex.get())) {
             if (!regexMessage.present) {
-                regexMessage.set(getName() + ' "' + getPropertyName() +
-                    '" does not match the regular expression "' + regex.get() + '".')
+                if (!message.present) {
+                    regexMessage.set(getName() + ' "' + getPropertyName() +
+                        '" does not match the regular expression "' + regex.get() + '".')
+                } else {
+                    regexMessage.set(message.get())
+                }
             }
             if (displayValue.get()) {
                 regexMessage.set(regexMessage.get() + ' Value is "' + propValue + '".')