Remove unused method SolrCloudManager.request() and cleanup DelegatingCloudManager (#3599)

Author: psalagnac

solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/DelegatingCloudManager.java

@@ -17,8 +17,6 @@
 package org.apache.solr.client.solrj.cloud;
 
 import java.io.IOException;
-import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
 import org.apache.solr.common.util.ObjectCache;
@@ -27,10 +25,11 @@
 /** Base class for overriding some behavior of {@link SolrCloudManager}. */
 public class DelegatingCloudManager implements SolrCloudManager {
   protected final SolrCloudManager delegate;
-  private ObjectCache objectCache = new ObjectCache();
-  private TimeSource timeSource = TimeSource.NANO_TIME;
 
   public DelegatingCloudManager(SolrCloudManager delegate) {
+    if (delegate == null) {
+      throw new IllegalArgumentException("delegate cannot be null");
+    }
     this.delegate = delegate;
   }
 
@@ -56,7 +55,7 @@ public DistribStateManager getDistribStateManager() {
 
   @Override
   public ObjectCache getObjectCache() {
-    return delegate == null ? objectCache : delegate.getObjectCache();
+    return delegate.getObjectCache();
   }
 
   @Override
@@ -66,12 +65,7 @@ public boolean isClosed() {
 
   @Override
   public TimeSource getTimeSource() {
-    return delegate == null ? timeSource : delegate.getTimeSource();
-  }
-
-  @Override
-  public <T extends SolrResponse> T request(SolrRequest<T> req) throws IOException {
-    return delegate.request(req);
+    return delegate.getTimeSource();
   }
 
   @Override

solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/cloud/SolrCloudManager.java

@@ -18,8 +18,6 @@
 package org.apache.solr.client.solrj.cloud;
 
 import java.io.IOException;
-import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.ClusterStateProvider;
 import org.apache.solr.common.SolrCloseable;
@@ -51,7 +49,4 @@ default ClusterState getClusterState() throws IOException {
   ObjectCache getObjectCache();
 
   TimeSource getTimeSource();
-
-  @Deprecated
-  <T extends SolrResponse> T request(SolrRequest<T> req) throws IOException;
 }

solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/SolrClientCloudManager.java

@@ -17,11 +17,7 @@
 
 package org.apache.solr.client.solrj.impl;
 
-import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrResponse;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.cloud.DistribStateManager;
 import org.apache.solr.client.solrj.cloud.NodeStateProvider;
 import org.apache.solr.client.solrj.cloud.SolrCloudManager;
@@ -103,17 +99,6 @@ public DistribStateManager getDistribStateManager() {
     return stateManager;
   }
 
-  @Override
-  public <T extends SolrResponse> T request(SolrRequest<T> req) throws IOException {
-    try {
-      return req.process(cloudSolrClient);
-    } catch (SolrServerException e) {
-      throw new IOException(e);
-    }
-  }
-
-  private static final byte[] EMPTY = new byte[0];
-
   public SolrZkClient getZkClient() {
     return zkClient;
   }