Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Eliminate the use of java.util.Stack
[yangtools.git]
/
yang
/
yang-data-impl
/
src
/
test
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
data
/
impl
/
NodeUtilsTest.java
diff --git
a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
index 285cdb0b30705e3128c76fe282a91586b62fbad7..eeac30bf99d704e220db41c12a98dda0bb279fdf 100644
(file)
--- a/
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
+++ b/
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
@@
-12,7
+12,8
@@
import java.net.URI;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Stack;
+import java.util.Deque;
+import java.util.LinkedList;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Assert;
import org.junit.Before;
@@
-48,7
+49,7
@@
public class NodeUtilsTest {
@Before
public void setUp() throws Exception {
ns = "urn:ietf:params:xml:ns:netconf:base:1.0";
@Before
public void setUp() throws Exception {
ns = "urn:ietf:params:xml:ns:netconf:base:1.0";
- qName =
new QNam
e(
+ qName =
QName.creat
e(
new URI(ns),
new Date(42), "yang-data-impl-mutableTest");
network = NodeHelper.buildTestConfigTree(qName);
new URI(ns),
new Date(42), "yang-data-impl-mutableTest");
network = NodeHelper.buildTestConfigTree(qName);
@@
-61,8
+62,8
@@
public class NodeUtilsTest {
@Test
public void testBuildPath() throws Exception {
SimpleNode<?> needle = network.getCompositesByName("topologies").iterator().next()
@Test
public void testBuildPath() throws Exception {
SimpleNode<?> needle = network.getCompositesByName("topologies").iterator().next()
- .getCompositesByName("topology").iterator().next()
- .getSimpleNodesByName("topology-id").iterator().next();
+
.getCompositesByName("topology").iterator().next()
+
.getSimpleNodesByName("topology-id").iterator().next();
String breadCrumbs = NodeUtils.buildPath(needle);
Assert.assertEquals("network.topologies.topology.topology-id", breadCrumbs);
String breadCrumbs = NodeUtils.buildPath(needle);
Assert.assertEquals("network.topologies.topology.topology-id", breadCrumbs);
@@
-109,7
+110,7
@@
public class NodeUtilsTest {
@Test
public void testBuildNodeMap() {
CompositeNode topology = network.getCompositesByName("topologies").iterator().next()
@Test
public void testBuildNodeMap() {
CompositeNode topology = network.getCompositesByName("topologies").iterator().next()
- .getCompositesByName("topology").iterator().next();
+
.getCompositesByName("topology").iterator().next();
Map<QName, List<Node<?>>> nodeMap = NodeUtils.buildNodeMap(topology.getValue());
Assert.assertEquals(3, nodeMap.size());
Map<QName, List<Node<?>>> nodeMap = NodeUtils.buildNodeMap(topology.getValue());
Assert.assertEquals(3, nodeMap.size());
@@
-132,20
+133,20
@@
public class NodeUtilsTest {
*/
@Test
public void testLoadConfigByGroovy() throws IOException, Exception {
*/
@Test
public void testLoadConfigByGroovy() throws IOException, Exception {
- CompositeNode treeRoot = NodeHelper.loadConfigByGroovy("./config02.groovy");
- Document shadowTree = NodeUtils.buildShadowDomTree(treeRoot);
- try {
+
CompositeNode treeRoot = NodeHelper.loadConfigByGroovy("./config02.groovy");
+
Document shadowTree = NodeUtils.buildShadowDomTree(treeRoot);
+
try {
checkFamilyBinding(treeRoot);
} catch (Exception e) {
LOG.error(e.getMessage());
throw e;
}
checkFamilyBinding(treeRoot);
} catch (Exception e) {
LOG.error(e.getMessage());
throw e;
}
- NodeHelper.compareXmlTree(shadowTree, "./config02g-shadow.xml", getClass());
+
NodeHelper.compareXmlTree(shadowTree, "./config02g-shadow.xml", getClass());
}
private static void checkFamilyBinding(final CompositeNode treeRoot) throws Exception {
}
private static void checkFamilyBinding(final CompositeNode treeRoot) throws Exception {
-
Stack<CompositeNode> jobQueue = new Stack
<>();
+
Deque<CompositeNode> jobQueue = new LinkedList
<>();
jobQueue.push(treeRoot);
while (!jobQueue.isEmpty()) {
jobQueue.push(treeRoot);
while (!jobQueue.isEmpty()) {