X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Ftransformer%2FNormalizedNodePrunerTest.java;h=f15b184513dd7ba31c10418e27ee9ff7e739c98f;hb=refs%2Fchanges%2F00%2F84600%2F3;hp=a961f6a5af287b3371872ad3ee12a86a57b4cb5c;hpb=4e696d9795fe7eef40369c05c340d137394126f3;p=controller.git diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java index a961f6a5af..f15b184513 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java @@ -52,15 +52,15 @@ public class NormalizedNodePrunerTest { MockitoAnnotations.initMocks(this); } - private static NormalizedNodePruner prunerFullSchema(YangInstanceIdentifier path) { + private static NormalizedNodePruner prunerFullSchema(final YangInstanceIdentifier path) { return new NormalizedNodePruner(path, FULL_SCHEMA); } - private static NormalizedNodePruner prunerNoAugSchema(YangInstanceIdentifier path) { + private static NormalizedNodePruner prunerNoAugSchema(final YangInstanceIdentifier path) { return new NormalizedNodePruner(path, NO_AUG_SCHEMA); } - private static NormalizedNodePruner prunerNoTestSchema(YangInstanceIdentifier path) { + private static NormalizedNodePruner prunerNoTestSchema(final YangInstanceIdentifier path) { return new NormalizedNodePruner(path, NO_TEST_SCHEMA); } @@ -140,7 +140,7 @@ public class NormalizedNodePrunerTest { } - private static int countNodes(NormalizedNode normalizedNode, final String namespaceFilter) { + private static int countNodes(final NormalizedNode normalizedNode, final String namespaceFilter) { if (normalizedNode == null) { return 0; } @@ -151,7 +151,7 @@ public class NormalizedNodePrunerTest { count.incrementAndGet(); } } - }).navigate(YangInstanceIdentifier.EMPTY.toString(), normalizedNode); + }).navigate(YangInstanceIdentifier.empty().toString(), normalizedNode); return count.get(); } @@ -381,7 +381,7 @@ public class NormalizedNodePrunerTest { } private static NormalizedNode createTestContainer() { - byte[] bytes1 = {1,2,3}; + byte[] bytes1 = {1, 2, 3}; LeafSetEntryNode entry1 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, bytes1)).withValue(bytes1).build(); @@ -389,14 +389,10 @@ public class NormalizedNodePrunerTest { LeafSetEntryNode entry2 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, bytes2)).withValue(bytes2).build(); - LeafSetEntryNode entry3 = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( - new NodeWithValue<>(TestModel.BINARY_LEAF_LIST_QNAME, null)).withValue(null).build(); - - return TestModel.createBaseTestContainerBuilder() .withChild(ImmutableLeafSetNodeBuilder.create().withNodeIdentifier( new NodeIdentifier(TestModel.BINARY_LEAF_LIST_QNAME)) - .withChild(entry1).withChild(entry2).withChild(entry3).build()) + .withChild(entry1).withChild(entry2).build()) .withChild(ImmutableNodes.leafNode(TestModel.SOME_BINARY_DATA_QNAME, new byte[]{1, 2, 3, 4})) .build(); }