Removed wildcard imports, unnused dependency and a few other changes

2 files changed, 13 insertions, 16 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
index 8cef25c21f8..e8d252f8ca8 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java
@@ -12,7 +12,6 @@ import com.yahoo.search.handler.SearchHandler;
 import com.yahoo.search.searchchain.config.test.SearchChainConfigurerTestCase;
 import com.yahoo.slime.Inspector;
 import com.yahoo.slime.ObjectTraverser;
-import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 import org.json.JSONObject;
 import org.junit.After;
@@ -20,9 +19,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
 
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -332,25 +332,25 @@ public class JSONSearchHandlerTestCase {
 
     private void createRequestMapping(Inspector inspector, Map<String, String> map, String parent){
         inspector.traverse((ObjectTraverser) (key, value) -> {
-            String delimiter = parent.equals("") ? "" : ".";
+            String qualifiedKey = parent + key;
             switch (value.type()) {
                 case BOOL:
-                    map.put(parent + delimiter + key, Boolean.toString(value.asBool()));
+                    map.put(qualifiedKey, Boolean.toString(value.asBool()));
                     break;
                 case DOUBLE:
-                    map.put(parent + delimiter + key, Double.toString(value.asDouble()));
+                    map.put(qualifiedKey, Double.toString(value.asDouble()));
                     break;
                 case LONG:
-                    map.put(parent + delimiter + key, Long.toString(value.asLong()));
+                    map.put(qualifiedKey, Long.toString(value.asLong()));
                     break;
                 case STRING:
-                    map.put(parent + delimiter + key, value.asString());
+                    map.put(qualifiedKey , value.asString());
                     break;
                 case OBJECT:
                     if (key.equals("grouping")) {
                         createRequestMapping(value, map, "");
                     } else {
-                        createRequestMapping(value, map, String.join(delimiter, parent, key));
+                        createRequestMapping(value, map, qualifiedKey+".");
                         break;
                     }
             }
@@ -449,6 +449,7 @@ public class JSONSearchHandlerTestCase {
         json.put("metrics.ignore", false);
 
 
+
         // Create mapping
         Inspector inspector = SlimeUtils.jsonToSlime(json.toString().getBytes("utf-8")).get();
         Map<String, String> map = new HashMap<>();
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
index 30a5d637767..6dcb34ec3e9 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java
@@ -3,16 +3,13 @@ package com.yahoo.search.handler.test;
 
 import com.yahoo.container.Container;
 import com.yahoo.container.core.config.testutil.HandlersConfigurerTestWrapper;
-import com.yahoo.container.jdisc.AsyncHttpResponse;
 import com.yahoo.container.jdisc.HttpRequest;
-
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.RequestHandlerTestDriver;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.io.IOUtils;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.net.HostName;
-import com.yahoo.processing.handler.ResponseStatus;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -23,7 +20,6 @@ import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.config.test.SearchChainConfigurerTestCase;
-import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -31,9 +27,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.URI;
-import java.util.*;
 import java.util.concurrent.Executors;
 
 import static org.hamcrest.CoreMatchers.containsString;