Fix checkArgument constructor

This adds a missing argument and removes the need for synthetic
accessors.

Change-Id: I7e293036b35b86c9ac555f2880747748b8c35443
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
index 7567f49533fa7c60bf3fc6396d1f5777b6a71941..a44310202c4530e4f25a6e633a19d9b54fc63449 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.parser.spi.meta;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import java.util.HashMap;
@@ -174,18 +174,18 @@ public final class SubstatementValidator {
         private final int min;
         private final int max;
 
-        private Cardinality(final int min, final int max) {
-            Preconditions.checkArgument(min >= 0, "Min %s cannot be less than 0!");
-            Preconditions.checkArgument(min <= max, "Min %s can not be greater than max %s!", min, max);
+        Cardinality(final int min, final int max) {
+            checkArgument(min >= 0, "Min %s cannot be less than 0!", min);
+            checkArgument(min <= max, "Min %s can not be greater than max %s!", min, max);
             this.min = min;
             this.max = max;
         }
 
-        private int getMax() {
+        int getMax() {
             return max;
         }
 
-        private int getMin() {
+        int getMin() {
             return min;
         }
     }