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

Jump to bottom

Use useSystemProperties with Apache connectors #5251

Merged
merged 1 commit into from
Feb 13, 2023
Merged

Use useSystemProperties with Apache connectors #5251

Show file tree
Hide file tree
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
16 changes: 10 additions & 6 deletions ...apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -255,10 +255,16 @@ class ApacheConnector implements Connector {
}
}

final boolean useSystemProperties =
PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.USE_SYSTEM_PROPERTIES);

final SSLContext sslContext = client.getSslContext();
final HttpClientBuilder clientBuilder = HttpClientBuilder.create();

clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext));
if (useSystemProperties) {
clientBuilder.useSystemProperties();
}
clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext, useSystemProperties));
clientBuilder.setConnectionManagerShared(
PropertiesHelper.getValue(config.getProperties(), ApacheClientProperties.CONNECTION_MANAGER_SHARED, false, null));
clientBuilder.setSSLContext(sslContext);
Expand Down Expand Up @@ -337,7 +343,8 @@ class ApacheConnector implements Connector {

private HttpClientConnectionManager getConnectionManager(final Client client,
final Configuration config,
final SSLContext sslContext) {
final SSLContext sslContext,
final boolean useSystemProperties) {
final Object cmObject = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);

// Connection manager from configuration.
Expand All @@ -355,9 +362,6 @@ private HttpClientConnectionManager getConnectionManager(final Client client,
}
}

final boolean useSystemProperties =
PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.USE_SYSTEM_PROPERTIES);

// Create custom connection manager.
return createConnectionManager(
client,
Expand Down
17 changes: 11 additions & 6 deletions ...che5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -251,10 +251,17 @@ class Apache5Connector implements Connector {
}
}

final boolean useSystemProperties =
PropertiesHelper.isProperty(config.getProperties(), Apache5ClientProperties.USE_SYSTEM_PROPERTIES);

final SSLContext sslContext = client.getSslContext();
final HttpClientBuilder clientBuilder = HttpClientBuilder.create();

clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext));
if (useSystemProperties) {
clientBuilder.useSystemProperties();
}

clientBuilder.setConnectionManager(getConnectionManager(client, config, sslContext, useSystemProperties));
clientBuilder.setConnectionManagerShared(
PropertiesHelper.getValue(
config.getProperties(),
Expand Down Expand Up @@ -341,7 +348,8 @@ class Apache5Connector implements Connector {

private HttpClientConnectionManager getConnectionManager(final Client client,
final Configuration config,
final SSLContext sslContext) {
final SSLContext sslContext,
final boolean useSystemProperties) {
final Object cmObject = config.getProperties().get(Apache5ClientProperties.CONNECTION_MANAGER);

// Connection manager from configuration.
Expand All @@ -359,9 +367,6 @@ private HttpClientConnectionManager getConnectionManager(final Client client,
}
}

final boolean useSystemProperties =
PropertiesHelper.isProperty(config.getProperties(), Apache5ClientProperties.USE_SYSTEM_PROPERTIES);

// Create custom connection manager.
return createConnectionManager(
client,
Expand Down