Merge pull request #669 from mziccard/validate-open-exception

aozarov · aozarov · commit 119ccdffd11d · 2016-02-25T08:40:24.000-08:00
Make validateOpen throw ClosedChannelException
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseWriteChannel.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -114,9 +115,9 @@ private void flush() {
     }
   }
 
-  private void validateOpen() throws IOException {
+  private void validateOpen() throws ClosedChannelException {
     if (!isOpen) {
-      throw new IOException("stream is closed");
+      throw new ClosedChannelException();
     }
   }
 
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.util.Arrays;
 import java.util.Random;
 
@@ -102,8 +103,7 @@ public void testClose() throws IOException {
   @Test
   public void testValidateOpen() throws IOException {
     channel.close();
-    thrown.expect(IOException.class);
-    thrown.expectMessage("stream is closed");
+    thrown.expect(ClosedChannelException.class);
     channel.write(ByteBuffer.allocate(42));
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -55,7 +56,7 @@ class BlobReadChannel implements ReadChannel {
   private byte[] buffer;
 
   BlobReadChannel(StorageOptions serviceOptions, BlobId blob,
-                  Map<StorageRpc.Option, ?> requestOptions) {
+      Map<StorageRpc.Option, ?> requestOptions) {
     this.serviceOptions = serviceOptions;
     this.blob = blob;
     this.requestOptions = requestOptions;
@@ -91,9 +92,9 @@ public void close() {
     }
   }
 
-  private void validateOpen() throws IOException {
+  private void validateOpen() throws ClosedChannelException {
     if (!isOpen) {
-      throw new IOException("stream is closed");
+      throw new ClosedChannelException();
     }
   }
 
diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelTest.java
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Random;
@@ -156,15 +157,15 @@ public void testClose() {
   }
 
   @Test
-  public void testReadClosed() {
+  public void testReadClosed() throws IOException {
     replay(storageRpcMock);
     reader = new BlobReadChannel(options, BLOB_ID, EMPTY_RPC_OPTIONS);
     reader.close();
     try {
       ByteBuffer readBuffer = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
       reader.read(readBuffer);
-      fail("Expected BlobReadChannel read to throw IOException");
-    } catch (IOException ex) {
+      fail("Expected BlobReadChannel read to throw ClosedChannelException");
+    } catch (ClosedChannelException ex) {
       // expected
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import java.io.IOException;`
`22`	`22`	`import java.io.Serializable;`
`23`	`23`	`import java.nio.ByteBuffer;`
	`24`	`+import java.nio.channels.ClosedChannelException;`
`24`	`25`	`import java.util.Arrays;`
`25`	`26`	`import java.util.Objects;`
`26`	`27`
`@@ -114,9 +115,9 @@ private void flush() {`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`
`117`		`- private void validateOpen() throws IOException {`
	`118`	`+ private void validateOpen() throws ClosedChannelException {`
`118`	`119`	`if (!isOpen) {`
`119`		`- throw new IOException("stream is closed");`
	`120`	`+ throw new ClosedChannelException();`
`120`	`121`	`}`
`121`	`122`	`}`
`122`	`123`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import java.io.IOException;`
`30`	`30`	`import java.io.Serializable;`
`31`	`31`	`import java.nio.ByteBuffer;`
	`32`	`+import java.nio.channels.ClosedChannelException;`
`32`	`33`	`import java.util.Map;`
`33`	`34`	`import java.util.Objects;`
`34`	`35`	`import java.util.concurrent.Callable;`
`@@ -55,7 +56,7 @@ class BlobReadChannel implements ReadChannel {`
`55`	`56`	`private byte[] buffer;`
`56`	`57`
`57`	`58`	`BlobReadChannel(StorageOptions serviceOptions, BlobId blob,`
`58`		`- Map<StorageRpc.Option, ?> requestOptions) {`
	`59`	`+ Map<StorageRpc.Option, ?> requestOptions) {`
`59`	`60`	`this.serviceOptions = serviceOptions;`
`60`	`61`	`this.blob = blob;`
`61`	`62`	`this.requestOptions = requestOptions;`
`@@ -91,9 +92,9 @@ public void close() {`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`
`94`		`- private void validateOpen() throws IOException {`
	`95`	`+ private void validateOpen() throws ClosedChannelException {`
`95`	`96`	`if (!isOpen) {`
`96`		`- throw new IOException("stream is closed");`
	`97`	`+ throw new ClosedChannelException();`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`