Skip to content

Commit

Permalink
Added missing qualifiers to avoid using the wrong beans.
Browse files Browse the repository at this point in the history
  • Loading branch information
jensalm committed Oct 9, 2024
1 parent cab1b71 commit a610650
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}

Expand Down Expand Up @@ -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) {

Expand Down

0 comments on commit a610650

Please sign in to comment.