From 3c48fc65fd2ba2ab1865947aed6627172a4570f4 Mon Sep 17 00:00:00 2001 From: sixcooler Date: Wed, 25 Sep 2013 18:45:16 +0200 Subject: [PATCH] reverted RemoteInstance to deprecated methods of httpClient-4.2 this should work with current remote-Solr-Instances --- .../solr/instance/RemoteInstance.java | 176 +++++++++--------- 1 file changed, 93 insertions(+), 83 deletions(-) diff --git a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java index 7032c37ec..c00a40835 100644 --- a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java @@ -37,27 +37,34 @@ import net.yacy.search.schema.WebgraphSchema; import org.apache.http.Header; import org.apache.http.HeaderElement; import org.apache.http.HttpEntity; +import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.AuthCache; import org.apache.http.client.entity.GzipDecompressingEntity; +import org.apache.http.client.protocol.ClientContext; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; +import org.apache.http.impl.conn.PoolingClientConnectionManager; +import org.apache.http.params.HttpConnectionParams; +import org.apache.http.params.HttpParams; import org.apache.http.protocol.HttpContext; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer; +@SuppressWarnings("deprecation") //TODO: switch to 4.3-Stuff public class RemoteInstance implements SolrInstance { private String solrurl; - // old Stuff: private final DefaultHttpClient client; - private final CloseableHttpClient client; + private final DefaultHttpClient client; +// 4.3 private final CloseableHttpClient client; private final String defaultCoreName; private final HttpSolrServer defaultServer; private final Collection coreNames; @@ -127,24 +134,74 @@ public class RemoteInstance implements SolrInstance { } } if (solraccount.length() > 0) { - final PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(); - cm.setMaxTotal(100); - - final RequestConfig.Builder reqBuilder = RequestConfig.custom(); - reqBuilder.setSocketTimeout(timeout); - reqBuilder.setConnectTimeout(timeout); - reqBuilder.setConnectionRequestTimeout(timeout); - - final BasicCredentialsProvider credsProvider = new BasicCredentialsProvider(); - credsProvider.setCredentials(new AuthScope(host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(solraccount, solrpw)); +// 4.3: +// final PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(); +// cm.setMaxTotal(100); +// +// final RequestConfig.Builder reqBuilder = RequestConfig.custom(); +// reqBuilder.setSocketTimeout(timeout); +// reqBuilder.setConnectTimeout(timeout); +// reqBuilder.setConnectionRequestTimeout(timeout); +// +// final BasicCredentialsProvider credsProvider = new BasicCredentialsProvider(); +// credsProvider.setCredentials(new AuthScope(host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(solraccount, solrpw)); +// +// final HttpClientBuilder builder = HttpClientBuilder.create(); +// builder.setConnectionManager(cm); +// builder.setDefaultRequestConfig(reqBuilder.build()); +// builder.setDefaultCredentialsProvider(credsProvider); +// builder.disableAutomaticRetries(); // no retries needed; we expect connections to fail; therefore we should not retry +// // ask for gzip - why not using net.yacy.cora.protocol.http.GzipRequestInterceptor? +// builder.addInterceptorLast(new HttpRequestInterceptor() { +// @Override +// public void process(final HttpRequest request, final HttpContext context) throws IOException { +// if (!request.containsHeader("Accept-Encoding")) request.addHeader("Accept-Encoding", "gzip"); +// if (!request.containsHeader("Connection")) request.addHeader("Connection", "close"); // prevent CLOSE_WAIT +// } +// +// }); +// // uncompress gzip - why not using net.yacy.cora.protocol.http.GzipResponseInterceptor? +// builder.addInterceptorLast(new HttpResponseInterceptor() { +// @Override +// public void process(final HttpResponse response, final HttpContext context) throws IOException { +// HttpEntity entity = response.getEntity(); +// if (entity != null) { +// Header ceheader = entity.getContentEncoding(); +// if (ceheader != null) { +// HeaderElement[] codecs = ceheader.getElements(); +// for (HeaderElement codec : codecs) { +// if (codec.getName().equalsIgnoreCase("gzip")) { +// response.setEntity(new GzipDecompressingEntity(response.getEntity())); +// return; +// } +// } +// } +// } +// } +// }); +// this.client = builder.build(); - final HttpClientBuilder builder = HttpClientBuilder.create(); - builder.setConnectionManager(cm); - builder.setDefaultRequestConfig(reqBuilder.build()); - builder.setDefaultCredentialsProvider(credsProvider); - builder.disableAutomaticRetries(); // no retries needed; we expect connections to fail; therefore we should not retry - // ask for gzip - why not using net.yacy.cora.protocol.http.GzipRequestInterceptor? - builder.addInterceptorLast(new HttpRequestInterceptor() { +// old Stuff START + PoolingClientConnectionManager cm = new PoolingClientConnectionManager(); // try also: ThreadSafeClientConnManager + cm.setMaxTotal(100); + + this.client = new DefaultHttpClient(cm) { + @Override + protected HttpContext createHttpContext() { + HttpContext context = super.createHttpContext(); + AuthCache authCache = new BasicAuthCache(); + BasicScheme basicAuth = new BasicScheme(); + HttpHost targetHost = new HttpHost(u.getHost(), u.getPort(), u.getProtocol()); + authCache.put(targetHost, basicAuth); + context.setAttribute(ClientContext.AUTH_CACHE, authCache); + this.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false)); // no retries needed; we expect connections to fail; therefore we should not retry + return context; + } + }; + HttpParams params = this.client.getParams(); + HttpConnectionParams.setConnectionTimeout(params, timeout); + HttpConnectionParams.setSoTimeout(params, timeout); + this.client.addRequestInterceptor(new HttpRequestInterceptor() { @Override public void process(final HttpRequest request, final HttpContext context) throws IOException { if (!request.containsHeader("Accept-Encoding")) request.addHeader("Accept-Encoding", "gzip"); @@ -152,8 +209,7 @@ public class RemoteInstance implements SolrInstance { } }); - // uncompress gzip - why not using net.yacy.cora.protocol.http.GzipResponseInterceptor? - builder.addInterceptorLast(new HttpResponseInterceptor() { + this.client.addResponseInterceptor(new HttpResponseInterceptor() { @Override public void process(final HttpResponse response, final HttpContext context) throws IOException { HttpEntity entity = response.getEntity(); @@ -171,57 +227,10 @@ public class RemoteInstance implements SolrInstance { } } }); - this.client = builder.build(); - -// old Stuff: -// PoolingClientConnectionManager cm = new PoolingClientConnectionManager(); // try also: ThreadSafeClientConnManager -// cm.setMaxTotal(100); -// -// this.client = new DefaultHttpClient(cm) { -// @Override -// protected HttpContext createHttpContext() { -// Auth-caching HttpContext context = super.createHttpContext(); -// is done AuthCache authCache = new BasicAuthCache(); -// by default BasicScheme basicAuth = new BasicScheme(); -// since 4.1 HttpHost targetHost = new HttpHost(u.getHost(), u.getPort(), u.getProtocol()); -// authCache.put(targetHost, basicAuth); -// context.setAttribute(ClientContext.AUTH_CACHE, authCache); -// this.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false)); // no retries needed; we expect connections to fail; therefore we should not retry -// return context; -// } -// }; -// HttpParams params = this.client.getParams(); -// HttpConnectionParams.setConnectionTimeout(params, timeout); -// HttpConnectionParams.setSoTimeout(params, timeout); -// this.client.addRequestInterceptor(new HttpRequestInterceptor() { -// @Override -// public void process(final HttpRequest request, final HttpContext context) throws IOException { -// if (!request.containsHeader("Accept-Encoding")) request.addHeader("Accept-Encoding", "gzip"); -// if (!request.containsHeader("Connection")) request.addHeader("Connection", "close"); // prevent CLOSE_WAIT -// } -// -// }); -// this.client.addResponseInterceptor(new HttpResponseInterceptor() { -// @Override -// public void process(final HttpResponse response, final HttpContext context) throws IOException { -// HttpEntity entity = response.getEntity(); -// if (entity != null) { -// Header ceheader = entity.getContentEncoding(); -// if (ceheader != null) { -// HeaderElement[] codecs = ceheader.getElements(); -// for (HeaderElement codec : codecs) { -// if (codec.getName().equalsIgnoreCase("gzip")) { -// response.setEntity(new GzipDecompressingEntity(response.getEntity())); -// return; -// } -// } -// } -// } -// } -// }); -// BasicCredentialsProvider credsProvider = new BasicCredentialsProvider(); -// credsProvider.setCredentials(new AuthScope(host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(solraccount, solrpw)); -// this.client.setCredentialsProvider(credsProvider); + BasicCredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials(new AuthScope(host, AuthScope.ANY_PORT), new UsernamePasswordCredentials(solraccount, solrpw)); + this.client.setCredentialsProvider(credsProvider); +// old Stuff END } else { this.client = null; } @@ -289,13 +298,14 @@ public class RemoteInstance implements SolrInstance { @Override public void close() { -// old Stuff: if (this.client != null) this.client.getConnectionManager().shutdown(); - if (this.client != null) - try { - this.client.close(); - } catch (final IOException e) { - // TODO Auto-generated catch block - } + if (this.client != null) this.client.getConnectionManager().shutdown(); +// 4.3 +// if (this.client != null) +// try { +// this.client.close(); +// } catch (final IOException e) { +// // TODO Auto-generated catch block +// } } }