---

Ajay Kannan · Ajay Kannan · commit 3d7bb3ee8a11 · 2015-10-08T09:43:05.000-07:00
yaml --- r: 943 b: refs/heads/master c: e1a50bc h: refs/heads/master i: 941: bc8f135 939: 155639f 935: 7bccad7 927: a5f39c0 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: d8478d7f445682488bcfc60a57be392e299146a1
+refs/heads/master: e1a50bc0063c25a4bfa729c8b305f06e061f0497
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java b/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/testing/package-info.java
diff --git a/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -40,6 +40,10 @@
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -62,14 +66,48 @@ public class DefaultDatastoreRpc implements DatastoreRpc {
   }
 
   public DefaultDatastoreRpc(DatastoreOptions options) {
+    String normalizedHost = normalizeHost(options.host());
     client = DatastoreFactory.get().create(
         new Builder()
             .dataset(options.projectId())
-            .host(options.host())
+            .host(normalizedHost)
             .initializer(options.httpRequestInitializer())
             .build());
   }
 
+  private static String normalizeHost(String host) {
+    host = host.toLowerCase();
+    if (includesScheme(host)) {
+      if (host.startsWith("https://") && isLocalHost(host)) {
+        throw new IllegalArgumentException(
+            "\"https\" is not supported for localhost.  Use \"http\" instead.");
+      } else {
+        return host;
+      }
+    }
+    return "http://" + host;
+  }
+
+  private static boolean isLocalHost(String host) {
+    if (host != null) {
+      try {
+        String normalizedHost = host;
+        if (!includesScheme(normalizedHost)) {
+          normalizedHost = "http://" + normalizedHost;
+        }
+        InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());
+        return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress();
+      } catch (UnknownHostException | MalformedURLException e) {
+        // ignore
+      }
+    }
+    return false;
+  }
+
+  private static boolean includesScheme(String url) {
+    return url.startsWith("http://") || url.startsWith("https://");
+  }
+
   private static DatastoreRpcException translate(DatastoreException exception) {
     String message = exception.getMessage();
     String reasonStr = "";
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java
@@ -22,7 +22,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.google.gcloud.datastore.testing.LocalGcdHelper;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpcFactory;
 
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -33,7 +33,6 @@
 import com.google.gcloud.datastore.StructuredQuery.OrderBy;
 import com.google.gcloud.datastore.StructuredQuery.Projection;
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
-import com.google.gcloud.datastore.testing.LocalGcdHelper;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
 import com.google.gcloud.spi.DatastoreRpcFactory;
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.datastore.testing;
+package com.google.gcloud.datastore;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/package-info.java
diff --git a/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
-import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelper.java b/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelper.java
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.gcloud.storage.testing;
+package com.google.gcloud.storage;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.AuthCredentials;
-import com.google.gcloud.storage.BlobInfo;
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageException;
-import com.google.gcloud.storage.StorageOptions;
-import com.google.gcloud.storage.testing.RemoteGcsHelper.Option.KeyFromClasspath;
+import com.google.gcloud.storage.RemoteGcsHelper.Option.KeyFromClasspath;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -57,7 +53,7 @@ private RemoteGcsHelper(StorageOptions options) {
   }
 
   /**
-   * Returns a {@link StorageOptions} object to be used for testing.
+   * Returns a {@StorageOptions} object to be used for testing.
    */
   public StorageOptions options() {
     return options;
@@ -100,7 +96,7 @@ public static String generateBucketName() {
    *
    * @param options creation options
    * @return A {@code RemoteGcsHelper} object for the provided options.
-   * @throws com.google.gcloud.storage.testing.RemoteGcsHelper.GcsHelperException if environment variables
+   * @throws com.google.gcloud.storage.RemoteGcsHelper.GcsHelperException if environment variables
    * {@code GCLOUD_TESTS_PROJECT_ID} and {@code GCLOUD_TESTS_KEY} are not set or if the file
    * pointed by {@code GCLOUD_TESTS_KEY} does not exist
    */
