Skip to content

Commit 44e621e

Browse files
committed
Merge remote-tracking branch 'origin/issue/432_authentication-feature-overwrite' into develop
* origin/issue/432_authentication-feature-overwrite: feature registration after clientconfig configuration in jersey client builder
2 parents 4ddc24c + ec18aa7 commit 44e621e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/dsf/DsfClientJersey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ else if (trustStore != null && keyStore != null && keyStorePassword != null)
223223

224224
ClientBuilder builder = ClientBuilder.newBuilder();
225225

226-
authFeatures.forEach(builder::register);
227-
228226
if (sslContext != null)
229227
builder.sslContext(sslContext);
230228

@@ -235,6 +233,8 @@ else if (trustStore != null && keyStore != null && keyStorePassword != null)
235233
config.property(ClientProperties.PROXY_PASSWORD, proxyPassword == null ? null : String.valueOf(proxyPassword));
236234
builder.withConfig(config);
237235

236+
authFeatures.forEach(builder::register);
237+
238238
if (userAgentValue != null && !userAgentValue.isBlank())
239239
builder.register((ClientRequestFilter) requestContext -> requestContext.getHeaders()
240240
.add(HttpHeaders.USER_AGENT, userAgentValue));

0 commit comments

Comments
 (0)