[RESTEASY-1957] Change most ResteasyProviderFactory protected fields/…

…methods into private [RESTEASY-1956] Get rid of further deprecated / unused stuff (including old providers precedence system) [RESTEASY-1957] Change most ResteasyDeployment protected fields/methods into private Removing useless methods (basically there for testing and/or duplicating others) + a bit of harmless refactoring [RESTEASY-1957] Removing bunch of redundant / useless methods from ResteasyProviderFactory (for example, one od ther register(...) methods can be used instead of most of the add* methods)
resteasy · Jul 25, 2018 · 266c036 · 266c036
1 parent f633034
commit 266c036
Show file tree

Hide file tree

Showing 13 changed files with 200 additions and 826 deletions.
diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/StringParameterInjector.java
@@ -503,13 +503,6 @@ private boolean initialize(Annotation[] annotations, ResteasyProviderFactory fac
           }
        }
 
-       // Else try to find a StringConverter if any
-       converter = factory.getStringConverter(baseType);
-       if (converter != null)
-       {
-    	   return true;
-       }
-
        // Else try to find a RuntimeDelegate.HeaderDelegate if any
        if (paramType.equals(HeaderParam.class))
        {

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
@@ -6,13 +6,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.CompletionStage;
 
 import org.jboss.resteasy.core.interception.jaxrs.ClientRequestFilterRegistry;
 import org.jboss.resteasy.resteasy_jaxrs.i18n.*;
 
 import javax.ws.rs.RuntimeType;
-import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.container.DynamicFeature;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Configuration;
@@ -31,19 +29,16 @@
 import org.jboss.resteasy.core.interception.jaxrs.ClientResponseFilterRegistry;
 import org.jboss.resteasy.core.interception.jaxrs.ContainerRequestFilterRegistry;
 import org.jboss.resteasy.core.interception.jaxrs.ContainerResponseFilterRegistry;
-import org.jboss.resteasy.core.interception.jaxrs.JaxrsInterceptorRegistry;
 import org.jboss.resteasy.core.interception.jaxrs.ReaderInterceptorRegistry;
 import org.jboss.resteasy.core.interception.jaxrs.WriterInterceptorRegistry;
 import org.jboss.resteasy.spi.AsyncResponseProvider;
 import org.jboss.resteasy.spi.AsyncStreamProvider;
-import org.jboss.resteasy.spi.ConstructorInjector;
 import org.jboss.resteasy.spi.ContextInjector;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.HttpResponse;
 import org.jboss.resteasy.spi.InjectorFactory;
 import org.jboss.resteasy.spi.ProviderFactoryDelegate;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.jboss.resteasy.spi.StringConverter;
 import org.jboss.resteasy.spi.StringParameterUnmarshaller;
 import org.jboss.resteasy.util.ThreadLocalStack;
 
@@ -53,12 +48,11 @@
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-@SuppressWarnings("deprecation")
-public class ThreadLocalResteasyProviderFactory extends ResteasyProviderFactory implements ProviderFactoryDelegate
+public final class ThreadLocalResteasyProviderFactory extends ResteasyProviderFactory implements ProviderFactoryDelegate
 {
    private static final ThreadLocalStack<ResteasyProviderFactory> delegate = new ThreadLocalStack<ResteasyProviderFactory>();
 
-   private ResteasyProviderFactory defaultFactory;
+   private final ResteasyProviderFactory defaultFactory;
 
 
    public ThreadLocalResteasyProviderFactory(ResteasyProviderFactory defaultFactory)
@@ -143,12 +137,6 @@ public boolean isBuiltinsRegistered()
       return getDelegate().isBuiltinsRegistered();
    }
 
-   @Override
-   public Set<Class<?>> getFeatureClasses()
-   {
-      return getDelegate().getFeatureClasses();
-   }
-
    @Override
    public void setBuiltinsRegistered(boolean builtinsRegistered)
    {
@@ -191,24 +179,12 @@ public void registerProviderInstance(Object provider)
       getDelegate().registerProviderInstance(provider);
    }
 
-   @Override
-   public StringConverter getStringConverter(Class<?> clazz)
-   {
-      return getDelegate().getStringConverter(clazz);
-   }
-
    @Override
    public <T> StringParameterUnmarshaller<T> createStringParameterUnmarshaller(Class<T> clazz)
    {
       return getDelegate().createStringParameterUnmarshaller(clazz);
    }
 
-   @Override
-   public Set<Object> getFeatureInstances()
-   {
-      return getDelegate().getFeatureInstances();
-   }
-
    @Override
    public void setInjectorFactory(InjectorFactory injectorFactory)
    {
@@ -254,12 +230,6 @@ public void registerProvider(Class provider, Integer priorityOverride, boolean i
       getDelegate().registerProvider(provider, priorityOverride, isBuiltin, contracts);
    }
 
-   @Override
-   public Map<Class<?>, Map<Class<?>, Integer>> getClassContracts()
-   {
-      return getDelegate().getClassContracts();
-   }
-
    @Override
    public ContainerRequestFilterRegistry getContainerRequestFilterRegistry()
    {
@@ -314,12 +284,6 @@ public ResteasyProviderFactory register(Object provider)
       return getDelegate().register(provider);
    }
 
-   @Override
-   public <T> ConstructorInjector createConstructorInjector(Class<? extends T> clazz)
-   {
-      return getDelegate().createConstructorInjector(clazz);
-   }
-
    @Override
    public <T> T createProviderInstance(Class<? extends T> clazz)
    {
@@ -374,12 +338,6 @@ public ResteasyProviderFactory setProperties(Map<String, ?> properties)
       return getDelegate().setProperties(properties);
    }
 
-   @Override
-   public void injectProperties(Class declaring, Object obj)
-   {
-      getDelegate().injectProperties(declaring, obj);
-   }
-
    @Override
    public UriBuilder createUriBuilder()
    {
@@ -398,12 +356,6 @@ public <T> T injectedInstance(Class<? extends T> clazz)
       return getDelegate().injectedInstance(clazz);
    }
 
-   @Override
-   public ResteasyProviderFactory getParent()
-   {
-      return getDelegate().getParent();
-   }
-
    @Override
    public RuntimeType getRuntimeType()
    {
@@ -488,12 +440,6 @@ public void registerProviderInstance(Object provider, Map<Class<?>, Integer> con
       getDelegate().registerProviderInstance(provider, contracts, defaultPriority, builtIn);
    }
 
-   @Override
-   public void addStringParameterUnmarshaller(Class<? extends StringParameterUnmarshaller> provider)
-   {
-      getDelegate().addStringParameterUnmarshaller(provider);
-   }
-
    @Override
    public Set<Class<?>> getProviderClasses()
    {
@@ -512,18 +458,6 @@ public ClientRequestFilterRegistry getClientRequestFilterRegistry()
       return getDelegate().getClientRequestFilterRegistry();
    }
 
-   /**
-    * This method retailed for backward compatibility for jaxrs-legacy code.
-    * Method, getClientRequestFilterRegistry, replaces it.
-    * @return interceptor registry
-    */
-   @Deprecated
-   @Override
-   public JaxrsInterceptorRegistry<ClientRequestFilter> getClientRequestFilters()
-   {
-      return getDelegate().getClientRequestFilters();
-   }
-
    @Override
    public Map<String, Object> getProperties()
    {
@@ -641,21 +575,4 @@ public <T> MessageBodyReader<T> getClientMessageBodyReader(Class<T> type, Type g
       return reader;
    }
 
-   @Override
-   public <T> MessageBodyReader<T> getServerMessageBodyReader(Class<T> type, Type genericType, Annotation[] annotations, MediaType mediaType)
-   {
-      MessageBodyReader<T> reader = getDelegate().getServerMessageBodyReader(type, genericType, annotations, mediaType);
-      if (reader!=null)
-          LogMessages.LOGGER.debugf("MessageBodyReader: %s", reader.getClass().getName());
-      return reader;
-   }
-
-   @Override
-   public <T> MessageBodyWriter<T> getServerMessageBodyWriter(Class<T> type, Type genericType, Annotation[] annotations, MediaType mediaType)
-   {
-      MessageBodyWriter<T> writer = getDelegate().getServerMessageBodyWriter(type, genericType, annotations, mediaType);
-      if (writer!=null)
-          LogMessages.LOGGER.debugf("MessageBodyWriter: %s", writer.getClass().getName());
-      return writer;
-   }
 }
diff --git a/.../main/java/org/jboss/resteasy/core/interception/jaxrs/ServerReaderInterceptorContext.java b/.../main/java/org/jboss/resteasy/core/interception/jaxrs/ServerReaderInterceptorContext.java
@@ -41,7 +41,7 @@ public ServerReaderInterceptorContext(ReaderInterceptor[] interceptors, Resteasy
    protected MessageBodyReader resolveReader(MediaType mediaType)
    {
       @SuppressWarnings(value = "unchecked")
-      MessageBodyReader reader =  providerFactory.getServerMessageBodyReader(type,
+      MessageBodyReader reader =  providerFactory.getMessageBodyReader(type,
               genericType, annotations, mediaType);
       //logger.info("**** picked reader: " + reader.getClass().getName());
       return reader;

diff --git a/.../main/java/org/jboss/resteasy/core/interception/jaxrs/ServerWriterInterceptorContext.java b/.../main/java/org/jboss/resteasy/core/interception/jaxrs/ServerWriterInterceptorContext.java
@@ -38,7 +38,7 @@ public ServerWriterInterceptorContext(WriterInterceptor[] interceptors, Resteasy
    @Override
    protected MessageBodyWriter resolveWriter()
    {
-      return providerFactory.getServerMessageBodyWriter(
+      return providerFactory.getMessageBodyWriter(
               type, genericType, annotations, mediaType);
 
    }

diff --git a/...jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/ConfigurationBootstrap.java b/...jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/ConfigurationBootstrap.java
@@ -202,27 +202,6 @@ public ResteasyDeployment createDeployment()
          Map<String, String> map = parseMap(languageExtensions);
          deployment.setLanguageExtensions(map);
       }
-      String before = getParameter(ResteasyContextParameters.RESTEASY_INTERCEPTOR_BEFORE_PRECEDENCE);
-      if (before != null)
-      {
-         Map<String, String> map = parseMap(before);
-         deployment.setInterceptorBeforePrecedences(map);
-      }
-      String after = getParameter(ResteasyContextParameters.RESTEASY_INTERCEPTOR_AFTER_PRECEDENCE);
-      if (after != null)
-      {
-         Map<String, String> map = parseMap(after);
-         deployment.setInterceptorAfterPrecedences(map);
-      }
-      String append = getParameter(ResteasyContextParameters.RESTEASY_APPEND_INTERCEPTOR_PRECEDENCE);
-      if (append != null)
-      {
-         String[] precedences = append.split(",");
-         for (String precedence : precedences)
-         {
-            deployment.getInterceptorPrecedences().add(precedence.trim());
-         }
-      }
 
       String useContainerFormParams = getParameter(ResteasyContextParameters.RESTEASY_USE_CONTAINER_FORM_PARAMS);
       if (useContainerFormParams != null)

diff --git a/...rs/src/main/java/org/jboss/resteasy/plugins/server/servlet/ResteasyContextParameters.java b/...rs/src/main/java/org/jboss/resteasy/plugins/server/servlet/ResteasyContextParameters.java
@@ -27,9 +27,6 @@ public interface ResteasyContextParameters {
     String RESTEASY_LANGUAGE_MAPPINGS = "resteasy.language.mappings";
     String RESTEASY_MEDIA_TYPE_PARAM_MAPPING = "resteasy.media.type.param.mapping";
     String RESTEASY_ROLE_BASED_SECURITY = "resteasy.role.based.security";
-    String RESTEASY_INTERCEPTOR_BEFORE_PRECEDENCE = "resteasy.interceptor.before.precedence";
-    String RESTEASY_INTERCEPTOR_AFTER_PRECEDENCE = "resteasy.interceptor.after.precedence";
-    String RESTEASY_APPEND_INTERCEPTOR_PRECEDENCE = "resteasy.append.interceptor.precedence";
     String RESTEASY_SCANNED_BY_DEPLOYER = "resteasy.scanned.by.deployer";
     String RESTEASY_JNDI_COMPONENT_RESOURCES = "resteasy.jndi.component.resources";
     String RESTEASY_UNWRAPPED_EXCEPTIONS = "resteasy.unwrapped.exceptions";