You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/18 00:00:22 UTC
[1/2] lucene-solr:apiv2: SOLR-8029: variable names changed
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 08e287ce4 -> 4841ce1af
SOLR-8029: variable names changed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4d04cc85
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4d04cc85
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4d04cc85
Branch: refs/heads/apiv2
Commit: 4d04cc85d69af51179d0ef9269b21859ed7b2861
Parents: e199495
Author: Noble Paul <no...@apache.org>
Authored: Wed Jan 18 08:55:53 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Wed Jan 18 08:55:53 2017 +1030
----------------------------------------------------------------------
.../org/apache/solr/handler/DumpRequestHandler.java | 4 ++--
.../org/apache/solr/core/TestSolrConfigHandler.java | 15 +++++----------
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4d04cc85/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
index aef703c..d7d5b71 100644
--- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
@@ -41,10 +41,10 @@ public class DumpRequestHandler extends RequestHandlerBase
{
// Show params
rsp.add( "params", req.getParams().toNamedList() );
- String[] parts = req.getParams().getParams("urlPart");
+ String[] parts = req.getParams().getParams("urlTemplateValues");
if (parts != null && parts.length > 0) {
Map map = new LinkedHashMap<>();
- rsp.getValues().add("urlPart", map);
+ rsp.getValues().add("urlTemplateValues", map);
for (String part : parts) {
map.put(part, req.getPathTemplateValues().get(part));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4d04cc85/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 b27a5a9..eae43cc 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -40,10 +40,10 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.handler.DumpRequestHandler;
import org.apache.solr.handler.TestBlobHandler;
import org.apache.solr.handler.TestSolrConfigHandlerConcurrent;
-import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrCache;
+import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestBase;
import org.apache.solr.util.RestTestHarness;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -790,20 +790,15 @@ public class TestSolrConfigHandler extends RestTestBase {
"org.apache.solr.handler.DumpRequestHandler",
10);
RESTfulServerProvider oldProvider = restTestHarness.getServerProvider();
- restTestHarness.setServerProvider(new RESTfulServerProvider() {
- @Override
- public String getBaseURL() {
- return jetty.getBaseUrl().toString() + "/v2/cores/" + DEFAULT_TEST_CORENAME;
- }
- });
+ restTestHarness.setServerProvider(() -> jetty.getBaseUrl().toString() + "/v2/cores/" + DEFAULT_TEST_CORENAME);
Map rsp = TestSolrConfigHandler.testForResponseElement(
harness,
null,
- "/something/part1_Value/fixed/part2_Value?urlPart=part1&urlPart=part2",
+ "/something/part1_Value/fixed/part2_Value?urlTemplateValues=part1&urlTemplateValues=part2",
null,
- Arrays.asList("urlPart"),
- (PredicateWithErrMsg) new PredicateWithErrMsg() {
+ Arrays.asList("urlTemplateValues"),
+ new PredicateWithErrMsg() {
@Override
public String test(Object o) {
if (o instanceof Map) {
[2/2] lucene-solr:apiv2: Merge remote-tracking branch 'origin/apiv2'
into apiv2
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/apiv2' into apiv2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4841ce1a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4841ce1a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4841ce1a
Branch: refs/heads/apiv2
Commit: 4841ce1af13a08004f65f28a61ea0edd5030faba
Parents: 4d04cc8 08e287c
Author: Noble Paul <no...@apache.org>
Authored: Wed Jan 18 10:30:15 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Wed Jan 18 10:30:15 2017 +1030
----------------------------------------------------------------------
solr/core/src/resources/apispec/core.system.blob.json | 2 +-
solr/core/src/resources/apispec/core.system.blob.upload.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------