Reviewer comments

jean-philippe-martin · jean-philippe-martin · commit bcabfbcfb727 · 2017-03-15T11:39:46.000-07:00
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -225,7 +225,7 @@ public SeekableByteChannel newByteChannel(
   private SeekableByteChannel newReadChannel(Path path, Set<? extends OpenOption> options)
       throws IOException {
     initStorage();
-    int maxChannelReopens = ((CloudStorageFileSystem)path.getFileSystem()).config().maxChannelReopens();
+    int maxChannelReopens = ((CloudStorageFileSystem) path.getFileSystem()).config().maxChannelReopens();
     for (OpenOption option : options) {
       if (option instanceof StandardOpenOption) {
         switch ((StandardOpenOption) option) {
@@ -247,8 +247,8 @@ private SeekableByteChannel newReadChannel(Path path, Set<? extends OpenOption>
           default:
             throw new UnsupportedOperationException(option.toString());
         }
-      } else if (option instanceof OptionMaxChannelReopen) {
-        maxChannelReopens = ((OptionMaxChannelReopen)option).maxChannelReopen();
+      } else if (option instanceof OptionMaxChannelReopens) {
+        maxChannelReopens = ((OptionMaxChannelReopens) option).maxChannelReopens();
       } else {
         throw new UnsupportedOperationException(option.toString());
       }
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java
@@ -98,7 +98,7 @@ public static CloudStorageOption.OpenCopy withBlockSize(int size) {
    * <p>The default is 0.
    */
   public static CloudStorageOption.OpenCopy withChannelReopen(int count) {
-    return OptionMaxChannelReopen.create(count);
+    return OptionMaxChannelReopens.create(count);
   }
 
   private CloudStorageOptions() {}
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java
@@ -117,7 +117,6 @@ public int read(ByteBuffer dst) throws IOException {
             innerOpen();
             continue;
           } else if ((exs.getCode() == 500 || exs.getCode() == 503)  && retries < maxRetries) {
-            // Retrying works in practice.
             retries++;
             sleepForAttempt(retries);
             continue;
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java b/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java
@@ -19,14 +19,14 @@
 import com.google.auto.value.AutoValue;
 
 @AutoValue
-abstract class OptionMaxChannelReopen implements CloudStorageOption.OpenCopy {
+abstract class OptionMaxChannelReopens implements CloudStorageOption.OpenCopy {
 
   /**
    * Re-open the channel if it's closed unexpectedly while we're reading it.
    */
-  static OptionMaxChannelReopen create(int retryCount) {
-    return new AutoValue_OptionMaxChannelReopen(retryCount);
+  static OptionMaxChannelReopens create(int retryCount) {
+    return new AutoValue_OptionMaxChannelReopens(retryCount);
   }
 
-  abstract int maxChannelReopen();
+  abstract int maxChannelReopens();
 }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public static CloudStorageOption.OpenCopy withBlockSize(int size) {`
`98`	`98`	`* <p>The default is 0.`
`99`	`99`	`*/`
`100`	`100`	`public static CloudStorageOption.OpenCopy withChannelReopen(int count) {`
`101`		`- return OptionMaxChannelReopen.create(count);`
	`101`	`+ return OptionMaxChannelReopens.create(count);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`private CloudStorageOptions() {}`