SOLR-16933: Include full query response in API tool #1863
Conversation
| new JSONWriter(arr, 2).write(response.asMap()); | ||
| echo(arr.toString()); | ||
| } | ||
| protected String callGet(String url) throws Exception { |
There was a problem hiding this comment.
I suspect that all the logic here in callGet is duplicated in other places around our codebase..... I wish we had a single place to do these types of calls that we could reuse. Maybe for another day. ;-).
There was a problem hiding this comment.
Probably, but also probably for another day 🙂
| assertFindInJson(response, "\"docs\":[{"); | ||
| } | ||
|
|
||
| private void assertFindInJson(String json, String find) { |
There was a problem hiding this comment.
sigh... Don't we have this elsewhere defined ;-).
There was a problem hiding this comment.
It's basically an assertStringContains, which I can't find elsewhere...
| @@ -42,4 +58,48 @@ public void testParsingGetUrl() throws URISyntaxException { | |||
| assertEquals("select id from COLL_NAME limit 10", params.get("stmt")); | |||
| } | |||
| } | |||
|
|
|||
| @Test | |||
| public void testQueryResponse() throws Exception { | |||
There was a problem hiding this comment.
Nice to see more test coverage!
|
Unfortunately the Http2SolrClient does not play nicely with the NoOpResponseParser for errors, so I switched to using the JSONMapResponseParser. Though I did make the error handling a little better for NoOpResponseParser usage... Will issue another commit. |
(cherry picked from commit f5b0d22)
https://issues.apache.org/jira/browse/SOLR-16933
So the initial issue here is that the SolrDocumentList serialization used to only be really handled by the
SolrRequestWriter(solr core only), and if you tried to use a general JSON serializer (JSONWriter), it would try to serialize theSolrDocumentListas an ArrayList of SolrDocuments, because it extendsArrayList<SolrDocument>. This meant that thenumFound,numFoundExact,start, etc. fields were lost.Two solutions here:
SolrDocumentListnow extendsMapWriter, so that it will serialize correctly even when used with a "dumb" serializer.ApiTool,CreateTool,DeleteTool), should use theNoOpResponseParser("json"), and just plainly echo the output of the API, without de-serializing and re-serializing.In the end # 2 is what actually fixes this, but # 1 is a good thing to include so that in the future people don't hit snags trying to serialize a Solr Query response with
JSONWriter.(The indentation of JSONWriter with the SolrDocumentList is not ideal, but it works. And it doesn't really matter as we aren't reserializing anymore.)