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 2016/04/25 15:46:47 UTC
lucene-solr:apiv2: SOLR-8029: /get spec was not mapped right
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 474141ea4 -> 9b8511cde
SOLR-8029: /get spec was not mapped right
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9b8511cd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9b8511cd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9b8511cd
Branch: refs/heads/apiv2
Commit: 9b8511cde4afdba1f247ae428e515420a843f7f7
Parents: 474141e
Author: Noble Paul <no...@apache.org>
Authored: Mon Apr 25 19:16:35 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Apr 25 19:16:35 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/api/V2HttpCall.java | 2 ++
.../org/apache/solr/handler/RealTimeGetHandler.java | 13 +++++++++++++
solr/core/src/resources/apispec/core.RealtimeGet.json | 7 +++----
solr/core/src/resources/apispec/emptySpec.json | 2 --
4 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b8511cd/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 4cba5ec..997ccce 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -51,6 +51,7 @@ import org.apache.solr.util.PathTrie;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.servlet.SolrDispatchFilter.Action.PASSTHROUGH;
import static org.apache.solr.util.PathTrie.getParts;
import static org.apache.solr.common.params.CommonParams.JSON;
import static org.apache.solr.common.params.CommonParams.WT;
@@ -131,6 +132,7 @@ public class V2HttpCall extends HttpSolrCall {
log.error("Error in init()", rte);
throw rte;
} finally {
+ if (api == null) action = PASSTHROUGH;
if (solrReq != null) solrReq.getContext().put(CommonParams.PATH, path);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b8511cd/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
index fd30d9f..a495aa1 100644
--- a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
@@ -16,13 +16,19 @@
*/
package org.apache.solr.handler;
+import com.google.common.collect.ImmutableList;
+import org.apache.solr.api.Api;
+import org.apache.solr.api.ApiBag;
import org.apache.solr.handler.component.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import static org.apache.solr.api.ApiBag.wrapRequestHandler;
+
public class RealTimeGetHandler extends SearchHandler {
@Override
protected List<String> getDefaultComponents()
@@ -43,6 +49,13 @@ public class RealTimeGetHandler extends SearchHandler {
public URL[] getDocs() {
return null;
}
+
+ @Override
+ public Collection<Api> getApis() {
+ return ImmutableList.of(
+ wrapRequestHandler(this, ApiBag.getSpec("core.RealtimeGet"))
+ );
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b8511cd/solr/core/src/resources/apispec/core.RealtimeGet.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/core.RealtimeGet.json b/solr/core/src/resources/apispec/core.RealtimeGet.json
index c798139..a1f7dfd 100644
--- a/solr/core/src/resources/apispec/core.RealtimeGet.json
+++ b/solr/core/src/resources/apispec/core.RealtimeGet.json
@@ -4,11 +4,10 @@
"GET"
],
"url": {
- "path": "/get",
"paths": [
- "$handlerName",
- "$handlerName/versions",
- "$handlerName/updates"
+ "/get",
+ "/get/versions",
+ "/get/updates"
],
"params": {
"id": {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b8511cd/solr/core/src/resources/apispec/emptySpec.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/emptySpec.json b/solr/core/src/resources/apispec/emptySpec.json
index e96e841..d95bff9 100644
--- a/solr/core/src/resources/apispec/emptySpec.json
+++ b/solr/core/src/resources/apispec/emptySpec.json
@@ -1,11 +1,9 @@
{
- "documentation": "https://cwiki.apache.org/confluence/display/solr/Schema+API",
"methods": [
"GET",
"POST"
],
"url": {
- "path": "$handlerName",
"paths": [
"$handlerName"
]