You can set various attributes using - * {@link com.google.gcloud.storage.contrib.nio.CloudStorageOptions CloudStorageOptions} static + * {@link com.google.cloud.storage.contrib.nio.CloudStorageOptions CloudStorageOptions} static * helpers: *
* Files.write(csvPath, csvLines, StandardCharsets.UTF_8,
@@ -65,7 +65,7 @@
* includes a trailing slash, will be considered a directory. It will always be assumed to exist,
* without performing any I/O. This allows you to do path manipulation in the same manner as you
* would with the normal UNIX file system implementation. You can disable this feature with
- * {@link com.google.gcloud.storage.contrib.nio.CloudStorageConfiguration#usePseudoDirectories()}.
+ * {@link com.google.cloud.storage.contrib.nio.CloudStorageConfiguration#usePseudoDirectories()}.
*
* Unit Testing
*
@@ -95,4 +95,4 @@
* data = Files.readBytes(path);}
*/
@javax.annotation.ParametersAreNonnullByDefault
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfigurationTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
similarity index 98%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfigurationTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
index f3382188cc7c..a2f155d2fd2c 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfigurationTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
similarity index 92%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
index 9d9a65690bd8..4130f880b0a4 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
@@ -14,15 +14,14 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withCacheControl;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.testing.EqualsTester;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Rule;
@@ -59,7 +58,7 @@ public void before() {
@Test
public void testReadAttributes() throws IOException {
- Files.write(path, HAPPY, withCacheControl("potato"));
+ Files.write(path, HAPPY, CloudStorageOptions.withCacheControl("potato"));
CloudStorageFileAttributeView lazyAttributes =
Files.getFileAttributeView(path, CloudStorageFileAttributeView.class);
assertThat(lazyAttributes.readAttributes().cacheControl().get()).isEqualTo("potato");
@@ -84,7 +83,7 @@ public void testReadAttributes_pseudoDirectory() throws IOException {
@Test
public void testName() throws IOException {
- Files.write(path, HAPPY, withCacheControl("potato"));
+ Files.write(path, HAPPY, CloudStorageOptions.withCacheControl("potato"));
CloudStorageFileAttributeView lazyAttributes =
Files.getFileAttributeView(path, CloudStorageFileAttributeView.class);
assertThat(lazyAttributes.name()).isEqualTo("gcs");
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
similarity index 82%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
index 38ee4020dbcb..47cad8064b52 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
@@ -14,21 +14,15 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withAcl;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withCacheControl;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentDisposition;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentEncoding;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withMimeType;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withUserMetadata;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.testing.EqualsTester;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.Acl;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.Acl;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Test;
@@ -61,14 +55,14 @@ public void before() {
@Test
public void testCacheControl() throws IOException {
- Files.write(path, HAPPY, withCacheControl("potato"));
+ Files.write(path, HAPPY, CloudStorageOptions.withCacheControl("potato"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).cacheControl().get())
.isEqualTo("potato");
}
@Test
public void testMimeType() throws IOException {
- Files.write(path, HAPPY, withMimeType("text/potato"));
+ Files.write(path, HAPPY, CloudStorageOptions.withMimeType("text/potato"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).mimeType().get())
.isEqualTo("text/potato");
}
@@ -76,14 +70,14 @@ public void testMimeType() throws IOException {
@Test
public void testAcl() throws IOException {
Acl acl = Acl.of(new Acl.User("serf@example.com"), Acl.Role.READER);
- Files.write(path, HAPPY, withAcl(acl));
+ Files.write(path, HAPPY, CloudStorageOptions.withAcl(acl));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).acl().get())
.contains(acl);
}
@Test
public void testContentDisposition() throws IOException {
- Files.write(path, HAPPY, withContentDisposition("crash call"));
+ Files.write(path, HAPPY, CloudStorageOptions.withContentDisposition("crash call"));
assertThat(
Files.readAttributes(path, CloudStorageFileAttributes.class).contentDisposition().get())
.isEqualTo("crash call");
@@ -91,14 +85,14 @@ public void testContentDisposition() throws IOException {
@Test
public void testContentEncoding() throws IOException {
- Files.write(path, HAPPY, withContentEncoding("my content encoding"));
+ Files.write(path, HAPPY, CloudStorageOptions.withContentEncoding("my content encoding"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).contentEncoding().get())
.isEqualTo("my content encoding");
}
@Test
public void testUserMetadata() throws IOException {
- Files.write(path, HAPPY, withUserMetadata("green", "bean"));
+ Files.write(path, HAPPY, CloudStorageOptions.withUserMetadata("green", "bean"));
assertThat(
Files.readAttributes(path, CloudStorageFileAttributes.class)
.userMetadata()
@@ -141,10 +135,10 @@ public void testIsSymbolicLink() throws IOException {
@Test
public void testEquals_equalsTester() throws IOException {
- Files.write(path, HAPPY, withMimeType("text/plain"));
+ Files.write(path, HAPPY, CloudStorageOptions.withMimeType("text/plain"));
CloudStorageFileAttributes a1 = Files.readAttributes(path, CloudStorageFileAttributes.class);
CloudStorageFileAttributes a2 = Files.readAttributes(path, CloudStorageFileAttributes.class);
- Files.write(path, HAPPY, withMimeType("text/potato"));
+ Files.write(path, HAPPY, CloudStorageOptions.withMimeType("text/potato"));
CloudStorageFileAttributes b1 = Files.readAttributes(path, CloudStorageFileAttributes.class);
CloudStorageFileAttributes b2 = Files.readAttributes(path, CloudStorageFileAttributes.class);
new EqualsTester().addEqualityGroup(a1, a2).addEqualityGroup(b1, b2).testEquals();
@@ -152,9 +146,9 @@ public void testEquals_equalsTester() throws IOException {
@Test
public void testFilekey() throws IOException {
- Files.write(path, HAPPY, withMimeType("text/plain"));
+ Files.write(path, HAPPY, CloudStorageOptions.withMimeType("text/plain"));
Path path2 = Paths.get(URI.create("gs://bucket/anotherrandompath"));
- Files.write(path2, HAPPY, withMimeType("text/plain"));
+ Files.write(path2, HAPPY, CloudStorageOptions.withMimeType("text/plain"));
// diff files cannot have same filekey
CloudStorageFileAttributes a1 = Files.readAttributes(path, CloudStorageFileAttributes.class);
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
similarity index 95%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
index fca592a99587..e2ade4a1adb1 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -14,15 +14,10 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.forBucket;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withCacheControl;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentDisposition;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentEncoding;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withMimeType;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withUserMetadata;
+import static com.google.cloud.storage.contrib.nio.CloudStorageFileSystem.forBucket;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
@@ -33,7 +28,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Rule;
@@ -565,11 +560,11 @@ public void testCopy_withCopyAttributes_preservesAttributes() throws IOException
Files.write(
source,
"(✿◕ ‿◕ )ノ".getBytes(UTF_8),
- withMimeType("text/lolcat"),
- withCacheControl("public; max-age=666"),
- withContentEncoding("foobar"),
- withContentDisposition("my-content-disposition"),
- withUserMetadata("answer", "42"));
+ CloudStorageOptions.withMimeType("text/lolcat"),
+ CloudStorageOptions.withCacheControl("public; max-age=666"),
+ CloudStorageOptions.withContentEncoding("foobar"),
+ CloudStorageOptions.withContentDisposition("my-content-disposition"),
+ CloudStorageOptions.withUserMetadata("answer", "42"));
Files.copy(source, target, COPY_ATTRIBUTES);
CloudStorageFileAttributes attributes =
@@ -589,9 +584,9 @@ public void testCopy_withoutOptions_doesntPreservesAttributes() throws IOExcepti
Files.write(
source,
"(✿◕ ‿◕ )ノ".getBytes(UTF_8),
- withMimeType("text/lolcat"),
- withCacheControl("public; max-age=666"),
- withUserMetadata("answer", "42"));
+ CloudStorageOptions.withMimeType("text/lolcat"),
+ CloudStorageOptions.withCacheControl("public; max-age=666"),
+ CloudStorageOptions.withUserMetadata("answer", "42"));
Files.copy(source, target);
CloudStorageFileAttributes attributes =
@@ -611,10 +606,10 @@ public void testCopy_overwriteAttributes() throws IOException {
Files.write(
source,
"(✿◕ ‿◕ )ノ".getBytes(UTF_8),
- withMimeType("text/lolcat"),
- withCacheControl("public; max-age=666"));
+ CloudStorageOptions.withMimeType("text/lolcat"),
+ CloudStorageOptions.withCacheControl("public; max-age=666"));
Files.copy(source, target1, COPY_ATTRIBUTES);
- Files.copy(source, target2, COPY_ATTRIBUTES, withMimeType("text/palfun"));
+ Files.copy(source, target2, COPY_ATTRIBUTES, CloudStorageOptions.withMimeType("text/palfun"));
CloudStorageFileAttributes attributes =
Files.readAttributes(target1, CloudStorageFileAttributes.class);
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
similarity index 97%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
index f20ad6369ea7..0bdc17994014 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.testing.EqualsTester;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.StorageOptions;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Test;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptionsTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
similarity index 72%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptionsTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
index 411bf64170a1..5397945b87c7 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptionsTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
@@ -14,21 +14,14 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withAcl;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withCacheControl;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentDisposition;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withContentEncoding;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withMimeType;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withUserMetadata;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageOptions.withoutCaching;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.Acl;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.Acl;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +48,7 @@ public void before() {
@Test
public void testWithoutCaching() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withoutCaching());
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withoutCaching());
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).cacheControl().get())
.isEqualTo("no-cache");
}
@@ -63,7 +56,7 @@ public void testWithoutCaching() throws IOException {
@Test
public void testCacheControl() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withCacheControl("potato"));
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withCacheControl("potato"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).cacheControl().get())
.isEqualTo("potato");
}
@@ -72,7 +65,7 @@ public void testCacheControl() throws IOException {
public void testWithAcl() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
Acl acl = Acl.of(new Acl.User("king@example.com"), Acl.Role.OWNER);
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withAcl(acl));
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withAcl(acl));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).acl().get())
.contains(acl);
}
@@ -80,7 +73,7 @@ public void testWithAcl() throws IOException {
@Test
public void testWithContentDisposition() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withContentDisposition("bubbly fun"));
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withContentDisposition("bubbly fun"));
assertThat(
Files.readAttributes(path, CloudStorageFileAttributes.class).contentDisposition().get())
.isEqualTo("bubbly fun");
@@ -89,7 +82,7 @@ public void testWithContentDisposition() throws IOException {
@Test
public void testWithContentEncoding() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withContentEncoding("gzip"));
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withContentEncoding("gzip"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).contentEncoding().get())
.isEqualTo("gzip");
}
@@ -100,8 +93,8 @@ public void testWithUserMetadata() throws IOException {
Files.write(
path,
"(✿◕ ‿◕ )ノ".getBytes(UTF_8),
- withUserMetadata("nolo", "contendere"),
- withUserMetadata("eternal", "sadness"));
+ CloudStorageOptions.withUserMetadata("nolo", "contendere"),
+ CloudStorageOptions.withUserMetadata("eternal", "sadness"));
assertThat(
Files.readAttributes(path, CloudStorageFileAttributes.class).userMetadata().get("nolo"))
.isEqualTo("contendere");
@@ -115,7 +108,7 @@ public void testWithUserMetadata() throws IOException {
@Test
public void testWithMimeType_string() throws IOException {
Path path = Paths.get(URI.create("gs://bucket/path"));
- Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), withMimeType("text/plain"));
+ Files.write(path, "(✿◕ ‿◕ )ノ".getBytes(UTF_8), CloudStorageOptions.withMimeType("text/plain"));
assertThat(Files.readAttributes(path, CloudStorageFileAttributes.class).mimeType().get())
.isEqualTo("text/plain");
}
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStoragePathTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
similarity index 78%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStoragePathTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
index a5c440c23772..4a1c40c9b28d 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStoragePathTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.forBucket;
+import static com.google.cloud.storage.contrib.nio.CloudStorageFileSystem.forBucket;
import com.google.common.collect.Iterables;
import com.google.common.testing.EqualsTester;
import com.google.common.testing.NullPointerTester;
-import com.google.gcloud.storage.testing.LocalGcsHelper;
+import com.google.cloud.storage.testing.LocalGcsHelper;
import org.junit.Before;
import org.junit.Rule;
@@ -53,7 +53,7 @@ public void before() {
@Test
public void testCreate_neverRemoveExtraSlashes() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("lol//cat").toString()).isEqualTo("lol//cat");
assertThat((Object) fs.getPath("lol//cat")).isEqualTo(fs.getPath("lol//cat"));
}
@@ -61,7 +61,7 @@ public void testCreate_neverRemoveExtraSlashes() {
@Test
public void testCreate_preservesTrailingSlash() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("lol/cat/").toString()).isEqualTo("lol/cat/");
assertThat((Object) fs.getPath("lol/cat/")).isEqualTo(fs.getPath("lol/cat/"));
}
@@ -69,7 +69,7 @@ public void testCreate_preservesTrailingSlash() {
@Test
public void testGetGcsFilename_empty_notAllowed() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
fs.getPath("").getBlobId();
}
@@ -77,21 +77,21 @@ public void testGetGcsFilename_empty_notAllowed() {
@Test
public void testGetGcsFilename_stripsPrefixSlash() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi").getBlobId().name()).isEqualTo("hi");
}
}
@Test
public void testGetGcsFilename_overrideStripPrefixSlash_doesntStripPrefixSlash() {
- try (CloudStorageFileSystem fs = forBucket("doodle", stripPrefixSlash(false))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", stripPrefixSlash(false))) {
assertThat(fs.getPath("/hi").getBlobId().name()).isEqualTo("/hi");
}
}
@Test
public void testGetGcsFilename_extraSlashes_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
fs.getPath("a//b").getBlobId().name();
}
@@ -99,14 +99,14 @@ public void testGetGcsFilename_extraSlashes_throwsIae() {
@Test
public void testGetGcsFilename_overridepermitEmptyPathComponents() {
- try (CloudStorageFileSystem fs = forBucket("doodle", permitEmptyPathComponents(true))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", permitEmptyPathComponents(true))) {
assertThat(fs.getPath("a//b").getBlobId().name()).isEqualTo("a//b");
}
}
@Test
public void testGetGcsFilename_freaksOutOnExtraSlashesAndDotDirs() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
fs.getPath("a//b/..").getBlobId().name();
}
@@ -114,7 +114,7 @@ public void testGetGcsFilename_freaksOutOnExtraSlashesAndDotDirs() {
@Test
public void testNameCount() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("").getNameCount()).isEqualTo(1);
assertThat(fs.getPath("/").getNameCount()).isEqualTo(0);
assertThat(fs.getPath("/hi/").getNameCount()).isEqualTo(1);
@@ -125,7 +125,7 @@ public void testNameCount() {
@Test
public void testGetName() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("").getName(0).toString()).isEqualTo("");
assertThat(fs.getPath("/hi").getName(0).toString()).isEqualTo("hi");
assertThat(fs.getPath("hi/there").getName(1).toString()).isEqualTo("there");
@@ -134,7 +134,7 @@ public void testGetName() {
@Test
public void testGetName_negative_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
fs.getPath("angel").getName(-1);
}
@@ -142,7 +142,7 @@ public void testGetName_negative_throwsIae() {
@Test
public void testGetName_overflow_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
fs.getPath("angel").getName(1);
}
@@ -150,7 +150,7 @@ public void testGetName_overflow_throwsIae() {
@Test
public void testIterator() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(Iterables.get(fs.getPath("/dog/mog"), 0).toString()).isEqualTo("dog");
assertThat(Iterables.get(fs.getPath("/dog/mog"), 1).toString()).isEqualTo("mog");
assertThat(Iterables.size(fs.getPath("/"))).isEqualTo(0);
@@ -161,7 +161,7 @@ public void testIterator() {
@Test
public void testNormalize() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/").normalize().toString()).isEqualTo("/");
assertThat(fs.getPath("a/x/../b/x/..").normalize().toString()).isEqualTo("a/b/");
assertThat(fs.getPath("/x/x/../../♡").normalize().toString()).isEqualTo("/♡");
@@ -171,7 +171,7 @@ public void testNormalize() {
@Test
public void testNormalize_dot_becomesBlank() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("").normalize().toString()).isEqualTo("");
assertThat(fs.getPath(".").normalize().toString()).isEqualTo("");
}
@@ -179,14 +179,14 @@ public void testNormalize_dot_becomesBlank() {
@Test
public void testNormalize_trailingSlash_isPreserved() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("o/").normalize().toString()).isEqualTo("o/");
}
}
@Test
public void testNormalize_doubleDot_becomesBlank() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("..").normalize().toString()).isEqualTo("");
assertThat(fs.getPath("../..").normalize().toString()).isEqualTo("");
}
@@ -194,14 +194,14 @@ public void testNormalize_doubleDot_becomesBlank() {
@Test
public void testNormalize_extraSlashes_getRemoved() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("//life///b/good//").normalize().toString()).isEqualTo("/life/b/good/");
}
}
@Test
public void testToRealPath_hasDotDir_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
fs.getPath("a/hi./b").toRealPath();
fs.getPath("a/.hi/b").toRealPath();
thrown.expect(IllegalArgumentException.class);
@@ -212,7 +212,7 @@ public void testToRealPath_hasDotDir_throwsIae() {
@Test
public void testToRealPath_hasDotDotDir_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
fs.getPath("a/hi../b").toRealPath();
fs.getPath("a/..hi/b").toRealPath();
thrown.expect(IllegalArgumentException.class);
@@ -223,7 +223,7 @@ public void testToRealPath_hasDotDotDir_throwsIae() {
@Test
public void testToRealPath_extraSlashes_throwsIae() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("extra slashes");
fs.getPath("a//b").toRealPath();
@@ -232,7 +232,7 @@ public void testToRealPath_extraSlashes_throwsIae() {
@Test
public void testToRealPath_overridePermitEmptyPathComponents_extraSlashes_slashesRemain() {
- try (CloudStorageFileSystem fs = forBucket("doodle", permitEmptyPathComponents(true))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", permitEmptyPathComponents(true))) {
assertThat(fs.getPath("/life///b/./good/").toRealPath().toString())
.isEqualTo("life///b/./good/");
}
@@ -240,7 +240,7 @@ public void testToRealPath_overridePermitEmptyPathComponents_extraSlashes_slashe
@Test
public void testToRealPath_permitEmptyPathComponents_doesNotNormalize() {
- try (CloudStorageFileSystem fs = forBucket("doodle", permitEmptyPathComponents(true))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", permitEmptyPathComponents(true))) {
assertThat(fs.getPath("a").toRealPath().toString()).isEqualTo("a");
assertThat(fs.getPath("a//b").toRealPath().toString()).isEqualTo("a//b");
assertThat(fs.getPath("a//./b//..").toRealPath().toString()).isEqualTo("a//./b//..");
@@ -249,14 +249,14 @@ public void testToRealPath_permitEmptyPathComponents_doesNotNormalize() {
@Test
public void testToRealPath_withWorkingDirectory_makesAbsolute() {
- try (CloudStorageFileSystem fs = forBucket("doodle", workingDirectory("/lol"))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", workingDirectory("/lol"))) {
assertThat(fs.getPath("a").toRealPath().toString()).isEqualTo("lol/a");
}
}
@Test
public void testToRealPath_disableStripPrefixSlash_makesPathAbsolute() {
- try (CloudStorageFileSystem fs = forBucket("doodle", stripPrefixSlash(false))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", stripPrefixSlash(false))) {
assertThat(fs.getPath("a").toRealPath().toString()).isEqualTo("/a");
assertThat(fs.getPath("/a").toRealPath().toString()).isEqualTo("/a");
}
@@ -264,21 +264,21 @@ public void testToRealPath_disableStripPrefixSlash_makesPathAbsolute() {
@Test
public void testToRealPath_trailingSlash_getsPreserved() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("a/b/").toRealPath().toString()).isEqualTo("a/b/");
}
}
@Test
public void testNormalize_empty_returnsEmpty() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("").normalize().toString()).isEqualTo("");
}
}
@Test
public void testNormalize_preserveTrailingSlash() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("a/b/../c/").normalize().toString()).isEqualTo("a/c/");
assertThat(fs.getPath("a/b/./c/").normalize().toString()).isEqualTo("a/b/c/");
}
@@ -286,7 +286,7 @@ public void testNormalize_preserveTrailingSlash() {
@Test
public void testGetParent_preserveTrailingSlash() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("a/b/c").getParent().toString()).isEqualTo("a/b/");
assertThat(fs.getPath("a/b/c/").getParent().toString()).isEqualTo("a/b/");
assertThat((Object) fs.getPath("").getParent()).isNull();
@@ -298,7 +298,7 @@ public void testGetParent_preserveTrailingSlash() {
@Test
public void testGetRoot() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hello").getRoot().toString()).isEqualTo("/");
assertThat((Object) fs.getPath("hello").getRoot()).isNull();
}
@@ -306,7 +306,7 @@ public void testGetRoot() {
@Test
public void testRelativize() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(
fs.getPath("/foo/bar/lol/cat").relativize(fs.getPath("/foo/a/b/../../c")).toString())
.isEqualTo("../../../a/b/../../c");
@@ -315,7 +315,7 @@ public void testRelativize() {
@Test
public void testRelativize_providerMismatch() {
- try (CloudStorageFileSystem gcs = forBucket("doodle")) {
+ try (CloudStorageFileSystem gcs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(ProviderMismatchException.class);
gcs.getPath("/etc").relativize(FileSystems.getDefault().getPath("/dog"));
}
@@ -324,7 +324,7 @@ public void testRelativize_providerMismatch() {
@Test
@SuppressWarnings("ReturnValueIgnored") // testing that an Exception is thrown
public void testRelativize_providerMismatch2() {
- try (CloudStorageFileSystem gcs = forBucket("doodle")) {
+ try (CloudStorageFileSystem gcs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(ProviderMismatchException.class);
gcs.getPath("/dog").relativize(FileSystems.getDefault().getPath("/etc"));
}
@@ -332,7 +332,7 @@ public void testRelativize_providerMismatch2() {
@Test
public void testResolve() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi").resolve("there").toString()).isEqualTo("/hi/there");
assertThat(fs.getPath("hi").resolve("there").toString()).isEqualTo("hi/there");
}
@@ -340,7 +340,7 @@ public void testResolve() {
@Test
public void testResolve_providerMismatch() {
- try (CloudStorageFileSystem gcs = forBucket("doodle")) {
+ try (CloudStorageFileSystem gcs = CloudStorageFileSystem.forBucket("doodle")) {
thrown.expect(ProviderMismatchException.class);
gcs.getPath("etc").resolve(FileSystems.getDefault().getPath("/dog"));
}
@@ -348,7 +348,7 @@ public void testResolve_providerMismatch() {
@Test
public void testIsAbsolute() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi").isAbsolute()).isTrue();
assertThat(fs.getPath("hi").isAbsolute()).isFalse();
}
@@ -356,7 +356,7 @@ public void testIsAbsolute() {
@Test
public void testToAbsolutePath() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat((Object) fs.getPath("/hi").toAbsolutePath()).isEqualTo(fs.getPath("/hi"));
assertThat((Object) fs.getPath("hi").toAbsolutePath()).isEqualTo(fs.getPath("/hi"));
}
@@ -364,14 +364,14 @@ public void testToAbsolutePath() {
@Test
public void testToAbsolutePath_withWorkingDirectory() {
- try (CloudStorageFileSystem fs = forBucket("doodle", workingDirectory("/lol"))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", workingDirectory("/lol"))) {
assertThat(fs.getPath("a").toAbsolutePath().toString()).isEqualTo("/lol/a");
}
}
@Test
public void testGetFileName() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi/there").getFileName().toString()).isEqualTo("there");
assertThat(fs.getPath("military/fashion/show").getFileName().toString()).isEqualTo("show");
}
@@ -379,7 +379,7 @@ public void testGetFileName() {
@Test
public void testCompareTo() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi/there").compareTo(fs.getPath("/hi/there"))).isEqualTo(0);
assertThat(fs.getPath("/hi/there").compareTo(fs.getPath("/hi/therf"))).isEqualTo(-1);
assertThat(fs.getPath("/hi/there").compareTo(fs.getPath("/hi/therd"))).isEqualTo(1);
@@ -388,7 +388,7 @@ public void testCompareTo() {
@Test
public void testStartsWith() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi/there").startsWith(fs.getPath("/hi/there"))).isTrue();
assertThat(fs.getPath("/hi/there").startsWith(fs.getPath("/hi/therf"))).isFalse();
assertThat(fs.getPath("/hi/there").startsWith(fs.getPath("/hi"))).isTrue();
@@ -401,7 +401,7 @@ public void testStartsWith() {
@Test
public void testEndsWith() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
assertThat(fs.getPath("/hi/there").endsWith(fs.getPath("there"))).isTrue();
assertThat(fs.getPath("/hi/there").endsWith(fs.getPath("therf"))).isFalse();
assertThat(fs.getPath("/hi/there").endsWith(fs.getPath("/blag/therf"))).isFalse();
@@ -442,7 +442,7 @@ public void testRelativize_willWorkWithRecursiveCopy() throws IOException {
@Test
public void testToFile_unsupported() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
Path path = fs.getPath("/lol");
thrown.expect(UnsupportedOperationException.class);
path.toFile();
@@ -451,7 +451,7 @@ public void testToFile_unsupported() {
@Test
public void testEquals() {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
new EqualsTester()
// These are obviously equal.
.addEqualityGroup(fs.getPath("/hello/cat"), fs.getPath("/hello/cat"))
@@ -467,7 +467,7 @@ public void testEquals() {
@Test
public void testEquals_currentDirectoryIsTakenIntoConsideration() {
- try (CloudStorageFileSystem fs = forBucket("doodle", workingDirectory("/hello"))) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle", workingDirectory("/hello"))) {
new EqualsTester()
.addEqualityGroup(fs.getPath("cat"), fs.getPath("/hello/cat"))
.addEqualityGroup(fs.getPath(""), fs.getPath("/hello"))
@@ -477,7 +477,7 @@ public void testEquals_currentDirectoryIsTakenIntoConsideration() {
@Test
public void testNullness() throws NoSuchMethodException, SecurityException {
- try (CloudStorageFileSystem fs = forBucket("doodle")) {
+ try (CloudStorageFileSystem fs = CloudStorageFileSystem.forBucket("doodle")) {
NullPointerTester tester = new NullPointerTester();
tester.ignore(CloudStoragePath.class.getMethod("equals", Object.class));
tester.setDefault(Path.class, fs.getPath("sup"));
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
similarity index 95%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
index 82940095d972..64cb5b2bdc42 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannelTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
@@ -25,10 +25,10 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import com.google.gcloud.ReadChannel;
-import com.google.gcloud.storage.Blob;
-import com.google.gcloud.storage.BlobId;
-import com.google.gcloud.storage.Storage;
+import com.google.cloud.ReadChannel;
+import com.google.cloud.storage.Blob;
+import com.google.cloud.storage.BlobId;
+import com.google.cloud.storage.Storage;
import org.junit.Before;
import org.junit.Rule;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannelTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
similarity index 97%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
index 9090cdd75edb..f652812a13d6 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
@@ -26,7 +26,7 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import com.google.gcloud.WriteChannel;
+import com.google.cloud.WriteChannel;
import org.junit.Before;
import org.junit.Rule;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/UnixPathTest.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
similarity index 99%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/UnixPathTest.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
index 2491c66f9a62..7bdf5b9cc248 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/UnixPathTest.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.contrib.nio;
+package com.google.cloud.storage.contrib.nio;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeTrue;
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/it/ITGcsNio.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
similarity index 94%
rename from gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/it/ITGcsNio.java
rename to gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
index e305b7373b58..534fffdca94e 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/gcloud/storage/contrib/nio/it/ITGcsNio.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -1,16 +1,16 @@
-package com.google.gcloud.storage.contrib.nio.it;
+package com.google.cloud.storage.contrib.nio.it;
import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.ImmutableList;
-import com.google.gcloud.storage.BlobInfo;
-import com.google.gcloud.storage.BucketInfo;
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageOptions;
-import com.google.gcloud.storage.contrib.nio.CloudStorageConfiguration;
-import com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem;
-import com.google.gcloud.storage.testing.RemoteGcsHelper;
+import com.google.cloud.storage.BlobInfo;
+import com.google.cloud.storage.BucketInfo;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.storage.contrib.nio.CloudStorageConfiguration;
+import com.google.cloud.storage.contrib.nio.CloudStorageFileSystem;
+import com.google.cloud.storage.testing.RemoteStorageHelper;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -67,7 +67,7 @@ public class ITGcsNio {
"les uns envers les autres dans un esprit de fraternité.");
private static final Logger log = Logger.getLogger(ITGcsNio.class.getName());
- private static final String BUCKET = RemoteGcsHelper.generateBucketName();
+ private static final String BUCKET = RemoteStorageHelper.generateBucketName();
private static final String SML_FILE = "tmp-test-small-file.txt";
private static final int SML_SIZE = 100;
// it's big, relatively speaking.
@@ -83,7 +83,7 @@ public class ITGcsNio {
@BeforeClass
public static void beforeClass() throws IOException {
// loads the credentials from local disk as par README
- RemoteGcsHelper gcsHelper = RemoteGcsHelper.create();
+ RemoteStorageHelper gcsHelper = RemoteStorageHelper.create();
storageOptions = gcsHelper.options();
storage = storageOptions.service();
// create and populate test bucket
@@ -94,7 +94,7 @@ public static void beforeClass() throws IOException {
@AfterClass
public static void afterClass() throws ExecutionException, InterruptedException {
- if (storage != null && !RemoteGcsHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS) &&
+ if (storage != null && !RemoteStorageHelper.forceDelete(storage, BUCKET, 5, TimeUnit.SECONDS) &&
log.isLoggable(Level.WARNING)) {
log.log(Level.WARNING, "Deletion of bucket {0} timed out, bucket is not empty", BUCKET);
}
diff --git a/gcloud-java-examples/pom.xml b/gcloud-java-examples/pom.xml
index 2961df05a356..34b6026fa7ea 100644
--- a/gcloud-java-examples/pom.xml
+++ b/gcloud-java-examples/pom.xml
@@ -51,25 +51,25 @@
Steps needed for running the example: *
{@code target/appassembler/bin/BigQueryExample []
-=======
- * - login using gcloud SDK - {@code gcloud auth login}.
- * - compile using maven - {@code mvn compile}
- * - run using maven -
- *
{@code mvn exec:java -Dexec.mainClass="com.google.cloud.examples.bigquery.BigQueryExample"
- * -Dexec.args="[]
->>>>>>> upstream/master:gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java
* list datasets |
* list tables |
* list jobs |
diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/nio/Stat.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/nio/Stat.java
index cb1cce018e59..ee9c4387a71a 100644
--- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/nio/Stat.java
+++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/nio/Stat.java
@@ -1,4 +1,4 @@
-package com.google.gcloud.examples.nio;
+package com.google.cloud.examples.nio;
import java.io.IOException;
import java.net.URI;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/FakeStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/FakeStorageRpc.java
similarity index 98%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/FakeStorageRpc.java
rename to gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/FakeStorageRpc.java
index 01e07a46d4f4..f98ee25aec14 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/FakeStorageRpc.java
+++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/FakeStorageRpc.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.testing;
+package com.google.cloud.storage.testing;
import com.google.api.services.storage.model.Bucket;
import com.google.api.services.storage.model.StorageObject;
-import com.google.gcloud.storage.spi.StorageRpc;
-import com.google.gcloud.storage.Storage;
-import com.google.gcloud.storage.StorageException;
+import com.google.cloud.storage.spi.StorageRpc;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageException;
import java.io.IOException;
import java.io.InputStream;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/LocalGcsHelper.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/LocalGcsHelper.java
similarity index 91%
rename from gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/LocalGcsHelper.java
rename to gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/LocalGcsHelper.java
index 7749ad160096..deb12c896511 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/testing/LocalGcsHelper.java
+++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/LocalGcsHelper.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.google.gcloud.storage.testing;
+package com.google.cloud.storage.testing;
-import com.google.gcloud.spi.ServiceRpcFactory;
-import com.google.gcloud.storage.spi.StorageRpc;
-import com.google.gcloud.storage.StorageOptions;
+import com.google.cloud.spi.ServiceRpcFactory;
+import com.google.cloud.storage.spi.StorageRpc;
+import com.google.cloud.storage.StorageOptions;
/**
* Utility to create an in-memory storage configuration for testing. Storage options can be