lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject [6/6] lucene-solr:branch_7_0: SOLR-10494: Make default response format JSON (wt=json), and also indent text responses formats (indent=on) by default
Date Mon, 24 Jul 2017 17:27:46 GMT
SOLR-10494: Make default response format JSON (wt=json), and also indent text responses formats (indent=on) by default

(cherry picked from commit 6a59253ec34e9e08d6b2306b51c81199d3f3d828)

Conflicts:
	solr/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/477c2188
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/477c2188
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/477c2188

Branch: refs/heads/branch_7_0
Commit: 477c2188ef9f2c82902cf4ed1ccb91bfc6ab5ebf
Parents: 13449c7
Author: Chris Hostetter <hossman@apache.org>
Authored: Mon Jul 24 08:42:02 2017 -0700
Committer: Chris Hostetter <hossman@apache.org>
Committed: Mon Jul 24 09:35:03 2017 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   8 +
 .../dataimport/TestHierarchicalDocBuilder.java  |   6 +-
 solr/contrib/ltr/example/README.md              |   2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   2 +-
 .../solr/response/TextResponseWriter.java       |   2 +-
 .../solr/servlet/DirectSolrConnection.java      |   1 +
 .../configsets/_default/conf/solrconfig.xml     |   7 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java |   9 +-
 .../solr/cloud/BasicDistributedZk2Test.java     |   1 +
 .../apache/solr/cloud/SolrCloudExampleTest.java |   2 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   6 +-
 .../org/apache/solr/cloud/TestCryptoKeys.java   |  28 ++--
 .../solr/core/TestConfigSetImmutable.java       |   4 +-
 .../org/apache/solr/core/TestCustomStream.java  |   4 +-
 .../apache/solr/core/TestDynamicLoading.java    |  38 ++---
 .../apache/solr/core/TestSolrConfigHandler.java | 160 +++++++++----------
 .../apache/solr/handler/CheckBackupStatus.java  |   2 +-
 .../apache/solr/handler/TestConfigReload.java   |   2 +-
 .../handler/TestReplicationHandlerBackup.java   |   4 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |  44 ++---
 .../apache/solr/handler/TestRestoreCore.java    |   2 +-
 .../org/apache/solr/handler/TestSQLHandler.java |   5 +-
 .../handler/TestSolrConfigHandlerCloud.java     |  40 ++---
 .../TestSolrConfigHandlerConcurrent.java        |   4 +-
 .../apache/solr/response/JSONWriterTest.java    |   4 +-
 .../solr/response/TestRawResponseWriter.java    |  11 +-
 .../solr/rest/schema/TestBulkSchemaAPI.java     |  58 +++----
 .../schema/TestCopyFieldCollectionResource.java |  12 +-
 .../schema/TestFieldCollectionResource.java     |  24 +--
 .../solr/rest/schema/TestFieldTypeResource.java |  14 +-
 .../rest/schema/TestSchemaNameResource.java     |   2 +-
 .../solr/rest/schema/TestSchemaResource.java    |   2 +-
 .../schema/TestSchemaSimilarityResource.java    |   2 +-
 .../solr/schema/TestBulkSchemaConcurrent.java   |   6 +-
 .../solr/schema/TestUseDocValuesAsStored2.java  |   8 +-
 .../solr/search/TestHashQParserPlugin.java      |   7 +
 .../solr/security/BasicAuthIntegrationTest.java |   2 +-
 .../solr/servlet/HttpSolrCallGetCoreTest.java   |   2 +-
 .../processor/TestNamedUpdateProcessors.java    |   8 +-
 .../example-DIH/solr/atom/conf/solrconfig.xml   |   3 +
 .../example-DIH/solr/db/conf/solrconfig.xml     |   3 +
 .../example-DIH/solr/mail/conf/solrconfig.xml   |   3 +
 .../example-DIH/solr/solr/conf/solrconfig.xml   |   3 +
 .../example-DIH/solr/tika/conf/solrconfig.xml   |   3 +
 solr/example/exampledocs/test_utf8.sh           |   4 +-
 solr/example/files/conf/solrconfig.xml          |   7 +-
 .../configsets/_default/conf/solrconfig.xml     |   7 +-
 .../conf/solrconfig.xml                         |   6 +
 solr/site/quickstart.mdtext                     |  51 +++---
 solr/solr-ref-guide/src/collections-api.adoc    |   6 +-
 .../src/common-query-parameters.adoc            |   2 +
 solr/solr-ref-guide/src/config-api.adoc         |  12 +-
 solr/solr-ref-guide/src/configsets-api.adoc     |   2 +-
 .../solr-ref-guide/src/configuring-logging.adoc |   2 +-
 .../src/cross-data-center-replication-cdcr.adoc |   2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc       |   4 +-
 solr/solr-ref-guide/src/faceting.adoc           |   5 +-
 solr/solr-ref-guide/src/highlighting.adoc       |   2 +-
 .../src/mbean-request-handler.adoc              |   6 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc  |   6 +-
 solr/solr-ref-guide/src/ping.adoc               |   2 +-
 solr/solr-ref-guide/src/query-screen.adoc       |   4 +-
 solr/solr-ref-guide/src/realtime-get.adoc       |   2 -
 .../src/request-parameters-api.adoc             |   2 -
 solr/solr-ref-guide/src/response-writers.adoc   | 132 ++++++++-------
 solr/solr-ref-guide/src/result-grouping.adoc    |  12 +-
 solr/solr-ref-guide/src/schema-api.adoc         |  18 +--
 solr/solr-ref-guide/src/suggester.adoc          |   7 +-
 .../solr-ref-guide/src/the-terms-component.adoc |   2 +-
 .../src/transforming-result-documents.adoc      |   4 +-
 solr/solr-ref-guide/src/using-javascript.adoc   |   2 +-
 solr/solr-ref-guide/src/using-python.adoc       |   2 +-
 .../solr/client/solrj/io/stream/SolrStream.java |   2 +
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   7 +
 .../java/org/apache/solr/util/RestTestBase.java |   2 +-
 .../org/apache/solr/util/RestTestHarness.java   |   6 +-
 solr/webapp/web/js/angular/controllers/query.js |   5 +-
 solr/webapp/web/partials/query.html             |   7 +-
 78 files changed, 487 insertions(+), 415 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 01327c8..501104b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -30,6 +30,11 @@ Jetty 9.3.14.v20161028
 Upgrading from Solr 6.x
 ----------------------
 
