You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/07/28 13:48:49 UTC
[1/3] jena git commit: Expose the setup of the pooling
HttpClientBuilder.
Repository: jena
Updated Branches:
refs/heads/master 68ee61098 -> d3fe87be0
Expose the setup of the pooling HttpClientBuilder.
For use by RDFParserBuilder.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a89605c1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a89605c1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a89605c1
Branch: refs/heads/master
Commit: a89605c150560b42e7d7a46f7d2660678b347ba3
Parents: 68ee610
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 27 10:10:18 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 27 10:10:18 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/riot/web/HttpOp.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a89605c1/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
index 72357a6..e65a350 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
@@ -210,19 +210,26 @@ public class HttpOp {
* with {@link #setDefaultHttpClient} or provided in the HttpOp calls.
*/
public static CloseableHttpClient createPoolingHttpClient() {
+ return createPoolingHttpClientBuilder().build() ;
+ }
+
+ /**
+ * Create an HttpClientBuilder that performs connection pooling.
+ */
+ public static HttpClientBuilder createPoolingHttpClientBuilder() {
String s = System.getProperty("http.maxConnections", "5");
int max = Integer.parseInt(s);
return HttpClientBuilder.create()
.useSystemProperties()
.setRedirectStrategy(laxRedirectStrategy)
.setMaxConnPerRoute(max)
- .setMaxConnTotal(2*max)
- .build() ;
+ .setMaxConnTotal(2*max);
}
-
+
/**
- * Create an HttpClient that performs client-side caching and conection pooling. This can be used
- * with {@link #setDefaultHttpClient} or provided in the HttpOp calls.
+ * Create an HttpClient that performs client-side caching and connection pooling.
+ * This can be used with {@link #setDefaultHttpClient} or provided in the HttpOp calls.
+ * Beware that content is cached in this process, including across remote server restart.
*/
public static CloseableHttpClient createCachingHttpClient() {
String s = System.getProperty("http.maxConnections", "5");
[3/3] jena git commit: JENA-1378: Merge commit 'refs/pull/271/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1378: Merge commit 'refs/pull/271/head' of github.com:apache/jena
This closes #271.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3fe87be
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3fe87be
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3fe87be
Branch: refs/heads/master
Commit: d3fe87be04e6a847d1aeeb238f9e509f89cf11e7
Parents: 68ee610 b11e873
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jul 28 14:44:16 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jul 28 14:44:16 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/riot/RDFParser.java | 18 ++++++++++++------
.../org/apache/jena/riot/RDFParserBuilder.java | 8 +++++---
.../java/org/apache/jena/riot/web/HttpOp.java | 17 ++++++++++++-----
3 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[2/3] jena git commit: JENA-1378: Set the accept header in the
default use case.
Posted by an...@apache.org.
JENA-1378: Set the accept header in the default use case.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b11e8739
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b11e8739
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b11e8739
Branch: refs/heads/master
Commit: b11e87393e520815c669bd0086434c2960496b78
Parents: a89605c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 27 10:12:40 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 27 10:12:40 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/riot/RDFParser.java | 18 ++++++++++++------
.../org/apache/jena/riot/RDFParserBuilder.java | 8 +++++---
2 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b11e8739/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
index 977789b..da8ef55 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
@@ -320,13 +320,19 @@ public class RDFParser {
}
TypedInputStream in;
+ urlStr = StreamManager.get(context).mapURI(urlStr);
if ( urlStr.startsWith("http://") || urlStr.startsWith("https://") ) {
- // For complete compatibility, we have to let null pass through.
- // Pair with RDFParserBuilder.buildHttpClient
- // Objects.requireNonNull(httpClient);
- // Remap.
- urlStr = StreamManager.get(context).mapURI(urlStr);
- in = HttpOp.execHttpGet(urlStr, null, httpClient, null);
+ // Need more control than LocatorURL provides. We could use it for the
+ // httpClient == null case.
+ //
+ // HttpOp.execHttpGet(,acceptHeader,) overrides the HttpClient default setting.
+ //
+ // If there is an explicitly set HttpClient use that as given, and do not override
+ // the accept header (i.e. pass null to arg accpetHeader in execHttpGet).
+ // Else, use httpOp as setup and set the accept header.
+ String acceptHeader =
+ ( httpClient == null ) ? WebContent.defaultRDFAcceptHeader : null;
+ in = HttpOp.execHttpGet(urlStr, acceptHeader, httpClient, null);
} else {
in = streamManager.open(urlStr);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b11e8739/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
index ed1ca7b..aaacd08 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
@@ -26,7 +26,6 @@ import java.util.*;
import org.apache.http.Header;
import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
import org.apache.http.message.BasicHeader;
import org.apache.jena.atlas.lib.IRILib;
import org.apache.jena.graph.BlankNodeId;
@@ -35,6 +34,7 @@ import org.apache.jena.riot.lang.LabelToNode;
import org.apache.jena.riot.system.*;
import org.apache.jena.riot.system.stream.StreamManager;
import org.apache.jena.riot.web.HttpNames;
+import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.util.Context;
@@ -504,8 +504,10 @@ public class RDFParserBuilder {
Header header = new BasicHeader(k, v);
hdrs.add(header);
});
- HttpClient hc = CachingHttpClientBuilder.create().setDefaultHeaders(hdrs).build();
- return hc;
+ HttpClient hc = HttpOp.createPoolingHttpClientBuilder()
+ .setDefaultHeaders(hdrs)
+ .build() ;
+ return hc ;
}
/**