URI-encode spaces in URLs

Author: lognaturel

src/org/opendatakit/briefcase/reused/http/Request.java

@@ -83,7 +83,7 @@ public RequestMethod getMethod() {
   // TODO v2.0 Move this to RequestBuilder, with uri() and isUri()
   URI asUri() {
     try {
-      return url.toURI();
+      return new URI(url.toString().replaceAll(" ", "%20"));
     } catch (URISyntaxException e) {
       throw new BriefcaseException(e);
     }

test/java/org/opendatakit/briefcase/reused/http/RequestTest.java

@@ -17,8 +17,10 @@
 package org.opendatakit.briefcase.reused.http;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayInputStream;
@@ -28,6 +30,7 @@
 public class RequestTest {
 
   private static final String BASE_URL = "http://foo.com";
+  private static final String URL_WITH_SPACE = "http://foo.com/some spaces are here";
 
   @Test
   public void can_map_a_response_body() {
@@ -40,4 +43,10 @@ public void can_map_a_response_body() {
   public void can_return_its_uri() {
     assertThat(RequestBuilder.get(BASE_URL).build().asUri(), instanceOf(URI.class));
   }
+
+  @Test
+  public void can_return_its_uri_with_encoded_spaces() {
+    assertThat(RequestBuilder.get(URL_WITH_SPACE).build().asUri(), instanceOf(URI.class));
+    assertThat(RequestBuilder.get(URL_WITH_SPACE).build().asUri().toString(), not(containsString(" ")));
+  }
 }