back out more changes

apache · Sep 29, 2023 · 4ac2b7d · 4ac2b7d
1 parent 5145071
commit 4ac2b7d
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -665,7 +665,7 @@ public void shutdown() throws Exception {
                 IOUtils.closeQuietly(c);
               });
       solrClientByCollection.clear();
-      ;
+
       List<Callable<JettySolrRunner>> shutdowns = new ArrayList<>(jettys.size());
       for (final JettySolrRunner jetty : jettys) {
         shutdowns.add(() -> stopJettySolrRunner(jetty));
@@ -934,11 +934,7 @@ public static CollectionStatePredicate expectedShardsAndActiveReplicas(
           }
         }
       }
-      if (activeReplicas == expectedReplicas) {
-        return true;
-      }
-
-      return false;
+      return activeReplicas == expectedReplicas;
     };
   }
 
@@ -1032,7 +1028,6 @@ public static class Builder {
     private String solrXml = DEFAULT_CLOUD_SOLR_XML;
     private JettyConfig.Builder jettyConfigBuilder;
     private Optional<String> securityJson = Optional.empty();
-    private String credentials;
 
     private List<Config> configs = new ArrayList<>();
     private Map<String, Object> clusterProperties = new HashMap<>();
@@ -1109,17 +1104,6 @@ public Builder withSecurityJson(String securityJson) {
       return this;
     }
 
-    /**
-     * Configure the solrClients for the {@linkplain MiniSolrCloudCluster}
-     *
-     * @param credentials The string specifying the username:password to use
-     * @return the instance of {@linkplain Builder}
-     */
-    public Builder withCredentials(String credentials) {
-      this.credentials = credentials;
-      return this;
-    }
-
     /**
      * Upload a collection config before tests start
      *