[RESTEASY-1549] Fix / workaround for a bunch of deprecation warnings

resteasy · Sep 18, 2017 · f2c73ea · f2c73ea
1 parent 1d8c22a
commit f2c73ea
Show file tree

Hide file tree

Showing 38 changed files with 137 additions and 120 deletions.
diff --git a/...n/src/main/java/org/jboss/resteasy/plugins/providers/jackson/JacksonJsonpInterceptor.java b/...n/src/main/java/org/jboss/resteasy/plugins/providers/jackson/JacksonJsonpInterceptor.java
@@ -17,7 +17,7 @@
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.jboss.resteasy.core.MediaTypeMap;
-import org.jboss.resteasy.resteasy_jaxrs.i18n.*;
+import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages;
 
 /**
  * <p>

diff --git a/.../jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java b/.../jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java
@@ -2,7 +2,8 @@
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.codehaus.jackson.annotate.JsonProperty;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -364,16 +365,16 @@ public XmlResourceWithJacksonAnnotation getJacksonAnnotatedResource() {
 
     @Test
     public void testJacksonJAXB() throws Exception {
+        try (CloseableHttpClient client = HttpClientBuilder.create().build())
         {
-            DefaultHttpClient client = new DefaultHttpClient();
             HttpGet get = new HttpGet(generateBaseUrl() + "/jaxb");
             HttpResponse response = client.execute(get);
             BufferedReader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
             Assert.assertTrue(reader.readLine().contains("attr_1"));
         }
 
+        try (CloseableHttpClient client = HttpClientBuilder.create().build())
         {
-            DefaultHttpClient client = new DefaultHttpClient();
             HttpGet get = new HttpGet(generateBaseUrl() + "/jaxb/json");
             HttpResponse response = client.execute(get);
             BufferedReader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));

diff --git a/...client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/ApacheHttpClient4Engine.java b/...client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/ApacheHttpClient4Engine.java
@@ -265,6 +265,7 @@ public void setHostnameVerifier(HostnameVerifier hostnameVerifier)
       this.hostnameVerifier = hostnameVerifier;
    }
 
+   @SuppressWarnings("deprecation")
    public HttpHost getDefaultProxy()
    {
 	   return (HttpHost) httpClient.getParams().getParameter(ConnRoutePNames.DEFAULT_PROXY);
@@ -440,6 +441,7 @@ protected boolean isRedirectRequired(final ClientInvocation request, final HttpR
       return false;
    }
 
+   @SuppressWarnings("deprecation")
    protected HttpClient createDefaultHttpClient()
    {
       HttpParams params = new SyncBasicHttpParams();
@@ -451,11 +453,13 @@ protected HttpClient createDefaultHttpClient()
       return new DefaultHttpClient(params);
    }
 
+   @SuppressWarnings("deprecation")
    protected void setRedirectRequired(final ClientInvocation request, HttpRequestBase httpMethod)
    {
       HttpClientParams.setRedirecting(httpMethod.getParams(), true);
    }
 
+   @SuppressWarnings("deprecation")
    protected void setRedirectNotRequired(final ClientInvocation request, HttpRequestBase httpMethod)
    {
       HttpClientParams.setRedirecting(httpMethod.getParams(), false);
@@ -511,6 +515,7 @@ protected void commitHeaders(ClientInvocation request, HttpRequestBase httpMetho
       }
    }
 
+   @SuppressWarnings("deprecation")
    public void close()
    {
       if (closed)
@@ -695,6 +700,7 @@ private static class FileExposingFileEntity extends FileEntity
        * @param pFile -
        * @param pContentType -
        */
