*/
package org.opendaylight.controller.sal.restconf.impl.test;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertNotNull;
-import com.google.common.base.Preconditions;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
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 java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.xml.transform.OutputKeys;
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.DataContainerNodeAttrBuilder;
+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) throws FileNotFoundException {
+ public static EffectiveModelContext loadSchemaContext(final String... yangPath) throws FileNotFoundException {
final List<File> files = new ArrayList<>();
for (final String path : yangPath) {
final String pathToFile = TestUtils.class.getResource(path).getPath();
return YangParserTestUtils.parseYangFiles(files);
}
- public static Module findModule(final Set<Module> modules, final String moduleName) {
+ public static Module findModule(final Collection<? extends Module> modules, final String moduleName) {
for (final Module module : modules) {
if (module.getName().equals(moduleName)) {
return module;
}
public static String getDocumentInPrintableForm(final Document doc) {
- Preconditions.checkNotNull(doc);
try {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
final TransformerFactory tf = TransformerFactory.newInstance();
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,
+ transformer.transform(new DOMSource(requireNonNull(doc)), new StreamResult(new OutputStreamWriter(out,
StandardCharsets.UTF_8)));
final byte[] charData = out.toByteArray();
return new String(charData, StandardCharsets.UTF_8);
* module set has only one element then this element is returned.
*
*/
- public static Module resolveModule(final String searchedModuleName, final Set<Module> modules) {
+ public static Module resolveModule(final String searchedModuleName, final Collection<? extends Module> modules) {
assertNotNull("Modules can't be null.", modules);
if (searchedModuleName != null) {
for (final Module m : modules) {
}
public static QName buildQName(final String name, final String uri, final String date, final String prefix) {
- try {
- return QName.create(new URI(uri), 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;
predicate.put(QName.create(namespace, revision, key), keys.get(key));
}
- return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate);
+ return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate);
}
public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName,
final String namespace, final String revision, final String... keysAndValues) throws ParseException {
- Preconditions.checkArgument(keysAndValues.length % 2 == 0,
- "number of keys argument have to be divisible by 2 (map)");
+ checkArgument(keysAndValues.length % 2 == 0, "number of keys argument have to be divisible by 2 (map)");
final Map<QName, Object> predicate = new HashMap<>();
int index = 0;
predicate.put(QName.create(namespace, revision, keysAndValues[index++]), keysAndValues[index++]);
}
- return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate);
+ 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 DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
+ final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
ImmutableMapEntryNodeBuilder.create();
final Map<String, Object> predicates = new HashMap<>();