[pulsar] branch master updated: [pulsar-io] Remove unused annotation (#4303)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new f0a33c4  [pulsar-io] Remove unused annotation (#4303)
f0a33c4 is described below

commit f0a33c4630c8d0cfeef0b7829c9b43fec3eb5997
Author: Like <ke...@outlook.com>
AuthorDate: Tue May 21 22:31:58 2019 +0800

    [pulsar-io] Remove unused annotation (#4303)
    
    * Remove unused annotation
    
    * Use try-resource management
---
 .../java/org/apache/pulsar/io/file/utils/GZipFiles.java    |  3 +--
 .../java/org/apache/pulsar/io/file/utils/ZipFiles.java     | 14 ++------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
index aa38356..0a31e31 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/GZipFiles.java
@@ -43,8 +43,7 @@ public class GZipFiles {
     /**
      * Returns true if the given file is a gzip file.
      */
-   @SuppressWarnings("deprecation")
-   public static boolean isGzip(File f) {
+    public static boolean isGzip(File f) {
 
        InputStream input = null;
         try {
diff --git a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
index 09cd0c2..367b04e 100644
--- a/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
+++ b/pulsar-io/file/src/main/java/org/apache/pulsar/io/file/utils/ZipFiles.java
@@ -25,7 +25,6 @@ import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -33,8 +32,6 @@ import java.nio.file.Path;
 import java.util.stream.Stream;
 import java.util.zip.ZipInputStream;
 
-import org.apache.commons.io.IOUtils;
-
 /**
  * Helper class that provides helper methods for working with
  * zip-formatted files.
@@ -44,19 +41,12 @@ public class ZipFiles {
     /**
      * Returns true if the given file is a gzip file.
      */
-   @SuppressWarnings("deprecation")
-   public static boolean isZip(File f) {
-
-       InputStream input = null;
-        try {
-            DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(f)));
+    public static boolean isZip(File f) {
+        try (DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(f)))){
             int test = in.readInt();
-            in.close();
             return test == 0x504b0304;
         } catch (final Exception e) {
             return false;
-        } finally {
-            IOUtils.closeQuietly(input);
         }
     }