AMBARI-22310. Get rid of deprecated Solr usages (infra + logsearch) (oleewere)

ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudClientBuilder.java

@@ -125,7 +125,7 @@ public class AmbariSolrCloudClientBuilder {
   }
 
   public AmbariSolrCloudClientBuilder withSolrCloudClient() {
-    this.solrCloudClient = new CloudSolrClient(this.zkConnectString);
+    this.solrCloudClient = new CloudSolrClient.Builder().withZkHost(this.zkConnectString).build();
     return this;
   }
 
@@ -209,7 +209,7 @@ public class AmbariSolrCloudClientBuilder {
   private void setupSecurity(String jaasFile) {
     if (jaasFile != null) {
       System.setProperty("java.security.auth.login.config", jaasFile);
-      HttpClientUtil.setConfigurer(new Krb5HttpClientConfigurer());
+      HttpClientUtil.addConfigurer(new Krb5HttpClientConfigurer());
     }
   }
 }

ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/commands/CreateCollectionCommand.java

@@ -23,9 +23,6 @@ import org.apache.ambari.infra.solr.util.ShardUtils;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.CollectionAdminResponse;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class CreateCollectionCommand extends AbstractSolrRetryCommand<CollectionAdminRequest.Create ,String> {
 
   public CreateCollectionCommand(int maxRetries, int interval) {
@@ -39,12 +36,9 @@ public class CreateCollectionCommand extends AbstractSolrRetryCommand<Collection
 
   @Override
   public CollectionAdminRequest.Create createRequest(AmbariSolrCloudClient client) {
-    CollectionAdminRequest.Create request = new CollectionAdminRequest.Create();
-    request.setConfigName(client.getConfigSet());
-    request.setCollectionName(client.getCollection());
-    request.setNumShards(client.getShards());
-    request.setReplicationFactor(client.getReplication());
-    request.setMaxShardsPerNode(client.getMaxShardsPerNode());
+    CollectionAdminRequest.Create request =
+      CollectionAdminRequest.createCollection(client.getCollection(), client.getConfigSet(), client.getShards(), client.getReplication());
+    request.setMaxShardsPerNode(client.getMaxShardsPerNode());;
     if (client.getRouterField() != null && client.getRouterName()!= null) {
       request.setRouterName(client.getRouterName());
       request.setRouterField(client.getRouterField());

ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/commands/CreateShardCommand.java

@@ -38,10 +38,7 @@ public class CreateShardCommand extends AbstractSolrRetryCommand<CollectionAdmin
 
   @Override
   public CollectionAdminRequest.CreateShard createRequest(AmbariSolrCloudClient client) {
-    CollectionAdminRequest.CreateShard createShardRequest = new CollectionAdminRequest.CreateShard();
-    createShardRequest.setCollectionName(client.getCollection());
-    createShardRequest.setShardName(shardName);
-    return createShardRequest;
+    return CollectionAdminRequest.createShard(client.getCollection(), shardName);
   }
 
   @Override

ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/commands/GetShardsCommand.java

@@ -34,6 +34,6 @@ public class GetShardsCommand extends AbstractRetryCommand<Collection<Slice>> {
   public Collection<Slice> createAndProcessRequest(AmbariSolrCloudClient solrCloudClient) throws Exception {
     ZkStateReader zkReader = new ZkStateReader(solrCloudClient.getSolrZkClient());
     zkReader.createClusterStateWatchersAndUpdate();
-    return zkReader.getClusterState().getSlices(solrCloudClient.getCollection());
+    return zkReader.getClusterState().getCollection(solrCloudClient.getCollection()).getSlices();
   }
 }