+* The default response type is now JSON ("wt=json") instead of XML, and line indentation is now on by default
+  ("indent=on"). If you expect the responses to your queries to be returned in the previous format (XML
+  format, no indentation), you must now you must now explicitly pass in "wt=xml" and "indent=off" as query
+  parameters, or configure them as defaults on your request handlers.  See SOLR-10494 for more details.
+
 * the cluster property 'legacyCloud' is set to false from 7.0. This means 'zookeeper is the truth' by
   default. If an entry for a replica does not exist in the state.json, that replica cannot get
   registered. This may affect users who use that feature where they bring up replicas and they are
@@ -443,6 +448,9 @@ Other Changes
 
 * SOLR-11088: Fix sporadic failures of MetricsHandlerTest.testPropertyFilter on jenkins (shalin)
 
+* SOLR-10494: Make default response format JSON (wt=json), and also indent text responses formats
+  (indent=on) by default (Trey Grainger & Cassandra Targett via hossman)
+
 ==================  6.7.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
index 086d7be..103d0dc 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
@@ -160,9 +160,9 @@ public class TestHierarchicalDocBuilder extends AbstractDataImportHandlerTestCas
     int totalDocsNum = parentsNum + childrenNum + grandChildrenNum;
     
     String resp = runFullImport(THREE_LEVEL_HIERARCHY_CONFIG);
-    String xpath = "//arr[@name='documents']/lst/arr[@name='id' and .='"+parentId1+"']/../"+
-      "arr[@name='_childDocuments_']/lst/arr[@name='id' and .='"+childId+"']/../"+
-      "arr[@name='_childDocuments_']/lst/arr[@name='id' and .='"+grandChildrenIds.get(0)+"']";
+    String xpath = "//arr[@name='documents']/lst[arr[@name='id']/str='"+parentId1+"']/"+
+      "arr[@name='_childDocuments_']/lst[arr[@name='id']/str='"+childId+"']/"+
+      "arr[@name='_childDocuments_']/lst[arr[@name='id']/str='"+grandChildrenIds.get(0)+"']";
     String results = TestHarness.validateXPath(resp, 
            xpath);
     assertTrue("Debug documents does not contain child documents\n"+resp+"\n"+ xpath+

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/contrib/ltr/example/README.md
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/example/README.md b/solr/contrib/ltr/example/README.md
index 77e582a..06a4789 100644
--- a/solr/contrib/ltr/example/README.md
+++ b/solr/contrib/ltr/example/README.md
@@ -29,7 +29,7 @@ Please refer to the Solr Reference Guide's section on [Learning To Rank](https:/
 4. Search and rerank the results using the trained model
 
 ```
-http://localhost:8983/solr/techproducts/query?indent=on&q=test&wt=json&rq={!ltr%20model=exampleModel%20reRankDocs=25%20efi.user_query=%27test%27}&fl=price,score,name
+http://localhost:8983/solr/techproducts/query?q=test&rq={!ltr%20model=exampleModel%20reRankDocs=25%20efi.user_query=%27test%27}&fl=price,score,name
 ```
 
 # Assemble training data

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 5319881..cc6a9c2 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2565,8 +2565,8 @@ public final class SolrCore implements SolrInfoBean, SolrMetricProducer, Closeab
   static{
     HashMap<String, QueryResponseWriter> m= new HashMap<>(15, 1);
     m.put("xml", new XMLResponseWriter());
-    m.put("standard", m.get("xml"));
     m.put(CommonParams.JSON, new JSONResponseWriter());
+    m.put("standard", m.get(CommonParams.JSON));
     m.put("geojson", new GeoJSONResponseWriter());
     m.put("graphml", new GraphMLResponseWriter());
     m.put("python", new PythonResponseWriter());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
index 261daee..4d052ae 100644
--- a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
@@ -84,7 +84,7 @@ public abstract class TextResponseWriter implements PushWriter {
     this.req = req;
     this.rsp = rsp;
     String indent = req.getParams().get("indent");
-    if (indent != null && !"".equals(indent) && !"off".equals(indent)) {
+    if (null == indent || !("off".equals(indent) || "false".equals(indent))){
       doIndent=true;
     }
     returnFields = rsp.getReturnFields();

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java
index 2d3d683..7fecd29 100644
--- a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java
+++ b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java
@@ -63,6 +63,7 @@ public class DirectSolrConnection
    * For example:
    * 
    * String json = solr.request( "/select?qt=dismax&amp;wt=json&amp;q=...", null );
+   * String xml = solr.request( "/select?qt=dismax&amp;wt=xml&amp;q=...", null );
    * String xml = solr.request( "/update", "&lt;add&gt;&lt;doc&gt;&lt;field ..." );
    */
   public String request( String pathAndParams, String body ) throws Exception

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
index 66d62df..4d18b5e 100644
--- a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
@@ -716,7 +716,12 @@
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
-      <!-- <str name="df">text</str> -->
+      <!-- Default search field
+         <str name="df">text</str> 
+        -->
+      <!-- Change from JSON to XML format (the default prior to Solr 7.0)
+         <str name="wt">xml</str> 
+        -->
     </lst>
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
index d15b3bc..492e2c3 100644
--- a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
+++ b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java
@@ -21,6 +21,7 @@ import java.util.Collections;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.request.LocalSolrQueryRequest;
@@ -109,8 +110,14 @@ public class TestCrossCoreJoin extends SolrTestCaseJ4 {
 
   public String query(SolrCore core, SolrQueryRequest req) throws Exception {
     String handler = "standard";
-    if (req.getParams().get("qt") != null)
+    if (req.getParams().get("qt") != null) {
       handler = req.getParams().get("qt");
+    }
+    if (req.getParams().get("wt") == null){
+      ModifiableSolrParams params = new ModifiableSolrParams(req.getParams());
+      params.set("wt", "xml");
+      req.setParams(params);
+    }
     SolrQueryResponse rsp = new SolrQueryResponse();
     SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
     core.execute(core.getRequestHandler(handler), req, rsp);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 5bb938d..ad9f7254 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -56,6 +56,7 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
   private static final String ONE_NODE_COLLECTION = "onenodecollection";
   private final boolean onlyLeaderIndexes = random().nextBoolean();
 
+
   public BasicDistributedZk2Test() {
     super();
     // we need DVs on point fields to compute stats & facets

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
index 2b79408..f8b11d1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
@@ -265,7 +265,7 @@ public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
     DocCollection coll = cloudClient.getZkStateReader().getClusterState().getCollection(collection);
     for (Slice slice : coll.getActiveSlices()) {
       for (Replica replica : slice.getReplicas()) {
-        String uri = "" + replica.get(ZkStateReader.BASE_URL_PROP) + "/" + replica.get(ZkStateReader.CORE_NAME_PROP) + "/config?wt=json";
+        String uri = "" + replica.get(ZkStateReader.BASE_URL_PROP) + "/" + replica.get(ZkStateReader.CORE_NAME_PROP) + "/config";
         Map respMap = getAsMap(cloudClient, uri);
         Long maxTime = (Long) (getObjectByPath(respMap, true, asList("config", "updateHandler", "autoSoftCommit", "maxTime")));
         ret.put(replica.getCoreName(), maxTime);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
index 364108c..30fd85f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -292,7 +292,7 @@ public class TestConfigSetsAPI extends SolrTestCaseJ4 {
     // Checking error when no configuration name is specified in request
     Map map = postDataAndGetResponse(solrCluster.getSolrClient(),
         solrCluster.getJettySolrRunners().get(0).getBaseUrl().toString()
-        + "/admin/configs?action=UPLOAD&wt=json", emptyData, null, null);
+        + "/admin/configs?action=UPLOAD", emptyData, null, null);
     assertNotNull(map);
     long statusCode = (long) getObjectByPath(map, false,
         Arrays.asList("responseHeader", "status"));
@@ -311,7 +311,7 @@ public class TestConfigSetsAPI extends SolrTestCaseJ4 {
     // Checking error when configuration name specified already exists
     map = postDataAndGetResponse(solrCluster.getSolrClient(),
         solrCluster.getJettySolrRunners().get(0).getBaseUrl().toString()
-        + "/admin/configs?action=UPLOAD&wt=json&name=myconf", emptyData, null, null);
+        + "/admin/configs?action=UPLOAD&name=myconf", emptyData, null, null);
     assertNotNull(map);
     statusCode = (long) getObjectByPath(map, false,
         Arrays.asList("responseHeader", "status"));
@@ -423,7 +423,7 @@ public class TestConfigSetsAPI extends SolrTestCaseJ4 {
       assertFalse(configManager.configExists(configSetName+suffix));
 
       Map map = postDataAndGetResponse(solrCluster.getSolrClient(),
-          solrCluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/admin/configs?action=UPLOAD&wt=json&name="+configSetName+suffix,
+          solrCluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/admin/configs?action=UPLOAD&name="+configSetName+suffix,
           sampleZippedConfig, username, password);
       assertNotNull(map);
       long statusCode = (long) getObjectByPath(map, false, Arrays.asList("responseHeader", "status"));

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
index ccc04f1..84bec90 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java
@@ -124,11 +124,11 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         "'create-requesthandler' : { 'name' : '/runtime', 'class': 'org.apache.solr.core.RuntimeLibReqHandler' , 'runtimeLib':true }" +
         "}";
     RestTestHarness client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
 
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "/runtime", "class"),
         "org.apache.solr.core.RuntimeLibReqHandler", 10);
@@ -138,15 +138,15 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         "'add-runtimelib' : { 'name' : 'signedjar' ,'version':1}\n" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "version"),
         1l, 10);
 
-    Map map = TestSolrConfigHandler.getRespMap("/runtime?wt=json", client);
+    Map map = TestSolrConfigHandler.getRespMap("/runtime", client);
     String s = (String) Utils.getObjectByPath(map, false, Arrays.asList("error", "msg"));
     assertNotNull(TestBlobHandler.getAsString(map), s);
     assertTrue(TestBlobHandler.getAsString(map), s.contains("should be signed with one of the keys in ZK /keys/exe"));
@@ -157,15 +157,15 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         "'update-runtimelib' : { 'name' : 'signedjar' ,'version':1, 'sig': 'QKqHtd37QN02iMW9UEgvAO9g9qOOuG5vEBNkbUsN7noc2hhXKic/ABFIOYJA9PKw61mNX2EmNFXOcO3WClYdSw=='}\n" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "sig"),
         wrongSig, 10);
 
-    map = TestSolrConfigHandler.getRespMap("/runtime?wt=json", client);
+    map = TestSolrConfigHandler.getRespMap("/runtime", client);
     s = (String) Utils.getObjectByPath(map, false, Arrays.asList("error", "msg"));
     assertNotNull(TestBlobHandler.getAsString(map), s);//No key matched signature for jar
     assertTrue(TestBlobHandler.getAsString(map), s.contains("No key matched signature for jar"));
@@ -176,17 +176,17 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         "'update-runtimelib' : { 'name' : 'signedjar' ,'version':1, 'sig': 'YkTQgOtvcM/H/5EQdABGl3wjjrPhonAGlouIx59vppBy2cZEofX3qX1yZu5sPNRmJisNXEuhHN2149dxeUmk2Q=='}\n" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "sig"),
         rightSig, 10);
 
     map = TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/runtime?wt=json",
+        "/runtime",
         null,
         Arrays.asList("class"),
         "org.apache.solr.core.RuntimeLibReqHandler", 10);
@@ -197,17 +197,17 @@ public class TestCryptoKeys extends AbstractFullDistribZkTestBase {
         "'update-runtimelib' : { 'name' : 'signedjar' ,'version':1, 'sig': 'VJPMTxDf8Km3IBj2B5HWkIOqeM/o+HHNobOYCNA3WjrEVfOMZbMMqS1Lo7uLUUp//RZwOGkOhrUhuPNY1z2CGEIKX2/m8VGH64L14d52oSvFiwhoTDDuuyjW1TFGu35D'}\n" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "sig"),
         rightSig, 10);
 
     map = TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/runtime?wt=json",
