summaryrefslogtreecommitdiffstats
path: root/clustercontroller-apputil
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-03 15:56:55 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-03 17:24:54 +0100
commit741fad2983111ea1589ab008b60b97a12072556b (patch)
tree48ddda163c267e00a4d45141c6ccbb1dc28abd5f /clustercontroller-apputil
parent11c0391cef31f03a317e043e537cad86fca4393d (diff)
Remove use of apache commons libraries from cluster-controller modules
Diffstat (limited to 'clustercontroller-apputil')
-rw-r--r--clustercontroller-apputil/pom.xml5
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java4
2 files changed, 2 insertions, 7 deletions
diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml
index c8190c1a1ac..f0da97f5b94 100644
--- a/clustercontroller-apputil/pom.xml
+++ b/clustercontroller-apputil/pom.xml
@@ -35,11 +35,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
index 1f3956ef875..f518fe23fe6 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
@@ -9,9 +9,9 @@ import com.yahoo.text.Utf8;
import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpRequest;
import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpRequestHandler;
import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpResult;
-import org.apache.commons.io.IOUtils;
import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.logging.Logger;
@@ -95,7 +95,7 @@ public class JDiscHttpRequestHandler extends LoggingRequestHandler {
private void copyPostData(com.yahoo.container.jdisc.HttpRequest request, HttpRequest legacyRequest) {
try {
- legacyRequest.setPostContent(IOUtils.toString(request.getData(), "UTF-8"));
+ legacyRequest.setPostContent(new String(request.getData().readAllBytes(), StandardCharsets.UTF_8));
} catch (IOException e) {
throw new RuntimeException(e);
}