---

garrettjonesgoogle · mziccard · commit 1065775af798 · 2016-06-27T11:57:22.000+02:00
yaml --- r: 7311 b: refs/heads/tswast-patch-1 c: a884d58 h: refs/heads/master i: 7309: 96d9df5 7307: c0c7194 7303: 2ef68ad 7295: e63dafa
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 19da84d2492d6937ac640813312dd2d56ce0c1d5
+refs/heads/tswast-patch-1: a884d5812ec71d23e1303277b14919b24af103ba
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-gax/pom.xml b/branches/tswast-patch-1/gcloud-java-gax/pom.xml
@@ -27,6 +27,11 @@
       <artifactId>auto-value</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.1</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/branches/tswast-patch-1/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java b/branches/tswast-patch-1/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java
@@ -11,6 +11,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -766,15 +767,15 @@ private static ImmutableList<Segment> parseTemplate(String template) {
 
   private static String encodeUrl(String text) {
     try {
-      return URLEncoder.encode(text, "UTF-8");
+      return URLEncoder.encode(text, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new ValidationException("UTF-8 encoding is not supported on this platform");
     }
   }
 
   private static String decodeUrl(String url) {
     try {
-      return URLDecoder.decode(url, "UTF-8");
+      return URLDecoder.decode(url, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new ValidationException("UTF-8 encoding is not supported on this platform");
     }
