Modifying Contract to support passing all parameters to encoders

fabiocarvalho777 · Jul 8, 2021 · 36dd5bc · 36dd5bc
1 parent 5c460ae
commit 36dd5bc
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/core/src/main/java/feign/Contract.java b/core/src/main/java/feign/Contract.java
@@ -37,6 +37,16 @@ public interface Contract {
 
   abstract class BaseContract implements Contract {
 
+    private boolean allParametersBody;
+
+    protected boolean allParametersBody() {
+      return allParametersBody;
+    }
+
+    protected void allParametersBody(boolean allParametersBody) {
+      this.allParametersBody = allParametersBody;
+    }
+
     /**
      * @param targetType {@link feign.Target#type() type} of the Feign interface.
      * @see #parseAndValidateMetadata(Class)
@@ -84,6 +94,7 @@ protected MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method me
       data.method(method);
       data.returnType(Types.resolve(targetType, targetType, method.getGenericReturnType()));
       data.configKey(Feign.configKey(targetType, method));
+      data.allParametersBody(this.allParametersBody);
 
       if (targetType.getInterfaces().length == 1) {
         processAnnotationOnClass(data, targetType.getInterfaces()[0]);
@@ -121,7 +132,7 @@ protected MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method me
           if (data.isAlreadyProcessed(i)) {
             checkState(data.formParams().isEmpty() || data.bodyIndex() == null,
                 "Body parameters cannot be used with form parameters.%s", data.warnings());
-          } else {
+          } else if (!data.allParametersBody()) {
             checkState(data.formParams().isEmpty(),
                 "Body parameters cannot be used with form parameters.%s", data.warnings());
             checkState(data.bodyIndex() == null,

diff --git a/core/src/main/java/feign/DeclarativeContract.java b/core/src/main/java/feign/DeclarativeContract.java
@@ -43,7 +43,7 @@ public final List<MethodMetadata> parseAndValidateMetadata(Class<?> targetType)
    * (unless they are the same).
    *
    * @param data metadata collected so far relating to the current java method.
-   * @param clz the class to process
+   * @param targetType the class to process
    */
   @Override
   protected final void processAnnotationOnClass(MethodMetadata data, Class<?> targetType) {

diff --git a/core/src/main/java/feign/MethodMetadata.java b/core/src/main/java/feign/MethodMetadata.java
@@ -30,6 +30,7 @@ public final class MethodMetadata implements Serializable {
   private Integer headerMapIndex;
   private Integer queryMapIndex;
   private boolean queryMapEncoded;
+  private boolean allParametersBody;
   private transient Type bodyType;
   private final RequestTemplate template = new RequestTemplate();
   private final List<String> formParams = new ArrayList<String>();
@@ -118,6 +119,15 @@ public MethodMetadata queryMapEncoded(boolean queryMapEncoded) {
     return this;
   }
 
+  public boolean allParametersBody() {
+    return allParametersBody;
+  }
+
+  MethodMetadata allParametersBody(boolean allParametersBody) {
+    this.allParametersBody = allParametersBody;
+    return this;
+  }
+
   /**
    * Type corresponding to {@link #bodyIndex()}.
    */

diff --git a/core/src/main/java/feign/ReflectiveFeign.java b/core/src/main/java/feign/ReflectiveFeign.java
@@ -155,7 +155,7 @@ public Map<String, MethodHandler> apply(Target target) {
         if (!md.formParams().isEmpty() && md.template().bodyTemplate() == null) {
           buildTemplate =
               new BuildFormEncodedTemplateFromArgs(md, encoder, queryMapEncoder, target);
-        } else if (md.bodyIndex() != null) {
+        } else if (md.bodyIndex() != null || md.allParametersBody()) {
           buildTemplate = new BuildEncodedTemplateFromArgs(md, encoder, queryMapEncoder, target);
         } else {
           buildTemplate = new BuildTemplateByResolvingArgs(md, queryMapEncoder, target);
@@ -379,10 +379,21 @@ private BuildEncodedTemplateFromArgs(MethodMetadata metadata, Encoder encoder,
     protected RequestTemplate resolve(Object[] argv,
                                       RequestTemplate mutable,
                                       Map<String, Object> variables) {
-      Object body = argv[metadata.bodyIndex()];
-      checkArgument(body != null, "Body parameter %s was null", metadata.bodyIndex());
+
+      boolean allParametersBody = mutable.methodMetadata().allParametersBody();
+
+      Object body = null;
+      if (!allParametersBody) {
+        body = argv[metadata.bodyIndex()];
+        checkArgument(body != null, "Body parameter %s was null", metadata.bodyIndex());
+      }
+
       try {
-        encoder.encode(body, metadata.bodyType(), mutable);
+        if (allParametersBody) {
+          encoder.encode(argv, Object[].class, mutable);
+        } else {
+          encoder.encode(body, metadata.bodyType(), mutable);
+        }
       } catch (EncodeException e) {
         throw e;
       } catch (RuntimeException e) {