diff --git a/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonClientProperties.java b/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonClientProperties.java new file mode 100644 index 0000000000..7e7c10de0c --- /dev/null +++ b/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonClientProperties.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2020 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 + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ +package org.glassfish.jersey.helidon.connector; + +import org.glassfish.jersey.internal.util.PropertiesClass; + +import io.helidon.config.Config; +import io.helidon.webclient.WebClient; + +/** + * Configuration options specific to the Client API that utilizes {@link HelidonConnectorProvider} + * @since 2.31 + */ +@PropertiesClass +public final class HelidonClientProperties { + + /** + * A Helidon {@link Config} instance that is passed to {@link WebClient.Builder#config(Config)} if available + */ + public static final String CONFIG = io.helidon.jersey.connector.HelidonProperties.CONFIG; +} diff --git a/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java b/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java index 893e4bf59b..9ec498348a 100644 --- a/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java +++ b/connectors/helidon-connector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java @@ -18,7 +18,6 @@ import org.glassfish.jersey.Beta; import org.glassfish.jersey.client.spi.Connector; -import org.glassfish.jersey.client.spi.ConnectorProvider; import org.glassfish.jersey.internal.util.JdkVersion; import javax.ws.rs.ProcessingException; @@ -38,7 +37,7 @@ *
  • {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
  • *
  • {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
  • *
  • {@link org.glassfish.jersey.client.ClientProperties#READ_TIMEOUT}
  • - *
  • {@link HelidonProperties#CONFIG}
  • + *
  • {@link HelidonClientProperties#CONFIG}
  • * *

    * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java b/core-common/src/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java index 31bc349b3a..4dea8d844a 100644 --- a/core-common/src/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java +++ b/core-common/src/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java @@ -49,6 +49,7 @@ class SystemPropertiesConfigurationModel implements ExternalConfigurationModel