Removed Duplicate Expansion (OpenFeign#909)

kdavisk6 · web-flow · commit ce662052d788 · 2019-03-08T10:14:07.000-05:00
Fixes OpenFeign#904 Query Template expanded twice. This is unnecessary and would have caused a performance issue at scale.
diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
@@ -167,7 +167,7 @@ public RequestTemplate resolve(Map<String, ?> variables) {
         QueryTemplate queryTemplate = queryTemplates.next();
         String queryExpanded = queryTemplate.expand(variables);
         if (Util.isNotBlank(queryExpanded)) {
-          query.append(queryTemplate.expand(variables));
+          query.append(queryExpanded);
           if (queryTemplates.hasNext()) {
             query.append("&");
           }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public RequestTemplate resolve(Map<String, ?> variables) {`
`167`	`167`	`QueryTemplate queryTemplate = queryTemplates.next();`
`168`	`168`	`String queryExpanded = queryTemplate.expand(variables);`
`169`	`169`	`if (Util.isNotBlank(queryExpanded)) {`
`170`		`- query.append(queryTemplate.expand(variables));`
	`170`	`+ query.append(queryExpanded);`
`171`	`171`	`if (queryTemplates.hasNext()) {`
`172`	`172`	`query.append("&");`
`173`	`173`	`}`