From 3a3d46599b463801714cc415c0e49e112f8d8838 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Tue, 9 Feb 2021 16:26:05 -0500 Subject: [PATCH] fix: cleanup use of non-preferred terms (#411) * replace poem with lorem ipsum in CloudStorageFileSystemProviderTest --- google-cloud-nio-retrofit/README.md | 4 +- .../contrib/nio/CloudStorageOption.java | 2 +- .../nio/testing/LocalStorageHelper.java | 4 +- .../CloudStorageFileSystemProviderTest.java | 43 +++++++++++-------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/google-cloud-nio-retrofit/README.md b/google-cloud-nio-retrofit/README.md index cf32acd4..319fad18 100644 --- a/google-cloud-nio-retrofit/README.md +++ b/google-cloud-nio-retrofit/README.md @@ -37,7 +37,7 @@ To run this example: [//]: # ({x-version-update-end}) The sample doesn't have anything about Google Cloud Storage in it. It gets that ability from the NIO -jar that we're adding to the classpath. We use the NIO "fat shaded" jar for this purpose as it +jar that we're adding to the classpath. We use the NIO "shaded" jar for this purpose as it also includes the dependencies for google-cloud-nio. The underlying mechanism is Java's standard [ServiceLoader](https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html) @@ -47,7 +47,7 @@ to plug in NIO providers like this one. If you have access to a project's source code you can also simply add google-cloud-nio as a dependency and let Maven pull in the required dependencies (this is what the NIO unit tests do). -This approach is preferable as the fat jar approach may waste memory on multiple copies of +This approach is preferable as the shaded jar approach may waste memory on multiple copies of dependencies. [developers-console]:https://console.developers.google.com/ diff --git a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java index 36d1eeaa..98342eba 100644 --- a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java +++ b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java @@ -19,7 +19,7 @@ import java.nio.file.CopyOption; import java.nio.file.OpenOption; -/** Master interface for file operation option classes related to Google Cloud Storage. */ +/** Main interface for file operation option classes related to Google Cloud Storage. */ public interface CloudStorageOption { /** Interface for Google Cloud Storage options that can be specified when opening files. */ diff --git a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java index dfee55b9..d0ec92aa 100644 --- a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java +++ b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java @@ -70,7 +70,7 @@ private LocalStorageHelper() {} public static StorageOptions getOptions() { instance.reset(); return StorageOptions.newBuilder() - .setProjectId("dummy-project-for-testing") + .setProjectId("fake-project-for-testing") .setServiceRpcFactory( new ServiceRpcFactory() { @Override @@ -87,7 +87,7 @@ public StorageRpc create(StorageOptions options) { */ public static StorageOptions customOptions(final boolean throwIfOptions) { return StorageOptions.newBuilder() - .setProjectId("dummy-project-for-testing") + .setProjectId("fake-project-for-testing") .setServiceRpcFactory( new ServiceRpcFactory() { @Override diff --git a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java index 4afce170..2b901737 100644 --- a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java +++ b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java @@ -66,24 +66,31 @@ public class CloudStorageFileSystemProviderTest { private static final List FILE_CONTENTS = ImmutableList.of( - "Fanatics have their dreams, wherewith they weave", - "A paradise for a sect; the savage too", - "From forth the loftiest fashion of his sleep", - "Guesses at Heaven; pity these have not", - "Trac'd upon vellum or wild Indian leaf", - "The shadows of melodious utterance.", - "But bare of laurel they live, dream, and die;", - "For Poesy alone can tell her dreams,", - "With the fine spell of words alone can save", - "Imagination from the sable charm", - "And dumb enchantment. Who alive can say,", - "'Thou art no Poet may'st not tell thy dreams?'", - "Since every man whose soul is not a clod", - "Hath visions, and would speak, if he had loved", - "And been well nurtured in his mother tongue.", - "Whether the dream now purpos'd to rehearse", - "Be poet's or fanatic's will be known", - "When this warm scribe my hand is in the grave."); + "Lorem ipsum dolor sit amet, consectetur ", + "adipisicing elit. Ab, corporis deleniti ducimus ", + "ea esse est fuga illum inventore itaque maiores ", + "mollitia necessitatibus nesciunt nisi nobis non, ", + "nulla officia omnis placeat quibusdam unde? Alias ", + "delectus dignissimos, ducimus enim et expedita ", + "iste molestiae mollitia porro sunt! Debitis ", + "doloribus earum modi nam neque nulla optio ", + "quisquam reprehenderit. Autem consequatur ", + "delectus vitae. Aut consectetur cum eaque facere ", + "illum in molestiae nam, nulla obcaecati officia ", + "optio perspiciatis, quisquam reiciendis sequi ", + "tempora, velit veritatis vitae? Alias ", + "consequuntur dolor doloremque eius et fugiat ", + "fugit harum illo incidunt ipsa maxime molestiae ", + "nostrum officia pariatur, quam quidem similique ", + "velit veniam voluptatem voluptatibus. Ab at ", + "commodi ea expedita optio. Ab cumque eos et, ", + "libero non quam quia recusandae tempora vitae! ", + "Debitis libero quidem reprehenderit voluptas. ", + "Architecto consectetur cum dignissimos, dolorem ", + "eos, eum explicabo fugiat magnam maiores modi ", + "numquam odio pariatur provident quae quasi quos ", + "ratione recusandae repellendus similique ullam ", + "velit!"); private static final String SINGULARITY = "A string";