Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing qualifiers to avoid using the wrong beans. #646

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Added missing qualifiers to avoid using the wrong beans. #646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../src/main/java/org/openziti/springboot/client/web/config/ZitiHttpClientConfiguration.java
View file
Open in desktop
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