Apache Solr open-source search software
SOLR-17686: Rename SearchHandler.stageInEnglish to stageToString and make it protected and non-static (#3224)
Jeanie Lame668dceb6bec
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex 2d6b36ac3cb..45a8c1d7a19 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -662,7 +662,7 @@ public class SearchHandler extends RequestHandlerBasefor (SearchComponent c : components) {if (checkLimitsBefore(c,- "handleResponses next stage:" + stageInEnglish(nextStage),+ "handleResponses next stage:" + stageToString(nextStage),rb.req,rb.rsp,components)) {@@ -681,7 +681,7 @@ public class SearchHandler extends RequestHandlerBasefor (SearchComponent c : components) {if (checkLimitsBefore(- c, "finishStage stage:" + stageInEnglish(nextStage), rb.req, rb.rsp, components)) {+ c, "finishStage stage:" + stageToString(nextStage), rb.req, rb.rsp, components)) {return;}c.finishStage(rb);@@ -726,9 +726,9 @@ public class SearchHandler extends RequestHandlerBasereturn true;}- private static String stageInEnglish(int nextStage) {+ protected String stageToString(int stage) {// This should probably be a enum, but that change should be its own ticket.- switch (nextStage) {+ switch (stage) {case STAGE_START:return "START";case STAGE_PARSE_QUERY:@@ -743,8 +743,7 @@ public class SearchHandler extends RequestHandlerBasecase STAGE_DONE:return "FINISHING";default:- throw new SolrException(- SolrException.ErrorCode.SERVER_ERROR, "Unrecognized stage:" + nextStage);+ return "CUSTOM_STAGE_" + String.valueOf(stage);}}