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/01/04 16:49:20 UTC
svn commit: r1722901 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: noble
Date: Mon Jan 4 15:49:20 2016
New Revision: 1722901
URL: http://svn.apache.org/viewvc?rev=1722901&view=rev
Log:
SOLR-8476: CoreAdminHandler refactoring
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1722901&r1=1722900&r2=1722901&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Jan 4 15:49:20 2016
@@ -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 Re
}
// 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 Re
} 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 Re
*/
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()