1 files changed, 4 insertions, 7 deletions

diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index ee30f6fd471..42d1b802094 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -12,14 +12,13 @@ import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
-import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.ObjectTraverser;
 import com.yahoo.slime.Slime;
+import com.yahoo.slime.SlimeUtils;
+import com.yahoo.text.Utf8;
 
 import javax.net.ssl.SSLContext;
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -381,14 +380,12 @@ public abstract class ControllerHttpClient {
     }
 
     private static Slime toSlime(byte[] data) {
-        return new JsonDecoder().decode(new Slime(), data);
+        return SlimeUtils.jsonToSlime(data);
     }
 
     private static String toJson(Slime slime) {
         try {
-            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-            new JsonFormat(true).encode(buffer, slime);
-            return buffer.toString(UTF_8);
+            return Utf8.toString(SlimeUtils.toJsonBytes(slime));
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);