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 index 70f21134408..0e1dfa407d8 100644 --- 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> 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 securityJson = Optional.empty(); - private String credentials; private List configs = new ArrayList<>(); private Map 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 *