Include variables Query Parameter Names when listing template parameters (OpenFeign#1144)

kdavisk6 · web-flow · commit f73fe7058a3a · 2019-12-27T14:25:18.000-05:00
Fixes OpenFeign#1089 Query Template names, which also happen to be templates, were not being considered when listing out all of the variable names in a Query Template.
diff --git a/core/src/main/java/feign/template/QueryTemplate.java b/core/src/main/java/feign/template/QueryTemplate.java
@@ -146,7 +146,7 @@ public List<String> getValues() {
   }
 
   public List<String> getVariables() {
-    List<String> variables = new ArrayList<>();
+    List<String> variables = new ArrayList<>(this.name.getVariables());
     for (Template template : this.values) {
       variables.addAll(template.getVariables());
     }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public List<String> getValues() {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`public List<String> getVariables() {`
`149`		`- List<String> variables = new ArrayList<>();`
	`149`	`+ List<String> variables = new ArrayList<>(this.name.getVariables());`
`150`	`150`	`for (Template template : this.values) {`
`151`	`151`	`variables.addAll(template.getVariables());`
`152`	`152`	`}`