Make ConstraintMetaDefition attributes Optional

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / CompiledPatternContext.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
index 2977f3ef6ecacdfbd81b1078c27a1cad574abf7b..a42b2a46f28c34f1cc34f6804ff05f9a40d23830 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/CompiledPatternContext.java
@@ -7,9 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.common.base.Strings;
 import java.util.regex.Pattern;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 
@@ -20,15 +17,17 @@ class CompiledPatternContext {
 
     CompiledPatternContext(final PatternConstraint yangConstraint) {
         pattern = Pattern.compile("^" + yangConstraint.getRegularExpression() + "$");
-        final String yangMessage = yangConstraint.getErrorMessage();
-        if (Strings.isNullOrEmpty(yangMessage)) {
-            errorMessage = "Value %s does not match regular expression <" + pattern.pattern() + ">";
-        } else {
-            errorMessage = yangMessage;
-        }
+        errorMessage = yangConstraint.getErrorMessage().orElse(null);
     }
 
-    public void validate(final String str) {
-        checkArgument(pattern.matcher(str).matches(), errorMessage, str);
+    void validate(final String str) {
+        if (!pattern.matcher(str).matches()) {
+            if (errorMessage != null) {
+                throw new IllegalArgumentException(errorMessage);
+            }
+
+            throw new IllegalArgumentException("Value " + str + "does not match regular expression '"
+                    + pattern.pattern() + "'");
+        }
     }
 }