Put Helidon Properties file back

Signed-off-by: jansupol <jan.supol@oracle.com>
eclipse-ee4j · Sep 24, 2020 · d8f177f · d8f177f
1 parent d19ed01
commit d8f177f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/...nnector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonClientProperties.java b/...nnector/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/...nector/src/main/java/org/glassfish/jersey/helidon/connector/HelidonConnectorProvider.java b/...nector/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 @@
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#READ_TIMEOUT}</li>
- * <li>{@link HelidonProperties#CONFIG}</li>
+ * <li>{@link HelidonClientProperties#CONFIG}</li>
  * </ul>
  * <p>
  * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an

diff --git a/...rc/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java b/...rc/main/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModel.java
@@ -49,6 +49,7 @@ class SystemPropertiesConfigurationModel implements ExternalConfigurationModel<V
             "org.glassfish.jersey.servlet.ServletProperties",
             "org.glassfish.jersey.message.MessageProperties",
             "org.glassfish.jersey.apache.connector.ApacheClientProperties",
+            "org.glassfish.jersey.helidon.connector.HelidonClientProperties",
             "org.glassfish.jersey.jdk.connector.JdkConnectorProperties",
             "org.glassfish.jersey.jetty.connector.JettyClientProperties",
             "org.glassfish.jersey.netty.connector.NettyClientProperties",