Remove use of deprecated Guava methods from testtool

Files.read() and Files.write() are scheduled for removal,
use their replacements.

Change-Id: Ic4b49611c6371c39a194b1f248b298e04e5d0c76
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
index cff30f51bb48348592f004d57315cf1bccf0d743..5d5d412b1dc92e596807a570f627436f1b51aaaa 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
@@ -199,7 +199,7 @@ public final class Main {
                             final File to = new File(
                                 configDir, String.format(SIM_DEVICE_CFG_PREFIX + "%d-%d.xml", batchStart, openDevice));
                             generatedConfigs.add(to);
-                            Files.write(builder.toString(), to, StandardCharsets.UTF_8);
+                            Files.asCharSink(to, StandardCharsets.UTF_8).write(builder.toString());
                             connectorCount = 0;
                             builder = new StringBuilder();
                             builder.append(before);
@@ -214,7 +214,7 @@ public final class Main {
                     final File to = new File(configDir, String.format(
                             SIM_DEVICE_CFG_PREFIX + "%d-%d.xml", batchStart, openDevices.get(openDevices.size() - 1)));
                     generatedConfigs.add(to);
-                    Files.write(builder.toString(), to, StandardCharsets.UTF_8);
+                    Files.asCharSink(to, StandardCharsets.UTF_8).write(builder.toString());
                 }
 
                 LOG.info("Config files generated in {}", configDir);

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
index 7d4d7e4cf19e143b755cf8e5f06ab736ed4f5ed6..4d262808d159a07aa1b2dd1885295e9a31ff380a 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
@@ -64,7 +64,8 @@ public final class ScaleUtil {
 
         while (true) {
             root.warn("Starting scale test with {} devices", params.deviceCount);
-            final ScheduledFuture timeoutGuardFuture = EXECUTOR.schedule(new TimeoutGuard(), TIMEOUT, TimeUnit.MINUTES);
+            final ScheduledFuture<?> timeoutGuardFuture = EXECUTOR.schedule(new TimeoutGuard(), TIMEOUT,
+                TimeUnit.MINUTES);
             final Configuration configuration = new ConfigurationBuilder().from(params).build();
             final NetconfDeviceSimulator netconfDeviceSimulator = new NetconfDeviceSimulator(configuration);
             try {
@@ -199,8 +200,8 @@ public final class ScaleUtil {
     private static class ScaleVerifyCallable implements Callable<Void> {
         private static final Logger LOG = LoggerFactory.getLogger(ScaleVerifyCallable.class);
 
-        private static final String RESTCONF_URL
-                = "http://127.0.0.1:8181/restconf/operational/network-topology:network-topology/topology/topology-netconf/";
+        private static final String RESTCONF_URL = "http://127.0.0.1:8181/restconf/operational/"
+                + "network-topology:network-topology/topology/topology-netconf/";
         private static final Pattern PATTERN = Pattern.compile("connected");
 
         private final AsyncHttpClient asyncHttpClient = new AsyncHttpClient(new Builder()

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
index 368c186fe5221476aaf23a1c519590f9f868dabf..5d8b0bf3abb1830c0d1051ab0dd926bdcd9777be 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
@@ -348,7 +348,7 @@ public class TesttoolParameters {
         final String editContentString;
         try {
             if (stream == null) {
-                editContentString = Files.toString(editContent, StandardCharsets.UTF_8);
+                editContentString = Files.asCharSource(editContent, StandardCharsets.UTF_8).read();
             } else {
                 editContentString = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
             }

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RestPerfClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RestPerfClient.java
index 55580f6bed01261615629ac42a3edb3cfae716e6..013f8896b63abfd17bd80ef661ea4e1421ee5d8e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RestPerfClient.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RestPerfClient.java
@@ -51,7 +51,7 @@ public final class RestPerfClient {
         private final String destination;
         private final String payload;
 
-        DestToPayload(String destination, String payload) {
+        DestToPayload(final String destination, final String payload) {
             this.destination = destination;
             this.payload = payload;
         }
@@ -69,7 +69,7 @@ public final class RestPerfClient {
 
     }
 
-    public static void main(String[] args) {
+    public static void main(final String[] args) {
 
         Parameters parameters = parseArgs(args, Parameters.getParser());
         parameters.validate();
@@ -81,7 +81,7 @@ public final class RestPerfClient {
 
         final String editContentString;
         try {
-            editContentString = Files.toString(parameters.editContent, StandardCharsets.UTF_8);
+            editContentString = Files.asCharSource(parameters.editContent, StandardCharsets.UTF_8).read();
         } catch (final IOException e) {
             throw new IllegalArgumentException("Cannot read content of " + parameters.editContent, e);
         }

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 6b51558546d1354363c7d2ad12e4a4771e5dd37d..9e2d9c419325d0f123f7885cecae8a54551b7886 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
@@ -137,7 +137,7 @@ public final class StressClient {
 
         final String editContentString;
         try {
-            editContentString = Files.toString(params.editContent, StandardCharsets.UTF_8);
+            editContentString = Files.asCharSource(params.editContent, StandardCharsets.UTF_8).read();
         } catch (final IOException e) {
             throw new IllegalArgumentException("Cannot read content of " + params.editContent, e);
         }