+        "/runtime",
         null,
         Arrays.asList("class"),
         "org.apache.solr.core.RuntimeLibReqHandler", 10);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
index 30fac6a..2388b3d 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java
@@ -73,7 +73,7 @@ public class TestConfigSetImmutable extends RestTestBase {
     String payload = "{\n" +
         "'create-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' , 'startup' : 'lazy'}\n" +
         "}";
-    String uri = "/config?wt=json";
+    String uri = "/config";
     String response = restTestHarness.post(uri, SolrTestCaseJ4.json(payload));
     Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
     assertNotNull(map.get("error"));
@@ -91,7 +91,7 @@ public class TestConfigSetImmutable extends RestTestBase {
         "                 },\n" +
         "    }";
 
-    String response = restTestHarness.post("/schema?wt=json", json(payload));
+    String response = restTestHarness.post("/schema", json(payload));
     Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
     assertNotNull(map.get("errors"));
     assertTrue(map.get("errors").toString().contains("immutable"));

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/core/TestCustomStream.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestCustomStream.java b/solr/core/src/test/org/apache/solr/core/TestCustomStream.java
index 3fc6394..0a70374 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCustomStream.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCustomStream.java
@@ -74,10 +74,10 @@ public class TestCustomStream extends AbstractFullDistribZkTestBase {
         "}";
 
     RestTestHarness client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client,"/config?wt=json",payload);
+    TestSolrConfigHandler.runConfigCommand(client,"/config",payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "expressible", "hello", "class"),
         "org.apache.solr.core.HelloStream",10);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
index 9bbe09f..4dca763 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
@@ -79,10 +79,10 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "'add-runtimelib' : { 'name' : 'colltest' ,'version':1}\n" +
         "}";
     RestTestHarness client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "version"),
         1l, 10);
