You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/01/28 13:28:19 UTC
svn commit: r1655277 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/client/solrj/embedded/
core/src/test/org/apache/solr/update/
solrj/src/java/org/apache/solr/client/solrj/
solrj/src/java/org/apache/solr/client/solrj/impl/
Author: romseygeek
Date: Wed Jan 28 12:28:18 2015
New Revision: 1655277
URL: http://svn.apache.org/r1655277
Log:
SOLR-6954: Remove deprecated SolrClient.shutdown() method from trunk
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jan 28 12:28:18 2015
@@ -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
----------------------
@@ -57,6 +59,8 @@ Other Changes
* SOLR-6902: Use JUnit rules instead of inheritance with distributed Solr
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 ==================
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Wed Jan 28 12:28:18 2015
@@ -213,14 +213,8 @@ public class EmbeddedSolrServer extends
* Shutdown all cores within the EmbeddedSolrServer instance
*/
@Override
- @Deprecated
- public void shutdown() {
- coreContainer.shutdown();
- }
-
- @Override
public void close() throws IOException {
- shutdown();
+ coreContainer.shutdown();
}
/**
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java Wed Jan 28 12:28:18 2015
@@ -86,9 +86,6 @@ public class MockStreamingSolrClients ex
}
@Override
- public void shutdown() { }
-
- @Override
public void close() {}
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java Wed Jan 28 12:28:18 2015
@@ -400,17 +400,4 @@ public abstract class SolrClient impleme
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();
- }
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java Wed Jan 28 12:28:18 2015
@@ -1033,12 +1033,6 @@ public class CloudSolrClient extends Sol
@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 Sol
}
if (shutdownLBHttpSolrServer) {
- lbClient.shutdown();
+ lbClient.close();
}
if (clientIsInternal && myClient!=null) {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java Wed Jan 28 12:28:18 2015
@@ -36,6 +36,7 @@ import org.apache.solr.common.params.Com
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
@Override
public void close() {
- shutdown();
- }
-
- @Override
- @Deprecated
- public void shutdown() {
- client.shutdown();
+ IOUtils.closeQuietly(client);
if (shutdownExecutor) {
scheduler.shutdown();
try {
@@ -460,7 +455,7 @@ public class ConcurrentUpdateSolrClient
}
public void shutdownNow() {
- client.shutdown();
+ IOUtils.closeQuietly(client);
if (shutdownExecutor) {
scheduler.shutdownNow(); // Cancel currently executing tasks
try {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java Wed Jan 28 12:28:18 2015
@@ -753,12 +753,6 @@ public class HttpSolrClient extends Solr
*/
@Override
public void close() throws IOException {
- shutdown();
- }
-
- @Override
- @Deprecated
- public void shutdown() {
if (httpClient != null && internalClient) {
HttpClientUtil.close(httpClient);
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java?rev=1655277&r1=1655276&r2=1655277&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java Wed Jan 28 12:28:18 2015
@@ -470,12 +470,6 @@ public class LBHttpSolrClient extends So
@Override
public void close() {
- shutdown();
- }
-
- @Override
- @Deprecated
- public void shutdown() {
if (aliveCheckExecutor != null) {
aliveCheckExecutor.shutdownNow();
}