Repository: nifi Updated Branches: refs/heads/master 455e3c1bc -> 98cdb50cc
NIFI-5843 added subjects to the error message when neither script body nor script text are provided Signed-off-by: Matthew Burgess <mattyb...@apache.org> This closes #3186 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/98cdb50c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/98cdb50c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/98cdb50c Branch: refs/heads/master Commit: 98cdb50cc0a72957959188d352b9507d4f85dea1 Parents: 455e3c1 Author: Alex Savitsky <alex.savit...@scotiabank.com> Authored: Wed Nov 28 10:10:08 2018 -0500 Committer: Matthew Burgess <mattyb...@apache.org> Committed: Wed Nov 28 11:13:17 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/script/ScriptingComponentHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/98cdb50c/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java index 776fc49..831d305 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java @@ -127,8 +127,8 @@ public class ScriptingComponentHelper { // Verify that exactly one of "script file" or "script body" is set Map<PropertyDescriptor, String> propertyMap = validationContext.getProperties(); if (StringUtils.isEmpty(propertyMap.get(ScriptingComponentUtils.SCRIPT_FILE)) == StringUtils.isEmpty(propertyMap.get(ScriptingComponentUtils.SCRIPT_BODY))) { - results.add(new ValidationResult.Builder().valid(false).explanation( - "Exactly one of Script File or Script Body must be set").build()); + results.add(new ValidationResult.Builder().subject("Script Body or Script File").valid(false).explanation( + "exactly one of Script File or Script Body must be set").build()); } return results;
