Use Java 11 HttpClient

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / client / http / perf / RequestMessageUtils.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
index 0b83cce0b518bf8bb432f25ca765431507eeb53e..2562e456982a742704b861ac523788d874dd5792 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/RequestMessageUtils.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.netconf.test.tool.client.http.perf;
 
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.Realm;
-import com.ning.http.client.Request;
+import java.net.URI;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.nio.charset.StandardCharsets;
 import org.opendaylight.netconf.test.tool.TestToolUtils;
 
 public final class RequestMessageUtils {
@@ -63,8 +64,8 @@ public final class RequestMessageUtils {
         return messageBuilder.toString();
     }
 
-    public static RestPerfClient.RequestData formPayload(Parameters parameters, String editContentString,
-                                                         int threadId, int requests) {
+    public static RestPerfClient.RequestData formPayload(final Parameters parameters, final String editContentString,
+                                                         final int threadId, final int requests) {
         final int devicePort = parameters.sameDevice
                 ? parameters.devicePortRangeStart : parameters.devicePortRangeStart + threadId;
         final StringBuilder destBuilder = new StringBuilder(DEST);
@@ -90,23 +91,11 @@ public final class RequestMessageUtils {
                 threadId, devicePort, requests);
     }
 
-    public static Request formRequest(AsyncHttpClient asyncHttpClient, String url, Parameters params, String msg) {
-        AsyncHttpClient.BoundRequestBuilder requestBuilder = asyncHttpClient.preparePost(url)
-                .addHeader("content-type", "application/json")
-                .addHeader("Accept", "application/xml")
-                .setBody(msg)
-                .setRequestTimeout(Integer.MAX_VALUE);
-
-        if (params.auth != null) {
-            requestBuilder.setRealm(new Realm.RealmBuilder()
-                    .setScheme(Realm.AuthScheme.BASIC)
-                    .setPrincipal(params.auth.get(0))
-                    .setPassword(params.auth.get(1))
-                    .setUsePreemptiveAuth(true)
-                    .build());
-        }
-        return requestBuilder.build();
+    public static HttpRequest formRequest(final String url, final String msg) {
+        return HttpRequest.newBuilder(URI.create(url))
+            .POST(BodyPublishers.ofString(msg, StandardCharsets.UTF_8))
+            .header("content-type", "application/json")
+            .header("Accept", "application/xml")
+            .build();
     }
-
-
 }