You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/03/17 11:40:27 UTC
[camel] 09/19: CAMEL-18995: camel-geocoder - Upgrade to HttpComponents 5.x
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-18995/upgrade-httpcomponents-5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5805296d9af662a6d726954e1e289d5e15c1fed4
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Mar 17 12:27:57 2023 +0100
CAMEL-18995: camel-geocoder - Upgrade to HttpComponents 5.x
---
components/camel-geocoder/pom.xml | 6 ++---
.../geocoder/GeoCoderNominatimProducer.java | 29 +++++++++++-----------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml
index fff08e2d076..98bf0d2e343 100644
--- a/components/camel-geocoder/pom.xml
+++ b/components/camel-geocoder/pom.xml
@@ -56,9 +56,9 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient4-version}</version>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>${httpclient-version}</version>
</dependency>
<!-- testing -->
diff --git a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderNominatimProducer.java b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderNominatimProducer.java
index bcbcd7353f8..7194b3f66bd 100644
--- a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderNominatimProducer.java
+++ b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderNominatimProducer.java
@@ -29,11 +29,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.StringHelper;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,13 +42,19 @@ import org.slf4j.LoggerFactory;
public class GeoCoderNominatimProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(GeoCoderNominatimProducer.class);
- private GeoCoderEndpoint endpoint;
+ private final GeoCoderEndpoint endpoint;
+ private final CloseableHttpClient httpClient = HttpClients.createDefault();
public GeoCoderNominatimProducer(GeoCoderEndpoint endpoint) {
super(endpoint);
this.endpoint = endpoint;
}
+ @Override
+ protected void doStop() throws Exception {
+ httpClient.close();
+ }
+
@Override
public void process(Exchange exchange) throws Exception {
// headers take precedence
@@ -83,7 +88,7 @@ public class GeoCoderNominatimProducer extends DefaultProducer {
private String query(String dlat, String dlon) throws IOException {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("format", "jsonv2");
params.put("lat", dlat);
params.put("lon", dlon);
@@ -92,7 +97,7 @@ public class GeoCoderNominatimProducer extends DefaultProducer {
}
private String query(String address) throws IOException {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("format", "jsonv2");
params.put("addressdetails", "1");
params.put("q", address);
@@ -108,17 +113,13 @@ public class GeoCoderNominatimProducer extends DefaultProducer {
}
url += operation;
- final RequestBuilder builder = RequestBuilder.get().setUri(url);
+ final ClassicRequestBuilder builder = ClassicRequestBuilder.get().setUri(url);
for (Map.Entry<String, String> entry : params.entrySet()) {
builder.addParameter(entry.getKey(), entry.getValue());
}
- try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
- try (CloseableHttpResponse resp = httpClient.execute(builder.build())) {
- return EntityUtils.toString(resp.getEntity());
- }
- }
+ return httpClient.execute(builder.build(), resp -> EntityUtils.toString(resp.getEntity()));
}
protected void extractResult(String place, Exchange exchange) {