@@ -93,15 +93,15 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "}";
 
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client,"/config?wt=json",payload);
+    TestSolrConfigHandler.runConfigCommand(client,"/config",payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "/test1", "class"),
         "org.apache.solr.core.BlobStoreTestRequestHandler",10);
 
-    Map map = TestSolrConfigHandler.getRespMap("/test1?wt=json", client);
+    Map map = TestSolrConfigHandler.getRespMap("/test1", client);
 
     assertNotNull(TestBlobHandler.getAsString(map), map = (Map) map.get("error"));
     assertTrue(TestBlobHandler.getAsString(map), map.get("msg").toString().contains(".system collection not available"));
@@ -110,7 +110,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
     TestBlobHandler.createSystemCollection(getHttpSolrClient(baseURL, randomClient.getHttpClient()));
     waitForRecoveriesToFinish(".system", true);
 
-    map = TestSolrConfigHandler.getRespMap("/test1?wt=json", client);
+    map = TestSolrConfigHandler.getRespMap("/test1", client);
 
 
     assertNotNull(map = (Map) map.get("error"));
@@ -122,11 +122,11 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "             }\n" +
         "  }";
 
-    TestSolrConfigHandler.runConfigCommand(client,"/config/params?wt=json",payload);
+    TestSolrConfigHandler.runConfigCommand(client,"/config/params",payload);
     TestSolrConfigHandler.testForResponseElement(
         client,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         Arrays.asList("response", "params", "watched", "x"),
         "X val",
@@ -136,7 +136,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
 
 
     for(int i=0;i<100;i++) {
-      map = TestSolrConfigHandler.getRespMap("/test1?wt=json", client);
+      map = TestSolrConfigHandler.getRespMap("/test1", client);
       if("X val".equals(map.get("x"))){
          success = true;
          break;
@@ -157,11 +157,11 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "'create-queryResponseWriter' : { 'name' : 'json1', 'class': 'org.apache.solr.core.RuntimeLibResponseWriter' , 'runtimeLib':true }" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
 
     Map result = TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "/runtime", "class"),
         "org.apache.solr.core.RuntimeLibReqHandler", 10);
@@ -170,7 +170,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
 
     result = TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/runtime?wt=json",
+        "/runtime",
         null,
         Arrays.asList("class"),
         "org.apache.solr.core.RuntimeLibReqHandler", 10);
@@ -198,10 +198,10 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "'update-runtimelib' : { 'name' : 'colltest' ,'version':2}\n" +
         "}";
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
-    TestSolrConfigHandler.runConfigCommand(client, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(client,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "runtimeLib", blobName, "version"),
         2l, 10);
@@ -221,11 +221,11 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "             }\n" +
         "  }";
 
