From 33e86a97bf0791b88a2f71fad2de7d54d374d9f6 Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Fri, 13 Mar 2020 13:02:51 +0800
Subject: [PATCH] Adapting partial code(file name start with I) to the sonar
 cloud rule (#2155)

---
 .../common/utils/IOUtils.java                 | 19 +++++--------------
 .../common/utils/IpUtils.java                 |  5 -----
 .../common/utils/IpUtilsTest.java             |  6 +++---
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IOUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IOUtils.java
index 73df158aa3..ce551d8405 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IOUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IOUtils.java
@@ -19,26 +19,17 @@
 package org.apache.dolphinscheduler.common.utils;
 
 
+import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 
 public class IOUtils {
 
-    public static void closeQuietly(InputStream fis){
-        if(fis != null){
+    public static void closeQuietly(Closeable closeable){
+        if(closeable != null){
             try {
-                fis.close();
-            } catch (IOException ignore) {
-            }
-        }
-    }
-
-    public static void closeQuietly(InputStreamReader reader){
-        if(reader != null){
-            try {
-                reader.close();
+                closeable.close();
             } catch (IOException ignore) {
+                // nothing need to do
             }
         }
     }
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java
index e7e0b34bdd..3b068c60d2 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java
@@ -17,16 +17,11 @@
 package org.apache.dolphinscheduler.common.utils;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
 /**
  * http utils
  */
 public class IpUtils {
 
-  private static final Logger logger = LoggerFactory.getLogger(IpUtils.class);
   public static final String DOT = ".";
 
   /**
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java
index e65bcd219b..ec6ffa35a7 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java
@@ -29,13 +29,13 @@ public class IpUtilsTest {
         long longNumber = IpUtils.ipToLong(ip);
         long longNumber2 = IpUtils.ipToLong(ip2);
         System.out.println(longNumber);
-        Assert.assertEquals(longNumber, 3232263681L);
-        Assert.assertEquals(longNumber2, 0L);
+        Assert.assertEquals(3232263681L, longNumber);
+        Assert.assertEquals(0L, longNumber2);
 
         String ip3 = "255.255.255.255";
         long longNumber3 = IpUtils.ipToLong(ip3);
         System.out.println(longNumber3);
-        Assert.assertEquals(longNumber3, 4294967295L);
+        Assert.assertEquals(4294967295L, longNumber3);
 
     }