Merge branch 'master' of github.com:openfeign/feign

.circleci/config.yml

@@ -21,18 +21,18 @@ executors:
     parameters:
       version:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     docker:
-      - image: circleci/openjdk:<<parameters.version>>
+      - image: cimg/openjdk:<<parameters.version>>
   android:
     parameters:
       version:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     docker:
-      - image: circleci/openjdk:<<parameters.version>>
+      - image: cimg/openjdk:<<parameters.version>>
 # common commands
 commands:
   resolve-dependencies:
@@ -101,7 +101,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     executor:
       name: java
@@ -140,7 +140,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8'
+        default: '8.0'
         type: string
     executor:
       name: java
@@ -160,7 +160,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '11'
+        default: '11.0'
         type: string
     executor:
       name: java
@@ -181,17 +181,17 @@ workflows:
   build:
     jobs:
       - test:
-          jdk: '8'
+          jdk: '8.0'
           name: 'jdk 8'
           filters:
             <<: *all-branches
       - test:
-          jdk: '11'
+          jdk: '11.0'
           name: 'jdk 11'
           filters:
             <<: *all-branches
       - test:
-          jdk: '17-buster'
+          jdk: '17.0'
           name: 'jdk 17'
           filters:
             <<: *all-branches
@@ -202,22 +202,22 @@ workflows:
   snapshot:
     jobs:
       - test:
-          jdk: '8'
+          jdk: '8.0'
           name: 'jdk 8'
           filters:
             <<: *master-only
       - test:
-          jdk: '11'
+          jdk: '11.0'
           name: 'jdk 11'
           filters:
             <<: *master-only
       - test:
-          jdk: '17-buster'
+          jdk: '17.0'
           name: 'jdk 17'
           filters:
             <<: *master-only
       - deploy:
-          jdk: '8'
+          jdk: '8.0'
           name: 'deploy snapshot'
           requires:
             - 'jdk 8'
@@ -227,7 +227,7 @@ workflows:
           filters:
             <<: *master-only
       - deploy-jdk11:
-          jdk: '11'
+          jdk: '11.0'
           name: 'deploy jdk11 snapshot modules'
           requires:
             - 'jdk 11'
@@ -239,13 +239,13 @@ workflows:
   release:
     jobs:
       - deploy:
-          jdk: '8'
+          jdk: '8.0'
           name: 'release to maven central'
           context: Sonatype
           filters:
             <<: *tags-only
       - deploy-jdk11:
-          jdk: '11'
+          jdk: '11.0'
           name: 'release jdk11 artifacts to maven central'
           requires:
             - 'release to maven central'

annotation-error-decoder/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.github.openfeign</groupId>
     <artifactId>parent</artifactId>
-    <version>12.1-SNAPSHOT</version>
+    <version>12.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>feign-annotation-error-decoder</artifactId>

apt-test-generator/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.github.openfeign</groupId>
     <artifactId>parent</artifactId>
-    <version>12.1-SNAPSHOT</version>
+    <version>12.2-SNAPSHOT</version>
   </parent>
 
   <groupId>io.github.openfeign.experimental</groupId>
@@ -116,7 +116,7 @@
       <plugin>
         <groupId>org.skife.maven</groupId>
         <artifactId>really-executable-jar-maven-plugin</artifactId>
-        <version>1.5.0</version>
+        <version>2.0.0</version>
         <configuration>
           <programFile>github</programFile>
         </configuration>

benchmark/pom.xml

@@ -20,17 +20,17 @@
   <parent>
     <groupId>io.github.openfeign</groupId>
     <artifactId>parent</artifactId>
-    <version>12.1-SNAPSHOT</version>
+    <version>12.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>feign-benchmark</artifactId>
   <name>Feign Benchmark (JMH)</name>
 
   <properties>
-    <jmh.version>1.35</jmh.version>
+    <jmh.version>1.36</jmh.version>
     <rx.netty.version>0.5.3</rx.netty.version>
     <rx.java.version>1.3.8</rx.java.version>
-    <netty.version>4.1.84.Final</netty.version>
+    <netty.version>4.1.86.Final</netty.version>
     <main.basedir>${project.basedir}/..</main.basedir>
   </properties>
 
@@ -155,7 +155,7 @@
       <plugin>
         <groupId>org.skife.maven</groupId>
         <artifactId>really-executable-jar-maven-plugin</artifactId>
-        <version>1.4.1</version>
+        <version>2.0.0</version>
         <configuration>
           <programFile>benchmark</programFile>
         </configuration>

core/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.github.openfeign</groupId>
     <artifactId>parent</artifactId>
