Apache Solr open-source search software
Remove MapWriter.append (#2919)
David Smileyd9461e21ff4a
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex 7dd30a14d24..e81a4a20c2b 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -1702,16 +1702,18 @@ public class ZkController implements Closeable {}if (core != null && core.getDirectoryFactory().isSharedStorage()) {if (core.getDirectoryFactory().isSharedStorage()) {+ // append additional entries to 'm'+ MapWriter original = m;m =- m.append(- props -> {- props.put(ZkStateReader.SHARED_STORAGE_PROP, "true");- props.put("dataDir", core.getDataDir());- UpdateLog ulog = core.getUpdateHandler().getUpdateLog();- if (ulog != null) {- props.put("ulogDir", ulog.getUlogDir());- }- });+ props -> {+ original.writeMap(props);+ props.put(ZkStateReader.SHARED_STORAGE_PROP, "true");+ props.put("dataDir", core.getDataDir());+ UpdateLog ulog = core.getUpdateHandler().getUpdateLog();+ if (ulog != null) {+ props.put("ulogDir", ulog.getUlogDir());+ }+ };}}} catch (SolrCoreInitializationException ex) {diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.javaindex 27039870857..0b748a0a25f 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java@@ -21,6 +21,7 @@ import java.util.List;import java.util.Map;import org.apache.solr.cloud.api.collections.CollectionHandlingUtils;import org.apache.solr.common.MapWriter;+import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionAdminParams;import org.apache.solr.common.params.CommonAdminParams;@@ -73,8 +74,9 @@ public class OverseerTaskQueueTest extends DistributedQueueTest {String watchID = tq.createResponseNode();String requestId2 = "baz";+ // append async then submittq.createRequestNode(- Utils.toJSON(props.append(ew -> ew.put(CommonAdminParams.ASYNC, requestId2))), watchID);+ Utils.toJSON(new ZkNodeProps(props).plus(CommonAdminParams.ASYNC, requestId2)), watchID);// Set a SolrResponse as the response node by removing the QueueEvent, as done in// OverseerTaskProcessordiff --git a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java b/solr/solrj/src/java/org/apache/solr/common/MapWriter.javaindex 0bbe2dc50a0..c103461d694 100644--- a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java+++ b/solr/solrj/src/java/org/apache/solr/common/MapWriter.java@@ -33,6 +33,9 @@ import org.noggit.JSONWriter;*/public interface MapWriter extends MapSerializable, NavigableObject, JSONWriter.Writable {+ /** Writes this object's entries out to {@code ew}. */+ void writeMap(EntryWriter ew) throws IOException;+default String jsonStr() {return Utils.toJSONString(this);}@@ -42,6 +45,7 @@ public interface MapWriter extends MapSerializable, NavigableObject, JSONWriter.return Utils.convertToMap(this, map);}+ /** For implementing Noggit {@link org.noggit.JSONWriter.Writable}. */@Overridedefault void write(JSONWriter writer) {writer.startObject();@@ -70,8 +74,7 @@ public interface MapWriter extends MapSerializable, NavigableObject, JSONWriter.writer.endObject();}- void writeMap(EntryWriter ew) throws IOException;-+ @Deprecateddefault MapWriter append(MapWriter another) {MapWriter m = this;return ew -> {