---

garrettjonesgoogle · mziccard · commit f8a78773a2d1 · 2016-06-27T11:57:22.000+02:00
yaml --- r: 3373 b: refs/heads/master c: a884d58 h: refs/heads/master i: 3371: b759345
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 19da84d2492d6937ac640813312dd2d56ce0c1d5
+refs/heads/master: a884d5812ec71d23e1303277b14919b24af103ba
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
diff --git a/trunk/gcloud-java-gax/pom.xml b/trunk/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/trunk/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java b/trunk/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");
     }