+      @SuppressWarnings("deprecation")
       public FileExposingFileEntity(File pFile, String pContentType)
       {
          super(pFile, pContentType);

diff --git a/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocation.java b/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocation.java
@@ -497,6 +497,7 @@ public <T> Future<T> submit(final Class<T> responseType)
    {
       return doSubmit(false, null, new AsyncClientHttpEngine.ResultExtractor<T>()
       {
+         @SuppressWarnings("unchecked")
          @Override
          public T extractResult(ClientResponse response)
          {
@@ -512,6 +513,7 @@ public <T> Future<T> submit(final GenericType<T> responseType)
    {
       return doSubmit(false, null, new AsyncClientHttpEngine.ResultExtractor<T>()
       {
+         @SuppressWarnings("unchecked")
          @Override
          public T extractResult(ClientResponse response)
          {

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/InjectorFactoryImpl.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/InjectorFactoryImpl.java
@@ -74,6 +74,7 @@ public MethodInjector createMethodInjector(ResourceLocator method, ResteasyProvi
       return new MethodInjectorImpl(method, factory);
    }
 
+   @SuppressWarnings("deprecation")
    @Override
    public ValueInjector createParameterExtractor(Parameter parameter, ResteasyProviderFactory providerFactory)
    {
@@ -137,6 +138,7 @@ public ValueInjector createParameterExtractor(Class injectTargetClass, Accessibl
       return createParameterExtractor(injectTargetClass, injectTarget, type, genericType, annotations, true, providerFactory);
    }
 
+   @SuppressWarnings("deprecation")
    @Override
    public ValueInjector createParameterExtractor(Class injectTargetClass, AccessibleObject injectTarget, Class type, Type genericType, Annotation[] annotations, boolean useDefault, ResteasyProviderFactory providerFactory)
    {

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ServerResponseWriter.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ServerResponseWriter.java
@@ -97,8 +97,8 @@ public static void writeNomapResponse(BuiltResponse jaxrsResponse, final HttpReq
       Object ent = jaxrsResponse.getEntity();
       Type generic = jaxrsResponse.getGenericType();
       Annotation[] annotations = jaxrsResponse.getAnnotations();
-      @SuppressWarnings(value = "unchecked")
       final MediaType mt = jaxrsResponse.getMediaType();
+      @SuppressWarnings(value = "unchecked")
       MessageBodyWriter writer = providerFactory.getMessageBodyWriter(
               type, generic, annotations, mt);
       if (writer!=null)

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ThreadLocalResteasyProviderFactory.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ThreadLocalResteasyProviderFactory.java
@@ -50,6 +50,7 @@
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
+@SuppressWarnings("deprecation")
 public class ThreadLocalResteasyProviderFactory extends ResteasyProviderFactory implements ProviderFactoryDelegate
 {
    private static final ThreadLocalStack<ResteasyProviderFactory> delegate = new ThreadLocalStack<ResteasyProviderFactory>();

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java
@@ -15,17 +15,14 @@
 import org.jboss.resteasy.resteasy_jaxrs.i18n.Messages;
 import org.jboss.resteasy.util.GetRestful;
 
-import javax.ws.rs.container.ResourceContext;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Configurable;
 import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
 import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.FeatureContext;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -79,7 +76,7 @@ public class ResteasyDeployment
    protected ThreadLocalResteasyProviderFactory threadLocalProviderFactory;
    protected String paramMapping;
 
-   @SuppressWarnings(value = "unchecked")
+   @SuppressWarnings(value = {"unchecked", "deprecation"})
    public void start()
    {
       // it is very important that each deployment create their own provider factory

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyProviderFactory.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyProviderFactory.java
@@ -85,7 +85,7 @@
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "deprecation"})
 public class ResteasyProviderFactory extends RuntimeDelegate implements Providers, HeaderValueProcessor, Configurable<ResteasyProviderFactory>, Configuration
 {
    /**

diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceBuilder.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceBuilder.java
@@ -244,6 +244,7 @@ public T queryParam(String name)
          return (T)this;
       }
 
+      @SuppressWarnings("deprecation")
       public T fromAnnotations()
       {
          Annotation[] annotations = parameter.getAnnotations();

diff --git a/resteasy-legacy/src/main/java/org/jboss/resteasy/spi/old/ResteasyProviderFactory.java b/resteasy-legacy/src/main/java/org/jboss/resteasy/spi/old/ResteasyProviderFactory.java
@@ -40,7 +40,8 @@
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
+@Deprecated
 public class ResteasyProviderFactory extends org.jboss.resteasy.spi.ResteasyProviderFactory
 {
    protected Map<Class<?>, ClientExceptionMapper> clientExceptionMappers;
@@ -136,10 +137,6 @@ protected void registerDefaultInterceptorPrecedences()
      registerDefaultInterceptorPrecedences(getClientExecutionInterceptorRegistry());
    }
 
-   private boolean isParentSameType() {
-      return parent != null && parent instanceof ResteasyProviderFactory;
-   }
-
    /**
     * Append interceptor predence
     *

diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestFacadeLinks.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestFacadeLinks.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
@@ -69,13 +69,14 @@ public TestFacadeLinks(Class<?> resourceType){
 	public void before(){
 		POJOResourceFactory noDefaults = new POJOResourceFactory(resourceType);
 		dispatcher.getRegistry().addResourceFactory(noDefaults);
-		httpClient = new DefaultHttpClient();
+		httpClient = HttpClientBuilder.create().build();
 		ApacheHttpClient4Engine engine = new ApacheHttpClient4Engine(httpClient);
 		url = generateBaseUrl();
 		ResteasyWebTarget target = new ResteasyClientBuilder().httpEngine(engine).build().target(url);
 		client = target.proxy(BookStoreService.class);
 	}
 
+	@SuppressWarnings("deprecation")
 	@After
 	public void after(){
 		// TJWS does not support chunk encodings well so I need to kill kept

diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinkIds.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinkIds.java
@@ -5,7 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
@@ -37,7 +37,7 @@ public static void beforeClass() throws Exception
       dispatcher = server.getDeployment().getDispatcher();
       POJOResourceFactory noDefaults = new POJOResourceFactory(IDServiceTestBean.class);
       dispatcher.getRegistry().addResourceFactory(noDefaults);
-      httpClient = new DefaultHttpClient();
+      httpClient = HttpClientBuilder.create().build();
       ApacheHttpClient4Engine engine = new ApacheHttpClient4Engine(httpClient);
       url = generateBaseUrl();
       ResteasyWebTarget target = new ResteasyClientBuilder().httpEngine(engine).build().target(url);
@@ -52,12 +52,12 @@ public static void afterClass() throws Exception
       dispatcher = null;
    }
 
-	private static Class<?> resourceType;
 	private static String url;
 	private static IDServiceTest client;
 	private static HttpClient httpClient;
 
-	@After
+	@SuppressWarnings("deprecation")
+    @After
 	public void after(){
 		// TJWS does not support chunk encodings well so I need to kill kept
 		// alive connections

diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinks.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinks.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
@@ -69,14 +69,15 @@ public TestLinks(Class<?> resourceType){
 	public void before(){
 		POJOResourceFactory noDefaults = new POJOResourceFactory(resourceType);
 		dispatcher.getRegistry().addResourceFactory(noDefaults);
-		httpClient = new DefaultHttpClient();
+		httpClient = HttpClientBuilder.create().build();
 		ApacheHttpClient4Engine engine = new ApacheHttpClient4Engine(httpClient);
 		url = generateBaseUrl();
 		ResteasyWebTarget target = new ResteasyClientBuilder().httpEngine(engine).build().target(url);
 		client = target.proxy(BookStoreService.class);
 	}
 
-	@After
+	@SuppressWarnings("deprecation")
+    @After
 	public void after(){
 		// TJWS does not support chunk encodings well so I need to kill kept
 		// alive connections

diff --git a/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestSecureLinks.java b/resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestSecureLinks.java
@@ -11,15 +11,17 @@
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.AuthCache;
 import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.protocol.ClientContext;
+import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
-import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
+import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
 import org.jboss.resteasy.client.jaxrs.engines.HttpContextProvider;
 import org.jboss.resteasy.core.Dispatcher;
 import org.jboss.resteasy.links.RESTServiceDiscovery;
@@ -85,7 +87,8 @@ public static List<Class<?>[]> getParameters(){
 	private Class<?> resourceType;
 	private String url;
 	private BookStoreService client;
-	private DefaultHttpClient httpClient;
+	private CloseableHttpClient httpClient;
+	private CredentialsProvider cp;
 	public TestSecureLinks(Class<?> resourceType){
 		this.resourceType = resourceType;
 	}
@@ -96,8 +99,9 @@ public void before(){
 		dispatcher.getRegistry().addResourceFactory(noDefaults);
 		url = generateBaseUrl();
 
-		httpClient = new DefaultHttpClient();
+		cp = new BasicCredentialsProvider();
-		ApacheHttpClient4Engine engine = new ApacheHttpClient4Engine(httpClient, new HttpContextProvider() {
+		httpClient = HttpClientBuilder.create().setDefaultCredentialsProvider(cp).build();
+		ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(httpClient, new HttpContextProvider() {
 			@Override
 			public HttpContext getContext() {
 				// Configure HttpClient to authenticate preemptively
@@ -109,7 +113,7 @@ public HttpContext getContext() {
 				authCache.put(getHttpHost(url), basicAuth);
 				// 3. Add AuthCache to the execution context
 				BasicHttpContext localContext = new BasicHttpContext();
-				localContext.setAttribute(ClientContext.AUTH_CACHE, authCache);
+				localContext.setAttribute(HttpClientContext.AUTH_CACHE, authCache);
 				return localContext;
 			}
 		});
@@ -120,12 +124,12 @@ public HttpContext getContext() {
 	@After
 	public void after(){
 		dispatcher.getRegistry().removeRegistrations(resourceType);
+		cp = null;
 	}
 
 	@Test
 	public void testSecureLinksAdmin() throws Exception
 	{
-		CredentialsProvider cp = httpClient.getCredentialsProvider();
 		cp.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("admin", "asd"));
 		Book book = client.getBookXML("foo");
 		checkBookLinks1(url, book, "add", "update", "list", "self", "remove");
@@ -134,7 +138,6 @@ public void testSecureLinksAdmin() throws Exception
 	@Test
 	public void testSecureLinksPowerUser() throws Exception
 	{
-		CredentialsProvider cp = httpClient.getCredentialsProvider();
 		cp.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("power-user", "asd"));
 		Book book = client.getBookXML("foo");
 		checkBookLinks1(url, book, "add", "update", "list", "self");
@@ -143,7 +146,6 @@ public void testSecureLinksPowerUser() throws Exception
 	@Test
 	public void testSecureLinksUser() throws Exception
 	{
-		CredentialsProvider cp = httpClient.getCredentialsProvider();
 		cp.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("user", "asd"));
 		Book book = client.getBookXML("foo");
 		checkBookLinks1(url, book, "list", "self");