Bump versions to 4.0.0-SNAPSHOT

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / TestUtils.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
index 0e0c3f88f06ecb1375a6a0b10fdf2ea252200fb4..d96cc770d5d7f2a05a48237c75a175b56f8e00ea 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
@@ -7,9 +7,10 @@
  */
 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;
@@ -18,8 +19,6 @@ import java.io.FileReader;
 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;
@@ -38,11 +37,12 @@ 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.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;
@@ -102,7 +102,6 @@ public final class TestUtils {
     }
 
     public static String getDocumentInPrintableForm(final Document doc) {
-        Preconditions.checkNotNull(doc);
         try {
             final ByteArrayOutputStream out = new ByteArrayOutputStream();
             final TransformerFactory tf = TransformerFactory.newInstance();
@@ -113,7 +112,7 @@ public final class TestUtils {
             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);
@@ -160,11 +159,7 @@ public final class TestUtils {
     }
 
     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) {
@@ -176,7 +171,7 @@ public final class TestUtils {
     }
 
     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;
@@ -222,8 +217,7 @@ public final class TestUtils {
 
     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;
@@ -234,7 +228,7 @@ public final class TestUtils {
         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 =