Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce the use of AttrBuilders
[netconf.git]
/
restconf
/
restconf-nb-bierman02
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
sal
/
restconf
/
impl
/
nn
/
to
/
xml
/
test
/
NnInstanceIdentifierToXmlTest.java
diff --git
a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
index 32c2b63ef93a4cd69a94733449ebbd8f6f2b84b3..5c6e629508b2ffcad3c220bf5af878d63356723e 100644
(file)
--- a/
restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
+++ b/
restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
@@
-33,7
+33,7
@@
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNode
Attr
Builder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@
-48,17
+48,14
@@
public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
private static SchemaContext schemaContext;
NormalizedNodeXmlBodyWriter xmlBodyWriter;
private static SchemaContext schemaContext;
NormalizedNodeXmlBodyWriter xmlBodyWriter;
- public NnInstanceIdentifierToXmlTest() throws NoSuchFieldException,
- SecurityException {
- super();
+ public NnInstanceIdentifierToXmlTest() {
+ super(schemaContext, null);
xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
}
@BeforeClass
public static void initialization() throws URISyntaxException {
xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
}
@BeforeClass
public static void initialization() throws URISyntaxException {
- schemaContext = schemaContextLoader("/instanceidentifier/yang",
- schemaContext);
- CONTROLLER_CONTEXT.setSchemas(schemaContext);
+ schemaContext = schemaContextLoader("/instanceidentifier/yang", schemaContext);
}
@Test
}
@Test
@@
-111,13
+108,13
@@
public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
- final DataContainerNode
Attr
Builder<NodeIdentifier, ContainerNode> dataCont = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
.containerBuilder((ContainerSchemaNode) schemaCont);
final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
.getDataChildByName(cont1);
.containerBuilder((ContainerSchemaNode) schemaCont);
final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
.getDataChildByName(cont1);
- final DataContainerNode
Attr
Builder<NodeIdentifier, ContainerNode> dataCont1 = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
.containerBuilder((ContainerSchemaNode) schemaCont1);
final List<DataSchemaNode> instanceLfLst11 = ControllerContext
.containerBuilder((ContainerSchemaNode) schemaCont1);
final List<DataSchemaNode> instanceLfLst11 = ControllerContext
@@
-154,7
+151,6
@@
public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
public void nnAsYangInstanceIdentifierAugment() throws Exception {
final NormalizedNodeContext normalizedNodeContext = preparNNC();
public void nnAsYangInstanceIdentifierAugment() throws Exception {
final NormalizedNodeContext normalizedNodeContext = preparNNC();
- final NormalizedNodeXmlBodyWriter xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
final OutputStream output = new ByteArrayOutputStream();
xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null,
final OutputStream output = new ByteArrayOutputStream();
xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null,
@@
-210,13
+206,13
@@
public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont);
- final DataContainerNode
Attr
Builder<NodeIdentifier, ContainerNode> dataCont = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont = Builders
.containerBuilder((ContainerSchemaNode) schemaCont);
final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
.getDataChildByName(cont1);
.containerBuilder((ContainerSchemaNode) schemaCont);
final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont)
.getDataChildByName(cont1);
- final DataContainerNode
Attr
Builder<NodeIdentifier, ContainerNode> dataCont1 = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> dataCont1 = Builders
.containerBuilder((ContainerSchemaNode) schemaCont1);
final List<DataSchemaNode> instanceLst11 = ControllerContext
.containerBuilder((ContainerSchemaNode) schemaCont1);
final List<DataSchemaNode> instanceLst11 = ControllerContext
@@
-227,7
+223,7
@@
public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest {
final CollectionNodeBuilder<MapEntryNode, MapNode> dataLst11 = Builders
.mapBuilder((ListSchemaNode) lst11Schema);
final CollectionNodeBuilder<MapEntryNode, MapNode> dataLst11 = Builders
.mapBuilder((ListSchemaNode) lst11Schema);
- final DataContainerNode
Attr
Builder<NodeIdentifierWithPredicates, MapEntryNode> dataLst11Vaule = Builders
+ final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> dataLst11Vaule = Builders
.mapEntryBuilder((ListSchemaNode) lst11Schema);
dataLst11Vaule.withChild(buildLeaf(lst11Schema, keyvalue111, dataLst11,
.mapEntryBuilder((ListSchemaNode) lst11Schema);
dataLst11Vaule.withChild(buildLeaf(lst11Schema, keyvalue111, dataLst11,