From a610650be9652a7d88e755fbd2003709861011b4 Mon Sep 17 00:00:00 2001 From: Jens Alm Date: Wed, 9 Oct 2024 14:30:11 -0400 Subject: [PATCH] Added missing qualifiers to avoid using the wrong beans. --- .../client/web/config/ZitiHttpClientConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ziti-springboot-client/src/main/java/org/openziti/springboot/client/web/config/ZitiHttpClientConfiguration.java b/ziti-springboot-client/src/main/java/org/openziti/springboot/client/web/config/ZitiHttpClientConfiguration.java index 2542b816..c469156a 100644 --- a/ziti-springboot-client/src/main/java/org/openziti/springboot/client/web/config/ZitiHttpClientConfiguration.java +++ b/ziti-springboot-client/src/main/java/org/openziti/springboot/client/web/config/ZitiHttpClientConfiguration.java @@ -100,7 +100,7 @@ public ZitiContext context(@Value("${spring.ziti.client.identity.file:}") Resour @Value("${spring.ziti.client.identity.password:}") String password) throws IOException { if (identityFile == null) { - throw new BeanCreationException("NO identity file specified. To use the default ziti setup please add a property named " + throw new BeanCreationException("No identity file specified. To use the default ziti setup please add a property named " + "`spring.ziti.client.identity.file` pointing to a ziti identity file."); } @@ -128,9 +128,9 @@ public ZitiSSLConnectionSocketFactory sslConnectionSocketFactory(ZitiContext zit @ConditionalOnProperty(value = "spring.ziti.client.connection-manager.enabled", havingValue = "true", matchIfMissing = true) @Bean("zitiPoolingConnectionManager") public PoolingHttpClientConnectionManager poolingConnectionManager( - ZitiConnectionSocketFactory zitiConnectionSocketFactory, - ZitiSSLConnectionSocketFactory zitiSSLConnectionSocketFactory, - DnsResolver zitiDnsResolver, + @Qualifier("zitiConnectionSocketFactory") ZitiConnectionSocketFactory zitiConnectionSocketFactory, + @Qualifier("zitiSSLConnectionSocketFactory") ZitiSSLConnectionSocketFactory zitiSSLConnectionSocketFactory, + @Qualifier("zitiDnsResolver") DnsResolver zitiDnsResolver, @Value("${spring.ziti.client.httpclient.max-total:}") Integer maxTotal, @Value("${spring.ziti.client.httpclient.max-per-route:}") Integer maxPerRoute) {