Fixed the problem with BitsCodec.deserialize
which was reported after merging following patch
https://git.opendaylight.org/gerrit/#/c/28251/
Fixed up tests to reflect fix of Bug 4645 in YangTools.
Change-Id: I59e76c82c1923f33caebf9b3dc7bbbff47505930
Signed-off-by: Igor Foltin <ifoltin@cisco.com>
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Optional;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Optional;
assertEquals("unknown", stringCont.getStringLeaf3().getValue());
assertEquals("unspecified string", stringCont.getStringLeaf4().getValue());
assertEquals("whatever", stringCont.getStringLeaf5());
assertEquals("unknown", stringCont.getStringLeaf3().getValue());
assertEquals("unspecified string", stringCont.getStringLeaf4().getValue());
assertEquals("whatever", stringCont.getStringLeaf5());
- assertEquals("", stringCont.getStringLeaf6());
+ assertNull(stringCont.getStringLeaf6());
assertFalse(bitsCont.getBitsLeaf().isBitZero());
assertTrue(bitsCont.getBitsLeaf().isBitOne());
assertFalse(bitsCont.getBitsLeaf().isBitTwo());
assertFalse(bitsCont.getBitsLeaf().isBitZero());
assertTrue(bitsCont.getBitsLeaf().isBitOne());
assertFalse(bitsCont.getBitsLeaf().isBitTwo());
+ assertNull(bitsCont.getBitsLeaf2());
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableCollection;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveStatementBase;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IdentityEffectiveStatementImpl;
final class LeafNodeCodecContext<D extends DataObject> extends NodeCodecContext<D> implements NodeContextSupplier {
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IdentityEffectiveStatementImpl;
final class LeafNodeCodecContext<D extends DataObject> extends NodeCodecContext<D> implements NodeContextSupplier {
return codec.deserialize(defaultValue);
}
return codec.deserialize(defaultValue);
}
+ if (defaultValue instanceof ImmutableList) {
+ return codec.deserialize(ImmutableSet.copyOf((ImmutableList) defaultValue));
+ }
+
if (defaultValue instanceof List) {
return codec.deserialize(defaultValue);
}
if (defaultValue instanceof List) {
return codec.deserialize(defaultValue);
}
final Map.Entry<InstanceIdentifier<?>, DataObject> entry = registry.fromNormalizedNode(BI_TOP_LEVEL_LIST_FOO_PATH, foo);
final List<NestedList> nestedLists = new ArrayList<>();
final Map.Entry<InstanceIdentifier<?>, DataObject> entry = registry.fromNormalizedNode(BI_TOP_LEVEL_LIST_FOO_PATH, foo);
final List<NestedList> nestedLists = new ArrayList<>();
- nestedLists.add(new NestedListBuilder().setKey(new NestedListKey("foo")).setType("").build());
- nestedLists.add(new NestedListBuilder().setKey(new NestedListKey("bar")).setType("").build());
+ nestedLists.add(new NestedListBuilder().setKey(new NestedListKey("foo")).build());
+ nestedLists.add(new NestedListBuilder().setKey(new NestedListKey("bar")).build());
final TopLevelList topLevelList = new TopLevelListBuilder().setKey(TOP_LEVEL_LIST_FOO_KEY).setNestedList(nestedLists).build();
assertEquals(topLevelList, entry.getValue());
}
final TopLevelList topLevelList = new TopLevelListBuilder().setKey(TOP_LEVEL_LIST_FOO_KEY).setNestedList(nestedLists).build();
assertEquals(topLevelList, entry.getValue());
}
leaf bits-leaf {
type my-bits;
}
leaf bits-leaf {
type my-bits;
}
+
+ leaf bits-leaf2 {
+ type bits {
+ bit disable-nagle {
+ position 0;
+ }
+ bit auto-sense-speed {
+ position 1;
+ }
+ bit 10-Mb-only {
+ position 2;
+ }
+ }
+ }
}
container binary-container {
}
container binary-container {