Skip to content

Commit 0d12cb4

Browse files
committed
Fix unit test failure
1 parent d793977 commit 0d12cb4

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/servicebus/factory/AbstractServiceBusSubClientBuilderFactory.java

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ abstract class AbstractServiceBusSubClientBuilderFactory<T, P extends ServiceBus
3838

3939
private ServiceBusClientBuilder serviceBusClientBuilder;
4040
private final boolean shareServiceBusClientBuilder;
41-
private ServiceBusClientBuilderFactory serviceBusClientBuilderFactory;
41+
private final ServiceBusClientBuilderFactory serviceBusClientBuilderFactory;
4242

4343
/**
4444
* Create a {@link AbstractServiceBusSubClientBuilderFactory} instance with the properties and the collection of
@@ -112,36 +112,33 @@ protected boolean isShareServiceBusClientBuilder() {
112112
@Override
113113
protected BiConsumer<T, ProxyOptions> consumeProxyOptions() {
114114
return (builder, proxy) -> {
115-
if (!isShareServiceBusClientBuilder()) {
116-
getServiceBusClientBuilder().proxyOptions(proxy);
117-
}
115+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
116+
// Skip direct configuration here to avoid duplicate calls
118117
};
119118
}
120119

121120
@Override
122121
protected BiConsumer<T, AmqpTransportType> consumeAmqpTransportType() {
123122
return (builder, t) -> {
124-
if (!isShareServiceBusClientBuilder()) {
125-
getServiceBusClientBuilder().transportType(t);
126-
}
123+
// In non-shared mode, configuration is applied to serviceBusClientBuilderFactory
124+
// which will be used when getServiceBusClientBuilder() is called
125+
// Skip direct configuration here to avoid duplicate calls
127126
};
128127
}
129128

130129
@Override
131130
protected BiConsumer<T, AmqpRetryOptions> consumeAmqpRetryOptions() {
132131
return (builder, retry) -> {
133-
if (!isShareServiceBusClientBuilder()) {
134-
getServiceBusClientBuilder().retryOptions(retry);
135-
}
132+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
133+
// Skip direct configuration here to avoid duplicate calls
136134
};
137135
}
138136

139137
@Override
140138
protected BiConsumer<T, ClientOptions> consumeClientOptions() {
141139
return (builder, client) -> {
142-
if (!isShareServiceBusClientBuilder()) {
143-
getServiceBusClientBuilder().clientOptions(client);
144-
}
140+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
141+
// Skip direct configuration here to avoid duplicate calls
145142
};
146143
}
147144

@@ -174,35 +171,31 @@ protected List<AuthenticationDescriptor<?>> getAuthenticationDescriptors(T build
174171
@Override
175172
protected BiConsumer<T, Configuration> consumeConfiguration() {
176173
return (builder, configuration) -> {
177-
if (!isShareServiceBusClientBuilder()) {
178-
getServiceBusClientBuilder().configuration(configuration);
179-
}
174+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
175+
// Skip direct configuration here to avoid duplicate calls
180176
};
181177
}
182178

183179
@Override
184180
protected BiConsumer<T, TokenCredential> consumeDefaultTokenCredential() {
185181
return (builder, credential) -> {
186-
if (!isShareServiceBusClientBuilder()) {
187-
getServiceBusClientBuilder().credential(credential);
188-
}
182+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
183+
// Skip direct configuration here to avoid duplicate calls
189184
};
190185
}
191186

192187
@Override
193188
protected BiConsumer<T, String> consumeConnectionString() {
194189
return (builder, connectionString) -> {
195-
if (!isShareServiceBusClientBuilder()) {
196-
getServiceBusClientBuilder().connectionString(connectionString);
197-
}
190+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
191+
// Skip direct configuration here to avoid duplicate calls
198192
};
199193
}
200194

201195
@Override
202196
protected void configureService(T builder) {
203-
if (!isShareServiceBusClientBuilder()) {
204-
getServiceBusClientBuilder().fullyQualifiedNamespace(properties.getFullyQualifiedNamespace());
205-
}
197+
// In non-shared mode, configuration is applied by serviceBusClientBuilderFactory
198+
// Skip direct configuration here to avoid duplicate calls
206199
}
207200

208201
protected ServiceBusClientBuilder getServiceBusClientBuilder() {

0 commit comments

Comments
 (0)