Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16767: migrate some methods into ApiTool that are only used by it (#1580)

Eric Pughe159ed37cad5
diff --git a/solr/core/src/java/org/apache/solr/cli/ApiTool.java b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
index 02971ab7828..c4ecce4a639 100644
--- a/solr/core/src/java/org/apache/solr/cli/ApiTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ApiTool.java
@@ -24,6 +24,7 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.request.GenericSolrRequest;
+import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.noggit.CharArr;
import org.noggit.JSONWriter;
@@ -60,7 +61,7 @@ public class ApiTool extends ToolBase {
if (getUrl != null) {
getUrl = getUrl.replace("+", "%20");
URI uri = new URI(getUrl);
- String solrUrl = SolrCLI.getSolrUrlFromUri(uri);
+ String solrUrl = getSolrUrlFromUri(uri);
String path = uri.getPath();
try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
NamedList<Object> response =
@@ -72,7 +73,7 @@ public class ApiTool extends ToolBase {
new GenericSolrRequest(
SolrRequest.METHOD.GET,
path.substring(path.indexOf("/", path.indexOf("/") + 1)),
- SolrCLI.getSolrParamsFromUri(uri)));
+ getSolrParamsFromUri(uri)));
// pretty-print the response to stdout
CharArr arr = new CharArr();
@@ -81,4 +82,24 @@ public class ApiTool extends ToolBase {
}
}
}
+
+ /**
+ * Get Solr base url with port if present and root from URI
+ *
+ * @param uri Full Solr URI (e.g. http://localhost:8983/solr/admin/info/system)
+ * @return Solr base url with port and root (from above example http://localhost:8983/solr)
+ */
+ public static String getSolrUrlFromUri(URI uri) {
+ return uri.getScheme() + "://" + uri.getAuthority() + "/" + uri.getPath().split("/")[1];
+ }
+
+ public static ModifiableSolrParams getSolrParamsFromUri(URI uri) {
+ ModifiableSolrParams paramsMap = new ModifiableSolrParams();
+ String[] params = uri.getQuery() == null ? new String[] {} : uri.getQuery().split("&");
+ for (String param : params) {
+ String[] paramSplit = param.split("=");
+ paramsMap.add(paramSplit[0], paramSplit[1]);
+ }
+ return paramsMap;
+ }
}
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 6ab176d4aa3..bd4d5e20bc2 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketException;
-import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -61,7 +60,6 @@ import org.apache.solr.client.solrj.request.GenericSolrRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.SolrVersion;
@@ -222,11 +220,6 @@ public class SolrCLI implements CLIO {
}
}
- /** Support options common to all tools. */
- public static List<Option> getCommonToolOptions() {
- return List.of();
- }
-
// Creates an instance of the requested tool, using classpath scanning if necessary
private static Tool newTool(String toolType) throws Exception {
if ("healthcheck".equals(toolType)) return new HealthcheckTool();
@@ -430,30 +423,10 @@ public class SolrCLI implements CLIO {
}
public static SolrClient getSolrClient(String solrUrl) {
- return new Http2SolrClient.Builder(solrUrl).maxConnectionsPerHost(32).build();
- }
-
- /**
- * Get Solr base url with port if present and root from URI
- *
- * @param uri Full Solr URI (e.g. http://localhost:8983/solr/admin/info/system)
- * @return Solr base url with port and root (from above example http://localhost:8983/solr)
- */
- public static String getSolrUrlFromUri(URI uri) {
- return uri.getScheme() + "://" + uri.getAuthority() + "/" + uri.getPath().split("/")[1];
+ return new Http2SolrClient.Builder(solrUrl).withMaxConnectionsPerHost(32).build();
}
- public static ModifiableSolrParams getSolrParamsFromUri(URI uri) {
- ModifiableSolrParams paramsMap = new ModifiableSolrParams();
- String[] params = uri.getQuery() == null ? new String[] {} : uri.getQuery().split("&");
- for (String param : params) {
- String[] paramSplit = param.split("=");
- paramsMap.add(paramSplit[0], paramSplit[1]);
- }
- return paramsMap;
- }
-
- public static final String JSON_CONTENT_TYPE = "application/json";
+ private static final String JSON_CONTENT_TYPE = "application/json";
public static NamedList<Object> postJsonToSolr(
SolrClient solrClient, String updatePath, String jsonBody) throws Exception {
@@ -471,7 +444,7 @@ public class SolrCLI implements CLIO {
private static final long MS_IN_DAY = MS_IN_HOUR * 24L;
@VisibleForTesting
- public static final String uptime(long uptimeMs) {
+ public static String uptime(long uptimeMs) {
if (uptimeMs <= 0L) return "?";
long numDays = (uptimeMs >= MS_IN_DAY) ? (uptimeMs / MS_IN_DAY) : 0L;
@@ -605,7 +578,7 @@ public class SolrCLI implements CLIO {
public static boolean safeCheckCollectionExists(String solrUrl, String collection) {
boolean exists = false;
- try (var solrClient = getSolrClient(solrUrl); ) {
+ try (var solrClient = getSolrClient(solrUrl)) {
NamedList<Object> existsCheckResult = solrClient.request(new CollectionAdminRequest.List());
@SuppressWarnings("unchecked")
List<String> collections = (List<String>) existsCheckResult.get("collections");
diff --git a/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java b/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
index c0f6fd8328b..82e9b99a473 100644
--- a/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/ApiToolTest.java
@@ -37,7 +37,7 @@ public class ApiToolTest extends SolrTestCase {
url = url.replace("+", "%20");
URI uri = new URI(url);
- ModifiableSolrParams params = SolrCLI.getSolrParamsFromUri(uri);
+ ModifiableSolrParams params = ApiTool.getSolrParamsFromUri(uri);
assertEquals(1, params.size());
assertEquals("select id from COLL_NAME limit 10", params.get("stmt"));
}