Remove buildTemplateFromArgs parameter from MethodHandler.Factory

OpenFeign · Nov 19, 2022 · e21d87d · e21d87d
1 parent fc8b9d2
commit e21d87d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/core/src/main/java/feign/AsyncFeign.java b/core/src/main/java/feign/AsyncFeign.java
@@ -210,7 +210,6 @@ public AsyncFeign<C> build() {
               options, decoder, errorDecoder);
       final ParseHandlersByName<C> handlersByName =
           new ParseHandlersByName<>(contract,
-              new RequestTemplateFactoryResolver(encoder, queryMapEncoder),
               methodHandlerFactory);
       final ReflectiveFeign<C> feign =
           new ReflectiveFeign<>(handlersByName, invocationHandlerFactory, defaultContextSupplier);

diff --git a/core/src/main/java/feign/AsynchronousMethodHandler.java b/core/src/main/java/feign/AsynchronousMethodHandler.java
@@ -277,8 +277,9 @@ static class Factory<C> implements MethodHandler.Factory<C> {
 
     public MethodHandler create(Target<?> target,
                                 MethodMetadata md,
-                                RequestTemplate.Factory buildTemplateFromArgs,
                                 C requestContext) {
+      final RequestTemplate.Factory buildTemplateFromArgs =
+          requestTemplateFactoryResolver.resolve(target, md);
       return new AsynchronousMethodHandler<C>(target, client, retryer, requestInterceptors,
           logger, logLevel, md, buildTemplateFromArgs, options, responseHandler,
           propagationPolicy, requestContext,

diff --git a/core/src/main/java/feign/Feign.java b/core/src/main/java/feign/Feign.java
@@ -208,7 +208,6 @@ public Feign build() {
               options, decoder, errorDecoder);
       ParseHandlersByName<Object> handlersByName =
           new ParseHandlersByName<>(contract,
-              new RequestTemplateFactoryResolver(encoder, queryMapEncoder),
               synchronousMethodHandlerFactory);
       return new ReflectiveFeign<>(handlersByName, invocationHandlerFactory, () -> null);
     }

diff --git a/core/src/main/java/feign/InvocationHandlerFactory.java b/core/src/main/java/feign/InvocationHandlerFactory.java
@@ -37,7 +37,6 @@ interface MethodHandler {
     interface Factory<C> {
       MethodHandler create(Target<?> target,
                            MethodMetadata md,
-                           RequestTemplate.Factory buildTemplateFromArgs,
                            C requestContext);
     }
   }

diff --git a/core/src/main/java/feign/ReflectiveFeign.java b/core/src/main/java/feign/ReflectiveFeign.java
@@ -116,15 +116,12 @@ public String toString() {
   static final class ParseHandlersByName<C> {
 
     private final Contract contract;
-    private final RequestTemplateFactoryResolver requestTemplateFactoryResolver;
     private final MethodHandler.Factory<C> factory;
 
     ParseHandlersByName(
         Contract contract,
-        RequestTemplateFactoryResolver requestTemplateFactoryResolver,
         MethodHandler.Factory<C> factory) {
       this.contract = contract;
-      this.requestTemplateFactoryResolver = requestTemplateFactoryResolver;
       this.factory = factory;
     }
 
@@ -161,8 +158,7 @@ private MethodHandler createMethodHandler(final Target<?> target,
         };
       }
 
-      RequestTemplate.Factory buildTemplate = requestTemplateFactoryResolver.resolve(target, md);
-      return factory.create(target, md, buildTemplate, requestContext);
+      return factory.create(target, md, requestContext);
     }
   }
 

diff --git a/core/src/main/java/feign/SynchronousMethodHandler.java b/core/src/main/java/feign/SynchronousMethodHandler.java
@@ -181,8 +181,9 @@ static class Factory implements MethodHandler.Factory<Object> {
 
     public MethodHandler create(Target<?> target,
                                 MethodMetadata md,
-                                RequestTemplate.Factory buildTemplateFromArgs,
                                 Object requestContext) {
+      final RequestTemplate.Factory buildTemplateFromArgs =
+          requestTemplateFactoryResolver.resolve(target, md);
       return new SynchronousMethodHandler(target, client, retryer, requestInterceptors,
           responseInterceptor, logger, logLevel, md, buildTemplateFromArgs, options, decoder,
           errorDecoder, dismiss404, closeAfterDecode, propagationPolicy);