HoustonPutman commented on code in PR #1863: URL: https://github.com/apache/solr/pull/1863#discussion_r1303259400
########## solr/core/src/java/org/apache/solr/cli/ApiTool.java: ########## @@ -61,29 +60,39 @@ public List<Option> getOptions() { @Override public void runImpl(CommandLine cli) throws Exception { + String response = null; String getUrl = cli.getOptionValue("get"); if (getUrl != null) { - getUrl = getUrl.replace("+", "%20"); - URI uri = new URI(getUrl); - String solrUrl = getSolrUrlFromUri(uri); - String path = uri.getPath(); - try (var solrClient = SolrCLI.getSolrClient(solrUrl)) { - NamedList<Object> response = - solrClient.request( - // For path parameter we need the path without the root so from the second / char - // (because root can be configured) - // E.g URL is http://localhost:8983/solr/admin/info/system path is - // /solr/admin/info/system and the path without root is /admin/info/system - new GenericSolrRequest( - SolrRequest.METHOD.GET, - path.substring(path.indexOf("/", path.indexOf("/") + 1)), - getSolrParamsFromUri(uri))); + response = callGet(getUrl); + } + if (response != null) { + // pretty-print the response to stdout + echo(response); + } + } - // pretty-print the response to stdout - CharArr arr = new CharArr(); - new JSONWriter(arr, 2).write(response.asMap()); - echo(arr.toString()); - } + protected String callGet(String url) throws Exception { Review Comment: Probably, but also probably for another day 🙂 ########## solr/core/src/java/org/apache/solr/cli/ApiTool.java: ########## @@ -61,29 +60,39 @@ public List<Option> getOptions() { @Override public void runImpl(CommandLine cli) throws Exception { + String response = null; String getUrl = cli.getOptionValue("get"); if (getUrl != null) { - getUrl = getUrl.replace("+", "%20"); - URI uri = new URI(getUrl); - String solrUrl = getSolrUrlFromUri(uri); - String path = uri.getPath(); - try (var solrClient = SolrCLI.getSolrClient(solrUrl)) { - NamedList<Object> response = - solrClient.request( - // For path parameter we need the path without the root so from the second / char - // (because root can be configured) - // E.g URL is http://localhost:8983/solr/admin/info/system path is - // /solr/admin/info/system and the path without root is /admin/info/system - new GenericSolrRequest( - SolrRequest.METHOD.GET, - path.substring(path.indexOf("/", path.indexOf("/") + 1)), - getSolrParamsFromUri(uri))); + response = callGet(getUrl); + } + if (response != null) { + // pretty-print the response to stdout + echo(response); + } + } - // pretty-print the response to stdout - CharArr arr = new CharArr(); - new JSONWriter(arr, 2).write(response.asMap()); - echo(arr.toString()); - } + protected String callGet(String url) throws Exception { Review Comment: Probably, but also probably for another day 🙂 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org