@@ -260,14 +260,14 @@ public String method() {
260260 }
261261
262262 public RequestTemplate decodeSlash (boolean decodeSlash ) {
263- this .decodeSlash = decodeSlash ;
264- return this ;
263+ this .decodeSlash = decodeSlash ;
264+ return this ;
265265 }
266266
267267 public boolean decodeSlash () {
268- return decodeSlash ;
268+ return decodeSlash ;
269269 }
270-
270+
271271 /* @see #url() */
272272 public RequestTemplate append (CharSequence value ) {
273273 url .append (value );
@@ -292,41 +292,76 @@ public String url() {
292292 }
293293
294294 /**
295- * Replaces queries with the specified {@code name} with url decoded {@code values} supplied.
295+ * Replaces queries with the specified {@code name} with the {@code values} supplied.
296+ * <br> Values can be passed in decoded or in url-encoded form depending on the value of the
297+ * {@code encoded} parameter.
296298 * <br> When the {@code value} is {@code null}, all queries with the {@code configKey} are
297299 * removed. <br> <br><br><b>relationship to JAXRS 2.0</b><br> <br> Like {@code WebTarget.query},
298300 * except the values can be templatized. <br> ex. <br>
299301 * <pre>
300302 * template.query("Signature", "{signature}");
301303 * </pre>
304+ * <br> <b>Note:</b> behavior of RequestTemplate is not consistent if a query parameter with
305+ * unsafe characters is passed as both encoded and unencoded, although no validation is performed.
306+ * <br> ex. <br>
307+ * <pre>
308+ * template.query(true, "param[]", "value");
309+ * template.query(false, "param[]", "value");
310+ * </pre>
302311 *
303- * @param name the name of the query
312+ * @param encoded whether name and values are already url-encoded
313+ * @param name the name of the query
304314 * @param values can be a single null to imply removing all values. Else no values are expected
305315 * to be null.
306316 * @see #queries()
307317 */
318+ public RequestTemplate query (boolean encoded , String name , String ... values ) {
319+ return doQuery (encoded , name , values );
320+ }
321+
322+ /* @see #query(boolean, String, String...) */
323+ public RequestTemplate query (boolean encoded , String name , Iterable <String > values ) {
324+ return doQuery (encoded , name , values );
325+ }
326+
327+ /**
328+ * Shortcut for {@code query(false, String, String...)}
329+ * @see #query(boolean, String, String...)
330+ */
308331 public RequestTemplate query (String name , String ... values ) {
309- String encodedName = encodeIfNotVariable (checkNotNull (name , "name" ));
310- queries .remove (encodedName );
332+ return doQuery (false , name , values );
333+ }
334+
335+ /**
336+ * Shortcut for {@code query(false, String, Iterable<String>)}
337+ * @see #query(boolean, String, String...)
338+ */
339+ public RequestTemplate query (String name , Iterable <String > values ) {
340+ return doQuery (false , name , values );
341+ }
342+
343+ private RequestTemplate doQuery (boolean encoded , String name , String ... values ) {
344+ checkNotNull (name , "name" );
345+ String paramName = encoded ? name : encodeIfNotVariable (name );
346+ queries .remove (paramName );
311347 if (values != null && values .length > 0 && values [0 ] != null ) {
312- ArrayList <String > encoded = new ArrayList <String >();
348+ ArrayList <String > paramValues = new ArrayList <String >();
313349 for (String value : values ) {
314- encoded .add (encodeIfNotVariable (value ));
350+ paramValues .add (encoded ? value : encodeIfNotVariable (value ));
315351 }
316- this .queries .put (encodedName , encoded );
352+ this .queries .put (paramName , paramValues );
317353 }
318354 return this ;
319355 }
320356
321- /* @see #query(String, String...) */
322- public RequestTemplate query (String name , Iterable <String > values ) {
357+ private RequestTemplate doQuery (boolean encoded , String name , Iterable <String > values ) {
323358 if (values != null ) {
324- return query ( name , toArray (values , String .class ));
359+ return doQuery ( encoded , name , toArray (values , String .class ));
325360 }
326- return query ( name , (String []) null );
361+ return doQuery ( encoded , name , (String []) null );
327362 }
328363
329- private String encodeIfNotVariable (String in ) {
364+ private static String encodeIfNotVariable (String in ) {
330365 if (in == null || in .indexOf ('{' ) == 0 ) {
331366 return in ;
332367 }
0 commit comments