Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15944: Tagger: JSON response should use map not array (#552)

David Smileybf55ef080160
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f1170f66f4b..befdead1bb5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -555,6 +555,9 @@ Bug Fixes
* SOLR-15919: Replace File with Path for many ZK operations (Mike Drob)
+* SOLR-15944: The Tagger's JSON response format now always uses an object/map to represent each tag instead of an
+ array, which didn't make sense. (David Smiley)
+
================== 8.11.2 ==================
Bug Fixes
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
index 1bb0cc0b528..e42865b66f1 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java
@@ -57,7 +57,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
-import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -161,7 +161,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {
final SolrIndexSearcher searcher = req.getSearcher();
final FixedBitSet matchDocIdsBS = new FixedBitSet(searcher.maxDoc());
- final List<NamedList<?>> tags = new ArrayList<>(2000);
+ final List<SimpleOrderedMap<?>> tags = new ArrayList<>(2000);
try {
Analyzer analyzer = req.getSchema().getField(indexedField).getType().getQueryAnalyzer();
@@ -185,7 +185,7 @@ public class TaggerRequestHandler extends RequestHandlerBase {
endOffset = offsetPair[1];
}
- NamedList<Object> tag = new NamedList<>();
+ SimpleOrderedMap<Object> tag = new SimpleOrderedMap<>();
tag.add("startOffset", startOffset);
tag.add("endOffset", endOffset);
if (addMatchText)
diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
index a9c9cd28e0e..b81e46c3531 100644
--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc
@@ -98,6 +98,8 @@ All the usages are replaced by BaseHttpSolrClient.RemoteSolrException and BaseHt
* SOLR-14142: Jetty low level request-logging in NCSA format is now enabled by default, with a retention of 3 days worth of logs.
This may require some more disk space for logs than was the case in 8.x. See Reference Guide chapter "Configuring Logging" for how to change this.
+* SOLR-15944: The Tagger's JSON response format now always uses an object/map to represent each tag instead of an array.
+
== New Features & Enhancements
* Replica placement plugins
diff --git a/solr/solr-ref-guide/src/tagger-handler.adoc b/solr/solr-ref-guide/src/tagger-handler.adoc
index ca9d4a22c19..4026b6898e6 100644
--- a/solr/solr-ref-guide/src/tagger-handler.adoc
+++ b/solr/solr-ref-guide/src/tagger-handler.adoc
@@ -322,10 +322,10 @@ The response should be this (the QTime may vary):
"status":0,
"QTime":1},
"tagsCount":1,
- "tags":[[
- "startOffset",6,
- "endOffset",19,
- "ids",["5128581"]]],
+ "tags":[{
+ "startOffset":6,
+ "endOffset":19,
+ "ids":["5128581"]}],
"response":{"numFound":1,"start":0,"docs":[
{
"id":"5128581",