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%2FBaseConstraints.java;h=e5f84310c4d0a6c4b501bf8e9e34843125093ff1;hb=refs%2Fchanges%2F22%2F94322%2F1;hp=7dd5fb402934afbb3caad6913c409e587caf1a59;hpb=64bcda2b7effc1e3e01a059500747bfa8b99d04d;p=yangtools.git

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
index 7dd5fb4029..e5f84310c4 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java
@@ -7,176 +7,80 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
-
-import com.google.common.base.Optional;
 
 /**
  * Utility class which provides factory methods to construct Constraints.
  *
+ * <p>
  * Provides static factory methods which constructs instances of
  * <ul>
- * <li>{@link LengthConstraint} - {@link #lengthConstraint(Number, Number, String, String)}
- * <li>{@link RangeConstraint} - {@link #rangeConstraint(Number, Number, String, String)}
- * <li>{@link PatternConstraint} - {@link #patternConstraint(String, String, String)}
+ * <li>{@link PatternConstraint} - {@link #newPatternConstraint(String, Optional, Optional)}
  * </ul>
  */
 public final class BaseConstraints {
-
     private BaseConstraints() {
-    }
-
-
-    /**
-     * Creates a {@link LengthConstraint}.
-     *
-     * Creates an instance of Length constraint based on supplied parameters
-     * with additional behaviour:
-     *
-     * <ul>
-     * <li>{@link LengthConstraint#getErrorAppTag()} returns <code>length-out-of-specified-bounds</code>
-     * <li>{@link LengthConstraint#getErrorMessage() returns <code>The argument is out of bounds &lt;<i>min</i>, <i>max</i> &gt;</code>
-     * </ul>
-     *
-     * @see LengthConstraint
-     *
-     * @param min  length-restricting lower bound value. The value MUST NOT be negative.
-     * @param max length-restricting upper bound value. The value MUST NOT be negative.
-     * @param description Description associated with constraint. {@link Optional#absent()} if description is undefined.
-     * @param reference Reference associated with constraint. {@link Optional#absent()} if reference is undefined.
-     * @return Instance of {@link LengthConstraint}
-     */
-    public static LengthConstraint newLengthConstraint(final Number min, final Number max, final Optional<String> description,
-            final Optional<String> reference) {
-        return new LengthConstraintImpl(min, max, description, reference);
+        // Hidden on purpose
     }
 
-    /**
-     * Creates a {@link RangeConstraint}.
-     *
-     * Creates an instance of Range constraint based on supplied parameters
-     * with additional behaviour:
-     *
-     * <ul>
-     * <li>{@link RangeConstraint#getErrorAppTag()} returns <code>range-out-of-specified-bounds</code>
-     * <li>{@link RangeConstraint#getErrorMessage() returns <code>The argument is out of bounds &lt;<i>min</i>, <i>max</i> &gt;</code>
-     * </ul>
-     *
-     *
-     * @see RangeConstraint
-     *
-     * @param min value-restricting lower bound value. The value MUST NOT Be null.
-     * @param max value-restricting upper bound value. The value MUST NOT Be null.
-     * @param description Description associated with constraint. {@link Optional#absent()} if description is undefined.
-     * @param reference Reference associated with constraint. {@link Optional#absent()} if reference is undefined.
-     * @return Instance of {@link RangeConstraint}
-     */
-    public static RangeConstraint newRangeConstraint(final Number min, final Number max, final Optional<String> description,
-            final Optional<String> reference) {
-        return new RangeConstraintImpl(min, max, description, reference);
-    }
-
-
     /**
      * Creates a {@link PatternConstraint}.
      *
+     * <p>
      * Creates an instance of Pattern constraint based on supplied parameters
      * with additional behaviour:
-     *
      * <ul>
-     * <li>{@link PatternConstraint#getErrorAppTag()} returns <code>invalid-regular-expression</code>
+     * <li>{@link PatternConstraint#getErrorAppTag()} returns
+     * <code>invalid-regular-expression</code>
      * </ul>
      *
      * @see PatternConstraint
      *
-     * @param pattern Regular expression, MUST NOT BE null.
-     * @param description Description associated with constraint.
-     * @param reference Reference associated with constraint.
-     * @returnInstance of {@link PatternConstraint}
+     * @param pattern
+     *            Regular expression, MUST NOT BE null.
+     * @param description
+     *            Description associated with constraint.
+     * @param reference
+     *            Reference associated with constraint.
+     * @return Instance of {@link PatternConstraint}
      */
     public static PatternConstraint newPatternConstraint(final String pattern, final Optional<String> description,
             final Optional<String> reference) {
         return new PatternConstraintImpl(pattern, description, reference);
     }
 
-
-    /**
-     * Creates a {@link LengthConstraint}.
-     *
-     * Creates an instance of Length constraint based on supplied parameters
-     * with additional behaviour:
-     *
-     * <ul>
-     * <li>{@link LengthConstraint#getErrorAppTag()} returns <code>length-out-of-specified-bounds</code>
-     * <li>{@link LengthConstraint#getErrorMessage() returns <code>The argument is out of bounds &lt;<i>min</i>, <i>max</i> &gt;</code>
-     * </ul>
-     *
-     * @see LengthConstraint
-     *
-     * @param min  length-restricting lower bound value. The value MUST NOT be negative.
-     * @param max length-restricting upper bound value. The value MUST NOT be negative.
-     * @param description Description associated with constraint.
-     * @param reference Reference associated with constraint.
-     * @return Instance of {@link LengthConstraint}
-     * @deprecated Use {@link #newLengthConstraint(Number, Number, Optional, Optional)} instead.
-     */
-    @Deprecated
-    public static LengthConstraint lengthConstraint(final Number min, final Number max, final String description,
-            final String reference) {
-        return newLengthConstraint(min, max, Optional.fromNullable(description), Optional.fromNullable(reference));
-    }
-
-    /**
-     * Creates a {@link RangeConstraint}.
-     *
-     * Creates an instance of Range constraint based on supplied parameters
-     * with additional behaviour:
-     *
-     * <ul>
-     * <li>{@link RangeConstraint#getErrorAppTag()} returns <code>range-out-of-specified-bounds</code>
-     * <li>{@link RangeConstraint#getErrorMessage() returns <code>The argument is out of bounds &lt;<i>min</i>, <i>max</i> &gt;</code>
-     * </ul>
-     *
-     *
-     * @see RangeConstraint
-     *
-     * @param min value-restricting lower bound value. The value MUST NOT Be null.
-     * @param max value-restricting upper bound value. The value MUST NOT Be null.
-     * @param description Description associated with constraint.
-     * @param reference Reference associated with constraint.
-     * @return Instance of {@link RangeConstraint}
-     * @deprecated Use {@link #newRangeConstraint(Number, Number, Optional, Optional)} instead.
-     */
-    @Deprecated
-    public static RangeConstraint rangeConstraint(final Number min, final Number max, final String description,
-            final String reference) {
-        return newRangeConstraint(min, max, Optional.fromNullable(description), Optional.fromNullable(reference));
-    }
-
     /**
      * Creates a {@link PatternConstraint}.
      *
-     * Creates an instance of Range constraint based on supplied parameters
+     * <p>
+     * Creates an instance of Pattern constraint based on supplied parameters
      * with additional behaviour:
-     *
      * <ul>
-     * <li>{@link PatternConstraint#getErrorAppTag()} returns <code>invalid-regular-expression</code>
+     * <li>{@link PatternConstraint#getErrorAppTag()} returns
+     * <code>invalid-regular-expression</code>
      * </ul>
      *
-     *
      * @see PatternConstraint
      *
-     * @param pattern Regular expression, MUST NOT
-     * @param description Description associated with constraint.
-     * @param reference Reference associated with constraint.
+     * @param pattern
+     *            Regular expression, MUST NOT BE null.
+     * @param description
+     *            Description associated with constraint.
+     * @param reference
+     *            Reference associated with constraint.
+     * @param errorAppTag
+     *            error-app-tag associated with constraint.
+     * @param errorMessage
+     *            error message associated with constraint.
+     * @param modifier
+     *            Modifier of pattern constraint.
      * @return Instance of {@link PatternConstraint}
-     * @deprecated Use {@link #newPatternConstraint(String, Optional, Optional)} Instead.
      */
-    @Deprecated
-    public static PatternConstraint patternConstraint(final String pattern, final String description,
-            final String reference) {
-        return newPatternConstraint(pattern, Optional.fromNullable(description), Optional.fromNullable(reference));
+    public static PatternConstraint newPatternConstraint(final String pattern, final Optional<String> description,
+            final Optional<String> reference, final String errorAppTag, final String errorMessage,
+            final Optional<ModifierKind> modifier) {
+        return new PatternConstraintImpl(pattern, description, reference, errorAppTag, errorMessage, modifier);
     }
 }