Improve binding-dom-codec assertions

[mdsal.git] / binding / mdsal-binding-dom-codec / src / main / java / org / opendaylight / mdsal / binding / dom / codec / impl / CaseNodeCodecContext.java

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseNodeCodecContext.java
index 1041319e434a06ff412b838037d08dbe90d4defa..a42130f5519834c6f7d807c877cb118e159b3427 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseNodeCodecContext.java
@@ -7,7 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
 import java.util.List;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item;
@@ -37,9 +39,9 @@ final class CaseNodeCodecContext<D extends DataObject> extends DataObjectCodecCo
     }
 
     @Override
-    public D deserialize(final NormalizedNode<?, ?> normalizedNode) {
-        Preconditions.checkState(normalizedNode instanceof ChoiceNode);
-        return createBindingProxy((ChoiceNode) normalizedNode);
+    public D deserialize(final NormalizedNode<?, ?> data) {
+        checkState(data instanceof ChoiceNode, "Unexpected data %s", data);
+        return createBindingProxy((ChoiceNode) data);
     }
 
     @Override
@@ -49,13 +51,13 @@ final class CaseNodeCodecContext<D extends DataObject> extends DataObjectCodecCo
 
     @Override
     public YangInstanceIdentifier.PathArgument serializePathArgument(final PathArgument arg) {
-        Preconditions.checkArgument(arg == null);
+        checkArgument(arg == null, "Unexpected argument %s", arg);
         return null;
     }
 
     @Override
     public PathArgument deserializePathArgument(final YangInstanceIdentifier.PathArgument arg) {
-        Preconditions.checkArgument(arg == null);
+        checkArgument(arg == null, "Unexpected argument %s", arg);
         return null;
     }
 }