import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import com.google.common.collect.Sets;
import java.io.File;
import java.io.InputStream;
-import java.net.URI;
import java.util.Collection;
import java.util.Optional;
+import java.util.Set;
import javax.ws.rs.core.MediaType;
import org.junit.BeforeClass;
import org.junit.Test;
import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
import org.opendaylight.netconf.sal.rest.impl.JsonNormalizedNodeBodyReader;
-import org.opendaylight.restconf.common.context.NormalizedNodeContext;
+import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeContext;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
private static EffectiveModelContext schemaContext;
private static final QNameModule INSTANCE_IDENTIFIER_MODULE_QNAME = QNameModule.create(
- URI.create("instance:identifier:module"), Revision.of("2014-01-17"));
+ XMLNamespace.of("instance:identifier:module"), Revision.of("2014-01-17"));
public TestJsonBodyReader() {
super(schemaContext, null);
- this.jsonBodyReader = new JsonNormalizedNodeBodyReader(controllerContext);
+ jsonBodyReader = new JsonNormalizedNodeBodyReader(controllerContext);
}
@Override
schemaContext.getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont"));
final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName());
final String uri = "instance-identifier-module:cont";
- mockBodyReader(uri, this.jsonBodyReader, false);
+ mockBodyReader(uri, jsonBodyReader, false);
final InputStream inputStream = TestJsonBodyReader.class
.getResourceAsStream("/instanceidentifier/json/jsondata.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader
- .readFrom(null, null, null, this.mediaType, null, inputStream);
+ final NormalizedNodeContext returnValue = jsonBodyReader
+ .readFrom(null, null, null, mediaType, null, inputStream);
checkNormalizedNodeContext(returnValue);
checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII);
}
final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()).node(cont1QName);
final DataSchemaNode dataSchemaNodeOnPath = ((DataNodeContainer) dataSchemaNode).getDataChildByName(cont1QName);
final String uri = "instance-identifier-module:cont/cont1";
- mockBodyReader(uri, this.jsonBodyReader, false);
+ mockBodyReader(uri, jsonBodyReader, false);
final InputStream inputStream = TestJsonBodyReader.class
.getResourceAsStream("/instanceidentifier/json/json_sub_container.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader
- .readFrom(null, null, null, this.mediaType, null, inputStream);
+ final NormalizedNodeContext returnValue = jsonBodyReader
+ .readFrom(null, null, null, mediaType, null, inputStream);
checkNormalizedNodeContext(returnValue);
checkExpectValueNormalizeNodeContext(dataSchemaNodeOnPath, returnValue, dataII);
}
final QName cont1QName = QName.create(dataSchemaNode.getQName(), "cont1");
final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName()).node(cont1QName);
final String uri = "instance-identifier-module:cont";
- mockBodyReader(uri, this.jsonBodyReader, true);
+ mockBodyReader(uri, jsonBodyReader, true);
final InputStream inputStream = TestJsonBodyReader.class
.getResourceAsStream("/instanceidentifier/json/json_sub_container.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader
- .readFrom(null, null, null, this.mediaType, null, inputStream);
+ final NormalizedNodeContext returnValue = jsonBodyReader
+ .readFrom(null, null, null, mediaType, null, inputStream);
checkNormalizedNodeContext(returnValue);
checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII);
}
public void moduleSubContainerAugmentDataPostTest() throws Exception {
final DataSchemaNode dataSchemaNode =
schemaContext.getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont"));
- final Module augmentModule = schemaContext.findModules(new URI("augment:module")).iterator().next();
+ final Module augmentModule = schemaContext.findModules(XMLNamespace.of("augment:module")).iterator().next();
final QName contAugmentQName = QName.create(augmentModule.getQNameModule(), "cont-augment");
- final YangInstanceIdentifier.AugmentationIdentifier augII = new YangInstanceIdentifier.AugmentationIdentifier(
- Sets.newHashSet(contAugmentQName));
+ final AugmentationIdentifier augII = new AugmentationIdentifier(Set.of(contAugmentQName));
final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName())
.node(augII).node(contAugmentQName);
final String uri = "instance-identifier-module:cont";
- mockBodyReader(uri, this.jsonBodyReader, true);
+ mockBodyReader(uri, jsonBodyReader, true);
final InputStream inputStream = TestXmlBodyReader.class
.getResourceAsStream("/instanceidentifier/json/json_augment_container.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader
- .readFrom(null, null, null, this.mediaType, null, inputStream);
+ final NormalizedNodeContext returnValue = jsonBodyReader
+ .readFrom(null, null, null, mediaType, null, inputStream);
checkNormalizedNodeContext(returnValue);
checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII);
}
public void moduleSubContainerChoiceAugmentDataPostTest() throws Exception {
final DataSchemaNode dataSchemaNode =
schemaContext.getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont"));
- final Module augmentModule = schemaContext.findModules(new URI("augment:module")).iterator().next();
+ final Module augmentModule = schemaContext.findModules(XMLNamespace.of("augment:module")).iterator().next();
final QName augmentChoice1QName = QName.create(augmentModule.getQNameModule(), "augment-choice1");
final QName augmentChoice2QName = QName.create(augmentChoice1QName, "augment-choice2");
final QName containerQName = QName.create(augmentChoice1QName, "case-choice-case-container1");
- final YangInstanceIdentifier.AugmentationIdentifier augChoice1II =
- new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(augmentChoice1QName));
- final YangInstanceIdentifier.AugmentationIdentifier augChoice2II =
- new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(augmentChoice2QName));
+ final AugmentationIdentifier augChoice1II = new AugmentationIdentifier(Set.of(augmentChoice1QName));
+ final AugmentationIdentifier augChoice2II = new AugmentationIdentifier(Set.of(augmentChoice2QName));
final YangInstanceIdentifier dataII = YangInstanceIdentifier.of(dataSchemaNode.getQName())
.node(augChoice1II).node(augmentChoice1QName).node(augChoice2II).node(augmentChoice2QName)
.node(containerQName);
final String uri = "instance-identifier-module:cont";
- mockBodyReader(uri, this.jsonBodyReader, true);
+ mockBodyReader(uri, jsonBodyReader, true);
final InputStream inputStream = TestXmlBodyReader.class
.getResourceAsStream("/instanceidentifier/json/json_augment_choice_container.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader
- .readFrom(null, null, null, this.mediaType, null, inputStream);
+ final NormalizedNodeContext returnValue = jsonBodyReader
+ .readFrom(null, null, null, mediaType, null, inputStream);
checkNormalizedNodeContext(returnValue);
checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII);
}
@Test
public void rpcModuleInputTest() throws Exception {
final String uri = "invoke-rpc-module:rpc-test";
- mockBodyReader(uri, this.jsonBodyReader, true);
- final InputStream inputStream = TestJsonBodyReader.class
- .getResourceAsStream("/invoke-rpc/json/rpc-input.json");
- final NormalizedNodeContext returnValue = this.jsonBodyReader.readFrom(null,
- null, null, this.mediaType, null, inputStream);
- checkNormalizedNodeContext(returnValue);
+ mockBodyReader(uri, jsonBodyReader, true);
+ final InputStream inputStream = TestJsonBodyReader.class.getResourceAsStream("/invoke-rpc/json/rpc-input.json");
+ final NormalizedNodeContext returnValue = jsonBodyReader.readFrom(null, null, null, mediaType, null,
+ inputStream);
+ checkNormalizedNodeContextRpc(returnValue);
final ContainerNode inputNode = (ContainerNode) returnValue.getData();
- final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(QName
- .create(inputNode.getNodeType(), "cont"));
- final Optional<DataContainerChild<? extends PathArgument, ?>> contDataNode = inputNode
- .getChild(yangCont.getLastPathArgument());
+ final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(
+ QName.create(inputNode.getIdentifier().getNodeType(), "cont"));
+ final Optional<DataContainerChild> contDataNode = inputNode.findChildByArg(yangCont.getLastPathArgument());
assertTrue(contDataNode.isPresent());
assertTrue(contDataNode.get() instanceof ContainerNode);
- final YangInstanceIdentifier yangleaf = YangInstanceIdentifier.of(QName
- .create(inputNode.getNodeType(), "lf"));
- final Optional<DataContainerChild<? extends PathArgument, ?>> leafDataNode = ((ContainerNode) contDataNode
- .get()).getChild(yangleaf.getLastPathArgument());
+ final YangInstanceIdentifier yangleaf = YangInstanceIdentifier.of(
+ QName.create(inputNode.getIdentifier().getNodeType(), "lf"));
+ final Optional<DataContainerChild> leafDataNode = ((ContainerNode) contDataNode.get())
+ .findChildByArg(yangleaf.getLastPathArgument());
assertTrue(leafDataNode.isPresent());
- assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().getValue()
- .toString()));
- }
-
- private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode,
- final NormalizedNodeContext nnContext) {
- checkExpectValueNormalizeNodeContext(dataSchemaNode, nnContext, null);
+ assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().body().toString()));
}
private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode,
Code Review / netconf.git / blobdiff