---

mziccard · web-flow · commit f146697dda02 · 2016-06-27T14:19:08.000+02:00
yaml --- r: 4427 b: refs/heads/gcs-nio c: dc566ba h: refs/heads/master i: 4425: 2b25d92 4423: eeddf9e
diff --git a/[refs] b/[refs]
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: 7cdcb6c431a6621d46f53199617848fbc25b3269
+refs/heads/gcs-nio: dc566ba6477cdaa463915735414731283cfc5d49
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
@@ -21,7 +21,6 @@
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
@@ -22,7 +22,6 @@
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
 import com.google.cloud.storage.Acl;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -28,7 +28,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.testing.NullPointerTester;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
@@ -22,7 +22,6 @@
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
 import com.google.cloud.storage.StorageOptions;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
@@ -21,7 +21,6 @@
 
 import com.google.common.testing.NullPointerTester;
 import com.google.cloud.storage.Acl;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.NullPointerTester;
-import com.google.cloud.storage.testing.LocalStorageHelper;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/FakeStorageRpc.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/FakeStorageRpc.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.testing;
+package com.google.cloud.storage.contrib.nio;
 
 import com.google.api.services.storage.model.Bucket;
 import com.google.api.services.storage.model.StorageObject;
@@ -63,7 +63,7 @@
  * </ul>
  */
 @NotThreadSafe
-public class FakeStorageRpc implements StorageRpc {
+class FakeStorageRpc implements StorageRpc {
 
   // fullname -> metadata
   Map<String, StorageObject> metadata = new HashMap<>();
diff --git a/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/LocalStorageHelper.java b/branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/LocalStorageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.storage.testing;
+package com.google.cloud.storage.contrib.nio;
 
 import com.google.cloud.spi.ServiceRpcFactory;
 import com.google.cloud.storage.spi.StorageRpc;
@@ -24,15 +24,14 @@
  * Utility to create an in-memory storage configuration for testing. Storage options can be
  * obtained via the {@link #options()} method. Returned options will point to FakeStorageRpc.
  */
-public class LocalStorageHelper {
+class LocalStorageHelper {
 
   // used for testing. Will throw if you pass it an option.
   private static final FakeStorageRpc instance = new FakeStorageRpc(true);
 
   /**
-   * Returns a {@link StorageOptions} that use the static FakeStorageRpc instance,
-   * and resets it first so you start from a clean slate.
-   * That instance will throw if you pass it any option.   *
+   * Returns a {@link StorageOptions} that use the static FakeStorageRpc instance, and resets it
+   * first so you start from a clean slate. That instance will throw if you pass it any option.
    */
   public static StorageOptions options() {
     instance.reset();
@@ -49,8 +48,8 @@ public StorageRpc create(StorageOptions options) {
   }
 
   /**
-   * Returns a {@link StorageOptions} that creates a new FakeStorageRpc instance
-   * with the given option.
+   * Returns a {@link StorageOptions} that creates a new FakeStorageRpc instance with the given
+   * option.
    */
   public static StorageOptions customOptions(final boolean throwIfOptions) {
     return StorageOptions.builder()
@@ -64,5 +63,4 @@ public StorageRpc create(StorageOptions options) {
          })
       .build();
   }
-
 }
