diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml index fb21083445..df75a6ae8d 100644 --- a/bundles/apidocs/pom.xml +++ b/bundles/apidocs/pom.xml @@ -58,11 +58,21 @@ jersey-apache-connector ${project.version} + + org.glassfish.jersey.connectors + jersey-apache5-connector + ${project.version} + org.glassfish.jersey.connectors jersey-grizzly-connector ${project.version} + + org.glassfish.jersey.connectors + jersey-helidon-connector + ${project.version} + org.glassfish.jersey.connectors jersey-jdk-connector @@ -190,6 +200,11 @@ jersey-mp-config ${project.version} + + org.glassfish.jersey.ext.microprofile + jersey-mp-rest-client + ${project.version} + org.glassfish.jersey.ext jersey-wadl-doclet diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java index d5c2ff8a01..099fa31123 100644 --- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java +++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 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 @@ -89,8 +89,8 @@ public final class ApacheClientProperties { /** * A value of {@code true} indicates that configured connection manager should be shared - * among multiple Jersey {@link org.glassfish.jersey.client.ClientRuntime} instances. It means that closing - * a particular {@link org.glassfish.jersey.client.ClientRuntime} instance does not shut down the underlying + * among multiple Jersey {@code ClientRuntime} instances. It means that closing + * a particular {@code ClientRuntime} instance does not shut down the underlying * connection manager automatically. In such case, the connection manager life-cycle * should be fully managed by the application code. To release all allocated resources, * caller code should especially ensure {@link org.apache.http.conn.HttpClientConnectionManager#shutdown()} gets @@ -114,7 +114,7 @@ public final class ApacheClientProperties { *

* The value MUST be an instance of {@link org.apache.http.client.config.RequestConfig}. *

- * If the property is absent default request configuration will be used. + * If the property is absent the default request configuration will be used. *

* The name of the configuration property is {@value}. * @@ -137,9 +137,9 @@ public final class ApacheClientProperties { /** * ConnectionReuseStrategy for the {@link org.apache.http.client.HttpClient}. *

- * The value MUST be an instance of {@link org.apache.http.impl.ConnectionReuseStrategy}. + * The value MUST be an instance of {@link org.apache.http.ConnectionReuseStrategy}. *

- * If the property is absent the default reuse strategy of the Apache HTTP library will be used + * If the property is absent the default reuse strategy of the Apache HTTP library will be used. *

* The name of the configuration property is {@value}. */ @@ -158,7 +158,9 @@ public final class ApacheClientProperties { /** - * Strategy that closes the Apache Connection. Accepts an instance of {@link ApacheConnectionClosingStrategy}. + *

+ * Strategy that closes the Apache Connection. Accepts an instance of {@link ApacheConnectionClosingStrategy}. + *

* * @see ApacheConnectionClosingStrategy * @since 2.30 diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java index 52059bb125..81e94b4b17 100644 --- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java +++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java @@ -110,18 +110,22 @@ *

* The following properties are only supported at construction of this class: *

*

* This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java index d92d490fb1..d97204fa62 100644 --- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java +++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 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 @@ -33,19 +33,23 @@ *

* The following connector configuration properties are supported: *

*

*

diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java index eac5be5f2f..df4c8e059c 100644 --- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java +++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ClientProperties.java @@ -90,8 +90,8 @@ public final class Apache5ClientProperties { /** * A value of {@code true} indicates that configured connection manager should be shared - * among multiple Jersey {@link org.glassfish.jersey.client.ClientRuntime} instances. It means that closing - * a particular {@link org.glassfish.jersey.client.ClientRuntime} instance does not shut down the underlying + * among multiple Jersey {@code ClientRuntime} instances. It means that closing + * a particular {@code ClientRuntime} instance does not shut down the underlying * connection manager automatically. In such case, the connection manager life-cycle * should be fully managed by the application code. To release all allocated resources, * caller code should especially ensure {@link org.apache.hc.client5.http.io.HttpClientConnectionManager#close()} gets @@ -124,7 +124,7 @@ public final class Apache5ClientProperties { public static final String REQUEST_CONFIG = "jersey.config.apache5.client.requestConfig"; /** - * HttpRequestRetryHandler which will be used to create {@link org.apache.hc.client5.http.classic.HttpClient}. + * HttpRequestRetryStrategy which will be used to create {@link org.apache.hc.client5.http.classic.HttpClient}. *

* The value MUST be an instance of {@link org.apache.hc.client5.http.HttpRequestRetryStrategy}. *

diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java index 13b827910f..9d101055f2 100644 --- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java +++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5Connector.java @@ -107,18 +107,21 @@ *

* The following properties are only supported at construction of this class: *

*

* This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can diff --git a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java index 9a32a2ce3c..7f5d882829 100644 --- a/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java +++ b/connectors/apache5-connector/src/main/java/org/glassfish/jersey/apache5/connector/Apache5ConnectorProvider.java @@ -32,19 +32,22 @@ *

* The following connector configuration properties are supported: *

*

*

diff --git a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java index 190232f94b..9e7acdd83e 100644 --- a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java +++ b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/JdkConnectorProperties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022 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 @@ -60,7 +60,7 @@ public final class JdkConnectorProperties { * Value is expected to be positive {@link Integer}. Default value is {@value #DEFAULT_MAX_REDIRECTS}. *

* HTTP redirection must be enabled by property {@link org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS}, - * otherwise {@code MAX_HEADER_SIZE} is not applied. + * otherwise {@code MAX_REDIRECTS} is not applied. * * @see org.glassfish.jersey.client.ClientProperties#FOLLOW_REDIRECTS * @see org.glassfish.jersey.jdk.connector.internal.RedirectException @@ -70,14 +70,14 @@ public final class JdkConnectorProperties { /** * To set the cookie policy of this cookie manager. *

- * The default value is ACCEPT_ORIGINAL_SERVER. + * The default value is {@link CookiePolicy#ACCEPT_ORIGINAL_SERVER}. * * @see java.net.CookieManager */ public static final String COOKIE_POLICY = "jersey.config.client.JdkConnectorProvider.cookiePolicy"; /** - * A maximal number of open connection to each destination. A destination is determined by the following triple: + * A maximum number of open connections per each destination. A destination is determined by the following triple: *

*

*

diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml index 5c3455ed12..b957da7398 100644 --- a/docs/src/main/docbook/appendix-properties.xml +++ b/docs/src/main/docbook/appendix-properties.xml @@ -1,7 +1,7 @@