Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8476: COreAdminHandler refactoring 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1722900 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2016-01-04 15:48:12 +00:00
parent b7685e057b
commit 6a9c381c07
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
View File

@ -51,6 +51,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import static org.apache.solr.common.params.CoreAdminParams.ACTION;
import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.STATUS;
/**
*
* @since solr 1.3
@ -140,14 +143,9 @@ public class CoreAdminHandler extends RequestHandlerBase {
}
// Pick the action
SolrParams params = req.getParams();
CoreAdminAction action = CoreAdminAction.STATUS;
String a = params.get(CoreAdminParams.ACTION);
if (a == null) return;
CoreAdminOperation op = opMap.get(a.toLowerCase(Locale.ROOT));
CoreAdminOperation op = opMap.get(req.getParams().get(ACTION, STATUS.toString()).toLowerCase(Locale.ROOT));
if (op == null) {
this.handleCustomAction(req, rsp);
handleCustomAction(req, rsp);
return;
}
@ -157,7 +155,7 @@ public class CoreAdminHandler extends RequestHandlerBase {
} else {
try {
MDC.put("CoreAdminHandler.asyncId", taskId);
MDC.put("CoreAdminHandler.action", action.name());
MDC.put("CoreAdminHandler.action", op.action.toString());
parallelExecutor.execute(new Runnable() {
@Override
public void run() {
@ -196,7 +194,7 @@ public class CoreAdminHandler extends RequestHandlerBase {
*/
protected void handleCustomAction(SolrQueryRequest req, SolrQueryResponse rsp) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Unsupported operation: " +
req.getParams().get(CoreAdminParams.ACTION));
req.getParams().get(ACTION));
}
public static ImmutableMap<String, String> paramToProp = ImmutableMap.<String, String>builder()