mlbiscoc commented on code in PR #2935:
URL: https://github.com/apache/solr/pull/2935#discussion_r1924552833
##########
solr/solrj/src/java/org/apache/solr/common/util/URLUtil.java:
##########
@@ -98,4 +102,59 @@ private static String removeTrailingSlashIfPresent(String
url) {
return url;
}
+
+ /**
+ * Construct a V1 base url for the Solr node, given its name (e.g.,
'app-node-1:8983_solr') and a
+ * URL scheme.
+ *
+ * @param nodeName name of the Solr node
+ * @param urlScheme scheme for the base url ('http' or 'https')
+ * @return url that looks like {@code https://app-node-1:8983/solr}
+ * @throws IllegalArgumentException if the provided node name is malformed
+ */
+ public static String getBaseUrlForNodeName(final String nodeName, final
String urlScheme) {
+ return getBaseUrlForNodeName(nodeName, urlScheme, false);
+ }
+
+ /**
+ * Construct a V1 or a V2 base url for the Solr node, given its name (e.g.,
+ * 'app-node-1:8983_solr') and a URL scheme.
+ *
+ * @param nodeName name of the Solr node
+ * @param urlScheme scheme for the base url ('http' or 'https')
+ * @param isV2 whether a V2 url should be constructed
+ * @return url that looks like {@code https://app-node-1:8983/api} (V2) or
{@code
+ * https://app-node-1:8983/solr} (V1)
+ * @throws IllegalArgumentException if the provided node name is malformed
+ */
+ public static String getBaseUrlForNodeName(
+ final String nodeName, final String urlScheme, boolean isV2) {
+ final int colonAt = nodeName.indexOf(':');
+ if (colonAt == -1) {
+ throw new IllegalArgumentException(
+ "nodeName does not contain expected ':' separator: " + nodeName);
+ }
+
+ final int _offset = nodeName.indexOf('_', colonAt);
+ if (_offset < 0) {
+ throw new IllegalArgumentException(
+ "nodeName does not contain expected '_' separator: " + nodeName);
+ }
+ final String hostAndPort = nodeName.substring(0, _offset);
+ return urlScheme + "://" + hostAndPort + "/" + (isV2 ? "api" : "solr");
+ }
+
+ /**
+ * Construct base Solr URL to a Solr node name
+ *
+ * @param solrUrl Given a base Solr URL string (e.g.,
'https://app-node-1:8983/solr')
+ * @return Node name that looks like {@code app-node-1:8983_solr}
+ * @throws MalformedURLException if the provided URL string is malformed
+ * @throws URISyntaxException if the provided URL string could not be parsed
as a URI reference.
+ */
+ public static String getNodeNameForBaseUrl(String solrUrl)
+ throws MalformedURLException, URISyntaxException {
+ URL url = new URI(solrUrl).toURL();
+ return url.getAuthority() + url.getPath().replace('/', '_');
Review Comment:
After changing configured nodes to List<URL>, this function isn't used
anymore except for tests.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
