J-458: Cleanup @beta and @deprecated APIs

Change-Id: I1802a6fcf17737a42234de6d21891aaddadc7ccd
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheClientProperties.java

@@ -55,21 +55,6 @@
 @PropertiesClass
 public final class ApacheClientProperties {
 
-    /**
-     * Support for specifying SSL configuration for HTTPS connections.
-     * Used only when making HTTPS requests.
-     * <p/>
-     * The value MUST be an instance of {@link org.glassfish.jersey.SslConfigurator}.
-     * <p/>
-     * A default value is not set.
-     * <p/>
-     * The name of the configuration property is <tt>{@value}</tt>.
-     *
-     * @deprecated Set the SSL configuration on the JAX-RS {@link javax.ws.rs.client.ClientBuilder}.
-     */
-    @Deprecated
-    public static final String SSL_CONFIG = "jersey.config.apache.client.ssl.sslConfig";
-
     /**
      * The credential provider that should be used to retrieve
      * credentials from a user. Credentials needed for proxy authentication
@@ -138,10 +123,6 @@ public final class ApacheClientProperties {
      */
     public static final String REQUEST_CONFIG = "jersey.config.apache.client.requestConfig";
 
-    private ApacheClientProperties() {
-        // prevents instantiation
-    }
-
     /**
      * Get the value of the specified property.
      *
@@ -152,11 +133,18 @@ private ApacheClientProperties() {
      * @param key           Name of the property.
      * @param type          Type to retrieve the value as.
      * @param <T>           Type of the property value.
-     * @return              Value of the property or {@code null}.
+     * @return Value of the property or {@code null}.
      *
      * @since 2.8
      */
-    public static <T> T getValue(Map<String, ?> properties, String key, Class<T> type) {
+    public static <T> T getValue(final Map<String, ?> properties, final String key, final Class<T> type) {
         return PropertiesHelper.getValue(properties, key, type, null);
     }
+
+    /**
+     * Prevents instantiation.
+     */
+    private ApacheClientProperties() {
+        throw new AssertionError("No instances allowed.");
+    }
 }

connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java

@@ -66,7 +66,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.glassfish.jersey.SslConfigurator;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.ClientRequest;
 import org.glassfish.jersey.client.ClientResponse;
@@ -140,7 +139,6 @@
  * <li>{@link ClientProperties#PROXY_PASSWORD}</li>
  * <li>{@link ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is {@link RequestEntityProcessing#CHUNKED}</li>
  * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
- * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * <p>
  * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
@@ -235,18 +233,14 @@ class ApacheConnector implements Connector {
             }
         }
 
-        final SSLContext sslContext = getSslContext(client, config);
+        final SSLContext sslContext = client.getSslContext();
         final HttpClientBuilder clientBuilder = HttpClientBuilder.create();
 
         clientBuilder.setConnectionManager(getConnectionManager(config, sslContext));
         clientBuilder.setSslcontext(sslContext);
 
         final RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
 
-        final int connectTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.CONNECT_TIMEOUT, 0);
-        final int socketTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.READ_TIMEOUT, 0);
-        final boolean ignoreCookies = PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.DISABLE_COOKIES);
-
         final Object credentialsProvider = config.getProperty(ApacheClientProperties.CREDENTIALS_PROVIDER);
         if (credentialsProvider != null && (credentialsProvider instanceof CredentialsProvider)) {
             clientBuilder.setDefaultCredentialsProvider((CredentialsProvider) credentialsProvider);
@@ -279,6 +273,8 @@ class ApacheConnector implements Connector {
                 .get(ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
         this.preemptiveBasicAuth = (preemptiveBasicAuthProperty != null) ? preemptiveBasicAuthProperty : false;
 
+        final boolean ignoreCookies = PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.DISABLE_COOKIES);
+
         if (reqConfig != null) {
             final RequestConfig.Builder reqConfigBuilder = RequestConfig.copy((RequestConfig) reqConfig);
             if (ignoreCookies) {
@@ -302,15 +298,6 @@ class ApacheConnector implements Connector {
         this.client = clientBuilder.build();
     }
 
-    private SSLContext getSslContext(final Client client, final Configuration config) {
-        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(
-                config.getProperties(),
-                ApacheClientProperties.SSL_CONFIG,
-                SslConfigurator.class);
-
-        return sslConfigurator != null ? sslConfigurator.createSSLContext() : client.getSslContext();
-    }
-
     private HttpClientConnectionManager getConnectionManager(final Configuration config, final SSLContext sslContext) {
         final Object cmObject = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
 
@@ -528,8 +515,8 @@ private HttpHost getHost(final HttpUriRequest request) {
     private HttpUriRequest getUriHttpRequest(final ClientRequest clientRequest) {
         final RequestConfig.Builder requestConfigBuilder = RequestConfig.copy(requestConfig);
 
-        int connectTimeout = clientRequest.resolveProperty(ClientProperties.CONNECT_TIMEOUT, -1);
-        int socketTimeout = clientRequest.resolveProperty(ClientProperties.READ_TIMEOUT, -1);
+        final int connectTimeout = clientRequest.resolveProperty(ClientProperties.CONNECT_TIMEOUT, -1);
+        final int socketTimeout = clientRequest.resolveProperty(ClientProperties.READ_TIMEOUT, -1);
 
         if (connectTimeout >= 0) {
             requestConfigBuilder.setConnectTimeout(connectTimeout);

connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnectorProvider.java

@@ -66,7 +66,6 @@
  * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
  * - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
  * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
- * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * </p>
  * <p>

connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyClientProperties.java

@@ -56,24 +56,9 @@ public final class JettyClientProperties {
      * Prevents instantiation.
      */
     private JettyClientProperties() {
+        throw new AssertionError("No instances allowed.");
     }
 
-    /**
-     * Support for specifying SSL configuration for HTTPS connections.
-     * Used only when making HTTPS requests.
-     *
-     * <p>The value MUST be an instance of {@link org.glassfish.jersey.SslConfigurator}.</p>
-     *
-     * <p>A default value is not set.</p>
-     *
-     * <p>The name of the configuration property is <tt>{@value}</tt>.</p>
-     *
-     * @deprecated Set the SSL configuration on the JAX-RS {@link javax.ws.rs.client.ClientBuilder}.
-     */
-    @Deprecated
-    public static final String SSL_CONFIG =
-            "jersey.config.jetty.client.ssl.sslConfig";
-
     /**
      * A value of {@code false} indicates the client should handle cookies
      * automatically using HttpClient's default cookie policy. A value
@@ -115,7 +100,7 @@ private JettyClientProperties() {
      *
      * @since 2.8
      */
-    public static <T> T getValue(Map<String, ?> properties, String key, Class<T> type) {
+    public static <T> T getValue(final Map<String, ?> properties, final String key, final Class<T> type) {
         return PropertiesHelper.getValue(properties, key, type, null);
     }
 

connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java

@@ -66,13 +66,11 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.glassfish.jersey.SslConfigurator;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.ClientRequest;
 import org.glassfish.jersey.client.ClientResponse;
 import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
 import org.glassfish.jersey.client.spi.Connector;
-import org.glassfish.jersey.internal.util.PropertiesHelper;
 import org.glassfish.jersey.internal.util.collection.ByteBufferInputStream;
 import org.glassfish.jersey.internal.util.collection.NonBlockingInputStream;
 import org.glassfish.jersey.message.internal.HeaderUtils;
@@ -116,7 +114,6 @@
  * <li>{@link ClientProperties#PROXY_USERNAME}</li>
  * <li>{@link ClientProperties#PROXY_PASSWORD}</li>
  * <li>{@link ClientProperties#PROXY_PASSWORD}</li>
- * <li>{@link JettyClientProperties#SSL_CONFIG}</li>
  * <li>{@link JettyClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
  * <li>{@link JettyClientProperties#DISABLE_COOKIES}</li>
  * </ul>
@@ -165,8 +162,7 @@ class JettyConnector implements Connector {
      * @param config client configuration.
      */
     JettyConnector(final Client jaxrsClient, final Configuration config) {
-
-        final SSLContext sslContext = getSslContext(jaxrsClient, config);
+        final SSLContext sslContext = jaxrsClient.getSslContext();
         final SslContextFactory sslContextFactory = new SslContextFactory();
         sslContextFactory.setSslContext(sslContext);
         this.client = new HttpClient(sslContextFactory);
@@ -210,16 +206,6 @@ class JettyConnector implements Connector {
         this.cookieStore = client.getCookieStore();
     }
 
-    private SSLContext getSslContext(final Client client, final Configuration config) {
-        final SslConfigurator sslConfigurator = PropertiesHelper.getValue(
-                config.getProperties(),
-                JettyClientProperties.SSL_CONFIG,
-                SslConfigurator.class,
-                null);
-
-        return sslConfigurator != null ? sslConfigurator.createSSLContext() : client.getSslContext();
-    }
-
     @SuppressWarnings("ChainOfInstanceofChecks")
     private static URI getProxyUri(final Object proxy) {
         if (proxy instanceof URI) {
@@ -289,7 +275,7 @@ private static void processResponseHeaders(final HttpFields respHeaders, final C
             final MultivaluedMap<String, String> headers = jerseyResponse.getHeaders();
             List<String> list = headers.get(headerName);
             if (list == null) {
-                list = new ArrayList<String>();
+                list = new ArrayList<>();
             }
             list.add(header.getValue());
             headers.put(headerName, list);
@@ -325,9 +311,9 @@ private Request translateRequest(final ClientRequest clientRequest) {
     }
 
     private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers, final Request request) {
-        Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
+        final Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
 
-        for (Map.Entry<String, String> e : stringHeaders.entrySet()) {
+        for (final Map.Entry<String, String> e : stringHeaders.entrySet()) {
             request.getHeaders().add(e.getKey(), e.getValue());
         }
         return stringHeaders;
@@ -404,7 +390,7 @@ public void onFailure(final Throwable t) {
                     }
                 }
             });
-            final AtomicReference<ClientResponse> jerseyResponse = new AtomicReference<ClientResponse>();
+            final AtomicReference<ClientResponse> jerseyResponse = new AtomicReference<>();
             final ByteBufferInputStream entityStream = new ByteBufferInputStream();
             jettyRequest.send(new Response.Listener.Adapter() {
 

connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnectorProvider.java

@@ -63,7 +63,6 @@
  * <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#PROXY_PASSWORD}</li>
- * <li>{@link JettyClientProperties#SSL_CONFIG}</li>
  * <li>{@link JettyClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
  * <li>{@link JettyClientProperties#DISABLE_COOKIES}</li>
  * </ul>

core-client/src/main/java/org/glassfish/jersey/client/ClientLifecycleListener.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -42,7 +42,6 @@
 import javax.ws.rs.ConstrainedTo;
 import javax.ws.rs.RuntimeType;
 
-import org.glassfish.jersey.Beta;
 import org.glassfish.jersey.spi.Contract;
 
 /**
@@ -53,8 +52,8 @@
  */
 @Contract
 @ConstrainedTo(RuntimeType.CLIENT)
-@Beta
 public interface ClientLifecycleListener {
+
     /**
      * Invoked when a new runtime is initialized for the client instance.
      */
@@ -64,4 +63,4 @@ public interface ClientLifecycleListener {
      * Invoked when the client instance is closed.
      */
     public void onClose();
-}
+}

core-server/src/main/java/org/glassfish/jersey/server/spi/ContainerLifecycleListener.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -42,7 +42,6 @@
 import javax.ws.rs.ConstrainedTo;
 import javax.ws.rs.RuntimeType;
 
-import org.glassfish.jersey.Beta;
 import org.glassfish.jersey.spi.Contract;
 
 /**
@@ -53,7 +52,6 @@
  */
 @Contract
 @ConstrainedTo(RuntimeType.SERVER)
-@Beta
 public interface ContainerLifecycleListener {
 
     /**

docs/src/main/docbook/jersey.ent

@@ -322,6 +322,7 @@
 <!ENTITY jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING "<link xlink:href='&jersey.javadoc.uri.prefix;/client/ClientProperties.html#REQUEST_ENTITY_PROCESSING'>ClientProperties.REQUEST_ENTITY_PROCESSING</link>" >
 <!ENTITY jersey.client.ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION "<link xlink:href='&jersey.javadoc.uri.prefix;/client/ClientProperties.html#SUPPRESS_HTTP_COMPLIANCE_VALIDATION'>ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION</link>" >
 <!ENTITY jersey.client.ClientProperties.USE_ENCODING "<link xlink:href='&jersey.javadoc.uri.prefix;/client/ClientProperties.html#USE_ENCODING'>ClientProperties.USE_ENCODING</link>" >
+<!ENTITY jersey.client.ClientLifecycleListener "<link xlink:href='&jersey.javadoc.uri.prefix;/client/ClientLifecycleListener.html'>ClientLifecycleListener</link>">
 <!ENTITY jersey.client.Connector "<link xlink:href='&jersey.javadoc.uri.prefix;/client/spi/Connector.html'>Connector</link>">
 <!ENTITY jersey.client.ConnectorProvider "<link xlink:href='&jersey.javadoc.uri.prefix;/client/spi/ConnectorProvider.html'>ConnectorProvider</link>">
 <!ENTITY jersey.client.CsrfProtectionFilter "<link xlink:href='&jersey.javadoc.uri.prefix;/client/filter/CsrfProtectionFilter.html'>CsrfProtectionFilter</link>">
@@ -555,6 +556,8 @@
 <!ENTITY jersey.test.TestProperties "<link xlink:href='&jersey.javadoc.uri.prefix;/test/TestProperties.html'>TestProperties</link>">
 <!ENTITY jersey.test.spi.TestContainer "<link xlink:href='&jersey.javadoc.uri.prefix;/test/spi/TestContainer.html'>TestContainer</link>">
 <!ENTITY jersey.test.spi.TestContainerFactory "<link xlink:href='&jersey.javadoc.uri.prefix;/test/spi/TestContainerFactory.html'>TestContainerFactory</link>">
+<!ENTITY jersey.test.util.ContainerRequestBuilder "<link xlink:href='&jersey.javadoc.uri.prefix;/test/util/server/ContainerRequestBuilder.html'>ContainerRequestBuilder</link>">
+<!ENTITY jersey.test.util.LoopBackConnectorProvider "<link xlink:href='&jersey.javadoc.uri.prefix;/test/util/client/LoopBackConnectorProvider.html'>LoopBackConnectorProvider</link>">
 
 <!-- Common Literals -->
 <!ENTITY lit.null "<literal>null</literal>">
@@ -772,6 +775,7 @@
 <!ENTITY lit.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING "<literal>ClientProperties.REQUEST_ENTITY_PROCESSING</literal>" >
 <!ENTITY lit.jersey.client.ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION "<literal>ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION</literal>" >
 <!ENTITY lit.jersey.client.ClientProperties.USE_ENCODING "<literal>ClientProperties.USE_ENCODING</literal>" >
+<!ENTITY lit.jersey.client.ClientLifecycleListener "<literal>ClientLifecycleListener</literal>">
 <!ENTITY lit.jersey.client.Connector "<literal>Connector</literal>">
 <!ENTITY lit.jersey.client.ConnectorProvider "<literal>ConnectorProvider</literal>">
 <!ENTITY lit.jersey.client.CsrfProtectionFilter "<literal>CsrfProtectionFilter</literal>">
@@ -964,3 +968,5 @@
 <!ENTITY lit.jersey.test.TestProperties "<literal>TestProperties</literal>">
 <!ENTITY lit.jersey.test.spi.TestContainer "<literal>TestContainer</literal>">
 <!ENTITY lit.jersey.test.spi.TestContainerFactory "<literal>TestContainerFactory</literal>">
+<!ENTITY lit.jersey.test.util.LoopBackConnectorProvider "<literal>LoopBackConnectorProvider</literal>">
+<!ENTITY lit.jersey.test.util.ContainerRequestBuilder "<literal>ContainerRequestBuilder</literal>">