Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Move off deprecated Reactor Netty API.

See gh-654
This commit is contained in:
Mark Paluch
2021-11-19 11:11:07 +01:00
parent a503fef1b0
commit 8dbd492d14
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java
View File

@@ -22,6 +22,7 @@ import java.security.KeyStore;
import io.netty.channel.ChannelOption;
import io.netty.handler.ssl.SslContextBuilder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import reactor.netty.http.Http11SslContextSpec;
import reactor.netty.http.client.HttpClient;
import org.springframework.http.client.reactive.ClientHttpConnector;
@@ -130,17 +131,14 @@ public class ClientHttpConnectorFactory {
if (hasSslConfiguration(sslConfiguration)) {
SslContextBuilder sslContextBuilder = SslContextBuilder.forClient();
configureSsl(sslConfiguration, sslContextBuilder);
Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient()
.configure(it -> configureSsl(sslConfiguration, it)).get();
client = client.secure(builder -> {
builder.sslContext(sslContextBuilder);
});
client = client.secure(builder -> builder.sslContext(sslContextSpec));
}
client = client.tcpConfiguration(it -> it.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
Math.toIntExact(options.getConnectionTimeout().toMillis())))
.proxyWithSystemProperties();
client = client.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
Math.toIntExact(options.getConnectionTimeout().toMillis())).proxyWithSystemProperties();
return new ReactorClientHttpConnector(client);
}