diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-08-09 13:45:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-09 13:45:54 +0200 |
commit | 3b2cfaff00bb6d7f2b49d06817699c84284dd2d6 (patch) | |
tree | 1f71c7efee4135fd66b684a0c2f640d9e68c52d7 /container-search | |
parent | 81e31d42ac94c8cd40c8086c59312c81c12897be (diff) | |
parent | 1a63cc82707744926c14d9ae7a934d411bcc8e3f (diff) |
Merge pull request #6520 from vespa-engine/henrhoi/post-api-requestmap-change
henrhoi/post-api-requestmap-change
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java | 3 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/handler/test/JSONSearchHandlerTestCase.java | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 5ac1f834031..c6d877c006a 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -579,8 +579,11 @@ public class SearchHandler extends LoggingRequestHandler { // Create request-mapping Map<String, String> requestMap = new HashMap<>(); + createRequestMapping(inspector, requestMap, ""); + requestMap.putAll(request.propertyMap()); + // Throws QueryException if query contains both yql- and select-parameter if (requestMap.containsKey("yql") && (requestMap.containsKey("select.where") || requestMap.containsKey("select.grouping")) ) { throw new QueryException("Illegal query: Query contains both yql- and select-parameter"); 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 e85a945cc67..5c2a749f858 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 @@ -11,10 +11,7 @@ import com.yahoo.io.IOUtils; import com.yahoo.net.HostName; import com.yahoo.search.handler.SearchHandler; import com.yahoo.search.searchchain.config.test.SearchChainConfigurerTestCase; -import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Inspector; -import com.yahoo.slime.ObjectTraverser; -import com.yahoo.slime.Type; import com.yahoo.vespa.config.SlimeUtils; import org.json.JSONObject; import org.junit.After; @@ -22,12 +19,11 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; + import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; -import java.util.stream.Collectors; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; import static org.hamcrest.CoreMatchers.containsString; @@ -373,6 +369,8 @@ public class JSONSearchHandlerTestCase { assertEquals(grouping.toString(), processedGrouping.toString()); } + + @Test public void testRequestMapping() throws Exception { JSONObject json = new JSONObject(); |