X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FPatternConstraintImpl.java;h=cd0ca2cf2431afb1977e82ab1cf45ebcad300e10;hb=635af1cfca70d0be0192f997c155d80cbbc5ba5d;hp=eecc2a01f5295f45bc14ed966c9b61740a94a50a;hpb=594ac3953ed56d9fb2fa2c0a6129baf1f892bcc1;p=yangtools.git diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java index eecc2a01f5..cd0ca2cf24 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java @@ -34,17 +34,19 @@ final class PatternConstraintImpl implements PatternConstraint, Immutable { private final String errorAppTag; private final String errorMessage; - public PatternConstraintImpl(final String regex, final Optional description, - final Optional reference) { - super(); + PatternConstraintImpl(final String regex, final Optional description, final Optional reference) { + this(regex, description, reference, "invalid-regular-expression", String.format( + "String %s is not valid regular expression.", regex)); + } + + PatternConstraintImpl(final String regex, final Optional description, final Optional reference, + final String errorAppTag, final String errorMessage) { this.regex = Preconditions.checkNotNull(regex, "regex must not be null."); this.description = description.orNull(); this.reference = reference.orNull(); - - // FIXME: Lookup better suitable error tag. - errorAppTag = "invalid-regular-expression"; - // TODO: add erro message - errorMessage = ""; + this.errorAppTag = errorAppTag != null ? errorAppTag : "invalid-regular-expression"; + this.errorMessage = errorMessage != null ? errorMessage : String.format( + "String %s is not valid regular expression.", regex); } @Override