http Issue 189: Update UriTemplate to RFC 6570

https://codereview.appspot.com/7521043/

Author: rmistry

google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java

@@ -29,7 +29,7 @@
  * Expands URI Templates.
  *
  * This Class supports Level 1 templates and all Level 4 composite templates as described in:
- * <a href="http://tools.ietf.org/html/draft-gregorio-uritemplate-07">URI Template</a>.
+ * <a href="http://tools.ietf.org/html/rfc6570">RFC 6570</a>.
  *
  * Specifically, for the variables:
  * var := "value"
@@ -40,36 +40,36 @@
  * {var} -> value
  * {list} -> red,green,blue
  * {list*} -> red,green,blue
- * {key}  -> semi,%3B,dot,.,comma,%2C
- * {key*}  -> semi=%3B,dot=.,comma=%2C
+ * {keys} -> semi,%3B,dot,.,comma,%2C
+ * {keys*} -> semi=%3B,dot=.,comma=%2C
  * {+list} -> red,green,blue
  * {+list*} -> red,green,blue
- * {+key}  -> semi,;,dot,.,comma,,
- * {+key*}  -> semi=;,dot=.,comma=,
+ * {+keys} -> semi,;,dot,.,comma,,
+ * {+keys*} -> semi=;,dot=.,comma=,
  * {#list} -> #red,green,blue
  * {#list*} -> #red,green,blue
- * {#key}  -> #semi,;,dot,.,comma,,
- * {#key*}  -> #semi=;,dot=.,comma=,
+ * {#keys} -> #semi,;,dot,.,comma,,
+ * {#keys*} -> #semi=;,dot=.,comma=,
  * X{.list} -> X.red,green,blue
  * X{.list*} -> X.red.green.blue
- * X{.key} - > X.semi,%3B,dot,.,comma,%2C
- * X{.key*}  -> X.semi=%3B.dot=..comma=%2C
+ * X{.keys} -> X.semi,%3B,dot,.,comma,%2C
+ * X{.keys*} -> X.semi=%3B.dot=..comma=%2C
  * {/list} -> /red,green,blue
  * {/list*} -> /red/green/blue
- * {/key}  -> /semi,%3B,dot,.,comma,%2C
- * {/key*}  -> /semi=%3B/dot=./comma=%2C
+ * {/keys} -> /semi,%3B,dot,.,comma,%2C
+ * {/keys*} -> /semi=%3B/dot=./comma=%2C
  * {;list} -> ;list=red,green,blue
- * {;list*} -> ;red;green;blue
- * {;key}  -> ;keys=semi,%3B,dot,.,comma,%2C
- * {;key*}  -> ;semi=%3B;dot=.;comma=%2C
+ * {;list*} -> ;list=red;list=green;list=blue
+ * {;keys} -> ;keys=semi,%3B,dot,.,comma,%2C
+ * {;keys*} -> ;semi=%3B;dot=.;comma=%2C
  * {?list} -> ?list=red,green,blue
- * {?list*} -> ?red&green&blue
- * {?key}  -> ?keys=semi,%3B,dot,.,comma,%2C
- * {?key*}  -> ?semi=%3B&dot=.&comma=%2C
+ * {?list*} -> ?list=red&list=green&list=blue
+ * {?keys} -> ?keys=semi,%3B,dot,.,comma,%2C
+ * {?keys*} -> ?semi=%3B&dot=.&comma=%2C
  * {&list} -> &list=red,green,blue
- * {&list*} -> &red&green&blue
- * {&key}  -> &keys=semi,%3B,dot,.,comma,%2C
- * {&key*}  -> &semi=%3B&dot=.&comma=%2C
+ * {&list*} -> &list=red&list=green&list=blue
+ * {&keys} -> &keys=semi,%3B,dot,.,comma,%2C
+ * {&keys*} -> &semi=%3B&dot=.&comma=%2C
  *
  * @since 1.6
  * @author Ravi Mistry
@@ -226,7 +226,7 @@ private static Map<String, Object> getMap(Object obj) {
  *
  * <p>
  * Supports Level 1 templates and all Level 4 composite templates as described in:
- * <a href="http://tools.ietf.org/html/draft-gregorio-uritemplate-07">URI Template</a>.
+ * <a href="http://tools.ietf.org/html/rfc6570">RFC 6570</a>.
  * </p>
  *
  * @param baseUrl The base URL which the URI component is relative to.
@@ -260,7 +260,7 @@ public static String expand(String baseUrl, String uriTemplate, Object parameter
  *
  * <p>
  * Supports Level 1 templates and all Level 4 composite templates as described in:
- * <a href="http://tools.ietf.org/html/draft-gregorio-uritemplate-07">URI Template</a>.
+ * <a href="http://tools.ietf.org/html/rfc6570">RFC 6570</a>.
  * </p>
  *
  * @param pathUri URI component. It may contain one or more sequences of the form "{name}", where
@@ -371,6 +371,10 @@ private static String getListPropertyValue(String varName, Iterator<?> iterator,
  }
  }
  while (iterator.hasNext()) {
+ if (containsExplodeModifier && compositeOutput.requiresVarAssignment()) {
+ retBuf.append(CharEscapers.escapeUriPath(varName));
+ retBuf.append("=");
+ }
  retBuf.append(compositeOutput.getEncodedValue(iterator.next().toString()));
  if (iterator.hasNext()) {
  retBuf.append(joiner);

google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java

@@ -110,11 +110,11 @@ private Iterable<String> getListIterable() {
  {"{/d}", "/red,green,blue"},
  {"{/d*}", "/red/green/blue"},
  {"{;d}", ";d=red,green,blue"},
- {"{;d*}", ";red;green;blue"},
+ {"{;d*}", ";d=red;d=green;d=blue"},
  {"{?d}", "?d=red,green,blue"},
- {"{?d*}", "?red&green&blue"},
+ {"{?d*}", "?d=red&d=green&d=blue"},
  {"{&d}", "&d=red,green,blue"},
- {"{&d*}", "&red&green&blue"},
+ {"{&d*}", "&d=red&d=green&d=blue"},
  };
 
  public void testExpandTemplates_explodeIterator() {
@@ -237,8 +237,8 @@ public void testExpandTemplates_mixedBagParameters() {
  requestMap.put("unused1", "unused param");
  requestMap.put("unused2", "unused=param");
  assertEquals(
- "foo/xyz/red/green/blue&red&green&blue&map=semi,%3B,dot,.,comma,%2CONE?unused1=unused%20"
- + "param&unused2=unused%3Dparam",
+ "foo/xyz/red/green/blue&iterable=red&iterable=green&iterable=blue&map=semi,%3B,dot,.,comma"
+ + ",%2CONE?unused1=unused%20param&unused2=unused%3Dparam",
  UriTemplate.expand("foo/{abc}{/iterator*}{&iterable*}{&map}{&enum}", requestMap, true));
  // Assert the map has not changed.
  assertEquals(7, requestMap.size());