SOLR-6954: Remove deprecated SolrClient.shutdown() method from trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1655277 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -43,6 +43,8 @@ Upgrading from Solr 5.x
 * The deprecated <nrtMode> configuration in solrconfig.xml has been removed.
   Please remove it from solrconfig.xml.
 
+* SolrClient.shutdown() has been removed, use SolrClient.close() instead.
+
 Detailed Change List
 ----------------------
 
@@ -58,6 +60,8 @@ Other Changes
   tests to allow for multiple tests without the same class.
   (Ramkumar Aiyengar, Erick Erickson, Mike McCandless)
 
+* SOLR-6954: Deprecated SolrClient.shutdown() method removed (Alan Woodward)
+  
 ==================  5.1.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java

@@ -212,15 +212,9 @@ public class EmbeddedSolrServer extends SolrClient
   /**
    * Shutdown all cores within the EmbeddedSolrServer instance
    */
-  @Override
-  @Deprecated
-  public void shutdown() {
-    coreContainer.shutdown();
-  }
-
   @Override
   public void close() throws IOException {
-    shutdown();
+    coreContainer.shutdown();
   }
   
   /**

solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java

@@ -85,9 +85,6 @@ public class MockStreamingSolrClients extends StreamingSolrClients {
       return solrClient.request(request);
     }
 
-    @Override
-    public void shutdown() { }
-
     @Override
     public void close() {}
     

solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java

@@ -400,17 +400,4 @@ public abstract class SolrClient implements Serializable, Closeable {
     return binder;
   }
 
-  /**
-   * Release allocated resources.
-   *
-   * @since solr 4.0
-   * @deprecated Use close() instead.
-   */
-  @Deprecated
-  public abstract void shutdown();
-
-  //@SuppressWarnings("deprecation")
-  public void close() throws IOException {
-    shutdown();
-  }
 }

solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java

@@ -1033,12 +1033,6 @@ public class CloudSolrClient extends SolrClient {
 
   @Override
   public void close() throws IOException {
-    shutdown();
-  }
-
-  @Override
-  @Deprecated
-  public void shutdown() {
     if (zkStateReader != null) {
       synchronized(this) {
         if (zkStateReader!= null)
@@ -1048,7 +1042,7 @@ public class CloudSolrClient extends SolrClient {
     }
     
     if (shutdownLBHttpSolrServer) {
-      lbClient.shutdown();
+      lbClient.close();
     }
     
     if (clientIsInternal && myClient!=null) {

solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java

@@ -36,6 +36,7 @@ import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.params.UpdateParams;
+import org.apache.solr.common.util.IOUtils;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SolrjNamedThreadFactory;
 import org.slf4j.Logger;
@@ -425,13 +426,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
 
   @Override
   public void close() {
-    shutdown();
+    IOUtils.closeQuietly(client);
-  }
-
-  @Override
-  @Deprecated
-  public void shutdown() {
-    client.shutdown();
     if (shutdownExecutor) {
       scheduler.shutdown();
       try {
@@ -460,7 +455,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient {
   }
 
   public void shutdownNow() {
-    client.shutdown();
+    IOUtils.closeQuietly(client);
     if (shutdownExecutor) {
       scheduler.shutdownNow(); // Cancel currently executing tasks
       try {

solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java

@@ -753,12 +753,6 @@ public class HttpSolrClient extends SolrClient {
    */
   @Override
   public void close() throws IOException {
-    shutdown();
-  }
-
-  @Override
-  @Deprecated
-  public void shutdown() {
     if (httpClient != null && internalClient) {
       HttpClientUtil.close(httpClient);
     }

solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java

@@ -470,12 +470,6 @@ public class LBHttpSolrClient extends SolrClient {
 
   @Override
   public void close() {
-    shutdown();
-  }
-
-  @Override
-  @Deprecated
-  public void shutdown() {
     if (aliveCheckExecutor != null) {
       aliveCheckExecutor.shutdownNow();
     }