Adding convenience methods to override base host and path in JsonHttpClient.Builder

Author: rmistry

google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpClient.java

@@ -343,6 +343,39 @@ public final GenericUrl getBaseUrl() {
       return baseUrl;
     }
 
+    /**
+     * Convenience method for setting base host on the base URL, for example
+     * {@code "www.googleapis.com"}.
+     *
+     * <p>
+     * This method is equivalent to calling {@code getBaseUrl().setHost()}.
+     * </p>
+     *
+     * @since 1.7
+     */
+    public Builder setBaseHost(String baseHost) {
+      baseUrl.setHost(baseHost);
+      return this;
+    }
+
+    /**
+     * Convenience method for setting base path on the base URL, for example {@code "/plus/v1/"}.
+     *
+     * <p>
+     * This method is equivalent to calling {@code getBaseUrl().setRawPath()}. Must be URL-encoded
+     * and must start and end with a "/".
+     * </p>
+     *
+     * @since 1.7
+     */
+    public Builder setBasePath(String basePath) {
+      Preconditions.checkArgument(
+          basePath.startsWith("/") && basePath.endsWith("/"),
+          "base path must start and end with a '/'");
+      baseUrl.setRawPath(basePath);
+      return this;
+    }
+
     /** Sets the JSON HTTP request initializer. Subclasses should override by calling super. */
     public Builder setJsonHttpRequestInitializer(
         JsonHttpRequestInitializer jsonHttpRequestInitializer) {

google-http-client/src/test/java/com/google/api/client/http/json/JsonHttpClientTest.java

@@ -28,7 +28,6 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 /**
@@ -69,10 +68,48 @@ public void testJsonHttpClientBuilder() {
             .setJsonHttpRequestInitializer(jsonHttpRequestInitializer)
             .setApplicationName(applicationName).build();
 
-    Assert.assertEquals(baseUrl.build(), client.getBaseUrl());
-    Assert.assertEquals(applicationName, client.getApplicationName());
-    Assert.assertEquals(jsonFactory, client.getJsonFactory());
-    Assert.assertEquals(jsonHttpRequestInitializer, client.getJsonHttpRequestInitializer());
+    assertEquals(baseUrl.build(), client.getBaseUrl());
+    assertEquals(applicationName, client.getApplicationName());
+    assertEquals(jsonFactory, client.getJsonFactory());
+    assertEquals(jsonHttpRequestInitializer, client.getJsonHttpRequestInitializer());
+  }
+
+  public void testBaseServerAndBasePathBuilder() {
+    JsonHttpClient client =
+        JsonHttpClient
+            .builder(new NetHttpTransport(), new JacksonFactory(),
+                new GenericUrl("http://www.testgoogleapis.com/test/path/v1/"))
+            .setBaseHost("www.googleapis.com")
+            .setBasePath("/test/path/v2/")
+            .build();
+
+    assertEquals("http://www.googleapis.com/test/path/v2/", client.getBaseUrl());
+  }
+
+  public void testInvalidBasePath() {
+    JsonHttpClient.Builder builder =
+        JsonHttpClient.builder(new NetHttpTransport(), new JacksonFactory(), new GenericUrl(
+            "http://www.testgoogleapis.com/test/path/v1/"));
+    try {
+      builder.setBasePath(null);
+      fail("Expected exception not thrown!");
+    } catch (NullPointerException e) {
+      // Expected because base path cannot be null.
+    }
+
+    try {
+      builder.setBasePath("test/path/v2/");
+      fail("Expected exception not thrown!");
+    } catch (IllegalArgumentException e) {
+      // Expected because base path did not start with "/".
+    }
+
+    try {
+      builder.setBasePath("/test/path/v2");
+      fail("Expected exception not thrown!");
+    } catch (IllegalArgumentException e) {
+      // Expected because base path did not end with "/".
+    }
   }
 
   public void testInitialize() throws IOException {
@@ -83,7 +120,7 @@ public void testInitialize() throws IOException {
               .setJsonHttpRequestInitializer(remoteRequestInitializer)
               .setApplicationName("Test Application").build();
     client.initialize(null);
-    Assert.assertTrue(remoteRequestInitializer.isCalled);
+    assertTrue(remoteRequestInitializer.isCalled);
   }
 
   public void testExecute() throws IOException {
@@ -97,7 +134,7 @@ public LowLevelHttpRequest buildGetRequest(final String url) {
           public LowLevelHttpResponse execute() {
             MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
             // Assert the requested URL is the expected one.
-            Assert.assertEquals(testBaseUrl + testUriTemplate, url);
+            assertEquals(testBaseUrl + testUriTemplate, url);
             return response;
           }
         };