Adding setBaseUrl to JsonHttpClient

Author: rmistry

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

@@ -287,7 +287,7 @@ public static class Builder {
      * be URL-encoded and must end with a "/". This is determined when the library is generated and
      * normally should not be changed.
      */
-    private final GenericUrl baseUrl;
+    private GenericUrl baseUrl;
 
     /**
      * The application name to be sent in the User-Agent header of each request or {@code null} for
@@ -334,35 +334,12 @@ public final GenericUrl getBaseUrl() {
     }
 
     /**
-     * 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>
+     * Sets the base URL of the service. Subclasses should override by calling super.
      *
      * @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);
+    public Builder setBaseUrl(GenericUrl baseUrl) {
+      this.baseUrl = baseUrl;
       return this;
     }
 

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

@@ -79,39 +79,12 @@ public void testBaseServerAndBasePathBuilder() {
         JsonHttpClient
             .builder(new NetHttpTransport(), new JacksonFactory(),
                 new GenericUrl("http://www.testgoogleapis.com/test/path/v1/"))
-            .setBaseHost("www.googleapis.com")
-            .setBasePath("/test/path/v2/")
+            .setBaseUrl(new GenericUrl("http://www.googleapis.com/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 {
     TestRemoteRequestInitializer remoteRequestInitializer = new TestRemoteRequestInitializer();
     JsonHttpClient client =