Take CR comments

GoogleCloudDataproc · Sep 9, 2024 · 2349976 · 2349976
1 parent 16ff443
commit 2349976
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/gcs/src/main/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystem.java b/gcs/src/main/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystem.java
@@ -592,6 +592,13 @@ public FSDataInputStream open(Path hadoopPath, int bufferSize) throws IOExceptio
   public FSDataInputStream open(FileStatus status) throws IOException {
     logger.atFine().log("openWithStatus(%s)", status);
 
+    if (!GoogleHadoopFileStatus.class.isAssignableFrom(status.getClass())) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Expected status to be of type GoogleHadoopFileStatus, but found %s",
+              status.getClass()));
+    }
+
     GoogleHadoopFileStatus fileStatus = (GoogleHadoopFileStatus) status;
 
     checkPath(status.getPath());

diff --git a/gcs/src/test/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystemTest.java b/gcs/src/test/java/com/google/cloud/hadoop/fs/gcs/GoogleHadoopFileSystemTest.java
@@ -274,8 +274,7 @@ public void testTotalTimeStatistics() throws IOException {
   }
 
   @Test
-  @SuppressWarnings("CheckReturnValue")
-  public void testStatus() throws Exception {
+  public void testFileOpenWithStatus() throws Exception {
     URI bucketName = new URI("gs://read-test-bucket/");
     URI failureBucketName = new URI("gs://read-test-bucket-other/");
 
@@ -296,19 +295,31 @@ public void testStatus() throws Exception {
     GoogleHadoopFileStatus fileStatus =
         new GoogleHadoopFileStatus(
             fileInfo, new Path(fileInfo.getPath()), 1, 2, FsPermission.getFileDefault(), "foo");
-    new GoogleHadoopFileSystem();
-    GoogleHadoopFileSystem fs = new GoogleHadoopFileSystem();
-    fs.initialize(bucketName, new Configuration());
-    fs.open(fileStatus);
-
-    fs.initialize(failureBucketName, new Configuration());
-
-    IllegalArgumentException exception =
-        assertThrows(IllegalArgumentException.class, () -> fs.open(fileStatus));
-    assertThat(exception.getMessage())
-        .isEqualTo(
-            "Wrong bucket: read-test-bucket, in path: gs://read-test-bucket/bar/test/object, expected bucket: read-test-bucket-other");
-    fs.close();
+    try (GoogleHadoopFileSystem fs = new GoogleHadoopFileSystem()) {
+      fs.initialize(bucketName, new Configuration());
+      fs.open(fileStatus);
+
+      fs.initialize(failureBucketName, new Configuration());
+
+      IllegalArgumentException exception =
+          assertThrows(IllegalArgumentException.class, () -> fs.open(fileStatus));
+      assertThat(exception.getMessage())
+          .isEqualTo(
+              "Wrong bucket: read-test-bucket, in path: gs://read-test-bucket/bar/test/object, expected bucket: read-test-bucket-other");
+    }
+  }
+
+  @Test
+  public void testFileOpenWithStatusInvalidType() throws Exception {
+    try (GoogleHadoopFileSystem fs = new GoogleHadoopFileSystem()) {
+      fs.initialize(new URI("gs://read-test-bucket/"), new Configuration());
+
+      IllegalArgumentException exception =
+          assertThrows(IllegalArgumentException.class, () -> fs.open(new FileStatus()));
+      assertThat(exception.getMessage())
+          .isEqualTo(
+              "Expected status to be of type GoogleHadoopFileStatus, but found class org.apache.hadoop.fs.FileStatus");
+    }
   }
 
   // -----------------------------------------------------------------