---

garrettjonesgoogle · garrettjonesgoogle · commit a2c8a52afb2a · 2015-11-03T17:16:59.000-08:00
yaml --- r: 1299 b: refs/heads/pubsub-alpha c: 02058b3 h: refs/heads/master i: 1297: 80d7bbe 1295: 6db91d9 v: v3
diff --git a/[refs] b/[refs]
@@ -3,4 +3,4 @@ refs/heads/master: a25e50430b55b93816be392e363638e67f67a500
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: 56ad0999fc3a095599c952aa419631857384be5e
+refs/heads/pubsub-alpha: 02058b376df10940c026152fed85886b16042947
diff --git a/branches/pubsub-alpha/gcloud-java-gax/pom.xml b/branches/pubsub-alpha/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/pubsub-alpha/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java b/branches/pubsub-alpha/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");
     }
