fix: paging breaks with + sign on phone number

pom.xml

@@ -372,4 +372,4 @@
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
-</project>
+</project>

src/main/java/com/twilio/http/Request.java

@@ -1,6 +1,7 @@
 package com.twilio.http;
 
 import com.google.common.collect.Range;
+import com.google.common.base.Joiner;
 import com.twilio.exception.ApiException;
 import com.twilio.exception.InvalidRequestException;
 import org.joda.time.DateTime;
@@ -175,9 +176,19 @@ private String buildURL() {
                 host = joinIgnoreNull(".", product, targetEdge, targetRegion, domain);
             }
 
-            return new URI(parsedUrl.getProtocol(), parsedUrl.getUserInfo(), host, parsedUrl.getPort(),
-                    parsedUrl.getPath(), parsedUrl.getQuery(), parsedUrl.getRef()).toURL().toString();
-        } catch (final MalformedURLException | URISyntaxException e) {
+            String urlPort = null;
+            if (parsedUrl.getPort() != -1) {
+                urlPort = ":" + parsedUrl.getPort();
+            }
+            String protocol = parsedUrl.getProtocol() + "://";
+            String[] pathPieces = parsedUrl.getPath().split("/", 0);
+            pathPieces[pathPieces.length-1] = URLEncoder.encode(pathPieces[pathPieces.length-1], "UTF-8");
+            String encodedPath = Joiner.on("/").join(pathPieces);
+            String query = parsedUrl.getQuery() != null ? "?" + parsedUrl.getQuery() : null;
+            String ref = parsedUrl.getRef() != null ? "#" + parsedUrl.getRef() : null;
+            String credentials  = parsedUrl.getUserInfo() != null ? parsedUrl.getUserInfo() + "@" : null;
+            return joinIgnoreNull("", protocol, credentials, host, urlPort, encodedPath, query, ref);
+        } catch (final MalformedURLException | UnsupportedEncodingException e) {
             throw new ApiException("Bad URL: " + url, e);
         }
     }

src/test/java/com/twilio/http/RequestTest.java

@@ -53,6 +53,14 @@ public void testConstructURLWithPipe() throws MalformedURLException {
         assertUrlsEqual(expected, url);
     }
 
+    @Test
+    public void testConstructURLWithCredentials() throws MalformedURLException {
+        Request r = new Request(HttpMethod.GET, "user:pass@" + Domains.API.toString(), "/2010-04-01/foobar");
+        URL url = r.constructURL();
+        URL expected = new URL("https://user:[email protected]/2010-04-01/foobar");
+        assertUrlsEqual(expected, url);
+    }
+
     @Test
     public void testConstructURLWithParam() throws MalformedURLException {
         Request r = new Request(HttpMethod.GET, Domains.API.toString(), "/2010-04-01/foobar");
@@ -72,6 +80,15 @@ public void testConstructURLWithParams() throws MalformedURLException {
         assertUrlsEqual(expected, url);
     }
 
+    @Test
+    public void testConstructURLWithPlusPrefix() {
+        Request r = new Request(HttpMethod.GET, Domains.API.toString(), "/2010-04-01/foobar");
+        r.addQueryParam("To", "+18888888888");
+        URL url = r.constructURL();
+        String expected = "https://api.twilio.com/2010-04-01/foobar?To=%2B18888888888";
+        assertEquals(expected, url.toString());
+    }
+
     @Test
     public void testConstructURLWithMultivaluedParam() throws MalformedURLException {
         Request r = new Request(HttpMethod.GET, Domains.API.toString(), "/2010-04-01/foobar");