---

michaelbausor · web-flow · commit badf6227788e · 2017-07-10T08:52:38.000-07:00
yaml --- r: 8159 b: refs/heads/tswast-patch-1 c: 046777d h: refs/heads/master i: 8157: af13f62 8155: 08b838f 8151: d30bae4 8143: 09854fa 8127: 4715f43
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
+refs/heads/tswast-patch-1: 046777d5a3d1fc26a199e60fc6ff5bf414d0d874
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -133,7 +133,7 @@ protected Path computeNext() {
    * Sets options that are only used by the constructor.
    */
   @VisibleForTesting
-  public static void setStorageOptions(StorageOptions newStorageOptions) {
+  public static void setStorageOptions(@Nullable StorageOptions newStorageOptions) {
     futureStorageOptions = newStorageOptions;
   }
 
@@ -157,7 +157,7 @@ public static void setStorageOptions(StorageOptions newStorageOptions) {
    *
    * @param newDefault new default CloudStorageConfiguration
    */
-  public static void setDefaultCloudStorageConfiguration(CloudStorageConfiguration newDefault) {
+  public static void setDefaultCloudStorageConfiguration(@Nullable CloudStorageConfiguration newDefault) {
     CloudStorageFileSystem.setDefaultCloudStorageConfiguration(newDefault);
   }
 
diff --git a/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -633,9 +633,7 @@ public void testNullness() throws Exception {
       tester.setDefault(Path.class, fs.getPath("and/one"));
       tester.setDefault(OpenOption.class, CREATE);
       tester.setDefault(CopyOption.class, COPY_ATTRIBUTES);
-      // can't do that, setStorageOptions accepts a null argument.
-      // TODO(jart): Figure out how to re-enable this.
-      // tester.testAllPublicStaticMethods(CloudStorageFileSystemProvider.class);
+      tester.testAllPublicStaticMethods(CloudStorageFileSystemProvider.class);
       tester.testAllPublicInstanceMethods(new CloudStorageFileSystemProvider());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ protected Path computeNext() {`
`133`	`133`	`* Sets options that are only used by the constructor.`
`134`	`134`	`*/`
`135`	`135`	`@VisibleForTesting`
`136`		`- public static void setStorageOptions(StorageOptions newStorageOptions) {`
	`136`	`+ public static void setStorageOptions(@Nullable StorageOptions newStorageOptions) {`
`137`	`137`	`futureStorageOptions = newStorageOptions;`
`138`	`138`	`}`
`139`	`139`
`@@ -157,7 +157,7 @@ public static void setStorageOptions(StorageOptions newStorageOptions) {`
`157`	`157`	`*`
`158`	`158`	`* @param newDefault new default CloudStorageConfiguration`
`159`	`159`	`*/`
`160`		`- public static void setDefaultCloudStorageConfiguration(CloudStorageConfiguration newDefault) {`
	`160`	`+ public static void setDefaultCloudStorageConfiguration(@Nullable CloudStorageConfiguration newDefault) {`
`161`	`161`	`CloudStorageFileSystem.setDefaultCloudStorageConfiguration(newDefault);`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -633,9 +633,7 @@ public void testNullness() throws Exception {`
`633`	`633`	`tester.setDefault(Path.class, fs.getPath("and/one"));`
`634`	`634`	`tester.setDefault(OpenOption.class, CREATE);`
`635`	`635`	`tester.setDefault(CopyOption.class, COPY_ATTRIBUTES);`
`636`		`- // can't do that, setStorageOptions accepts a null argument.`
`637`		`- // TODO(jart): Figure out how to re-enable this.`
`638`		`- // tester.testAllPublicStaticMethods(CloudStorageFileSystemProvider.class);`
	`636`	`+ tester.testAllPublicStaticMethods(CloudStorageFileSystemProvider.class);`
`639`	`637`	`tester.testAllPublicInstanceMethods(new CloudStorageFileSystemProvider());`
`640`	`638`	`}`
`641`	`639`	`}`