inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-66: AlfrescoCoreAdminHandler.handleCustomAction now handles unknown actions

Browse Source
This commit is contained in:
Gethin James
2016-06-16 11:25:25 +02:00
parent 487d8d7dfd
commit 31f749efb8
2 changed files with 167 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
search-services/alfresco-solr/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
View File

@@ -178,167 +178,125 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
protected void handleCustomAction(SolrQueryRequest req, SolrQueryResponse rsp)
{
System.out.println("######## Handle Custom Action ###########");
log.info("######## Handle Custom Action ###########");
SolrParams params = req.getParams();
String cname = params.get(CoreAdminParams.CORE);
String a = params.get(CoreAdminParams.ACTION);
String action = params.get(CoreAdminParams.ACTION);
action = action==null?"":action.toUpperCase();
try
{
if (a.equalsIgnoreCase("TEST"))
{
System.out.println("######## Run Tests ###########");
new AlfrescoCoreAdminTester(this).runTests(req, rsp);
}
else if (a.equalsIgnoreCase("AUTHTEST"))
{
new AlfrescoCoreAdminTester(this).runAuthTest(req, rsp);
}
else if (a.equalsIgnoreCase("CMISTEST"))
{
new AlfrescoCoreAdminTester(this).runCmisTests(req, rsp);
}
else if (a.equalsIgnoreCase("newCore"))
{
newCore(req, rsp);
}
else if (a.equalsIgnoreCase("updateCore"))
{
updateCore(req, rsp);
}
else if (a.equalsIgnoreCase("removeCore"))
{
removeCore(req, rsp);
}
else if (a.equalsIgnoreCase("CHECK"))
{
actionCHECK(cname);
}
else if (a.equalsIgnoreCase("NODEREPORT"))
{
actionNODEREPORTS(rsp, params, cname);
}
else if (a.equalsIgnoreCase("ACLREPORT"))
{
actionACLREPORT(rsp, params, cname);
}
else if (a.equalsIgnoreCase("TXREPORT"))
{
actionTXREPORT(rsp, params, cname);
}
else if (a.equalsIgnoreCase("ACLTXREPORT"))
{
actionACLTXREPORT(rsp, params, cname);
}
else if (a.equalsIgnoreCase("REPORT"))
{
actionREPORT(rsp, params, cname);
}
else if (a.equalsIgnoreCase("PURGE"))
{
if (cname != null)
{
actionPURGE(params, cname);
}
else
{
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionPURGE(params, coreName);
switch (action) {
case "TEST":
log.info("######## Run Tests ###########");
new AlfrescoCoreAdminTester(this).runTests(req, rsp);
break;
case "AUTHTEST":
new AlfrescoCoreAdminTester(this).runAuthTest(req, rsp);
break;
case "CMISTEST":
new AlfrescoCoreAdminTester(this).runCmisTests(req, rsp);
break;
case "NEWCORE":
newCore(req, rsp);
break;
case "UPDATECORE":
updateCore(req, rsp);
break;
case "REMOVECORE":
removeCore(req, rsp);
break;
case "CHECK":
actionCHECK(cname);
break;
case "NODEREPORT":
actionNODEREPORTS(rsp, params, cname);
break;
case "ACLREPORT":
actionACLREPORT(rsp, params, cname);
break;
case "TXREPORT":
actionTXREPORT(rsp, params, cname);
break;
case "ACLTXREPORT":
actionACLTXREPORT(rsp, params, cname);
break;
case "REPORT":
actionREPORT(rsp, params, cname);
break;
case "PURGE":
if (cname != null) {
actionPURGE(params, cname);
} else {
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionPURGE(params, coreName);
}
}
}
}
else if (a.equalsIgnoreCase("REINDEX"))
{
if (cname != null)
{
actionREINDEX(params, cname);
}
else
{
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionREINDEX(params, coreName);
break;
case "REINDEX":
if (cname != null) {
actionREINDEX(params, cname);
} else {
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionREINDEX(params, coreName);
}
}
}
}
else if (a.equalsIgnoreCase("RETRY"))
{
if (cname != null)
{
actionRETRY(rsp, cname);
}
else
{
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionRETRY(rsp, coreName);
break;
case "RETRY":
if (cname != null) {
actionRETRY(rsp, cname);
} else {
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionRETRY(rsp, coreName);
}
}
}
}
else if (a.equalsIgnoreCase("INDEX"))
{
if (cname != null)
{
actionINDEX(params, cname);
}
else
{
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionINDEX(params, coreName);
break;
case "INDEX":
if (cname != null) {
actionINDEX(params, cname);
} else {
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionINDEX(params, coreName);
}
}
}
}
else if (a.equalsIgnoreCase("FIX"))
{
if (cname != null)
{
actionFIX(cname);
}
else
{
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionFIX(coreName);
break;
case "FIX":
if (cname != null) {
actionFIX(cname);
} else {
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionFIX(coreName);
}
}
}
}
else if (a.equalsIgnoreCase("SUMMARY"))
{
if (cname != null)
{
NamedList<Object> report = new SimpleOrderedMap<Object>();
actionSUMMARY(params, report, cname);
rsp.add("Summary", report);
}
else
{
NamedList<Object> report = new SimpleOrderedMap<Object>();
for (String coreName : getTrackerRegistry().getCoreNames())
{
actionSUMMARY(params, report, coreName);
break;
case "SUMMARY":
if (cname != null) {
NamedList<Object> report = new SimpleOrderedMap<Object>();
actionSUMMARY(params, report, cname);
rsp.add("Summary", report);
} else {
NamedList<Object> report = new SimpleOrderedMap<Object>();
for (String coreName : getTrackerRegistry().getCoreNames()) {
actionSUMMARY(params, report, coreName);
}
rsp.add("Summary", report);
}
rsp.add("Summary", report);
}
}
else if (a.equalsIgnoreCase("LOG4J"))
{
String resource = "log4j-solr.properties";
if (params.get("resource") != null)
{
resource = params.get("resource");
}
initResourceBasedLogging(resource);
}
else
{
handleCustomAction(req, rsp);
break;
case "LOG4J":
String resource = "log4j-solr.properties";
if (params.get("resource") != null) {
resource = params.get("resource");
}
initResourceBasedLogging(resource);
break;
default:
super.handleCustomAction(req, rsp);
break;
}
}
catch (Exception ex)
{
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"Error executing implementation of admin request " + a, ex);
"Error executing implementation of admin request " + action, ex);
}
}
@@ -371,9 +329,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
File solrHome = new File(coreContainer.getSolrHome());
File templates = new File(solrHome, "templates");
File template = new File(templates, templateName);
if(numShards > 1 )
{

62
search-services/alfresco-solr/src/test/java/org/alfresco/solr/AdminHandlerTest.java Normal file
View File

@@ -0,0 +1,62 @@
package org.alfresco.solr;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.common.SolrException;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.BeforeClass;
import org.junit.Test;
@LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
@SolrTestCaseJ4.SuppressSSL
public class AdminHandlerTest extends AlfrescoSolrTestCaseJ4 {
static CoreAdminHandler admin;
@BeforeClass
public static void beforeClass() throws Exception {
initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml");
admin = h.getCoreContainer().getMultiCoreHandler();
}
@Test(expected = SolrException.class)
public void testUnhandled() throws Exception
{
SolrQueryResponse resp = new SolrQueryResponse();
admin.handleRequestBody(req(CoreAdminParams.ACTION, "totalnonsense",
CoreAdminParams.NAME, h.getCore().getName()),
resp);
}
@Test
public void testhandledTestActions() throws Exception
{
requestAction("test");
requestAction("CMISTEST");
requestAction("authTEST");
}
@Test
public void testhandledCores() throws Exception
{
requestAction("newCore");
requestAction("updateCore");
requestAction("removeCore");
}
@Test
public void testhandledReports() throws Exception
{
requestAction("CHECK");
requestAction("REPORT");
requestAction("SUMMARY");
}
private void requestAction(String actionName) throws Exception {
admin.handleRequestBody(req(CoreAdminParams.ACTION, actionName,
CoreAdminParams.NAME, h.getCore().getName()),
new SolrQueryResponse());
}
}