-    TestSolrConfigHandler.runConfigCommand(client,"/config/params?wt=json",payload);
+    TestSolrConfigHandler.runConfigCommand(client,"/config/params",payload);
     TestSolrConfigHandler.testForResponseElement(
         client,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         Arrays.asList("response", "params", "watched", "x"),
         "X val",
@@ -233,7 +233,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
    result = TestSolrConfigHandler.testForResponseElement(
         client,
         null,
-        "/test1?wt=json",
+        "/test1",
         cloudClient,
         Arrays.asList("x"),
         "X val",
@@ -246,11 +246,11 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "             }\n" +
         "  }";
 
-    TestSolrConfigHandler.runConfigCommand(client,"/config/params?wt=json",payload);
+    TestSolrConfigHandler.runConfigCommand(client,"/config/params",payload);
     result = TestSolrConfigHandler.testForResponseElement(
         client,
         null,
-        "/test1?wt=json",
+        "/test1",
         cloudClient,
         Arrays.asList("x"),
         "X val changed",

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 13d4d01..71b8807 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -106,7 +106,7 @@ public class TestSolrConfigHandler extends RestTestBase {
 
   public void testProperty() throws Exception {
     RestTestHarness harness = restTestHarness;
-    Map confMap = getRespMap("/config?wt=json", harness);
+    Map confMap = getRespMap("/config", harness);
     assertNotNull(getObjectByPath(confMap, false, Arrays.asList("config", "requestHandler", "/admin/luke")));
     assertNotNull(getObjectByPath(confMap, false, Arrays.asList("config", "requestHandler", "/admin/system")));
     assertNotNull(getObjectByPath(confMap, false, Arrays.asList("config", "requestHandler", "/admin/mbeans")));
@@ -120,20 +120,20 @@ public class TestSolrConfigHandler extends RestTestBase {
     String payload = "{\n" +
         " 'set-property' : { 'updateHandler.autoCommit.maxDocs':100, 'updateHandler.autoCommit.maxTime':10 , 'requestDispatcher.requestParsers.addHttpRequestToContext':true} \n" +
         " }";
-    runConfigCommand(harness, "/config?wt=json", payload);
+    runConfigCommand(harness, "/config", payload);
 
-    Map m = (Map) getRespMap("/config/overlay?wt=json", harness).get("overlay");
+    Map m = (Map) getRespMap("/config/overlay", harness).get("overlay");
     Map props = (Map) m.get("props");
     assertNotNull(props);
     assertEquals("100", String.valueOf(getObjectByPath(props, true, ImmutableList.of("updateHandler", "autoCommit", "maxDocs"))));
     assertEquals("10", String.valueOf(getObjectByPath(props, true, ImmutableList.of("updateHandler", "autoCommit", "maxTime"))));
 
-    m =  getRespMap("/config/updateHandler?wt=json", harness);
+    m =  getRespMap("/config/updateHandler", harness);
     assertNotNull(getObjectByPath(m, true, ImmutableList.of("config","updateHandler", "commitWithin", "softCommit")));
     assertNotNull(getObjectByPath(m, true, ImmutableList.of("config","updateHandler", "autoCommit", "maxDocs")));
     assertNotNull(getObjectByPath(m, true, ImmutableList.of("config","updateHandler", "autoCommit", "maxTime")));
 
-    m = (Map) getRespMap("/config?wt=json", harness).get("config");
+    m = (Map) getRespMap("/config", harness).get("config");
     assertNotNull(m);
 
     assertEquals("100", String.valueOf(getObjectByPath(m, true, ImmutableList.of("updateHandler", "autoCommit", "maxDocs"))));
@@ -142,9 +142,9 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         " 'unset-property' :  'updateHandler.autoCommit.maxDocs'} \n" +
         " }";
-    runConfigCommand(harness, "/config?wt=json", payload);
+    runConfigCommand(harness, "/config", payload);
 
-    m = (Map) getRespMap("/config/overlay?wt=json", harness).get("overlay");
+    m = (Map) getRespMap("/config/overlay", harness).get("overlay");
     props = (Map) m.get("props");
     assertNotNull(props);
     assertNull(getObjectByPath(props, true, ImmutableList.of("updateHandler", "autoCommit", "maxDocs")));
@@ -157,15 +157,15 @@ public class TestSolrConfigHandler extends RestTestBase {
         " 'set-user-property' : { 'my.custom.variable.a':'MODIFIEDA'," +
         " 'my.custom.variable.b':'MODIFIEDB' } \n" +
         " }";
-    runConfigCommand(harness, "/config?wt=json", payload);
+    runConfigCommand(harness, "/config", payload);
 
-    Map m = (Map) getRespMap("/config/overlay?wt=json", harness).get("overlay");
+    Map m = (Map) getRespMap("/config/overlay", harness).get("overlay");
     Map props = (Map) m.get("userProps");
     assertNotNull(props);
     assertEquals(props.get("my.custom.variable.a"), "MODIFIEDA");
     assertEquals(props.get("my.custom.variable.b"), "MODIFIEDB");
 
-    m = (Map) getRespMap("/dump?wt=json&json.nl=map&initArgs=true", harness).get("initArgs");
+    m = (Map) getRespMap("/dump?json.nl=map&initArgs=true", harness).get("initArgs");
 
     m = (Map) m.get(PluginInfo.DEFAULTS);
     assertEquals("MODIFIEDA", m.get("a"));
@@ -190,11 +190,11 @@ public class TestSolrConfigHandler extends RestTestBase {
     String payload = "{\n" +
         "'create-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' , 'startup' : 'lazy'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
 
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudSolrClient,
         Arrays.asList("overlay", "requestHandler", "/x", "startup"),
         "lazy",
@@ -204,11 +204,11 @@ public class TestSolrConfigHandler extends RestTestBase {
         "'update-requesthandler' : { 'name' : '/x', 'class': 'org.apache.solr.handler.DumpRequestHandler' ,registerPath :'/solr,/v2', " +
         " 'startup' : 'lazy' , 'a':'b' , 'defaults': {'def_a':'def A val', 'multival':['a','b','c']}}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
 
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudSolrClient,
         Arrays.asList("overlay", "requestHandler", "/x", "a"),
         "b",
@@ -221,10 +221,10 @@ public class TestSolrConfigHandler extends RestTestBase {
         " 'defaults': {'a':'A','b':'B','c':'C'}}\n" +
         "}";
 
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudSolrClient,
         Arrays.asList("overlay", "requestHandler", "/dump", "defaults", "c" ),
         "C",
@@ -232,7 +232,7 @@ public class TestSolrConfigHandler extends RestTestBase {
 
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/x?wt=json&getdefaults=true&json.nl=map",
+        "/x?getdefaults=true&json.nl=map",
         cloudSolrClient,
         Arrays.asList("getdefaults", "def_a"),
         "def A val",
@@ -240,7 +240,7 @@ public class TestSolrConfigHandler extends RestTestBase {
 
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/x?wt=json&param=multival&json.nl=map",
+        "/x?param=multival&json.nl=map",
         cloudSolrClient,
         Arrays.asList("params", "multival"),
         Arrays.asList("a", "b", "c"),
@@ -249,12 +249,12 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'delete-requesthandler' : '/x'" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     boolean success = false;
     long startTime = System.nanoTime();
     int maxTimeoutSeconds = 10;
     while (TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {
-      String uri = "/config/overlay?wt=json";
+      String uri = "/config/overlay";
       Map m = testServerBaseUrl == null ? getRespMap(uri, writeHarness) : TestSolrConfigHandlerConcurrent.getAsMap(testServerBaseUrl + uri, cloudSolrClient);
       if (null == Utils.getObjectByPath(m, true, Arrays.asList("overlay", "requestHandler", "/x", "a"))) {
         success = true;
@@ -268,10 +268,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'create-queryconverter' : { 'name' : 'qc', 'class': 'org.apache.solr.spelling.SpellingQueryConverter'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "queryConverter", "qc", "class"),
         "org.apache.solr.spelling.SpellingQueryConverter",
@@ -279,10 +279,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'update-queryconverter' : { 'name' : 'qc', 'class': 'org.apache.solr.spelling.SuggestQueryConverter'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "queryConverter", "qc", "class"),
         "org.apache.solr.spelling.SuggestQueryConverter",
@@ -291,10 +291,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'delete-queryconverter' : 'qc'" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "queryConverter", "qc"),
         null,
@@ -303,10 +303,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'create-searchcomponent' : { 'name' : 'tc', 'class': 'org.apache.solr.handler.component.TermsComponent'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "searchComponent", "tc", "class"),
         "org.apache.solr.handler.component.TermsComponent",
@@ -314,10 +314,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'update-searchcomponent' : { 'name' : 'tc', 'class': 'org.apache.solr.handler.component.TermVectorComponent' }\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "searchComponent", "tc", "class"),
         "org.apache.solr.handler.component.TermVectorComponent",
@@ -326,10 +326,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'delete-searchcomponent' : 'tc'" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "searchComponent", "tc"),
         null,
@@ -338,10 +338,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'create-valuesourceparser' : { 'name' : 'cu', 'class': 'org.apache.solr.core.CountUsageValueSourceParser'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "valueSourceParser", "cu", "class"),
         "org.apache.solr.core.CountUsageValueSourceParser",
@@ -352,10 +352,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'update-valuesourceparser' : { 'name' : 'cu', 'class': 'org.apache.solr.search.function.NvlValueSourceParser'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "valueSourceParser", "cu", "class"),
         "org.apache.solr.search.function.NvlValueSourceParser",
@@ -364,10 +364,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'delete-valuesourceparser' : 'cu'" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "valueSourceParser", "cu"),
         null,
@@ -378,10 +378,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'create-transformer' : { 'name' : 'mytrans', 'class': 'org.apache.solr.response.transform.ValueAugmenterFactory', 'value':'5'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "transformer", "mytrans", "class"),
         "org.apache.solr.response.transform.ValueAugmenterFactory",
@@ -390,10 +390,10 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'update-transformer' : { 'name' : 'mytrans', 'class': 'org.apache.solr.response.transform.ValueAugmenterFactory', 'value':'6'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "transformer", "mytrans", "value"),
         "6",
@@ -403,10 +403,10 @@ public class TestSolrConfigHandler extends RestTestBase {
         "'delete-transformer' : 'mytrans'," +
         "'create-initparams' : { 'name' : 'hello', 'key':'val'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     Map map = testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "transformer", "mytrans"),
         null,
@@ -430,10 +430,10 @@ public class TestSolrConfigHandler extends RestTestBase {
         "        }\n" +
         "    }\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     map = testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "searchComponent","myspellcheck", "spellchecker", "class"),
         "solr.DirectSolrSpellChecker",
@@ -448,16 +448,16 @@ public class TestSolrConfigHandler extends RestTestBase {
         "                    {name: s2,lookupImpl: FuzzyLookupFactory , dictionaryImpl : DocumentExpressionDictionaryFactory}]" +
         "    }\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
     map = testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config?wt=json",
+        "/config",
         cloudSolrClient,
         Arrays.asList("config", "requestHandler","/dump100", "class"),
         "org.apache.solr.handler.DumpRequestHandler",
         10);
 
-    map = getRespMap("/dump100?wt=json&json.nl=arrmap&initArgs=true", writeHarness);
+    map = getRespMap("/dump100?json.nl=arrmap&initArgs=true", writeHarness);
     List initArgs = (List) map.get("initArgs");
     assertNotNull(initArgs);
     assertTrue(initArgs.size() >= 2);
@@ -470,11 +470,11 @@ public class TestSolrConfigHandler extends RestTestBase {
         "    registerPath :'/solr,/v2'"+
         ", 'startup' : 'lazy'}\n" +
         "}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
 
     testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudSolrClient,
         Arrays.asList("overlay", "requestHandler", "/dump101", "startup"),
         "lazy",
@@ -483,18 +483,18 @@ public class TestSolrConfigHandler extends RestTestBase {
     payload = "{\n" +
         "'add-cache' : {name:'lfuCacheDecayFalse', class:'solr.search.LFUCache', size:10 ,initialSize:9 , timeDecay:false }," +
         "'add-cache' : {name: 'perSegFilter', class: 'solr.search.LRUCache', size:10, initialSize:0 , autowarmCount:10}}";
-    runConfigCommand(writeHarness, "/config?wt=json", payload);
+    runConfigCommand(writeHarness, "/config", payload);
 
     map = testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudSolrClient,
         Arrays.asList("overlay", "cache", "lfuCacheDecayFalse", "class"),
         "solr.search.LFUCache",
         10);
     assertEquals("solr.search.LRUCache",getObjectByPath(map, true, ImmutableList.of("overlay", "cache", "perSegFilter", "class")));
 
-    map = getRespMap("/dump101?cacheNames=lfuCacheDecayFalse&cacheNames=perSegFilter&wt=json", writeHarness);
+    map = getRespMap("/dump101?cacheNames=lfuCacheDecayFalse&cacheNames=perSegFilter", writeHarness);
     assertEquals("Actual output "+ Utils.toJSONString(map), "org.apache.solr.search.LRUCache",getObjectByPath(map, true, ImmutableList.of( "caches", "perSegFilter")));
     assertEquals("Actual output "+ Utils.toJSONString(map), "org.apache.solr.search.LFUCache",getObjectByPath(map, true, ImmutableList.of( "caches", "lfuCacheDecayFalse")));
 
@@ -568,12 +568,12 @@ public class TestSolrConfigHandler extends RestTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config/params", payload);
 
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "x", "a"),
         "A val",
@@ -582,7 +582,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "x", "b"),
         "B val",
@@ -592,12 +592,12 @@ public class TestSolrConfigHandler extends RestTestBase {
         "'create-requesthandler' : { 'name' : '/d', registerPath :'/solr,/v2' , 'class': 'org.apache.solr.handler.DumpRequestHandler' }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config", payload);
 
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "/d", "name"),
         "/d",
@@ -605,14 +605,14 @@ public class TestSolrConfigHandler extends RestTestBase {
 
     TestSolrConfigHandler.testForResponseElement(harness,
         null,
-        "/d?wt=json&useParams=x",
+        "/d?useParams=x",
         null,
         Arrays.asList("params", "a"),
         "A val",
         5);
     TestSolrConfigHandler.testForResponseElement(harness,
         null,
-        "/d?wt=json&useParams=x&a=fomrequest",
+        "/d?useParams=x&a=fomrequest",
         null,
         Arrays.asList("params", "a"),
         "fomrequest",
@@ -622,11 +622,11 @@ public class TestSolrConfigHandler extends RestTestBase {
         "'create-requesthandler' : { 'name' : '/dump1', registerPath :'/solr,/v2' , 'class': 'org.apache.solr.handler.DumpRequestHandler', 'useParams':'x' }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config", payload);
 
     TestSolrConfigHandler.testForResponseElement(harness,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "/dump1", "name"),
         "/dump1",
@@ -635,7 +635,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/dump1?wt=json",
+        "/dump1",
         null,
         Arrays.asList("params", "a"),
         "A val",
@@ -651,12 +651,12 @@ public class TestSolrConfigHandler extends RestTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config/params", payload);
 
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "c"),
         "CY val",
@@ -664,7 +664,7 @@ public class TestSolrConfigHandler extends RestTestBase {
 
     TestSolrConfigHandler.testForResponseElement(harness,
         null,
-        "/dump1?wt=json&useParams=y",
+        "/dump1?useParams=y",
         null,
         Arrays.asList("params", "c"),
         "CY val",
@@ -674,7 +674,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/dump1?wt=json&useParams=y",
+        "/dump1?useParams=y",
         null,
         Arrays.asList("params", "b"),
         "BY val",
@@ -683,7 +683,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/dump1?wt=json&useParams=y",
+        "/dump1?useParams=y",
         null,
         Arrays.asList("params", "a"),
         "A val",
@@ -692,7 +692,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/dump1?wt=json&useParams=y",
+        "/dump1?useParams=y",
         null,
         Arrays.asList("params", "d"),
         Arrays.asList("val 1", "val 2"),
@@ -708,12 +708,12 @@ public class TestSolrConfigHandler extends RestTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config/params", payload);
 
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "c"),
         "CY val modified",
@@ -722,7 +722,7 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "e"),
         "EY val",
@@ -737,11 +737,11 @@ public class TestSolrConfigHandler extends RestTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config/params", payload);
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "p"),
         "P val",
@@ -750,17 +750,17 @@ public class TestSolrConfigHandler extends RestTestBase {
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "c"),
         null,
         10);
     payload = " {'delete' : 'y'}";
-    TestSolrConfigHandler.runConfigCommand(harness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config/params", payload);
     TestSolrConfigHandler.testForResponseElement(
         harness,
         null,
-        "/config/params?wt=json",
+        "/config/params",
         null,
         Arrays.asList("response", "params", "y", "p"),
         null,
@@ -785,10 +785,10 @@ public class TestSolrConfigHandler extends RestTestBase {
         "  }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(harness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(harness, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(harness,
         null,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         null,
         Arrays.asList("overlay", "requestHandler", "aRequestHandler", "class"),
         "org.apache.solr.handler.DumpRequestHandler",

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java b/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java
index f84d89f..bd9b1eb 100644
--- a/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java
+++ b/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java
@@ -46,7 +46,7 @@ public class CheckBackupStatus extends SolrTestCaseJ4 {
   }
 
   public void fetchStatus() throws IOException {
-    String masterUrl = client.getBaseURL() + "/"  + coreName + ReplicationHandler.PATH + "?command=" + ReplicationHandler.CMD_DETAILS;
+    String masterUrl = client.getBaseURL() + "/"  + coreName + ReplicationHandler.PATH + "?wt=xml&command=" + ReplicationHandler.CMD_DETAILS;
     response = client.getHttpClient().execute(new HttpGet(masterUrl), new BasicResponseHandler());
     if(pException.matcher(response).find()) {
       fail("Failed to create backup");

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
index 162584c..ab7a74d 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
@@ -121,7 +121,7 @@ public class TestConfigReload extends AbstractFullDistribZkTestBase {
     while ( TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds){
       Thread.sleep(50);
       for (String url : urls) {
-        Map respMap = getAsMap(url+uri+"?wt=json");
+        Map respMap = getAsMap(url+uri);
         if(String.valueOf(newVersion).equals(String.valueOf( getObjectByPath(respMap, true, asList(name, "znodeVersion"))))){
           succeeded.add(url);
         }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
index 0439775..a513606 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
@@ -267,7 +267,7 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
 
   public static void runBackupCommand(JettySolrRunner masterJetty, String cmd, String params) throws IOException {
     String masterUrl = buildUrl(masterJetty.getLocalPort(), context) + "/" + DEFAULT_TEST_CORENAME
-        + ReplicationHandler.PATH+"?command=" + cmd + params;
+        + ReplicationHandler.PATH+"?wt=xml&command=" + cmd + params;
     InputStream stream = null;
     try {
       URL url = new URL(masterUrl);
@@ -290,7 +290,7 @@ public class TestReplicationHandlerBackup extends SolrJettyTestBase {
     }
 
     public boolean fetchStatus() throws IOException {
-      String masterUrl = buildUrl(masterJetty.getLocalPort(), context) + "/" + DEFAULT_TEST_CORENAME + ReplicationHandler.PATH + "?command=" + ReplicationHandler.CMD_DETAILS;
+      String masterUrl = buildUrl(masterJetty.getLocalPort(), context) + "/" + DEFAULT_TEST_CORENAME + ReplicationHandler.PATH + "?wt=xml&command=" + ReplicationHandler.CMD_DETAILS;
       URL url;
       InputStream stream = null;
       try {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
index db04486..7b7ebae 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java
@@ -94,12 +94,12 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
         "'create-requesthandler' : { 'name' : '/dump0', 'class': 'org.apache.solr.handler.DumpRequestHandler' }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config", payload);
 
     payload = "{\n" +
         "'create-requesthandler' : { 'name' : '/dump1', 'class': 'org.apache.solr.handler.DumpRequestHandler', 'useParams':'x' }\n" +
         "}";
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config", payload);
 
     AbstractFullDistribZkTestBase.waitForRecoveriesToFinish(COLL_NAME, cloudClient.getZkStateReader(), false, true, 90);
 
@@ -110,11 +110,11 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
         "             }\n" +
         "  }";
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
 
     Map result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "x", "a"),
         "A val",
@@ -123,7 +123,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudClient,
         asList("overlay", "requestHandler", "/dump0", "name"),
         "/dump0",
@@ -131,7 +131,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump0?wt=json&useParams=x",
+        "/dump0?useParams=x",
         cloudClient,
         asList("params", "a"),
         "A val",
@@ -140,7 +140,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump0?wt=json&useParams=x&a=fomrequest",
+        "/dump0?useParams=x&a=fomrequest",
         cloudClient,
         asList("params", "a"),
         "fomrequest",
@@ -148,7 +148,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudClient,
         asList("overlay", "requestHandler", "/dump1", "name"),
         "/dump1",
@@ -156,7 +156,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump1?wt=json",
+        "/dump1",
         cloudClient,
         asList("params", "a"),
         "A val",
@@ -174,12 +174,12 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
 
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "c"),
         "CY val",
@@ -190,7 +190,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump1?wt=json&useParams=y",
+        "/dump1?useParams=y",
         cloudClient,
         asList("params", "c"),
         "CY val",
@@ -202,7 +202,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/requestHandler?componentName=/dump1&expandParams=true&wt=json&useParams=y&c=CC",
+        "/config/requestHandler?componentName=/dump1&expandParams=true&useParams=y&c=CC",
         cloudClient,
         asList("config", "requestHandler","/dump1","_useParamsExpanded_","x", "a"),
         "A val",
@@ -224,12 +224,12 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
 
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "c"),
         "CY val modified",
@@ -246,11 +246,11 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "p"),
         "P val",
@@ -260,12 +260,12 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
     compareValues(result, 0l, asList("response", "params", "x", "","v"));
 
     payload = "{update :{x : {_appends_ :{ add : 'first' },  _invariants_ : {fixed: f }}}}";
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
 
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "x", "_appends_", "add"),
         "first",
@@ -275,7 +275,7 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump1?wt=json&fixed=changeit&add=second",
+        "/dump1?fixed=changeit&add=second",
         cloudClient,
         asList("params", "fixed"),
         "f",
@@ -289,11 +289,11 @@ public class TestReqParamsAPI extends SolrCloudTestCase {
     }, asList("params", "add"));
 
     payload = " {'delete' : 'y'}";
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config/params", payload);
     TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "p"),
         null,

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
index 2d1ac7f..6b5ebad 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
@@ -222,7 +222,7 @@ public class TestRestoreCore extends SolrJettyTestBase {
 
   public static boolean fetchRestoreStatus (String baseUrl, String coreName) throws IOException {
     String masterUrl = baseUrl + "/" + coreName +
-        ReplicationHandler.PATH + "?command=" + ReplicationHandler.CMD_RESTORE_STATUS;
+        ReplicationHandler.PATH + "?wt=xml&command=" + ReplicationHandler.CMD_RESTORE_STATUS;
     final Pattern pException = Pattern.compile("<str name=\"exception\">(.*?)</str>");
 
     InputStream stream = null;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 78bdbe0..545a41a 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -2554,12 +2554,13 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
 
   public void assertResponseContains(SolrClient server, SolrParams requestParams, String json) throws IOException, SolrServerException {
     String p = requestParams.get("qt");
+    ModifiableSolrParams modifiableSolrParams = (ModifiableSolrParams) requestParams;
+    modifiableSolrParams.set("indent", modifiableSolrParams.get("indent", "off"));
     if(p != null) {
-      ModifiableSolrParams modifiableSolrParams = (ModifiableSolrParams) requestParams;
       modifiableSolrParams.remove("qt");
     }
 
-    QueryRequest query = new QueryRequest( requestParams );
+    QueryRequest query = new QueryRequest( modifiableSolrParams );
     query.setPath(p);
     query.setResponseParser(new InputStreamResponseParser("json"));
     query.setMethod(SolrRequest.METHOD.POST);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
index 0dbbe40..f143c02 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
@@ -76,12 +76,12 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "'create-requesthandler' : { 'name' : '/admin/luke', " +
         "'class': 'org.apache.solr.handler.DumpRequestHandler'}}";
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config", payload);
 
 
     TestSolrConfigHandler.testForResponseElement(writeHarness,
         testServerBaseUrl,
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudClient,
         Arrays.asList("overlay", "requestHandler", "/admin/luke", "class"),
         "org.apache.solr.handler.DumpRequestHandler",
@@ -124,11 +124,11 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
 
     Map result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "x", "a"),
         "A val",
@@ -139,11 +139,11 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "'update-requesthandler' : { 'name' : '/dump', 'class': 'org.apache.solr.handler.DumpRequestHandler' }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness, "/config", payload);
 
     TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudClient,
         asList("overlay", "requestHandler", "/dump", "name"),
         "/dump",
@@ -151,7 +151,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump?wt=json&useParams=x",
+        "/dump?useParams=x",
         cloudClient,
         asList("params", "a"),
         "A val",
@@ -160,7 +160,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
     TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump?wt=json&useParams=x&a=fomrequest",
+        "/dump?useParams=x&a=fomrequest",
         cloudClient,
         asList("params", "a"),
         "fomrequest",
@@ -170,11 +170,11 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "'create-requesthandler' : { 'name' : '/dump1', 'class': 'org.apache.solr.handler.DumpRequestHandler', 'useParams':'x' }\n" +
         "}";
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config", payload);
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/config/overlay?wt=json",
+        "/config/overlay",
         cloudClient,
         asList("overlay", "requestHandler", "/dump1", "name"),
         "/dump1",
@@ -182,7 +182,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump1?wt=json",
+        "/dump1",
         cloudClient,
         asList("params", "a"),
         "A val",
@@ -201,12 +201,12 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
 
    result =  TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "c"),
         "CY val",
@@ -216,7 +216,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
 
     result = TestSolrConfigHandler.testForResponseElement(null,
         urls.get(random().nextInt(urls.size())),
-        "/dump?wt=json&useParams=y",
+        "/dump?useParams=y",
         cloudClient,
         asList("params", "c"),
         "CY val",
@@ -235,12 +235,12 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
 
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "c"),
         "CY val modified",
@@ -257,11 +257,11 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
         "  }";
 
 
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
     result = TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "p"),
         "P val",
@@ -269,11 +269,11 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
     compareValues(result, null, asList("response", "params", "y", "c"));
 
     payload = " {'delete' : 'y'}";
-    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params?wt=json", payload);
+    TestSolrConfigHandler.runConfigCommand(writeHarness,"/config/params", payload);
     TestSolrConfigHandler.testForResponseElement(
         null,
         urls.get(random().nextInt(urls.size())),
-        "/config/params?wt=json",
+        "/config/params",
         cloudClient,
         asList("response", "params", "y", "p"),
         null,

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
index 3fdf78a..d077c84 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
@@ -143,7 +143,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
         val3 = String.valueOf(10 * i + 3);
         payload = payload.replace("CACHEVAL3", val3);
   
-        response = publisher.post("/config?wt=json", SolrTestCaseJ4.json(payload));
+        response = publisher.post("/config", SolrTestCaseJ4.json(payload));
       } finally {
         publisher.close();
       }
@@ -171,7 +171,7 @@ public class TestSolrConfigHandlerConcurrent extends AbstractFullDistribZkTestBa
       while ( TimeUnit.SECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutSeconds) {
         Thread.sleep(100);
         errmessages.clear();
-        Map respMap = getAsMap(url+"/config/overlay?wt=json", cloudClient);
+        Map respMap = getAsMap(url+"/config/overlay", cloudClient);
         Map m = (Map) respMap.get("overlay");
         if(m!= null) m = (Map) m.get("props");
         if(m == null) {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
index 45ca708..1b53150 100644
--- a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
@@ -51,7 +51,7 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
   
   @Test
   public void testTypes() throws IOException {
-    SolrQueryRequest req = req("dummy");
+    SolrQueryRequest req = req("q", "dummy", "indent","off");
     SolrQueryResponse rsp = new SolrQueryResponse();
     QueryResponseWriter w = new PythonResponseWriter();
 
@@ -90,7 +90,7 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
   }
 
   private void implTestJSON(final String namedListStyle) throws IOException {
-    SolrQueryRequest req = req("wt","json","json.nl",namedListStyle);
+    SolrQueryRequest req = req("wt","json","json.nl",namedListStyle, "indent", "off");
     SolrQueryResponse rsp = new SolrQueryResponse();
     JSONResponseWriter w = new JSONResponseWriter();
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/477c2188/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
index 0f95f79..7995efa 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java
@@ -138,7 +138,12 @@ public class TestRawResponseWriter extends SolrTestCaseJ4 {
     // check response against each writer
 
     // xml & none (default behavior same as XML)
-    String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<response>\n<str name=\"content\">test</str><str name=\"foo\">bar</str>\n</response>\n";
+    String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+        "<response>\n" +
+        "\n" +
+        "<str name=\"content\">test</str>\n" +
+        "<str name=\"foo\">bar</str>\n" +
+        "</response>\n";
     StringWriter xmlSout = new StringWriter();
     writerXmlBase.write(xmlSout, req(), rsp);
     assertEquals(xml, xmlSout.toString());
@@ -154,7 +159,9 @@ public class TestRawResponseWriter extends SolrTestCaseJ4 {
     assertEquals(xml, noneBout.toString(StandardCharsets.UTF_8.toString()));
 
     // json
-    String json = "{\"content\":\"test\",\"foo\":\"bar\"}\n";
+    String json = "{\n" +
+        "  \"content\":\"test\",\n" +
+        "  \"foo\":\"bar\"}\n";
     StringWriter jsonSout = new StringWriter();
     writerJsonBase.write(jsonSout, req(), rsp);
     assertEquals(json, jsonSout.toString());


Mime
View raw message