-    <version>12.1-SNAPSHOT</version>
+    <version>12.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>feign-core</artifactId>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.3.23</version>
+      <version>5.3.24</version>
       <scope>test</scope>
     </dependency>
 
@@ -86,7 +86,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>enforce-banned-dependencies</id>

core/src/main/java/feign/AsyncFeign.java

@@ -14,7 +14,6 @@
 package feign;
 
 import feign.InvocationHandlerFactory.MethodHandler;
-import feign.ReflectiveFeign.ParseHandlersByName;
 import feign.Logger.Level;
 import feign.Request.Options;
 import feign.Target.HardCodedTarget;
@@ -206,11 +205,11 @@ public AsyncFeign<C> build() {
               client, retryer, requestInterceptors,
               responseHandler, logger, logLevel,
               propagationPolicy, methodInfoResolver,
+              new RequestTemplateFactoryResolver(encoder, queryMapEncoder),
               options, decoder, errorDecoder);
-      final ParseHandlersByName<C> handlersByName =
-          new ParseHandlersByName<>(contract, encoder, queryMapEncoder, methodHandlerFactory);
       final ReflectiveFeign<C> feign =
-          new ReflectiveFeign<>(handlersByName, invocationHandlerFactory, defaultContextSupplier);
+          new ReflectiveFeign<>(contract, methodHandlerFactory, invocationHandlerFactory,
+              defaultContextSupplier);
       return new AsyncFeign<>(feign);
     }
   }

core/src/main/java/feign/AsynchronousMethodHandler.java

@@ -246,6 +246,7 @@ static class Factory<C> implements MethodHandler.Factory<C> {
     private final Logger.Level logLevel;
     private final ExceptionPropagationPolicy propagationPolicy;
     private final MethodInfoResolver methodInfoResolver;
+    private final RequestTemplateFactoryResolver requestTemplateFactoryResolver;
     private final Options options;
     private final Decoder decoder;
     private final ErrorDecoder errorDecoder;
@@ -255,6 +256,7 @@ static class Factory<C> implements MethodHandler.Factory<C> {
         Logger logger, Logger.Level logLevel,
         ExceptionPropagationPolicy propagationPolicy,
         MethodInfoResolver methodInfoResolver,
+        RequestTemplateFactoryResolver requestTemplateFactoryResolver,
         Options options,
         Decoder decoder,
         ErrorDecoder errorDecoder) {
@@ -266,15 +268,18 @@ static class Factory<C> implements MethodHandler.Factory<C> {
       this.logLevel = checkNotNull(logLevel, "logLevel");
       this.propagationPolicy = propagationPolicy;
       this.methodInfoResolver = methodInfoResolver;
+      this.requestTemplateFactoryResolver =
+          checkNotNull(requestTemplateFactoryResolver, "requestTemplateFactoryResolver");
       this.options = checkNotNull(options, "options");
       this.errorDecoder = checkNotNull(errorDecoder, "errorDecoder");
       this.decoder = checkNotNull(decoder, "decoder");
     }
 
     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,

core/src/main/java/feign/Feign.java

@@ -13,7 +13,6 @@
  */
 package feign;
 
-import feign.ReflectiveFeign.ParseHandlersByName;
 import feign.Request.Options;
 import feign.Target.HardCodedTarget;
 import feign.codec.Decoder;
@@ -200,14 +199,16 @@ public <T> T target(Target<T> target) {
     public Feign build() {
       super.enrich();
 
-      MethodHandler.Factory<Object> synchronousMethodHandlerFactory =
+      final ResponseHandler responseHandler =
+          new ResponseHandler(logLevel, logger, decoder, errorDecoder,
+              dismiss404, closeAfterDecode, responseInterceptor);
+      MethodHandler.Factory<Object> methodHandlerFactory =
           new SynchronousMethodHandler.Factory(client, retryer, requestInterceptors,
-              responseInterceptor, logger, logLevel, dismiss404, closeAfterDecode,
-              propagationPolicy, options, decoder, errorDecoder);
-      ParseHandlersByName<Object> handlersByName =
-          new ParseHandlersByName<>(contract, encoder, queryMapEncoder,
-              synchronousMethodHandlerFactory);
-      return new ReflectiveFeign<>(handlersByName, invocationHandlerFactory, () -> null);
+              responseHandler, logger, logLevel, propagationPolicy,
+              new RequestTemplateFactoryResolver(encoder, queryMapEncoder),
+              options);
+      return new ReflectiveFeign<>(contract, methodHandlerFactory, invocationHandlerFactory,
+          () -> null);
     }
   }
 

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);
     }
   }