Use SlimeUtils in more places

4 files changed, 23 insertions, 30 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
index 4da27e8c346..cea40da52b9 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigVerification.java
@@ -3,10 +3,8 @@ package com.yahoo.vespa.config;
 
 import ai.vespa.util.http.VespaHttpClientBuilder;
 import com.yahoo.slime.ArrayTraverser;
-import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
 import com.yahoo.slime.Slime;
-import com.yahoo.text.Utf8;
+import com.yahoo.slime.SlimeUtils;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -49,14 +47,9 @@ public class ConfigVerification {
 
         Map<String, Stack<String>> recurseMappings = new LinkedHashMap<>();
         for (Map.Entry<String, String> entry : outputs.entrySet()) {
-            Slime slime = new JsonDecoder().decode(new Slime(), Utf8.toBytes(entry.getValue()));
+            Slime slime = SlimeUtils.jsonToSlime(entry.getValue());
             final List<String> list = new ArrayList<>();
-            slime.get().field("configs").traverse(new ArrayTraverser() {
-                @Override
-                public void entry(int idx, Inspector inspector) {
-                    list.add(inspector.asString());
-                }
-            });
+            slime.get().field("configs").traverse((ArrayTraverser) (idx, inspector) -> list.add(inspector.asString()));
             Stack<String> stack = new Stack<>();
             Collections.sort(list);
             stack.addAll(list);
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
index a9b46f25751..447bc63eeb6 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeRequestData.java
@@ -4,9 +4,8 @@ package com.yahoo.vespa.config.protocol;
 import com.yahoo.jrt.Request;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
 import com.yahoo.slime.Slime;
-import com.yahoo.text.Utf8;
+import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.config.ConfigKey;
 
 import java.util.Optional;
@@ -47,7 +46,7 @@ class SlimeRequestData {
 
     private Slime getData() {
         if (data == null) {
-            data = new JsonDecoder().decode(new Slime(), Utf8.toBytes(request.parameters().get(0).asString()));
+            data = SlimeUtils.jsonToSlime(request.parameters().get(0).asString());
         }
         return data;
     }
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeResponseData.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeResponseData.java
index 40414c24c96..ba1e7a8c72e 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeResponseData.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeResponseData.java
@@ -3,9 +3,8 @@ package com.yahoo.vespa.config.protocol;
 
 import com.yahoo.jrt.Request;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
 import com.yahoo.slime.Slime;
-import com.yahoo.text.Utf8;
+import com.yahoo.slime.SlimeUtils;
 
 /**
  * Contains response data for a slime response and methods for decoding the response data that
@@ -37,7 +36,7 @@ class SlimeResponseData {
     private Slime getData() {
         if (request.returnValues().size() > 0) {
             if (data == null) {
-                data = new JsonDecoder().decode(new Slime(), Utf8.toBytes(request.returnValues().get(0).asString()));
+                data = SlimeUtils.jsonToSlime(request.returnValues().get(0).asString());
             }
             return data;
         } else {
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
index 4d1ba2f8793..d4f8b771880 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
@@ -6,16 +6,19 @@ import com.yahoo.config.subscription.ConfigSourceSet;
 import com.yahoo.config.subscription.ConfigSubscriber;
 import com.yahoo.config.subscription.impl.GenericConfigSubscriber;
 import com.yahoo.config.subscription.impl.JRTConfigRequester;
+import com.yahoo.config.subscription.impl.JRTConfigSubscription;
 import com.yahoo.config.subscription.impl.MockConnection;
 import com.yahoo.foo.SimpletypesConfig;
-import com.yahoo.config.subscription.impl.JRTConfigSubscription;
 import com.yahoo.jrt.Request;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.JsonDecoder;
 import com.yahoo.slime.Slime;
+import com.yahoo.slime.SlimeUtils;
 import com.yahoo.test.ManualClock;
-import com.yahoo.text.Utf8;
-import com.yahoo.vespa.config.*;
+import com.yahoo.vespa.config.ConfigKey;
+import com.yahoo.vespa.config.ConfigPayload;
+import com.yahoo.vespa.config.ErrorCode;
+import com.yahoo.vespa.config.RawConfig;
+import com.yahoo.vespa.config.TimingValues;
 import com.yahoo.vespa.config.util.ConfigUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,15 +39,15 @@ import static org.junit.Assert.assertTrue;
 public class JRTConfigRequestV3Test {
 
     private final Optional<VespaVersion> vespaVersion = Optional.of(VespaVersion.fromString("5.38.24"));
-    private String defName = "mydef";
-    private String defNamespace = "my.name.space";
-    private String hostname = "myhost";
-    private String configId = "config/id";
-    private String defMd5 = "595f44fec1e92a71d3e9e77456ba80d1";
-    private long currentGeneration = 3;
-    private long timeout = 5000;
+    private final String defName = "mydef";
+    private final String defNamespace = "my.name.space";
+    private final String hostname = "myhost";
+    private final String configId = "config/id";
+    private final String defMd5 = "595f44fec1e92a71d3e9e77456ba80d1";
+    private final long currentGeneration = 3;
+    private final long timeout = 5000;
     private Trace trace ;
-    private String configMd5 = ConfigUtils.getMd5(createPayload().getData());
+    private final String configMd5 = ConfigUtils.getMd5(createPayload().getData());
     private JRTClientConfigRequest clientReq;
     private JRTServerConfigRequest serverReq;
 
@@ -118,8 +121,7 @@ public class JRTConfigRequestV3Test {
     public void error_response_adds_common_elements() {
         serverReq.addErrorResponse(ErrorCode.APPLICATION_NOT_LOADED, ErrorCode.getName(ErrorCode.APPLICATION_NOT_LOADED));
         assertThat(serverReq.getRequest().returnValues().size(), is(1));
-        Slime data = new JsonDecoder().decode(new Slime(), Utf8.toBytes(serverReq.getRequest().returnValues().get(0).asString()));
-        Inspector response = data.get();
+        Inspector response = SlimeUtils.jsonToSlime(serverReq.getRequest().returnValues().get(0).asString()).get();
         assertThat(response.field(SlimeResponseData.RESPONSE_DEF_NAME).asString(), is(defName));
         assertThat(response.field(SlimeResponseData.RESPONSE_DEF_NAMESPACE).asString(), is(defNamespace));
         assertThat(response.field(SlimeResponseData.RESPONSE_DEF_MD5).asString(), is(defMd5));