Author: ningjiang
Date: Tue Sep 4 08:51:16 2012
New Revision: 1380493
URL: http://svn.apache.org/viewvc?rev=1380493&view=rev
Log:
CAMEL-5559 Upgrade camel-solr to use http client 4.x
Modified:
camel/trunk/components/camel-solr/pom.xml
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
Modified: camel/trunk/components/camel-solr/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/pom.xml?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/pom.xml (original)
+++ camel/trunk/components/camel-solr/pom.xml Tue Sep 4 08:51:16 2012
@@ -94,6 +94,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient4-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>${httpclient4-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.24</version>
Modified:
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
(original)
+++
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
Tue Sep 4 08:51:16 2012
@@ -16,32 +16,35 @@
*/
package org.apache.camel.component.solr;
+import java.net.URL;
import java.util.Map;
+
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
-import org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer;
+import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
/**
* Represents a Solr endpoint.
*/
public class SolrEndpoint extends DefaultEndpoint {
- private CommonsHttpSolrServer solrServer;
- private CommonsHttpSolrServer streamingSolrServer;
+ private HttpSolrServer solrServer;
+ private ConcurrentUpdateSolrServer streamingSolrServer;
private String requestHandler;
private int streamingThreadCount;
private int streamingQueueSize;
public SolrEndpoint(String endpointUri, SolrComponent component, String
address, Map<String, Object> parameters) throws Exception {
super(endpointUri, component);
-
- solrServer = new CommonsHttpSolrServer("http://"; + address);
+ // check the url address
+ URL url = new URL("http://"; + address);
+ solrServer = new HttpSolrServer(url.toString());
streamingQueueSize = getIntFromString((String)
parameters.get(SolrConstants.PARAM_STREAMING_QUEUE_SIZE),
SolrConstants.DEFUALT_STREAMING_QUEUE_SIZE);
streamingThreadCount = getIntFromString((String)
parameters.get(SolrConstants.PARAM_STREAMING_THREAD_COUNT),
SolrConstants.DEFAULT_STREAMING_THREAD_COUNT);
- streamingSolrServer = new StreamingUpdateSolrServer("http://"; +
address, streamingQueueSize, streamingThreadCount);
+ streamingSolrServer = new ConcurrentUpdateSolrServer(url.toString(),
streamingQueueSize, streamingThreadCount);
}
public static int getIntFromString(String value, int defaultValue) {
@@ -66,51 +69,44 @@ public class SolrEndpoint extends Defaul
return true;
}
- public CommonsHttpSolrServer getSolrServer() {
+ public HttpSolrServer getSolrServer() {
return solrServer;
}
- public CommonsHttpSolrServer getStreamingSolrServer() {
+ public ConcurrentUpdateSolrServer getStreamingSolrServer() {
return streamingSolrServer;
}
- public void setStreamingSolrServer(CommonsHttpSolrServer
streamingSolrServer) {
+ public void setStreamingSolrServer(ConcurrentUpdateSolrServer
streamingSolrServer) {
this.streamingSolrServer = streamingSolrServer;
}
public void setMaxRetries(int maxRetries) {
solrServer.setMaxRetries(maxRetries);
- streamingSolrServer.setMaxRetries(maxRetries);
}
public void setSoTimeout(int soTimeout) {
solrServer.setSoTimeout(soTimeout);
- streamingSolrServer.setSoTimeout(soTimeout);
}
public void setConnectionTimeout(int connectionTimeout) {
solrServer.setConnectionTimeout(connectionTimeout);
- streamingSolrServer.setConnectionTimeout(connectionTimeout);
}
public void setDefaultMaxConnectionsPerHost(int
defaultMaxConnectionsPerHost) {
solrServer.setDefaultMaxConnectionsPerHost(defaultMaxConnectionsPerHost);
-
streamingSolrServer.setDefaultMaxConnectionsPerHost(defaultMaxConnectionsPerHost);
}
public void setMaxTotalConnections(int maxTotalConnections) {
solrServer.setMaxTotalConnections(maxTotalConnections);
- streamingSolrServer.setMaxTotalConnections(maxTotalConnections);
}
public void setFollowRedirects(boolean followRedirects) {
solrServer.setFollowRedirects(followRedirects);
- streamingSolrServer.setFollowRedirects(followRedirects);
}
public void setAllowCompression(boolean allowCompression) {
solrServer.setAllowCompression(allowCompression);
- streamingSolrServer.setAllowCompression(allowCompression);
}
public void setRequestHandler(String requestHandler) {
Modified:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
(original)
+++
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
Tue Sep 4 08:51:16 2012
@@ -42,7 +42,7 @@ public class InitSolrEndpointTest extend
@Test(expected = ResolveEndpointFailedException.class)
public void wrongURLFormatFailsEndpointCreation() throws Exception {
- context.getEndpoint("solr://localhost:-99/solr");
+ context.getEndpoint("solr://localhost:x99/solr");
}
private String getFullOptions() {
Modified:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
(original)
+++
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
Tue Sep 4 08:51:16 2012
@@ -25,7 +25,7 @@ import org.apache.camel.test.junit4.Came
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.junit.AfterClass;
import org.junit.Before;
@@ -37,7 +37,7 @@ public class SolrComponentTestSupport ex
protected static final String TEST_ID = "1234";
protected static JettySolrRunner solrRunner;
- protected static CommonsHttpSolrServer solrServer;
+ protected static HttpSolrServer solrServer;
protected void solrInsertTestEntry() {
Map<String, Object> headers = new HashMap<String, Object>();
@@ -69,7 +69,7 @@ public class SolrComponentTestSupport ex
solrRunner = new JettySolrRunner("/solr", PORT);
solrRunner.start();
- solrServer = new CommonsHttpSolrServer("http://localhost:"; + PORT +
"/solr");
+ solrServer = new HttpSolrServer("http://localhost:"; + PORT + "/solr");
}
@AfterClass
Modified:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
(original)
+++
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
Tue Sep 4 08:51:16 2012
@@ -19,12 +19,13 @@ package org.apache.camel.component.solr;
import java.io.File;
import java.util.Arrays;
import static junit.framework.Assert.assertEquals;
+
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
@@ -45,7 +46,7 @@ public class SolrSpringTest extends Abst
}
private static JettySolrRunner solrRunner;
- private static CommonsHttpSolrServer solrServer;
+ private static HttpSolrServer solrServer;
@Produce(uri = "direct:direct-xml-start")
protected ProducerTemplate directXmlRoute;
@@ -160,7 +161,7 @@ public class SolrSpringTest extends Abst
solrRunner = new JettySolrRunner("/solr",
SolrComponentTestSupport.PORT);
solrRunner.start();
- solrServer = new CommonsHttpSolrServer("http://localhost:"; +
SolrComponentTestSupport.PORT + "/solr");
+ solrServer = new HttpSolrServer("http://localhost:"; +
SolrComponentTestSupport.PORT + "/solr");
}
@AfterClass
Modified:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java?rev=1380493&r1=1380492&r2=1380493&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
(original)
+++
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
Tue Sep 4 08:51:16 2012
@@ -20,10 +20,10 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
import org.apache.camel.Exchange;
+import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.junit.Before;
import org.junit.Ignore;
@@ -123,7 +123,7 @@ public class SolrUpdateTest extends Solr
template.send("direct:start", exchange);
- assertEquals(SolrException.class, exchange.getException().getClass());
+ assertEquals(SolrServerException.class,
exchange.getException().getClass());
}
@Test
