jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399819 )
Change subject: Completely disable cookie management in WikibaseRepository
......................................................................
Completely disable cookie management in WikibaseRepository
Instead of disabling cookies on each request, we can just disable cookie
management completely.
Change-Id: I50d20c91a1666c2d75c078c6659de007a01bbe5e
---
M
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
index 81b15be..eeccbc5 100644
---
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
+++
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
@@ -56,7 +56,6 @@
import org.openrdf.rio.helpers.StatementCollector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.wikidata.query.rdf.tool.HttpClientUtils;
import org.wikidata.query.rdf.tool.change.Change;
import org.wikidata.query.rdf.tool.exception.ContainedException;
import org.wikidata.query.rdf.tool.exception.FatalException;
@@ -93,6 +92,7 @@
.setMaxConnPerRoute(100).setMaxConnTotal(100)
.setRetryHandler(getRetryHandler(RETRIES))
.setServiceUnavailableRetryStrategy(getRetryStrategy(RETRIES,
RETRY_INTERVAL))
+ .disableCookieManagement()
.setUserAgent("Wikidata Query Service Updater")
.build();
@@ -239,7 +239,6 @@
StatementCollector collector = new StatementCollector();
parser.setRDFHandler(new NormalizingRdfHandler(collector));
HttpGet request = new HttpGet(uri);
- HttpClientUtils.ignoreCookies(request);
try {
try (CloseableHttpResponse response = client.execute(request)) {
if (response.getStatusLine().getStatusCode() == 404) {
@@ -376,7 +375,6 @@
* @throws ParseException the json was malformed and couldn't be parsed
*/
private JSONObject getJson(HttpRequestBase request) throws IOException,
ParseException {
- HttpClientUtils.ignoreCookies(request);
try (CloseableHttpResponse response = client.execute(request)) {
return (JSONObject) new JSONParser().parse(new
InputStreamReader(response.getEntity().getContent(),
Charsets.UTF_8));
--
To view, visit https://gerrit.wikimedia.org/r/399819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50d20c91a1666c2d75c078c6659de007a01bbe5e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
