Use SlimeUtils in more places

2 files changed, 6 insertions, 10 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);
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java b/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java
index 870afaa4f99..3b8b2ffcb28 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/TestConfig.java
@@ -6,9 +6,8 @@ import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
 import com.yahoo.slime.ObjectTraverser;
-import com.yahoo.slime.Slime;
+import com.yahoo.slime.SlimeUtils;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -56,7 +55,7 @@ public class TestConfig {
      * is returned, using {@link #fromEndpointsOnly}. Otherwise, all config attributes are parsed.
      */
     public static TestConfig fromJson(byte[] jsonBytes) {
-        Inspector config = new JsonDecoder().decode(new Slime(), jsonBytes).get();
+        Inspector config = SlimeUtils.jsonToSlime(jsonBytes).get();
         if (config.field("localEndpoints").valid())
             return TestConfig.fromEndpointsOnly(toClusterMap(config.field("localEndpoints")));