import java.io.OutputStreamWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+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.DataContainerNodeAttrBuilder;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
private static final Logger LOG = LoggerFactory.getLogger(TestUtils.class);
- private final static YangContextParser PARSER = new YangParserImpl();
+ public static SchemaContext loadSchemaContext(final String... yangPath)
+ throws FileNotFoundException, ReactorException {
+ final List<InputStream> files = new ArrayList<>();
+ for (final String path : yangPath) {
+ final String pathToFile = TestUtils.class.getResource(path).getPath();
+ final File testDir = new File(pathToFile);
+ final String[] fileList = testDir.list();
+ if (fileList == null) {
+ throw new FileNotFoundException(pathToFile);
+ }
- private static Set<Module> loadModules(final String resourceDirectory) throws FileNotFoundException {
- final File testDir = new File(resourceDirectory);
- final String[] fileList = testDir.list();
- final List<File> testFiles = new ArrayList<File>();
- if (fileList == null) {
- throw new FileNotFoundException(resourceDirectory);
- }
- for (int i = 0; i < fileList.length; i++) {
- final String fileName = fileList[i];
- if (new File(testDir, fileName).isDirectory() == false) {
- testFiles.add(new File(testDir, fileName));
+ for (final String fileName : fileList) {
+ final File file = new File(testDir, fileName);
+ if (file.isDirectory() == false) {
+ files.add(new NamedFileInputStream(file, file.getPath()));
+ }
}
}
- return PARSER.parseYangModels(testFiles);
- }
-
- public static Set<Module> loadModulesFrom(final String yangPath) {
- try {
- return TestUtils.loadModules(TestUtils.class.getResource(yangPath).getPath());
- } catch (final FileNotFoundException e) {
- LOG.error("Yang files at path: " + yangPath + " weren't loaded.");
- }
-
- return null;
- }
-
- public static SchemaContext loadSchemaContext(final Set<Module> modules) {
- return PARSER.resolveSchemaContext(modules);
- }
-
- public static SchemaContext loadSchemaContext(final String resourceDirectory) throws FileNotFoundException {
- return PARSER.resolveSchemaContext(loadModulesFrom(resourceDirectory));
+ return YangParserTestUtils.parseYangStreams(files);
}
public static Module findModule(final Set<Module> modules, final String moduleName) {
public static Document loadDocumentFrom(final InputStream inputStream) {
try {
- final DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
- final DocumentBuilder docBuilder = dbfac.newDocumentBuilder();
- return docBuilder.parse(inputStream);
- } catch (SAXException | IOException | ParserConfigurationException e) {
+ return UntrustedXML.newDocumentBuilder().parse(inputStream);
+ } catch (SAXException | IOException e) {
LOG.error("Error during loading Document from XML", e);
return null;
}
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- transformer.transform(new DOMSource(doc), new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+ transformer.transform(new DOMSource(doc), new StreamResult(new OutputStreamWriter(out,
+ StandardCharsets.UTF_8)));
final byte[] charData = out.toByteArray();
- return new String(charData, "UTF-8");
- } catch (IOException | TransformerException e) {
+ return new String(charData, StandardCharsets.UTF_8);
+ } catch (final TransformerException e) {
final String msg = "Error during transformation of Document into String";
LOG.error(msg, e);
return msg;
return matcher.matches();
}
- public static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName, final String namespace,
+ public static NodeIdentifier getNodeIdentifier(final String localName, final String namespace,
final String revision) throws ParseException {
- return new YangInstanceIdentifier.NodeIdentifier(QName.create(namespace, revision, localName));
+ return new NodeIdentifier(QName.create(namespace, revision, localName));
}
- public static YangInstanceIdentifier.NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName,
+ public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName,
final String namespace, final String revision, final Map<String, Object> keys) throws ParseException {
final Map<QName, Object> predicate = new HashMap<>();
for (final String key : keys.keySet()) {
predicate.put(QName.create(namespace, revision, key), keys.get(key));
}
- return new YangInstanceIdentifier.NodeIdentifierWithPredicates(
-
- QName.create(namespace, revision, localName), predicate);
+ return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate);
}
- public static YangInstanceIdentifier.NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName,
+ public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName,
final String namespace, final String revision, final String... keysAndValues) throws ParseException {
- if (keysAndValues.length % 2 != 0) {
- new IllegalArgumentException("number of keys argument have to be divisible by 2 (map)");
- }
+ Preconditions.checkArgument((keysAndValues.length % 2) == 0,
+ "number of keys argument have to be divisible by 2 (map)");
final Map<QName, Object> predicate = new HashMap<>();
- int i = 0;
- while (i < keysAndValues.length) {
- predicate.put(QName.create(namespace, revision, keysAndValues[i++]), keysAndValues[i++]);
+ int index = 0;
+ while (index < keysAndValues.length) {
+ predicate.put(QName.create(namespace, revision, keysAndValues[index++]), keysAndValues[index++]);
}
- return new YangInstanceIdentifier.NodeIdentifierWithPredicates(QName.create(namespace, revision, localName),
- predicate);
+ return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate);
}
static NormalizedNode<?,?> prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException {
final String ietfInterfacesDate = "2013-07-04";
final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces";
- final DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode = ImmutableMapEntryNodeBuilder.create();
+ final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
+ ImmutableMapEntryNodeBuilder.create();
final Map<String, Object> predicates = new HashMap<>();
predicates.put("name", "eth0");
Code Review / netconf.git / blobdiff