From 595835f6ee4fa024799827f89d9b55dfabcced23 Mon Sep 17 00:00:00 2001 From: Alan Jackoway Date: Thu, 9 May 2019 09:57:47 -0400 Subject: [PATCH] NIFI-6281 Rename ISO8061_INSTANT_VALIDATOR to ISO8601_INSTANT_VALIDATOR ISO8061_INSTANT_VALIDATOR was misnamed - the correct standard is ISO 8601. Also updated the error messages to have spaces in them, which is how the ISO site displays them. This closes #3465 Signed-off-by: Mike Thomsen --- .../apache/nifi/processor/util/StandardValidators.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java index 51e41db0c3..6bf9aaac33 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java @@ -273,18 +273,21 @@ public class StandardValidators { } }; - public static final Validator ISO8061_INSTANT_VALIDATOR = new Validator() { + public static final Validator ISO8601_INSTANT_VALIDATOR = new Validator() { @Override public ValidationResult validate(final String subject, final String input, final ValidationContext context) { try { Instant.parse(input); - return new ValidationResult.Builder().subject(subject).input(input).explanation("Valid ISO8061 Instant Date").valid(true).build(); + return new ValidationResult.Builder().subject(subject).input(input).explanation("Valid ISO 8601 Instant Date").valid(true).build(); } catch (final Exception e) { - return new ValidationResult.Builder().subject(subject).input(input).explanation("Not a valid ISO8061 Instant Date, please enter in UTC time").valid(false).build(); + return new ValidationResult.Builder().subject(subject).input(input).explanation("Not a valid ISO 8601 Instant Date, please enter in UTC time").valid(false).build(); } } }; + // Old name retained for compatibility + @Deprecated + public static final Validator ISO8061_INSTANT_VALIDATOR = ISO8601_INSTANT_VALIDATOR; public static final Validator NON_NEGATIVE_INTEGER_VALIDATOR = new Validator() { @Override