From commits-return-1745-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Mon Jan 22 16:53:06 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 9E78F180676 for ; Mon, 22 Jan 2018 16:53:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8DB02160C3A; Mon, 22 Jan 2018 15:53:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DEC31160C4B for ; Mon, 22 Jan 2018 16:53:05 +0100 (CET) Received: (qmail 9642 invoked by uid 500); 22 Jan 2018 15:53:05 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 9617 invoked by uid 99); 22 Jan 2018 15:53:05 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jan 2018 15:53:05 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8681582058; Mon, 22 Jan 2018 15:53:04 +0000 (UTC) Date: Mon, 22 Jan 2018 15:53:05 +0000 To: "commits@fineract.apache.org" Subject: [fineract-cn-lang] 01/08: Added optional option for valididentifier_s_ validation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: myrle@apache.org In-Reply-To: <151663638449.12103.7813901531240893754@gitbox.apache.org> References: <151663638449.12103.7813901531240893754@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: fineract-cn-lang X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Rev: a46bc1f98a9b7fe1c01e74b8f6fae33b9724735c X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180122155304.8681582058@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. myrle pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-lang.git commit a46bc1f98a9b7fe1c01e74b8f6fae33b9724735c Author: Myrle Krantz AuthorDate: Thu Aug 17 11:06:36 2017 +0200 Added optional option for valididentifier_s_ validation. --- src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java | 6 ++++++ .../io/mifos/core/lang/validation/constraints/ValidIdentifiers.java | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java b/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java index 183b6ac..f739eb3 100644 --- a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java +++ b/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java @@ -26,14 +26,20 @@ import java.util.List; */ public class CheckIdentifiers implements ConstraintValidator> { private int maximumLength = 32; + private boolean optional; + @Override public void initialize(final ValidIdentifiers constraintAnnotation) { maximumLength = constraintAnnotation.maxLength(); + optional = constraintAnnotation.optional(); } @Override public boolean isValid(final List value, final ConstraintValidatorContext context) { + if (optional && value == null) + return true; + return value != null && value.stream().allMatch(x -> x != null && CheckIdentifier.validate(x, maximumLength)); } } diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java index d881860..f4b2533 100644 --- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java +++ b/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java @@ -43,4 +43,5 @@ public @interface ValidIdentifiers { Class[] payload() default { }; int maxLength() default 32; + boolean optional() default false; } \ No newline at end of file -- To stop receiving notification emails like this one, please contact myrle@apache.org.