Apache Solr open-source search software
SOLR-17743: V2 API: use correct content-type (#3326)
David Smiley0bc55d5bc4c3
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.javaindex 8ba0c29fa6b..6ae00fb67e5 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/JacksonContentWriter.java@@ -22,15 +22,16 @@ import java.io.IOException;import java.io.OutputStream;import org.apache.solr.client.solrj.request.RequestWriter;+/**+ * @lucene.internal+ */public class JacksonContentWriter implements RequestWriter.ContentWriter {public static final ObjectMapper DEFAULT_MAPPER = new ObjectMapper();private final Object toWrite;- private final String contentType;- public JacksonContentWriter(String contentType, Object toWrite) {- this.contentType = contentType;+ public JacksonContentWriter(Object toWrite) {this.toWrite = toWrite;}@@ -41,6 +42,6 @@ public class JacksonContentWriter implements RequestWriter.ContentWriter {@Overridepublic String getContentType() {- return contentType;+ return "application/json; charset=UTF-8";}}diff --git a/solr/solrj/src/resources/java-template/api.mustache b/solr/solrj/src/resources/java-template/api.mustacheindex c374e2d879d..4b3163ffd87 100644--- a/solr/solrj/src/resources/java-template/api.mustache+++ b/solr/solrj/src/resources/java-template/api.mustache@@ -130,7 +130,6 @@ public class {{classname}} {{{#isBodyParam}}{{#vendorExtensions.x-genericEntity}}this.requestBody = requestBody;- addHeader("Content-type", "application/json");{{/vendorExtensions.x-genericEntity}}{{/isBodyParam}}{{^isBodyParam}}@@ -150,7 +149,6 @@ public class {{classname}} {this.requestBody = new {{{dataType}}}();{{/isArray}}{{/isMap}}- addHeader("Content-type", "application/json");{{/vendorExtensions.x-genericEntity}}{{/bodyParam}}}@@ -202,26 +200,24 @@ public class {{classname}} {@Override@SuppressWarnings("unchecked")- public RequestWriter.ContentWriter getContentWriter(String expectedType) {+ public RequestWriter.ContentWriter getContentWriter(String _expectedTypeIGNORE) {+ // v2 only supports JSON request bodies, so we ignore this type coming from the RequestWriter{{#vendorExtensions.x-genericEntity}}- if (requestBody instanceof String) {- return new RequestWriter.StringPayloadContentWriter((String) requestBody, expectedType);- } else if (requestBody instanceof InputStream) {- final var inputStream = (InputStream) requestBody;- return new RequestWriter.ContentWriter() {- @Override- public void write(OutputStream os) throws IOException {- inputStream.transferTo(os);- }+ return new RequestWriter.ContentWriter() {+ @Override+ public void write(OutputStream os) throws IOException {+ ((InputStream) requestBody).transferTo(os);+ }- @Override- public String getContentType() {- return expectedType;- }- };- }+ @Override+ public String getContentType() {+ return "application/octet-stream";+ }+ };+ {{/vendorExtensions.x-genericEntity}}+ {{^vendorExtensions.x-genericEntity}}+ return new JacksonContentWriter(requestBody);{{/vendorExtensions.x-genericEntity}}- return new JacksonContentWriter(expectedType, requestBody);}{{/bodyParam}}@@ -235,7 +231,7 @@ public class {{classname}} {final ModifiableSolrParams params = new ModifiableSolrParams();{{#queryParams}}if ({{paramName}} != null) {- {{#isArray}}{{paramName}}.stream().forEach(v -> params.add("{{baseName}}", v{{^items.isString}}.toString(){{/items.isString}}));{{/isArray}}+ {{#isArray}}{{paramName}}.forEach(v -> params.add("{{baseName}}", v{{^items.isString}}.toString(){{/items.isString}}));{{/isArray}}{{^isArray}}params.add("{{baseName}}", {{paramName}}{{^isString}}.toString(){{/isString}});{{/isArray}}}{{/queryParams}}