You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2018/05/12 08:22:43 UTC
lucene-solr:branch_7x: SOLR-12333: drop redundant lines in JSON
response writers
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 0734d4836 -> 29b323605
SOLR-12333: drop redundant lines in JSON response writers
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/29b32360
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/29b32360
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/29b32360
Branch: refs/heads/branch_7x
Commit: 29b323605130e3173deeab06661880ef9db874e8
Parents: 0734d48
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Sat May 12 11:22:43 2018 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Sat May 12 11:23:50 2018 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/response/GeoJSONResponseWriter.java | 11 +----------
.../org/apache/solr/response/JSONResponseWriter.java | 12 +-----------
3 files changed, 4 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29b32360/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3f8529d..8dc94e0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -207,6 +207,8 @@ Optimizations
* SOLR-12312: Replication IndexFetcher should cap its internal buffer size when the file being transferred is small.
(Jeff Miller, David Smiley)
+* SOLR-12333: Removed redundant lines for handling lists in JSON reponse writers. (David Smiley via Mikhail Khludnev)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29b32360/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java
index 012290e..90b20ff 100644
--- a/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/GeoJSONResponseWriter.java
@@ -163,16 +163,7 @@ class GeoJSONWriter extends JSONWriter {
indent();
writeKey(fname, true);
val = doc.getFieldValue(fname);
-
- // SolrDocument will now have multiValued fields represented as a Collection,
- // even if only a single value is returned for this document.
- // For SolrDocumentList, use writeVal instead of writeArray
- if (!(val instanceof SolrDocumentList) && val instanceof List) {
- // shortcut this common case instead of going through writeVal again
- writeArray(name,((Iterable)val).iterator());
- } else {
- writeVal(fname, val);
- }
+ writeVal(fname, val);
}
// GeoJSON does not really support nested FeatureCollections
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29b32360/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
index 5f6e2f2..409802c 100644
--- a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
@@ -29,7 +29,6 @@ import org.apache.solr.common.MapWriter;
import org.apache.solr.common.MapWriter.EntryWriter;
import org.apache.solr.common.PushWriter;
import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@@ -365,16 +364,7 @@ class JSONWriter extends TextResponseWriter {
indent();
writeKey(fname, true);
Object val = doc.getFieldValue(fname);
-
- // SolrDocument will now have multiValued fields represented as a Collection,
- // even if only a single value is returned for this document.
- // For SolrDocumentList, use writeVal instead of writeArray
- if (!(val instanceof SolrDocumentList) && val instanceof List) {
- // shortcut this common case instead of going through writeVal again
- writeArray(name,((Iterable)val).iterator());
- } else {
- writeVal(fname, val);
- }
+ writeVal(fname, val);
}
if(doc.hasChildDocuments()) {