import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.ArrayList;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.mockito.Mockito;
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.TransactionChainHandler;
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
}
- public static SchemaContext loadSchemaContext(final String... yangPath)
+ public static EffectiveModelContext loadSchemaContext(final String... yangPath)
throws FileNotFoundException {
final List<File> files = new ArrayList<>();
for (final String path : yangPath) {
}
public static QName buildQName(final String name, final String uri, final String date, final String prefix) {
- try {
- final URI u = new URI(uri);
- return QName.create(u, Revision.ofNullable(date), name);
- } catch (final URISyntaxException e) {
- return null;
- }
+ return QName.create(XMLNamespace.of(uri), Revision.ofNullable(date), name);
}
public static QName buildQName(final String name, final String uri, final String date) {
}
public static String loadTextFile(final String filePath) throws IOException {
- final FileReader fileReader = new FileReader(filePath);
+ final FileReader fileReader = new FileReader(filePath, StandardCharsets.UTF_8);
final BufferedReader bufReader = new BufferedReader(fileReader);
String line = null;
return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate);
}
- public static NormalizedNode<?, ?> prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException {
+ public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException {
final String ietfInterfacesDate = "2013-07-04";
final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces";
final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
return mapEntryNode.build();
}
- public static SchemaContextHandler newSchemaContextHandler(final SchemaContext schemaContext) {
+ public static SchemaContextHandler newSchemaContextHandler(final EffectiveModelContext schemaContext) {
DOMDataBroker mockDataBroker = mock(DOMDataBroker.class);
- DOMTransactionChain mockChain = mock(DOMTransactionChain.class);
DOMDataTreeWriteTransaction mockTx = mock(DOMDataTreeWriteTransaction.class);
doReturn(CommitInfo.emptyFluentFuture()).when(mockTx).commit();
- doReturn(mockTx).when(mockChain).newWriteOnlyTransaction();
+ doReturn(mockTx).when(mockDataBroker).newWriteOnlyTransaction();
- doReturn(mockChain).when(mockDataBroker).createTransactionChain(any());
- SchemaContextHandler schemaContextHandler = SchemaContextHandler.newInstance(
- new TransactionChainHandler(mockDataBroker), Mockito.mock(DOMSchemaService.class));
- schemaContextHandler.onGlobalContextUpdated(schemaContext);
+ SchemaContextHandler schemaContextHandler = new SchemaContextHandler(mockDataBroker,
+ mock(DOMSchemaService.class));
+ schemaContextHandler.onModelContextUpdated(schemaContext);
return schemaContextHandler;
}
}