Skip to content

Commit a14d324

Browse files
committed
Upgraded sample code to 5.4 API level and updated the migration guide
1 parent b34b676 commit a14d324

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

samples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<maven.compiler.source>1.8</maven.compiler.source>
4242
<maven.compiler.target>1.8</maven.compiler.target>
4343
<hc4.client.version>4.5.13</hc4.client.version>
44-
<hc5.client.version>5.3</hc5.client.version>
44+
<hc5.client.version>5.4.2</hc5.client.version>
4545
<jackson.version>2.12.6.1</jackson.version>
46-
<asyncjson.version>0.2.0</asyncjson.version>
46+
<asyncjson.version>0.4.0</asyncjson.version>
4747
</properties>
4848

4949
<dependencies>

samples/src/main/java/org/apache/hc/client5/migration/examples/HttpClient5ClassicExample.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
3737
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
3838
import org.apache.hc.client5.http.protocol.HttpClientContext;
39-
import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
39+
import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
40+
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
4041
import org.apache.hc.core5.http.ClassicHttpRequest;
4142
import org.apache.hc.core5.http.ContentType;
4243
import org.apache.hc.core5.http.HttpEntity;
@@ -56,7 +57,7 @@ public class HttpClient5ClassicExample {
5657

5758
public static void main(String... args) throws Exception {
5859
PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
59-
.setSSLSocketFactory(SSLConnectionSocketFactoryBuilder.create()
60+
.setTlsSocketStrategy((TlsSocketStrategy) ClientTlsStrategyBuilder.create()
6061
.setSslContext(SSLContexts.createSystemDefault())
6162
.setTlsVersions(TLS.V_1_3)
6263
.build())

src/site/markdown/httpcomponents-client-5.4.x/migration-guide/migration-to-classic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ There are also some important differences with URL normalization and encoding.
4343

4444
```java
4545
PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
46-
.setSSLSocketFactory(SSLConnectionSocketFactoryBuilder.create()
46+
.setTlsSocketStrategy((TlsSocketStrategy) ClientTlsStrategyBuilder.create()
4747
.setSslContext(SSLContexts.createSystemDefault())
4848
.setTlsVersions(TLS.V_1_3)
4949
.build())

0 commit comments

Comments
 (0)