fix lint

solr/core/src/java/org/apache/solr/cli/AssertTool.java

@@ -34,13 +34,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
- * Supports assert command in the bin/solr script.
- * Asserts various conditions and exists with error code if there are failures,
- * else continues with no output.
+ * Supports assert command in the bin/solr script. Asserts various conditions and exists with error
+ * code if there are failures, else continues with no output.
  */
-
 public class AssertTool extends ToolBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static String message = null;

solr/core/src/java/org/apache/solr/cli/SolrCLI.java

@@ -513,7 +513,7 @@ private static void printHelp() {
    */
   public static String normalizeSolrUrl(String solrUrl) {
     if (solrUrl != null) {
-      if (solrUrl.indexOf("/solr") > -1) { //
+      if (solrUrl.contains("/solr")) { //
         String newSolrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
         CLIO.out(
             "WARNING: URLs provided to this tool needn't include Solr's context-root (e.g. \"/solr\"). Such URLs are deprecated and support for them will be removed in a future release. Correcting from ["
@@ -575,17 +575,6 @@ public static String getZkHost(CommandLine cli) throws Exception {
       return zkHost;
     }
 
-    String solrUrl = cli.getOptionValue("solrUrl");
-    if (solrUrl == null) {
-      solrUrl = getDefaultSolrUrl();
-      CLIO.getOutStream()
-          .println(
-              "Neither -zkHost or -solrUrl parameters provided so assuming solrUrl is "
-                  + solrUrl
-                  + ".");
-    }
-    solrUrl = normalizeSolrUrl(solrUrl);
-
     try (SolrClient solrClient = getSolrClient(cli)) {
       // hit Solr to get system info
       NamedList<Object> systemInfo =