You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/04/11 14:50:18 UTC
[nifi] branch main updated: NIFI-9898: Used CloseableHttpClient and replaced deprecated class/method usages in ProxyAwareTransportFactory in GCP module
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 157a5d342a NIFI-9898: Used CloseableHttpClient and replaced deprecated class/method usages in ProxyAwareTransportFactory in GCP module
157a5d342a is described below
commit 157a5d342afdc799604fe73dd3ec7da165d60a30
Author: Peter Turcsanyi <tu...@apache.org>
AuthorDate: Fri Apr 8 23:40:20 2022 +0200
NIFI-9898: Used CloseableHttpClient and replaced deprecated class/method usages in ProxyAwareTransportFactory in GCP module
Also bumped GCP dependencies
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5950.
---
.../processors/gcp/ProxyAwareTransportFactory.java | 18 +++++++++---------
nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/ProxyAwareTransportFactory.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/ProxyAwareTransportFactory.java
index 48524163be..7d91f9a465 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/ProxyAwareTransportFactory.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/ProxyAwareTransportFactory.java
@@ -17,15 +17,15 @@
package org.apache.nifi.processors.gcp;
import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.apache.ApacheHttpTransport;
+import com.google.api.client.http.apache.v2.ApacheHttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.auth.http.HttpTransportFactory;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.conn.params.ConnRouteParams;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.nifi.proxy.ProxyConfiguration;
import org.apache.nifi.proxy.ProxySpec;
@@ -57,20 +57,20 @@ public class ProxyAwareTransportFactory implements HttpTransportFactory {
final int port = proxyConfig.getProxyServerPort();
final HttpHost proxyHost = new HttpHost(host, port);
- final DefaultHttpClient httpClient = new DefaultHttpClient();
- ConnRouteParams.setDefaultProxy(httpClient.getParams(), proxyHost);
+ final HttpClientBuilder httpClientBuilder = HttpClientBuilder.create()
+ .setProxy(proxyHost);
if (proxyConfig.hasCredential()) {
final AuthScope proxyAuthScope = new AuthScope(host, port);
- final UsernamePasswordCredentials proxyCredential
- = new UsernamePasswordCredentials(proxyConfig.getProxyUserName(), proxyConfig.getProxyUserPassword());
+ final UsernamePasswordCredentials proxyCredential = new UsernamePasswordCredentials(proxyConfig.getProxyUserName(), proxyConfig.getProxyUserPassword());
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(proxyAuthScope, proxyCredential);
- httpClient.setCredentialsProvider(credentialsProvider);
+ httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
- return new ApacheHttpTransport(httpClient);
+ final CloseableHttpClient httpClient = httpClientBuilder.build();
+ return new ApacheHttpTransport(httpClient);
}
return new NetHttpTransport.Builder().setProxy(proxy).build();
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
index d5772fbc4b..5066bacd20 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
@@ -27,7 +27,7 @@
<packaging>pom</packaging>
<properties>
- <google.cloud.sdk.version>0.162.0</google.cloud.sdk.version>
+ <google.cloud.sdk.version>0.172.0</google.cloud.sdk.version>
</properties>
<dependencyManagement>