From 75a22c9041a0b22e66b2f9662dae53614c882010 Mon Sep 17 00:00:00 2001 From: JP Martin Date: Mon, 18 Apr 2016 09:39:37 -0700 Subject: [PATCH] Move gcloud -> cloud (issue #877) --- .../gcloud-java-nio-examples/pom.xml | 2 +- .../nio/examples/ListFilesystems.java | 2 +- gcloud-java-contrib/gcloud-java-nio/pom.xml | 2 +- .../nio/CloudStorageConfiguration.java | 2 +- .../nio/CloudStorageFileAttributeView.java | 2 +- .../nio/CloudStorageFileAttributes.java | 2 +- .../contrib/nio/CloudStorageFileSystem.java | 2 +- .../nio/CloudStorageFileSystemProvider.java | 55 +++++------ .../nio/CloudStorageObjectAttributes.java | 4 +- .../CloudStorageObjectImmutableException.java | 2 +- .../contrib/nio/CloudStorageOption.java | 2 +- .../contrib/nio/CloudStorageOptions.java | 2 +- .../storage/contrib/nio/CloudStoragePath.java | 15 ++- ...CloudStoragePseudoDirectoryAttributes.java | 10 +- .../CloudStoragePseudoDirectoryException.java | 2 +- .../contrib/nio/CloudStorageReadChannel.java | 2 +- .../storage/contrib/nio/CloudStorageUtil.java | 2 +- .../contrib/nio/CloudStorageWriteChannel.java | 2 +- .../storage/contrib/nio/OptionAcl.java | 2 +- .../storage/contrib/nio/OptionBlockSize.java | 2 +- .../contrib/nio/OptionCacheControl.java | 2 +- .../contrib/nio/OptionContentDisposition.java | 2 +- .../contrib/nio/OptionContentEncoding.java | 2 +- .../storage/contrib/nio/OptionMimeType.java | 2 +- .../contrib/nio/OptionUserMetadata.java | 2 +- .../storage/contrib/nio/UnixPath.java | 2 +- .../storage/contrib/nio/package-info.java | 6 +- .../nio/CloudStorageConfigurationTest.java | 2 +- .../CloudStorageFileAttributeViewTest.java | 7 +- .../nio/CloudStorageFileAttributesTest.java | 28 +++--- .../CloudStorageFileSystemProviderTest.java | 31 +++--- .../nio/CloudStorageFileSystemTest.java | 2 +- .../contrib/nio/CloudStorageOptionsTest.java | 25 ++--- .../contrib/nio/CloudStoragePathTest.java | 96 +++++++++---------- .../nio/CloudStorageReadChannelTest.java | 2 +- .../nio/CloudStorageWriteChannelTest.java | 2 +- .../storage/contrib/nio/UnixPathTest.java | 2 +- .../storage/contrib/nio/it/ITGcsNio.java | 6 +- .../storage/testing/FakeStorageRpc.java | 8 +- .../storage/testing/LocalGcsHelper.java | 8 +- 40 files changed, 162 insertions(+), 191 deletions(-) rename gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/{gcloud => cloud}/nio/examples/ListFilesystems.java (97%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageConfiguration.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileAttributeView.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileAttributes.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileSystem.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileSystemProvider.java (93%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageObjectAttributes.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageObjectImmutableException.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageOption.java (96%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageOptions.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStoragePath.java (94%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java (90%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStoragePseudoDirectoryException.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageReadChannel.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageUtil.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageWriteChannel.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionAcl.java (94%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionBlockSize.java (94%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionCacheControl.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionContentDisposition.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionContentEncoding.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionMimeType.java (94%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/OptionUserMetadata.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/UnixPath.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/{gcloud => cloud}/storage/contrib/nio/package-info.java (94%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageConfigurationTest.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileAttributeViewTest.java (93%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileAttributesTest.java (84%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileSystemProviderTest.java (95%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageFileSystemTest.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageOptionsTest.java (74%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStoragePathTest.java (78%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageReadChannelTest.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/CloudStorageWriteChannelTest.java (98%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/UnixPathTest.java (99%) rename gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/{gcloud => cloud}/storage/contrib/nio/it/ITGcsNio.java (98%) rename gcloud-java-storage/src/main/java/com/google/{gcloud => cloud}/storage/testing/FakeStorageRpc.java (98%) rename gcloud-java-storage/src/main/java/com/google/{gcloud => cloud}/storage/testing/LocalGcsHelper.java (91%) diff --git a/gcloud-java-contrib/gcloud-java-nio-examples/pom.xml b/gcloud-java-contrib/gcloud-java-nio-examples/pom.xml index cea1f7b4be5a..1fab30cbe273 100644 --- a/gcloud-java-contrib/gcloud-java-nio-examples/pom.xml +++ b/gcloud-java-contrib/gcloud-java-nio-examples/pom.xml @@ -9,7 +9,7 @@ Demonstrates how to use the gcloud-java-nio jar to add GCS functionality to legacy code. - com.google.gcloud + com.google.cloud gcloud-java-contrib 0.1.6-SNAPSHOT diff --git a/gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/gcloud/nio/examples/ListFilesystems.java b/gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java similarity index 97% rename from gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/gcloud/nio/examples/ListFilesystems.java rename to gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java index 5e92768d1cf6..b03dc13763d1 100644 --- a/gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/gcloud/nio/examples/ListFilesystems.java +++ b/gcloud-java-contrib/gcloud-java-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.nio.examples; +package com.google.cloud.nio.examples; import java.io.IOException; import java.net.URI; diff --git a/gcloud-java-contrib/gcloud-java-nio/pom.xml b/gcloud-java-contrib/gcloud-java-nio/pom.xml index f7380647a80e..6b14a97ee105 100644 --- a/gcloud-java-contrib/gcloud-java-nio/pom.xml +++ b/gcloud-java-contrib/gcloud-java-nio/pom.xml @@ -9,7 +9,7 @@ FileSystemProvider for Java NIO to access GCS transparently. - com.google.gcloud + com.google.cloud gcloud-java-contrib 0.1.6-SNAPSHOT diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfiguration.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java similarity index 99% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfiguration.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java index 5d92c8e2063e..b5166c143f62 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageConfiguration.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.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.base.Preconditions.checkArgument; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeView.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeView.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java index 44e9438aa99e..773aa1b22b6c 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributeView.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.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.base.Preconditions.checkNotNull; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributes.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributes.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java index 1953457115ec..160f665ebc34 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileAttributes.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystem.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java similarity index 99% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystem.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java index aafb1c786ec9..df9b3e2072ee 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystem.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.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.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java similarity index 93% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProvider.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java index 5fbcf754cc76..36a6c3210cb9 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageFileSystemProvider.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java @@ -14,16 +14,11 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Strings.isNullOrEmpty; -import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.URI_SCHEME; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.checkBucket; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.checkNotNullArray; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.checkPath; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.stripPathFromUri; import com.google.auto.service.AutoService; import com.google.common.annotations.VisibleForTesting; @@ -147,7 +142,7 @@ public CloudStorageFileSystemProvider() { @Override public String getScheme() { - return URI_SCHEME; + return CloudStorageFileSystem.URI_SCHEME; } /** @@ -164,12 +159,12 @@ public CloudStorageFileSystem getFileSystem(URI uri) { @Override public CloudStorageFileSystem newFileSystem(URI uri, Map env) { checkArgument( - uri.getScheme().equalsIgnoreCase(URI_SCHEME), + uri.getScheme().equalsIgnoreCase(CloudStorageFileSystem.URI_SCHEME), "Cloud Storage URIs must have '%s' scheme: %s", - URI_SCHEME, + CloudStorageFileSystem.URI_SCHEME, uri); checkArgument( - !isNullOrEmpty(uri.getHost()), "%s:// URIs must have a host: %s", URI_SCHEME, uri); + !isNullOrEmpty(uri.getHost()), "%s:// URIs must have a host: %s", CloudStorageFileSystem.URI_SCHEME, uri); checkArgument( uri.getPort() == -1 && isNullOrEmpty(uri.getPath()) @@ -178,20 +173,20 @@ && isNullOrEmpty(uri.getFragment()) && isNullOrEmpty(uri.getUserInfo()), "GCS FileSystem URIs mustn't have: port, userinfo, path, query, or fragment: %s", uri); - checkBucket(uri.getHost()); + CloudStorageUtil.checkBucket(uri.getHost()); return new CloudStorageFileSystem(this, uri.getHost(), CloudStorageConfiguration.fromMap(env)); } @Override public CloudStoragePath getPath(URI uri) { - return CloudStoragePath.getPath(getFileSystem(stripPathFromUri(uri)), uri.getPath()); + return CloudStoragePath.getPath(getFileSystem(CloudStorageUtil.stripPathFromUri(uri)), uri.getPath()); } @Override public SeekableByteChannel newByteChannel( Path path, Set options, FileAttribute... attrs) throws IOException { checkNotNull(path); - checkNotNullArray(attrs); + CloudStorageUtil.checkNotNullArray(attrs); if (options.contains(StandardOpenOption.WRITE)) { // TODO: Make our OpenOptions implement FileAttribute. Also remove buffer option. return newWriteChannel(path, options); @@ -227,7 +222,7 @@ private SeekableByteChannel newReadChannel(Path path, Set throw new UnsupportedOperationException(option.toString()); } } - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) { throw new CloudStoragePseudoDirectoryException(cloudPath); } @@ -237,7 +232,7 @@ private SeekableByteChannel newReadChannel(Path path, Set private SeekableByteChannel newWriteChannel(Path path, Set options) throws IOException { - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) { throw new CloudStoragePseudoDirectoryException(cloudPath); } @@ -311,7 +306,7 @@ private SeekableByteChannel newWriteChannel(Path path, Set @Override public InputStream newInputStream(Path path, OpenOption... options) throws IOException { InputStream result = super.newInputStream(path, options); - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); int blockSize = cloudPath.getFileSystem().config().blockSize(); for (OpenOption option : options) { if (option instanceof OptionBlockSize) { @@ -323,7 +318,7 @@ public InputStream newInputStream(Path path, OpenOption... options) throws IOExc @Override public boolean deleteIfExists(Path path) throws IOException { - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) { throw new CloudStoragePseudoDirectoryException(cloudPath); } @@ -332,7 +327,7 @@ public boolean deleteIfExists(Path path) throws IOException { @Override public void delete(Path path) throws IOException { - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (!deleteIfExists(cloudPath)) { throw new NoSuchFileException(cloudPath.toString()); } @@ -361,7 +356,7 @@ public void copy(Path source, Path target, CopyOption... options) throws IOExcep boolean setContentEncoding = false; boolean setContentDisposition = false; - CloudStoragePath toPath = checkPath(target); + CloudStoragePath toPath = CloudStorageUtil.checkPath(target); BlobInfo.Builder tgtInfoBuilder = BlobInfo.builder(toPath.getBlobId()).contentType(""); int blockSize = -1; @@ -402,7 +397,7 @@ public void copy(Path source, Path target, CopyOption... options) throws IOExcep } } - CloudStoragePath fromPath = checkPath(source); + CloudStoragePath fromPath = CloudStorageUtil.checkPath(source); blockSize = blockSize != -1 @@ -470,7 +465,7 @@ public void copy(Path source, Path target, CopyOption... options) throws IOExcep @Override public boolean isSameFile(Path path, Path path2) { - return checkPath(path).equals(checkPath(path2)); + return CloudStorageUtil.checkPath(path).equals(CloudStorageUtil.checkPath(path2)); } /** @@ -478,7 +473,7 @@ public boolean isSameFile(Path path, Path path2) { */ @Override public boolean isHidden(Path path) { - checkPath(path); + CloudStorageUtil.checkPath(path); return false; } @@ -494,7 +489,7 @@ public void checkAccess(Path path, AccessMode... modes) throws IOException { throw new UnsupportedOperationException(mode.toString()); } } - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) { return; } @@ -508,11 +503,11 @@ public void checkAccess(Path path, AccessMode... modes) throws IOException { public A readAttributes( Path path, Class type, LinkOption... options) throws IOException { checkNotNull(type); - checkNotNullArray(options); + CloudStorageUtil.checkNotNullArray(options); if (type != CloudStorageFileAttributes.class && type != BasicFileAttributes.class) { throw new UnsupportedOperationException(type.getSimpleName()); } - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) { @SuppressWarnings("unchecked") A result = (A) new CloudStoragePseudoDirectoryAttributes(cloudPath); @@ -543,11 +538,11 @@ public Map readAttributes(Path path, String attributes, LinkOpti public V getFileAttributeView( Path path, Class type, LinkOption... options) { checkNotNull(type); - checkNotNullArray(options); + CloudStorageUtil.checkNotNullArray(options); if (type != CloudStorageFileAttributeView.class && type != BasicFileAttributeView.class) { throw new UnsupportedOperationException(type.getSimpleName()); } - CloudStoragePath cloudPath = checkPath(path); + CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path); @SuppressWarnings("unchecked") V result = (V) new CloudStorageFileAttributeView(storage, cloudPath); return result; @@ -558,13 +553,13 @@ public V getFileAttributeView( */ @Override public void createDirectory(Path dir, FileAttribute... attrs) { - checkPath(dir); - checkNotNullArray(attrs); + CloudStorageUtil.checkPath(dir); + CloudStorageUtil.checkNotNullArray(attrs); } @Override public DirectoryStream newDirectoryStream(Path dir, final Filter filter) { - final CloudStoragePath cloudPath = checkPath(dir); + final CloudStoragePath cloudPath = CloudStorageUtil.checkPath(dir); checkNotNull(filter); String prefix = cloudPath.toString(); final Iterator blobIterator = storage.list(cloudPath.bucket(), Storage.BlobListOption.prefix(prefix), Storage.BlobListOption.fields()).iterateAll(); diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectAttributes.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectAttributes.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java index c9b512e73a64..a687c5a0eb0c 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectAttributes.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java @@ -14,10 +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.base.Preconditions.checkNotNull; -import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.FILE_TIME_UNKNOWN; +import static com.google.cloud.storage.contrib.nio.CloudStorageFileSystem.FILE_TIME_UNKNOWN; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectImmutableException.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectImmutableException.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java index 7998ec0ec34b..523e5dae7ed4 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageObjectImmutableException.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; /** * Exception reminding user that Cloud Storage objects can't be mutated. diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOption.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java similarity index 96% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOption.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java index 5b15ed2fce79..266bd67c2c84 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOption.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import java.nio.file.CopyOption; import java.nio.file.OpenOption; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptions.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptions.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java index e215daf0fd56..e95e3a9532be 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageOptions.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.gcloud.storage.Acl; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePath.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java similarity index 94% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePath.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java index 28282f131030..b27926c02b87 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePath.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java @@ -14,13 +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.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.URI_SCHEME; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.checkNotNullArray; -import static com.google.gcloud.storage.contrib.nio.CloudStorageUtil.checkPath; import com.google.common.collect.UnmodifiableIterator; import com.google.gcloud.storage.BlobId; @@ -126,7 +123,7 @@ public CloudStoragePath toAbsolutePath() { */ @Override public CloudStoragePath toRealPath(LinkOption... options) { - checkNotNullArray(options); + CloudStorageUtil.checkNotNullArray(options); return newPath(toRealPathInternal(true)); } @@ -156,7 +153,7 @@ public CloudStoragePath normalize() { @Override public CloudStoragePath resolve(Path object) { - return newPath(path.resolve(checkPath(object).path)); + return newPath(path.resolve(CloudStorageUtil.checkPath(object).path)); } @Override @@ -166,7 +163,7 @@ public CloudStoragePath resolve(String other) { @Override public CloudStoragePath resolveSibling(Path other) { - return newPath(path.resolveSibling(checkPath(other).path)); + return newPath(path.resolveSibling(CloudStorageUtil.checkPath(other).path)); } @Override @@ -176,7 +173,7 @@ public CloudStoragePath resolveSibling(String other) { @Override public CloudStoragePath relativize(Path object) { - return newPath(path.relativize(checkPath(object).path)); + return newPath(path.relativize(CloudStorageUtil.checkPath(object).path)); } @Nullable @@ -311,7 +308,7 @@ public String toString() { @Override public URI toUri() { try { - return new URI(URI_SCHEME, bucket(), path.toAbsolutePath().toString(), null); + return new URI(CloudStorageFileSystem.URI_SCHEME, bucket(), path.toAbsolutePath().toString(), null); } catch (URISyntaxException e) { throw new AssertionError(e); } diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java similarity index 90% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java index 6c4da62b725d..b08953afbbdc 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; - -import static com.google.gcloud.storage.contrib.nio.CloudStorageFileSystem.FILE_TIME_UNKNOWN; +package com.google.cloud.storage.contrib.nio; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -68,17 +66,17 @@ public long size() { @Override public FileTime lastModifiedTime() { - return FILE_TIME_UNKNOWN; + return CloudStorageFileSystem.FILE_TIME_UNKNOWN; } @Override public FileTime creationTime() { - return FILE_TIME_UNKNOWN; + return CloudStorageFileSystem.FILE_TIME_UNKNOWN; } @Override public FileTime lastAccessTime() { - return FILE_TIME_UNKNOWN; + return CloudStorageFileSystem.FILE_TIME_UNKNOWN; } @Override diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java index 8998a0d18322..5a63bc790c6c 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import java.nio.file.InvalidPathException; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannel.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannel.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java index 57be6501f1e9..e5b91c52235a 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageReadChannel.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.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.base.Preconditions.checkArgument; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageUtil.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageUtil.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java index 761048cbe3fa..78a602e407b3 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageUtil.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.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.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannel.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java similarity index 98% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannel.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java index 343233ea89fb..8aeeca3eef57 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/CloudStorageWriteChannel.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.gcloud.WriteChannel; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionAcl.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java similarity index 94% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionAcl.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java index 6e3a97797d85..4f0d5e2fa6a4 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionAcl.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; import com.google.gcloud.storage.Acl; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionBlockSize.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java similarity index 94% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionBlockSize.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java index 972c18a6ca45..61d3ba6e7d8e 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionBlockSize.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionCacheControl.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionCacheControl.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java index e8fa5e5145db..25b18ac96162 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionCacheControl.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentDisposition.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentDisposition.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java index 9af30785d471..8df320d687d7 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentDisposition.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentEncoding.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentEncoding.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java index 6043503caaad..8d599fb11d52 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionContentEncoding.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionMimeType.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java similarity index 94% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionMimeType.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java index be88e3fa971e..759cb00bee5b 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionMimeType.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionUserMetadata.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java similarity index 95% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionUserMetadata.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java index 3853a3f1f1fa..3c45e384c964 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/OptionUserMetadata.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.gcloud.storage.contrib.nio; +package com.google.cloud.storage.contrib.nio; import com.google.auto.value.AutoValue; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/UnixPath.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java similarity index 99% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/UnixPath.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java index 8f5383fd7005..3d8c6ae77299 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/UnixPath.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.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.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/package-info.java b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java similarity index 94% rename from gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/package-info.java rename to gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java index 7aefa177745c..bee99002b82f 100644 --- a/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/gcloud/storage/contrib/nio/package-info.java +++ b/gcloud-java-contrib/gcloud-java-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java @@ -53,7 +53,7 @@ * } * *

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 93% 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..7a7a790148f1 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,10 +14,9 @@ * 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; @@ -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 84% 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..4c15b92428e1 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,15 +14,9 @@ * 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; @@ -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..0914e86d8553 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; @@ -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 99% 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..7eb520664301 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,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 java.nio.charset.StandardCharsets.UTF_8; 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 74% 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..438eb87de963 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,16 +14,9 @@ * 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; @@ -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..da45ca6fc840 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,10 +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.cloud.storage.contrib.nio.CloudStorageFileSystem.forBucket; import com.google.common.collect.Iterables; import com.google.common.testing.EqualsTester; @@ -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 99% 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..a378320b6f2e 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; 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 98% 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..03c4e6bdb793 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; 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 98% 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..c450ee95f65d 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,4 +1,4 @@ -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; @@ -8,8 +8,8 @@ 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.cloud.storage.contrib.nio.CloudStorageConfiguration; +import com.google.cloud.storage.contrib.nio.CloudStorageFileSystem; import com.google.gcloud.storage.testing.RemoteGcsHelper; import org.junit.AfterClass; 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