Use Files.readString()

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / client / stress / StressClient.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
index ab3dd0694b33c7d944d69955f8223d0fb4973f0e..0a61735b26263407b0029089dfb307c508d2487a 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
@@ -5,18 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.test.tool.client.stress;
 
 import ch.qos.logback.classic.Level;
 import com.google.common.base.Stopwatch;
-import com.google.common.io.Files;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -27,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
-import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.messages.NetconfMessage;
 import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.opendaylight.netconf.client.NetconfClientDispatcherImpl;
 import org.opendaylight.netconf.client.mdsal.NetconfDeviceCommunicator;
@@ -47,50 +45,39 @@ import org.xml.sax.SAXException;
 
 @SuppressFBWarnings("DM_EXIT")
 public final class StressClient {
-
     private static final Logger LOG = LoggerFactory.getLogger(StressClient.class);
 
     static final QName COMMIT_QNAME = QName.create(CommitInput.QNAME, "commit");
-    public static final NetconfMessage COMMIT_MSG;
-
-    static {
-        try {
-            COMMIT_MSG = new NetconfMessage(XmlUtil.readXmlToDocument(
-                "<rpc message-id=\"commit-batch\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                    + "    <commit/>\n"
-                    + "</rpc>"));
-        } catch (final SAXException | IOException e) {
-            throw new ExceptionInInitializerError(e);
-        }
-    }
+    public static final NetconfMessage COMMIT_MSG = new NetconfMessage(readString("""
+        <rpc message-id="commit-batch" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <commit/>
+        </rpc>"""));
 
     static final QName EDIT_QNAME = QName.create(EditConfigInput.QNAME, "edit-config");
-    static final org.w3c.dom.Document EDIT_CANDIDATE_BLUEPRINT;
-    static final org.w3c.dom.Document EDIT_RUNNING_BLUEPRINT;
-
-    static {
+    static final Document EDIT_CANDIDATE_BLUEPRINT = readString("""
+        <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <edit-config>
+                <target>
+                    <candidate/>
+                </target>
+                <default-operation>none</default-operation>
+                <config/>
+            </edit-config>
+        </rpc>""");
+    static final Document EDIT_RUNNING_BLUEPRINT  = readString("""
+        <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <edit-config>
+                <target>
+                    <running/>
+                </target>
+                <default-operation>none</default-operation>
+                <config/>
+            </edit-config>
+        </rpc>""");
+
+    private static Document readString(final String str) {
         try {
-            EDIT_CANDIDATE_BLUEPRINT = XmlUtil.readXmlToDocument(
-                    "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                            + "    <edit-config xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                            + "        <target>\n"
-                            + "            <candidate/>\n"
-                            + "        </target>\n"
-                            + "        <default-operation>none</default-operation>"
-                            + "        <config/>\n"
-                            + "    </edit-config>\n"
-                            + "</rpc>");
-
-            EDIT_RUNNING_BLUEPRINT = XmlUtil.readXmlToDocument(
-                    "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                            + "    <edit-config xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                            + "        <target>\n"
-                            + "            <running/>\n"
-                            + "        </target>\n"
-                            + "        <default-operation>none</default-operation>"
-                            + "        <config/>\n"
-                            + "    </edit-config>\n"
-                            + "</rpc>");
+            return XmlUtil.readXmlToDocument(str);
         } catch (SAXException | IOException e) {
             throw new ExceptionInInitializerError(e);
         }
@@ -137,7 +124,7 @@ public final class StressClient {
 
         final String editContentString;
         try {
-            editContentString = Files.asCharSource(params.editContent, StandardCharsets.UTF_8).read();
+            editContentString = Files.readString(params.editContent.toPath());
         } catch (final IOException e) {
             throw new IllegalArgumentException("Cannot read content of " + params.editContent, e);
         }