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 12:55:58 UTC
svn commit: r1655263 [4/4] - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
contrib/map-reduce/src/java/org/apache/solr/hadoop/...
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Wed Jan 28 11:55:57 2015
@@ -76,90 +76,91 @@ public class TestBinaryField extends Sol
public void testSimple() throws Exception {
- SolrClient client = getSolrClient();
- byte[] buf = new byte[10];
- for (int i = 0; i < 10; i++) {
- buf[i] = (byte) i;
- }
- SolrInputDocument doc = null;
- doc = new SolrInputDocument();
- doc.addField("id", 1);
- doc.addField("data", ByteBuffer.wrap(buf, 2, 5));
- client.add(doc);
-
- doc = new SolrInputDocument();
- doc.addField("id", 2);
- doc.addField("data", ByteBuffer.wrap(buf, 4, 3));
- client.add(doc);
-
- doc = new SolrInputDocument();
- doc.addField("id", 3);
- doc.addField("data", buf);
- client.add(doc);
-
- client.commit();
-
- QueryResponse resp = client.query(new SolrQuery("*:*"));
- client.shutdown();
- SolrDocumentList res = resp.getResults();
- List<Bean> beans = resp.getBeans(Bean.class);
- assertEquals(3, res.size());
- assertEquals(3, beans.size());
- for (SolrDocument d : res) {
- Integer id = (Integer) d.getFieldValue("id");
- byte[] data = (byte[]) d.getFieldValue("data");
- if (id == 1) {
- assertEquals(5, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)(i + 2), b);
- }
-
- } else if (id == 2) {
- assertEquals(3, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)(i + 4), b);
- }
-
-
- } else if (id == 3) {
- assertEquals(10, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)i, b);
- }
-
+ try (SolrClient client = getSolrClient()) {
+ byte[] buf = new byte[10];
+ for (int i = 0; i < 10; i++) {
+ buf[i] = (byte) i;
}
+ SolrInputDocument doc = null;
+ doc = new SolrInputDocument();
+ doc.addField("id", 1);
+ doc.addField("data", ByteBuffer.wrap(buf, 2, 5));
+ client.add(doc);
+
+ doc = new SolrInputDocument();
+ doc.addField("id", 2);
+ doc.addField("data", ByteBuffer.wrap(buf, 4, 3));
+ client.add(doc);
+
+ doc = new SolrInputDocument();
+ doc.addField("id", 3);
+ doc.addField("data", buf);
+ client.add(doc);
+
+ client.commit();
+
+ QueryResponse resp = client.query(new SolrQuery("*:*"));
+ SolrDocumentList res = resp.getResults();
+ List<Bean> beans = resp.getBeans(Bean.class);
+ assertEquals(3, res.size());
+ assertEquals(3, beans.size());
+ for (SolrDocument d : res) {
+
+ Integer id = (Integer) d.getFieldValue("id");
+ byte[] data = (byte[]) d.getFieldValue("data");
+ if (id == 1) {
+ assertEquals(5, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) (i + 2), b);
+ }
+
+ } else if (id == 2) {
+ assertEquals(3, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) (i + 4), b);
+ }
+
+
+ } else if (id == 3) {
+ assertEquals(10, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) i, b);
+ }
- }
- for (Bean d : beans) {
- Integer id = d.id;
- byte[] data = d.data;
- if (id == 1) {
- assertEquals(5, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)(i + 2), b);
- }
-
- } else if (id == 2) {
- assertEquals(3, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)(i + 4), b);
}
+ }
+ for (Bean d : beans) {
+ Integer id = d.id;
+ byte[] data = d.data;
+ if (id == 1) {
+ assertEquals(5, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) (i + 2), b);
+ }
+
+ } else if (id == 2) {
+ assertEquals(3, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) (i + 4), b);
+ }
+
+
+ } else if (id == 3) {
+ assertEquals(10, data.length);
+ for (int i = 0; i < data.length; i++) {
+ byte b = data[i];
+ assertEquals((byte) i, b);
+ }
- } else if (id == 3) {
- assertEquals(10, data.length);
- for (int i = 0; i < data.length; i++) {
- byte b = data[i];
- assertEquals((byte)i, b);
}
}
-
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java Wed Jan 28 11:55:57 2015
@@ -163,25 +163,22 @@ public class TestSolrJ extends SolrTestC
public void doCommitPerf() throws Exception {
- HttpSolrClient client = new HttpSolrClient("http://127.0.0.1:8983/solr");
- long start = System.currentTimeMillis();
+ try (HttpSolrClient client = new HttpSolrClient("http://127.0.0.1:8983/solr")) {
- for (int i=0; i<10000; i++) {
- SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", Integer.toString(i % 13));
- client.add(doc);
- client.commit(true, true, true);
- }
+ long start = System.currentTimeMillis();
- long end = System.currentTimeMillis();
+ for (int i = 0; i < 10000; i++) {
+ SolrInputDocument doc = new SolrInputDocument();
+ doc.addField("id", Integer.toString(i % 13));
+ client.add(doc);
+ client.commit(true, true, true);
+ }
- client.shutdown();
+ long end = System.currentTimeMillis();
+ System.out.println("TIME: " + (end-start));
+ }
- System.out.println("TIME: " + (end-start));
}
-
-
-
}
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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -85,9 +85,11 @@ public class MockStreamingSolrClients ex
return solrClient.request(request);
}
+ @Override
+ public void shutdown() { }
@Override
- public void shutdown() {}
+ 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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -35,6 +35,7 @@ import org.apache.solr.common.params.Mod
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import java.io.Closeable;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -47,7 +48,7 @@ import java.util.List;
*
* @since 5.0, replaced {@code SolrServer}
*/
-public abstract class SolrClient implements Serializable {
+public abstract class SolrClient implements Serializable, Closeable {
private static final long serialVersionUID = 1L;
private DocumentObjectBinder binder;
@@ -403,6 +404,13 @@ public abstract class SolrClient impleme
* 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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -1032,6 +1032,12 @@ public class CloudSolrClient extends Sol
}
@Override
+ public void close() throws IOException {
+ shutdown();
+ }
+
+ @Override
+ @Deprecated
public void shutdown() {
if (zkStateReader != null) {
synchronized(this) {
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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -424,6 +424,12 @@ public class ConcurrentUpdateSolrClient
}
@Override
+ public void close() {
+ shutdown();
+ }
+
+ @Override
+ @Deprecated
public void shutdown() {
client.shutdown();
if (shutdownExecutor) {
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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -752,6 +752,12 @@ public class HttpSolrClient extends Solr
* Close the {@link ClientConnectionManager} from the internal client.
*/
@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=1655263&r1=1655262&r2=1655263&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 11:55:57 2015
@@ -469,6 +469,12 @@ public class LBHttpSolrClient extends So
}
@Override
+ public void close() {
+ shutdown();
+ }
+
+ @Override
+ @Deprecated
public void shutdown() {
if (aliveCheckExecutor != null) {
aliveCheckExecutor.shutdownNow();
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java Wed Jan 28 11:55:57 2015
@@ -118,7 +118,7 @@ public abstract class LargeVolumeTestBas
log.info("Caught benign exception during commit: " + e.getMessage());
}
if (!(client instanceof EmbeddedSolrServer)) {
- client.shutdown();
+ client.close();
}
} catch (Exception e) {
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Wed Jan 28 11:55:57 2015
@@ -213,13 +213,13 @@ abstract public class SolrExampleTests e
if (jetty != null) {
// check system wide system handler + "/admin/info/system"
String url = jetty.getBaseUrl().toString();
- HttpSolrClient adminClient = new HttpSolrClient(url);
- SolrQuery q = new SolrQuery();
- q.set("qt", "/admin/info/system");
- QueryResponse rsp = adminClient.query(q);
- assertNotNull(rsp.getResponse().get("mode"));
- assertNotNull(rsp.getResponse().get("lucene"));
- adminClient.shutdown();
+ try (HttpSolrClient adminClient = new HttpSolrClient(url)) {
+ SolrQuery q = new SolrQuery();
+ q.set("qt", "/admin/info/system");
+ QueryResponse rsp = adminClient.query(q);
+ assertNotNull(rsp.getResponse().get("mode"));
+ assertNotNull(rsp.getResponse().get("lucene"));
+ }
}
}
@@ -547,7 +547,7 @@ abstract public class SolrExampleTests e
if (!(client instanceof EmbeddedSolrServer)) {
/* Do not close in case of using EmbeddedSolrServer,
* as that would close the CoreContainer */
- client.shutdown();
+ client.close();
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java Wed Jan 28 11:55:57 2015
@@ -105,16 +105,13 @@ public class TestLBHttpSolrClient extend
doc.addField("name", solrInstance.name);
docs.add(doc);
}
- HttpSolrClient client = new HttpSolrClient(solrInstance.getUrl(), httpClient);
SolrResponseBase resp;
- try {
+ try (HttpSolrClient client = new HttpSolrClient(solrInstance.getUrl(), httpClient)) {
resp = client.add(docs);
assertEquals(0, resp.getStatus());
resp = client.commit();
- } finally {
- client.shutdown();
+ assertEquals(0, resp.getStatus());
}
- assertEquals(0, resp.getStatus());
}
@Override
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java Wed Jan 28 11:55:57 2015
@@ -76,30 +76,30 @@ public class SolrExampleStreamingTest ex
public void testWaitOptions() throws Exception {
// SOLR-3903
final List<Throwable> failures = new ArrayList<>();
- ConcurrentUpdateSolrClient concurrentClient = new ConcurrentUpdateSolrClient
+ try (ConcurrentUpdateSolrClient concurrentClient = new ConcurrentUpdateSolrClient
(jetty.getBaseUrl().toString() + "/collection1", 2, 2) {
@Override
public void handleError(Throwable ex) {
failures.add(ex);
}
- };
-
- int docId = 42;
- for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) {
- for (boolean waitSearch : Arrays.asList(true, false)) {
- for (boolean waitFlush : Arrays.asList(true, false)) {
- UpdateRequest updateRequest = new UpdateRequest();
- SolrInputDocument document = new SolrInputDocument();
- document.addField("id", docId++ );
- updateRequest.add(document);
- updateRequest.setAction(action, waitSearch, waitFlush);
- concurrentClient.request(updateRequest);
+ }) {
+
+ int docId = 42;
+ for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) {
+ for (boolean waitSearch : Arrays.asList(true, false)) {
+ for (boolean waitFlush : Arrays.asList(true, false)) {
+ UpdateRequest updateRequest = new UpdateRequest();
+ SolrInputDocument document = new SolrInputDocument();
+ document.addField("id", docId++);
+ updateRequest.add(document);
+ updateRequest.setAction(action, waitSearch, waitFlush);
+ concurrentClient.request(updateRequest);
+ }
}
}
+ concurrentClient.commit();
+ concurrentClient.blockUntilFinished();
}
- concurrentClient.commit();
- concurrentClient.blockUntilFinished();
- concurrentClient.shutdown();
if (0 != failures.size()) {
assertEquals(failures.size() + " Unexpected Exception, starting with...",
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java Wed Jan 28 11:55:57 2015
@@ -17,12 +17,8 @@ package org.apache.solr.client.solrj.emb
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import junit.framework.Assert;
-
import org.apache.solr.core.SolrCore;
import org.junit.Rule;
import org.junit.rules.RuleChain;
@@ -30,7 +26,10 @@ import org.junit.rules.TestRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
public class TestEmbeddedSolrServer extends AbstractEmbeddedSolrServerTestCase {
@@ -55,9 +54,9 @@ public class TestEmbeddedSolrServer exte
Assert.assertEquals(cores, ((EmbeddedSolrServer)getSolrCore1()).getCoreContainer());
}
- public void testShutdown() {
+ public void testClose() throws IOException {
- EmbeddedSolrServer solrServer = (EmbeddedSolrServer)getSolrCore0();
+ EmbeddedSolrServer solrServer = (EmbeddedSolrServer) getSolrCore0();
Assert.assertEquals(3, cores.getCores().size());
List<SolrCore> solrCores = new ArrayList<>();
@@ -66,7 +65,7 @@ public class TestEmbeddedSolrServer exte
solrCores.add(solrCore);
}
- solrServer.shutdown();
+ solrServer.close();
Assert.assertEquals(0, cores.getCores().size());
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java Wed Jan 28 11:55:57 2015
@@ -20,7 +20,6 @@ package org.apache.solr.client.solrj.imp
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.solr.SolrJettyTestBase;
@@ -44,7 +43,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.Socket;
@@ -160,17 +158,16 @@ public class BasicHttpSolrClientTest ext
@Test
public void testTimeout() throws Exception {
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() +
- "/slow/foo");
+
SolrQuery q = new SolrQuery("*:*");
- client.setSoTimeout(2000);
- try {
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/slow/foo")) {
+ client.setSoTimeout(2000);
QueryResponse response = client.query(q, METHOD.GET);
fail("No exception thrown.");
} catch (SolrServerException e) {
assertTrue(e.getMessage().contains("Timeout"));
}
- client.shutdown();
+
}
/**
@@ -183,9 +180,7 @@ public class BasicHttpSolrClientTest ext
assertEquals(status + " didn't generate an UNKNOWN error code, someone modified the list of valid ErrorCode's w/o changing this test to work a different way",
ErrorCode.UNKNOWN, ErrorCode.getErrorCode(status));
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() +
- "/debug/foo");
- try {
+ try ( HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
DebugServlet.setErrorCode(status);
try {
SolrQuery q = new SolrQuery("foo");
@@ -196,262 +191,275 @@ public class BasicHttpSolrClientTest ext
assertEquals("Unexpected exception status code", status, e.code());
}
} finally {
- client.shutdown();
DebugServlet.clear();
}
}
@Test
- public void testQuery(){
+ public void testQuery() throws IOException {
DebugServlet.clear();
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo");
- SolrQuery q = new SolrQuery("foo");
- q.setParam("a", "\u1234");
- try {
- client.query(q, METHOD.GET);
- } catch (Throwable t) {}
-
- //default method
- assertEquals("get", DebugServlet.lastMethod);
- //agent
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- //default wt
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- //default version
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- //agent
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- //keepalive
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- //content-type
- assertEquals(null, DebugServlet.headers.get("Content-Type"));
- //param encoding
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
+ SolrQuery q = new SolrQuery("foo");
+ q.setParam("a", "\u1234");
+ try {
+ client.query(q, METHOD.GET);
+ } catch (Throwable t) {
+ }
- //POST
- DebugServlet.clear();
- try {
- client.query(q, METHOD.POST);
- } catch (Throwable t) {}
- assertEquals("post", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ //default method
+ assertEquals("get", DebugServlet.lastMethod);
+ //agent
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ //default wt
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ //default version
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ //agent
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ //keepalive
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ //content-type
+ assertEquals(null, DebugServlet.headers.get("Content-Type"));
+ //param encoding
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- //PUT
- DebugServlet.clear();
- try {
- client.query(q, METHOD.PUT);
- } catch (Throwable t) {}
- assertEquals("put", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ //POST
+ DebugServlet.clear();
+ try {
+ client.query(q, METHOD.POST);
+ } catch (Throwable t) {
+ }
+ assertEquals("post", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
- //XML/GET
- client.setParser(new XMLResponseParser());
- DebugServlet.clear();
- try {
- client.query(q, METHOD.GET);
- } catch (Throwable t) {}
- assertEquals("get", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ //PUT
+ DebugServlet.clear();
+ try {
+ client.query(q, METHOD.PUT);
+ } catch (Throwable t) {
+ }
+ assertEquals("put", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
- //XML/POST
- client.setParser(new XMLResponseParser());
- DebugServlet.clear();
- try {
- client.query(q, METHOD.POST);
- } catch (Throwable t) {}
- assertEquals("post", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ //XML/GET
+ client.setParser(new XMLResponseParser());
+ DebugServlet.clear();
+ try {
+ client.query(q, METHOD.GET);
+ } catch (Throwable t) {
+ }
+ assertEquals("get", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+
+ //XML/POST
+ client.setParser(new XMLResponseParser());
+ DebugServlet.clear();
+ try {
+ client.query(q, METHOD.POST);
+ } catch (Throwable t) {
+ }
+ assertEquals("post", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+
+ client.setParser(new XMLResponseParser());
+ DebugServlet.clear();
+ try {
+ client.query(q, METHOD.PUT);
+ } catch (Throwable t) {
+ }
+ assertEquals("put", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ }
- client.setParser(new XMLResponseParser());
- DebugServlet.clear();
- try {
- client.query(q, METHOD.PUT);
- } catch (Throwable t) {}
- assertEquals("put", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- assertEquals("application/x-www-form-urlencoded; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
- client.shutdown();
}
@Test
- public void testDelete(){
+ public void testDelete() throws IOException {
DebugServlet.clear();
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo");
- try {
- client.deleteById("id");
- } catch (Throwable t) {}
-
- //default method
- assertEquals("post", DebugServlet.lastMethod);
- //agent
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- //default wt
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- //default version
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- //agent
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- //keepalive
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
+ try {
+ client.deleteById("id");
+ } catch (Throwable t) {
+ }
+
+ //default method
+ assertEquals("post", DebugServlet.lastMethod);
+ //agent
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ //default wt
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ //default version
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ //agent
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ //keepalive
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+
+ //XML
+ client.setParser(new XMLResponseParser());
+ try {
+ client.deleteByQuery("*:*");
+ } catch (Throwable t) {
+ }
+
+ assertEquals("post", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
+ }
- //XML
- client.setParser(new XMLResponseParser());
- try {
- client.deleteByQuery("*:*");
- } catch (Throwable t) {}
-
- assertEquals("post", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals("keep-alive", DebugServlet.headers.get("Connection"));
- client.shutdown();
}
@Test
- public void testUpdate(){
+ public void testUpdate() throws IOException {
DebugServlet.clear();
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo");
- UpdateRequest req = new UpdateRequest();
- req.add(new SolrInputDocument());
- req.setParam("a", "\u1234");
- try {
- client.request(req);
- } catch (Throwable t) {}
-
- //default method
- assertEquals("post", DebugServlet.lastMethod);
- //agent
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- //default wt
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- //default version
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- //content type
- assertEquals("application/xml; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
- //parameter encoding
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
+ UpdateRequest req = new UpdateRequest();
+ req.add(new SolrInputDocument());
+ req.setParam("a", "\u1234");
+ try {
+ client.request(req);
+ } catch (Throwable t) {
+ }
+
+ //default method
+ assertEquals("post", DebugServlet.lastMethod);
+ //agent
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ //default wt
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ //default version
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ //content type
+ assertEquals("application/xml; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ //parameter encoding
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+
+ //XML response
+ client.setParser(new XMLResponseParser());
+ try {
+ client.request(req);
+ } catch (Throwable t) {
+ }
+ assertEquals("post", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals("application/xml; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+
+ //javabin request
+ client.setParser(new BinaryResponseParser());
+ client.setRequestWriter(new BinaryRequestWriter());
+ DebugServlet.clear();
+ try {
+ client.request(req);
+ } catch (Throwable t) {
+ }
+ assertEquals("post", DebugServlet.lastMethod);
+ assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
+ assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
+ assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
+ assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
+ assertEquals("application/javabin", DebugServlet.headers.get("Content-Type"));
+ assertEquals(1, DebugServlet.parameters.get("a").length);
+ assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
+ }
- //XML response
- client.setParser(new XMLResponseParser());
- try {
- client.request(req);
- } catch (Throwable t) {}
- assertEquals("post", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("xml", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals("application/xml; charset=UTF-8", DebugServlet.headers.get("Content-Type"));
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
-
- //javabin request
- client.setParser(new BinaryResponseParser());
- client.setRequestWriter(new BinaryRequestWriter());
- DebugServlet.clear();
- try {
- client.request(req);
- } catch (Throwable t) {}
- assertEquals("post", DebugServlet.lastMethod);
- assertEquals("Solr[" + HttpSolrClient.class.getName() + "] 1.0", DebugServlet.headers.get("User-Agent"));
- assertEquals(1, DebugServlet.parameters.get(CommonParams.WT).length);
- assertEquals("javabin", DebugServlet.parameters.get(CommonParams.WT)[0]);
- assertEquals(1, DebugServlet.parameters.get(CommonParams.VERSION).length);
- assertEquals(client.getParser().getVersion(), DebugServlet.parameters.get(CommonParams.VERSION)[0]);
- assertEquals("application/javabin", DebugServlet.headers.get("Content-Type"));
- assertEquals(1, DebugServlet.parameters.get("a").length);
- assertEquals("\u1234", DebugServlet.parameters.get("a")[0]);
- client.shutdown();
}
@Test
public void testRedirect() throws Exception {
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/redirect/foo");
- SolrQuery q = new SolrQuery("*:*");
- // default = false
- try {
- QueryResponse response = client.query(q);
- fail("Should have thrown an exception.");
- } catch (SolrServerException e) {
- assertTrue(e.getMessage().contains("redirect"));
- }
- client.setFollowRedirects(true);
- try {
- QueryResponse response = client.query(q);
- } catch (Throwable t) {
- fail("Exception was thrown:" + t);
- }
- //And back again:
- client.setFollowRedirects(false);
- try {
- QueryResponse response = client.query(q);
- fail("Should have thrown an exception.");
- } catch (SolrServerException e) {
- assertTrue(e.getMessage().contains("redirect"));
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/redirect/foo")) {
+ SolrQuery q = new SolrQuery("*:*");
+ // default = false
+ try {
+ QueryResponse response = client.query(q);
+ fail("Should have thrown an exception.");
+ } catch (SolrServerException e) {
+ assertTrue(e.getMessage().contains("redirect"));
+ }
+ client.setFollowRedirects(true);
+ try {
+ QueryResponse response = client.query(q);
+ } catch (Throwable t) {
+ fail("Exception was thrown:" + t);
+ }
+ //And back again:
+ client.setFollowRedirects(false);
+ try {
+ QueryResponse response = client.query(q);
+ fail("Should have thrown an exception.");
+ } catch (SolrServerException e) {
+ assertTrue(e.getMessage().contains("redirect"));
+ }
}
- client.shutdown();
+
}
@Test
public void testCompression() throws Exception {
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo");
- try {
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
SolrQuery q = new SolrQuery("*:*");
// verify request header gets set
@@ -470,8 +478,6 @@ public class BasicHttpSolrClientTest ext
client.query(q);
} catch (Throwable t) {}
assertNull(DebugServlet.headers.get("Accept-Encoding"));
- } finally {
- client.shutdown();
}
// verify server compresses output
@@ -494,36 +500,29 @@ public class BasicHttpSolrClientTest ext
}
// verify compressed response can be handled
- client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/collection1");
- try {
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/collection1")) {
client.setAllowCompression(true);
SolrQuery q = new SolrQuery("foo");
QueryResponse response = client.query(q);
assertEquals(0, response.getStatus());
- } finally {
- client.shutdown();
}
}
@Test
public void testSetParametersExternalClient() throws IOException{
-
- CloseableHttpClient httpClient = HttpClientUtil.createClient(null);
- HttpSolrClient solrClient = new HttpSolrClient(jetty.getBaseUrl().toString(),
- httpClient);
- try {
- try {
- solrClient.setMaxTotalConnections(1);
- fail("Operation should not succeed.");
- } catch (UnsupportedOperationException e) {}
- try {
- solrClient.setDefaultMaxConnectionsPerHost(1);
- fail("Operation should not succeed.");
- } catch (UnsupportedOperationException e) {}
- } finally {
- solrClient.shutdown();
- httpClient.close();
+ try (CloseableHttpClient httpClient = HttpClientUtil.createClient(null);
+ HttpSolrClient solrClient = new HttpSolrClient(jetty.getBaseUrl().toString(), httpClient)) {
+
+ try {
+ solrClient.setMaxTotalConnections(1);
+ fail("Operation should not succeed.");
+ } catch (UnsupportedOperationException e) {}
+ try {
+ solrClient.setDefaultMaxConnectionsPerHost(1);
+ fail("Operation should not succeed.");
+ } catch (UnsupportedOperationException e) {}
+
}
}
@@ -614,9 +613,8 @@ public class BasicHttpSolrClientTest ext
@Test
public void testQueryString() throws Exception {
- HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() +
- "/debug/foo");
- try {
+
+ try (HttpSolrClient client = new HttpSolrClient(jetty.getBaseUrl().toString() + "/debug/foo")) {
// test without request query params
DebugServlet.clear();
client.setQueryParams(setOf("serverOnly"));
@@ -664,8 +662,6 @@ public class BasicHttpSolrClientTest ext
// so it passes the verification step.
req.setQueryParams(setOf("requestOnly", "both", "neither"));
verifyServletState(client, req);
- } finally {
- client.shutdown();
}
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java Wed Jan 28 11:55:57 2015
@@ -4,6 +4,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
import org.junit.Test;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -35,7 +36,7 @@ public class CloudSolrClientMultiConstru
Collection<String> hosts;
@Test
- public void testWithChroot() {
+ public void testWithChroot() throws IOException {
boolean setOrList = random().nextBoolean();
int numOfZKServers = TestUtil.nextInt(random(), 1, 5);
boolean withChroot = random().nextBoolean();
@@ -43,7 +44,6 @@ public class CloudSolrClientMultiConstru
final String chroot = "/mychroot";
StringBuilder sb = new StringBuilder();
- CloudSolrClient client;
if(setOrList) {
/*
@@ -62,15 +62,16 @@ public class CloudSolrClientMultiConstru
if(i<numOfZKServers -1) sb.append(",");
}
- if(withChroot) {
+ String clientChroot = null;
+ if (withChroot) {
sb.append(chroot);
- client = new CloudSolrClient(hosts, "/mychroot");
- } else {
- client = new CloudSolrClient(hosts, null);
+ clientChroot = "/mychroot";
+ }
+
+ try (CloudSolrClient client = new CloudSolrClient(hosts, clientChroot)) {
+ assertEquals(sb.toString(), client.getZkHost());
}
- assertEquals(sb.toString(), client.getZkHost());
- client.shutdown();
}
@Test(expected = IllegalArgumentException.class)
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java Wed Jan 28 11:55:57 2015
@@ -20,9 +20,9 @@ package org.apache.solr.client.solrj.imp
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
@@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
@@ -123,8 +122,7 @@ public class CloudSolrClientTest extends
String collectionName = "overwriteCollection";
createCollection(collectionName, controlClientCloud, 1, 1);
waitForRecoveriesToFinish(collectionName, false);
- CloudSolrClient cloudClient = createCloudClient(collectionName);
- try {
+ try (CloudSolrClient cloudClient = createCloudClient(collectionName)) {
SolrInputDocument doc1 = new SolrInputDocument();
doc1.addField(id, "0");
doc1.addField("a_t", "hello1");
@@ -158,8 +156,6 @@ public class CloudSolrClientTest extends
resp = cloudClient.query(new SolrQuery("*:*"));
assertEquals("There should be 3 documents because there should be two id=1 docs due to overwrite=false", 3, resp.getResults().getNumFound());
- } finally {
- cloudClient.shutdown();
}
}
@@ -213,13 +209,10 @@ public class CloudSolrClientTest extends
params.add("q", "id:" + id);
params.add("distrib", "false");
QueryRequest queryRequest = new QueryRequest(params);
- HttpSolrClient solrClient = new HttpSolrClient(url);
- try {
+ try (HttpSolrClient solrClient = new HttpSolrClient(url)) {
QueryResponse queryResponse = queryRequest.process(solrClient);
SolrDocumentList docList = queryResponse.getResults();
assertTrue(docList.getNumFound() == 1);
- } finally {
- solrClient.shutdown();
}
}
@@ -238,10 +231,7 @@ public class CloudSolrClientTest extends
assertTrue(docs.getNumFound() == 0);
// Test Multi-Threaded routed updates for UpdateRequest
-
- CloudSolrClient threadedClient = null;
- try {
- threadedClient = new CloudSolrClient(zkServer.getZkAddress());
+ try (CloudSolrClient threadedClient = new CloudSolrClient(zkServer.getZkAddress())) {
threadedClient.setParallelUpdates(true);
threadedClient.setDefaultCollection(collectionName);
response = threadedClient.request(request);
@@ -260,17 +250,12 @@ public class CloudSolrClientTest extends
params.add("q", "id:" + id);
params.add("distrib", "false");
QueryRequest queryRequest = new QueryRequest(params);
- HttpSolrClient solrClient = new HttpSolrClient(url);
- try {
+ try (HttpSolrClient solrClient = new HttpSolrClient(url)) {
QueryResponse queryResponse = queryRequest.process(solrClient);
SolrDocumentList docList = queryResponse.getResults();
assertTrue(docList.getNumFound() == 1);
- } finally {
- solrClient.shutdown();
}
}
- } finally {
- threadedClient.shutdown();
}
// Test that queries with _route_ params are routed by the client
@@ -361,14 +346,14 @@ public class CloudSolrClientTest extends
controlClient.commit();
cloudClient.commit();
- cloudClient.shutdown();
+ cloudClient.close();
}
private Long getNumRequests(String baseUrl, String collectionName) throws
SolrServerException, IOException {
- HttpSolrClient client = new HttpSolrClient(baseUrl + "/"+ collectionName);
+
NamedList<Object> resp;
- try {
+ try (HttpSolrClient client = new HttpSolrClient(baseUrl + "/"+ collectionName)) {
client.setConnectionTimeout(15000);
client.setSoTimeout(60000);
ModifiableSolrParams params = new ModifiableSolrParams();
@@ -379,8 +364,6 @@ public class CloudSolrClientTest extends
// use generic request to avoid extra processing of queries
QueryRequest req = new QueryRequest(params);
resp = client.request(req);
- } finally {
- client.shutdown();
}
return (Long) resp.findRecursive("solr-mbeans", "QUERYHANDLER",
"standard", "stats", "requests");
@@ -393,37 +376,38 @@ public class CloudSolrClientTest extends
}
private void stateVersionParamTest() throws Exception {
- CloudSolrClient client = createCloudClient(null);
- try {
+
+ try (CloudSolrClient client = createCloudClient(null)) {
String collectionName = "checkStateVerCol";
createCollection(collectionName, client, 2, 2);
waitForRecoveriesToFinish(collectionName, false);
DocCollection coll = client.getZkStateReader().getClusterState().getCollection(collectionName);
Replica r = coll.getSlices().iterator().next().getReplicas().iterator().next();
- HttpSolrClient solrClient = new HttpSolrClient(r.getStr(ZkStateReader.BASE_URL_PROP) + "/"+collectionName);
+ SolrQuery q = new SolrQuery().setQuery("*:*");
+ HttpSolrClient.RemoteSolrException sse = null;
+ try (HttpSolrClient solrClient = new HttpSolrClient(r.getStr(ZkStateReader.BASE_URL_PROP) + "/"+collectionName)) {
- SolrQuery q = new SolrQuery().setQuery("*:*");
+ log.info("should work query, result {}", solrClient.query(q));
+ //no problem
+ q.setParam(CloudSolrClient.STATE_VERSION, collectionName + ":" + coll.getZNodeVersion());
+ log.info("2nd query , result {}", solrClient.query(q));
+ //no error yet good
- log.info("should work query, result {}", solrClient.query(q));
- //no problem
- q.setParam(CloudSolrClient.STATE_VERSION, collectionName + ":" + coll.getZNodeVersion());
- log.info("2nd query , result {}", solrClient.query(q));
- //no error yet good
+ q.setParam(CloudSolrClient.STATE_VERSION, collectionName + ":" + (coll.getZNodeVersion() - 1)); //an older version expect error
- q.setParam(CloudSolrClient.STATE_VERSION, collectionName+":"+ (coll.getZNodeVersion() -1)); //an older version expect error
+ try {
+ solrClient.query(q);
+ log.info("expected query error");
+ } catch (HttpSolrClient.RemoteSolrException e) {
+ sse = e;
+ }
+
+ assertNotNull(sse);
+ assertEquals(" Error code should be ", sse.code(), SolrException.ErrorCode.INVALID_STATE.code);
- HttpSolrClient.RemoteSolrException sse = null;
- try {
- solrClient.query(q);
- log.info("expected query error");
- } catch (HttpSolrClient.RemoteSolrException e) {
- sse = e;
}
- solrClient.shutdown();
- assertNotNull(sse);
- assertEquals(" Error code should be ", sse.code(), SolrException.ErrorCode.INVALID_STATE.code);
//now send the request to another node that does n ot serve the collection
@@ -443,68 +427,56 @@ public class CloudSolrClientTest extends
}
log.info("thenode which does not serve this collection{} ",theNode);
assertNotNull(theNode);
- solrClient = new HttpSolrClient(theNode + "/"+collectionName);
- q.setParam(CloudSolrClient.STATE_VERSION, collectionName+":"+coll.getZNodeVersion());
+ try (SolrClient solrClient = new HttpSolrClient(theNode + "/"+collectionName)) {
- try {
- solrClient.query(q);
- log.info("error was expected");
- } catch (HttpSolrClient.RemoteSolrException e) {
- sse = e;
+ q.setParam(CloudSolrClient.STATE_VERSION, collectionName + ":" + coll.getZNodeVersion());
+ try {
+ solrClient.query(q);
+ log.info("error was expected");
+ } catch (HttpSolrClient.RemoteSolrException e) {
+ sse = e;
+ }
+ assertNotNull(sse);
+ assertEquals(" Error code should be ", sse.code(), SolrException.ErrorCode.INVALID_STATE.code);
}
- solrClient.shutdown();
- assertNotNull(sse);
- assertEquals(" Error code should be ", sse.code() , SolrException.ErrorCode.INVALID_STATE.code);
- } finally {
- client.shutdown();
}
}
- public void testShutdown() throws MalformedURLException {
- CloudSolrClient client = new CloudSolrClient("[ff01::114]:33332");
- try {
+ public void testShutdown() throws IOException {
+ try (CloudSolrClient client = new CloudSolrClient("[ff01::114]:33332")) {
client.setZkConnectTimeout(100);
client.connect();
fail("Expected exception");
} catch (SolrException e) {
assertTrue(e.getCause() instanceof TimeoutException);
- } finally {
- client.shutdown();
}
}
- public void testWrongZkChrootTest() throws MalformedURLException {
- CloudSolrClient client = null;
- try {
- client = new CloudSolrClient(zkServer.getZkAddress() + "/xyz/foo");
+ public void testWrongZkChrootTest() throws IOException {
+ try (CloudSolrClient client = new CloudSolrClient(zkServer.getZkAddress() + "/xyz/foo")) {
client.setDefaultCollection(DEFAULT_COLLECTION);
client.setZkClientTimeout(1000 * 60);
client.connect();
fail("Expected exception");
} catch(SolrException e) {
assertTrue(e.getCause() instanceof KeeperException);
- } finally {
- client.shutdown();
}
// see SOLR-6146 - this test will fail by virtue of the zkClient tracking performed
// in the afterClass method of the base class
}
public void customHttpClientTest() throws IOException {
- CloudSolrClient solrClient = null;
+
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(HttpClientUtil.PROP_SO_TIMEOUT, 1000);
- CloseableHttpClient client = null;
- try {
- client = HttpClientUtil.createClient(params);
- solrClient = new CloudSolrClient(zkServer.getZkAddress(), client);
+ try (CloseableHttpClient client = HttpClientUtil.createClient(params);
+ CloudSolrClient solrClient = new CloudSolrClient(zkServer.getZkAddress(), client)) {
+
assertTrue(solrClient.getLbClient().getHttpClient() == client);
- } finally {
- solrClient.shutdown();
- client.close();
+
}
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java Wed Jan 28 11:55:57 2015
@@ -25,7 +25,6 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.response.QueryResponse;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,25 +52,21 @@ public class ExternalHttpClientTest exte
*/
@Test
public void testTimeoutWithExternalClient() throws Exception {
+
HttpClientBuilder builder = HttpClientBuilder.create();
RequestConfig config = RequestConfig.custom().setSocketTimeout(2000).build();
builder.setDefaultRequestConfig(config);
- HttpSolrClient solrClient = null;
- try (CloseableHttpClient httpClient = builder.build()) {
- solrClient = new HttpSolrClient(jetty.getBaseUrl().toString() +
- "/slow/foo", httpClient);
+
+ try (CloseableHttpClient httpClient = builder.build();
+ HttpSolrClient solrClient = new HttpSolrClient(jetty.getBaseUrl().toString() + "/slow/foo", httpClient)) {
SolrQuery q = new SolrQuery("*:*");
try {
- QueryResponse response = solrClient.query(q, SolrRequest.METHOD.GET);
+ solrClient.query(q, SolrRequest.METHOD.GET);
fail("No exception thrown.");
} catch (SolrServerException e) {
assertTrue(e.getMessage().contains("Timeout"));
}
- } finally {
- if (solrClient != null) {
- solrClient.shutdown();
- }
}
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java Wed Jan 28 11:55:57 2015
@@ -3,16 +3,16 @@
*/
package org.apache.solr.client.solrj.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -42,26 +42,18 @@ public class LBHttpSolrClientTest {
*/
@Test
public void testLBHttpSolrClientHttpClientResponseParserStringArray() throws IOException {
- CloseableHttpClient httpClient = HttpClientUtil.createClient(new ModifiableSolrParams());
- LBHttpSolrClient testClient = new LBHttpSolrClient(httpClient, (ResponseParser) null);
- HttpSolrClient httpSolrClient = testClient.makeSolrClient("http://127.0.0.1:8080");
- try {
+
+ try (CloseableHttpClient httpClient = HttpClientUtil.createClient(new ModifiableSolrParams());
+ LBHttpSolrClient testClient = new LBHttpSolrClient(httpClient, (ResponseParser) null);
+ HttpSolrClient httpSolrClient = testClient.makeSolrClient("http://127.0.0.1:8080")) {
assertNull("Generated server should have null parser.", httpSolrClient.getParser());
- } finally {
- httpSolrClient.shutdown();
- testClient.shutdown();
- httpClient.close();
}
- try {
- ResponseParser parser = new BinaryResponseParser();
- httpClient = HttpClientUtil.createClient(new ModifiableSolrParams());
- testClient = new LBHttpSolrClient(httpClient, parser);
- httpSolrClient = testClient.makeSolrClient("http://127.0.0.1:8080");
+
+ ResponseParser parser = new BinaryResponseParser();
+ try (CloseableHttpClient httpClient = HttpClientUtil.createClient(new ModifiableSolrParams());
+ LBHttpSolrClient testClient = new LBHttpSolrClient(httpClient, parser);
+ HttpSolrClient httpSolrClient = testClient.makeSolrClient("http://127.0.0.1:8080")) {
assertEquals("Invalid parser passed to generated server.", parser, httpSolrClient.getParser());
- } finally {
- httpSolrClient.shutdown();
- testClient.shutdown();
- httpClient.close();
}
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java Wed Jan 28 11:55:57 2015
@@ -95,45 +95,46 @@ public class TestCoreAdmin extends Abstr
@Test
public void testCustomUlogDir() throws Exception {
- SolrClient client = getSolrAdmin();
-
- File dataDir = createTempDir("data").toFile();
-
- File newCoreInstanceDir = createTempDir("instance").toFile();
-
- File instanceDir = new File(cores.getSolrHome());
- FileUtils.copyDirectory(instanceDir, new File(newCoreInstanceDir,
- "newcore"));
-
- CoreAdminRequest.Create req = new CoreAdminRequest.Create();
- req.setCoreName("newcore");
- req.setInstanceDir(newCoreInstanceDir.getAbsolutePath() + File.separator + "newcore");
- req.setDataDir(dataDir.getAbsolutePath());
- req.setUlogDir(new File(dataDir, "ulog").getAbsolutePath());
- req.setConfigSet("shared");
-
- // These should be the inverse of defaults.
- req.setIsLoadOnStartup(false);
- req.setIsTransient(true);
- req.process(client);
-
- // Show that the newly-created core has values for load on startup and transient different than defaults due to the
- // above.
- File logDir;
- try (SolrCore coreProveIt = cores.getCore("collection1");
- SolrCore core = cores.getCore("newcore")) {
+ try (SolrClient client = getSolrAdmin()) {
- assertTrue(core.getCoreDescriptor().isTransient());
- assertFalse(coreProveIt.getCoreDescriptor().isTransient());
+ File dataDir = createTempDir("data").toFile();
- assertFalse(core.getCoreDescriptor().isLoadOnStartup());
- assertTrue(coreProveIt.getCoreDescriptor().isLoadOnStartup());
+ File newCoreInstanceDir = createTempDir("instance").toFile();
- logDir = new File(core.getUpdateHandler().getUpdateLog().getLogDir());
- }
+ File instanceDir = new File(cores.getSolrHome());
+ FileUtils.copyDirectory(instanceDir, new File(newCoreInstanceDir,
+ "newcore"));
+
+ CoreAdminRequest.Create req = new CoreAdminRequest.Create();
+ req.setCoreName("newcore");
+ req.setInstanceDir(newCoreInstanceDir.getAbsolutePath() + File.separator + "newcore");
+ req.setDataDir(dataDir.getAbsolutePath());
+ req.setUlogDir(new File(dataDir, "ulog").getAbsolutePath());
+ req.setConfigSet("shared");
+
+ // These should be the inverse of defaults.
+ req.setIsLoadOnStartup(false);
+ req.setIsTransient(true);
+ req.process(client);
- assertEquals(new File(dataDir, "ulog" + File.separator + "tlog").getAbsolutePath(), logDir.getAbsolutePath());
- client.shutdown();
+ // Show that the newly-created core has values for load on startup and transient different than defaults due to the
+ // above.
+ File logDir;
+ try (SolrCore coreProveIt = cores.getCore("collection1");
+ SolrCore core = cores.getCore("newcore")) {
+
+ assertTrue(core.getCoreDescriptor().isTransient());
+ assertFalse(coreProveIt.getCoreDescriptor().isTransient());
+
+ assertFalse(core.getCoreDescriptor().isLoadOnStartup());
+ assertTrue(coreProveIt.getCoreDescriptor().isLoadOnStartup());
+
+ logDir = new File(core.getUpdateHandler().getUpdateLog().getLogDir());
+ }
+
+ assertEquals(new File(dataDir, "ulog" + File.separator + "tlog").getAbsolutePath(), logDir.getAbsolutePath());
+
+ }
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java Wed Jan 28 11:55:57 2015
@@ -73,15 +73,16 @@ public class NoOpResponseParserTest exte
*/
@Test
public void testQueryParse() throws Exception {
- HttpSolrClient client = (HttpSolrClient) createNewSolrClient();
- SolrQuery query = new SolrQuery("id:1234");
- QueryRequest req = new QueryRequest(query);
- client.setParser(new NoOpResponseParser());
- NamedList<Object> resp = client.request(req);
- String responseString = (String) resp.get("response");
- assertResponse(responseString);
- client.shutdown();
+ try (HttpSolrClient client = (HttpSolrClient) createNewSolrClient()) {
+ SolrQuery query = new SolrQuery("id:1234");
+ QueryRequest req = new QueryRequest(query);
+ client.setParser(new NoOpResponseParser());
+ NamedList<Object> resp = client.request(req);
+ String responseString = (String) resp.get("response");
+ assertResponse(responseString);
+ }
+
}
private void assertResponse(String responseString) throws IOException {
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Wed Jan 28 11:55:57 2015
@@ -368,9 +368,9 @@ public abstract class BaseDistributedSea
protected void destroyServers() throws Exception {
if (controlJetty != null) controlJetty.stop();
- if (controlClient != null) ((HttpSolrClient) controlClient).shutdown();
+ if (controlClient != null) controlClient.close();
for (JettySolrRunner jetty : jettys) jetty.stop();
- for (SolrClient client : clients) ((HttpSolrClient) client).shutdown();
+ for (SolrClient client : clients) client.close();
clients.clear();
jettys.clear();
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Wed Jan 28 11:55:57 2015
@@ -99,7 +99,7 @@ abstract public class SolrJettyTestBase
jetty.stop();
jetty = null;
}
- if (client != null) client.shutdown();
+ if (client != null) client.close();
client = null;
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Wed Jan 28 11:55:57 2015
@@ -1532,16 +1532,16 @@ public abstract class AbstractFullDistri
super.printLayout();
}
if (commondCloudSolrClient != null) {
- commondCloudSolrClient.shutdown();
+ commondCloudSolrClient.close();
}
if (controlClient != null) {
- ((HttpSolrClient) controlClient).shutdown();
+ controlClient.close();
}
if (cloudClient != null) {
- cloudClient.shutdown();
+ cloudClient.close();
}
if (controlClientCloud != null) {
- controlClientCloud.shutdown();
+ controlClientCloud.close();
}
super.distribTearDown();
@@ -1624,11 +1624,8 @@ public abstract class AbstractFullDistri
CollectionAdminResponse res = new CollectionAdminResponse();
if (client == null) {
final String baseUrl = getBaseUrl((HttpSolrClient) clients.get(clientIndex));
- SolrClient adminClient = createNewSolrClient("", baseUrl);
- try {
+ try (SolrClient adminClient = createNewSolrClient("", baseUrl)) {
res.setResponse(adminClient.request(request));
- } finally {
- if (adminClient != null) adminClient.shutdown();
}
} else {
res.setResponse(client.request(request));
@@ -1855,16 +1852,11 @@ public abstract class AbstractFullDistri
.getBaseURL();
baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());
- HttpSolrClient baseClient = new HttpSolrClient(baseUrl);
- NamedList r;
- try {
+ try (HttpSolrClient baseClient = new HttpSolrClient(baseUrl)) {
baseClient.setConnectionTimeout(15000);
baseClient.setSoTimeout(60000 * 5);
- r = baseClient.request(request);
- } finally {
- baseClient.shutdown();
+ return baseClient.request(request);
}
- return r;
}
protected void createCollection(String collName,
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java?rev=1655263&r1=1655262&r2=1655263&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java Wed Jan 28 11:55:57 2015
@@ -17,14 +17,6 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.embedded.SSLConfig;
@@ -40,6 +32,14 @@ import org.eclipse.jetty.servlet.Servlet
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+
public class MiniSolrCloudCluster {
private static Logger log = LoggerFactory.getLogger(MiniSolrCloudCluster.class);
@@ -196,7 +196,7 @@ public class MiniSolrCloudCluster {
*/
public void shutdown() throws Exception {
try {
- solrClient.shutdown();
+ solrClient.close();
for (int i = jettys.size() - 1; i >= 0; --i) {
stopJettySolrRunner(i);
}