Merge pull request #2078 from nothingzhl/code_optimization

Code optimization

Author: harawata

src/main/java/org/apache/ibatis/io/DefaultVFS.java

@@ -329,9 +329,7 @@ protected boolean isJar(URL url) {
    * @return true, if is jar
    */
   protected boolean isJar(URL url, byte[] buffer) {
-    InputStream is = null;
-    try {
-      is = url.openStream();
+    try (InputStream is = url.openStream()) {
       is.read(buffer, 0, JAR_MAGIC.length);
       if (Arrays.equals(buffer, JAR_MAGIC)) {
         if (log.isDebugEnabled()) {
@@ -341,14 +339,6 @@ protected boolean isJar(URL url, byte[] buffer) {
       }
     } catch (Exception e) {
       // Failure to read the stream means this is not a JAR
-    } finally {
-      if (is != null) {
-        try {
-          is.close();
-        } catch (Exception e) {
-          // Ignore
-        }
-      }
     }
 
     return false;

src/main/java/org/apache/ibatis/io/ResolverUtil.java

@@ -37,8 +37,7 @@
  * by calling {@link #setClassLoader(ClassLoader)} prior to invoking any of the {@code find()}
  * methods.</p>
  *
- * <p>General searches are initiated by calling the
- * {@link #find(org.apache.ibatis.io.ResolverUtil.Test, String)} ()} method and supplying
+ * <p>General searches are initiated by calling the {@link #find(Test, String)} and supplying
  * a package name and a Test instance. This will cause the named package <b>and all sub-packages</b>
  * to be scanned for classes that meet the test. There are also utility methods for the common
  * use cases of scanning multiple packages for extensions of particular classes, or classes

src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java

@@ -238,8 +238,7 @@ private boolean commandReadyToExecute(String trimmedLine) {
   }
 
   private void executeStatement(String command) throws SQLException {
-    Statement statement = connection.createStatement();
-    try {
+    try (Statement statement = connection.createStatement()) {
       statement.setEscapeProcessing(escapeProcessing);
       String sql = command;
       if (removeCRs) {
@@ -262,13 +261,6 @@ private void executeStatement(String command) throws SQLException {
           printlnError(message);
         }
       }
-    } finally {
-      try {
-        statement.close();
-      } catch (Exception ignored) {
-        // Ignore to workaround a bug in some connection pools
-        // (Does anyone know the details of the bug?)
-      }
     }
   }
 

src/main/java/org/apache/ibatis/jdbc/SqlRunner.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -77,16 +77,10 @@ public Map<String, Object> selectOne(String sql, Object... args) throws SQLExcep
    * @throws SQLException If statement preparation or execution fails
    */
   public List<Map<String, Object>> selectAll(String sql, Object... args) throws SQLException {
-    PreparedStatement ps = connection.prepareStatement(sql);
-    try {
+    try (PreparedStatement ps = connection.prepareStatement(sql)) {
       setParameters(ps, args);
-      ResultSet rs = ps.executeQuery();
-      return getResults(rs);
-    } finally {
-      try {
-        ps.close();
-      } catch (SQLException e) {
-        //ignore
+      try (ResultSet rs = ps.executeQuery()) {
+        return getResults(rs);
       }
     }
   }
@@ -111,17 +105,19 @@ public int insert(String sql, Object... args) throws SQLException {
       setParameters(ps, args);
       ps.executeUpdate();
       if (useGeneratedKeySupport) {
-        List<Map<String, Object>> keys = getResults(ps.getGeneratedKeys());
-        if (keys.size() == 1) {
-          Map<String, Object> key = keys.get(0);
-          Iterator<Object> i = key.values().iterator();
-          if (i.hasNext()) {
-            Object genkey = i.next();
-            if (genkey != null) {
-              try {
-                return Integer.parseInt(genkey.toString());
-              } catch (NumberFormatException e) {
-                //ignore, no numeric key support
+        try (ResultSet generatedKeys = ps.getGeneratedKeys()) {
+          List<Map<String, Object>> keys = getResults(generatedKeys);
+          if (keys.size() == 1) {
+            Map<String, Object> key = keys.get(0);
+            Iterator<Object> i = key.values().iterator();
+            if (i.hasNext()) {
+              Object genkey = i.next();
+              if (genkey != null) {
+                try {
+                  return Integer.parseInt(genkey.toString());
+                } catch (NumberFormatException e) {
+                  //ignore, no numeric key support
+                }
               }
             }
           }
@@ -146,16 +142,9 @@ public int insert(String sql, Object... args) throws SQLException {
    * @throws SQLException If statement preparation or execution fails
    */
   public int update(String sql, Object... args) throws SQLException {
-    PreparedStatement ps = connection.prepareStatement(sql);
-    try {
+    try (PreparedStatement ps = connection.prepareStatement(sql)) {
       setParameters(ps, args);
       return ps.executeUpdate();
-    } finally {
-      try {
-        ps.close();
-      } catch (SQLException e) {
-        //ignore
-      }
     }
   }
 
@@ -179,15 +168,8 @@ public int delete(String sql, Object... args) throws SQLException {
    * @throws SQLException If statement preparation or execution fails
    */
   public void run(String sql) throws SQLException {
-    Statement stmt = connection.createStatement();
-    try {
+    try (Statement stmt = connection.createStatement()) {
       stmt.execute(sql);
-    } finally {
-      try {
-        stmt.close();
-      } catch (SQLException e) {
-        //ignore
-      }
     }
   }
 
@@ -221,43 +203,33 @@ private void setParameters(PreparedStatement ps, Object... args) throws SQLExcep
   }
 
   private List<Map<String, Object>> getResults(ResultSet rs) throws SQLException {
-    try {
-      List<Map<String, Object>> list = new ArrayList<>();
-      List<String> columns = new ArrayList<>();
-      List<TypeHandler<?>> typeHandlers = new ArrayList<>();
-      ResultSetMetaData rsmd = rs.getMetaData();
-      for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
-        columns.add(rsmd.getColumnLabel(i + 1));
-        try {
-          Class<?> type = Resources.classForName(rsmd.getColumnClassName(i + 1));
-          TypeHandler<?> typeHandler = typeHandlerRegistry.getTypeHandler(type);
-          if (typeHandler == null) {
-            typeHandler = typeHandlerRegistry.getTypeHandler(Object.class);
-          }
-          typeHandlers.add(typeHandler);
-        } catch (Exception e) {
-          typeHandlers.add(typeHandlerRegistry.getTypeHandler(Object.class));
-        }
-      }
-      while (rs.next()) {
-        Map<String, Object> row = new HashMap<>();
-        for (int i = 0, n = columns.size(); i < n; i++) {
-          String name = columns.get(i);
-          TypeHandler<?> handler = typeHandlers.get(i);
-          row.put(name.toUpperCase(Locale.ENGLISH), handler.getResult(rs, name));
+    List<Map<String, Object>> list = new ArrayList<>();
+    List<String> columns = new ArrayList<>();
+    List<TypeHandler<?>> typeHandlers = new ArrayList<>();
+    ResultSetMetaData rsmd = rs.getMetaData();
+    for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
+      columns.add(rsmd.getColumnLabel(i + 1));
+      try {
+        Class<?> type = Resources.classForName(rsmd.getColumnClassName(i + 1));
+        TypeHandler<?> typeHandler = typeHandlerRegistry.getTypeHandler(type);
+        if (typeHandler == null) {
+          typeHandler = typeHandlerRegistry.getTypeHandler(Object.class);
         }
-        list.add(row);
+        typeHandlers.add(typeHandler);
+      } catch (Exception e) {
+        typeHandlers.add(typeHandlerRegistry.getTypeHandler(Object.class));
       }
-      return list;
-    } finally {
-      if (rs != null) {
-        try {
-          rs.close();
-        } catch (Exception e) {
-          // ignore
-        }
+    }
+    while (rs.next()) {
+      Map<String, Object> row = new HashMap<>();
+      for (int i = 0, n = columns.size(); i < n; i++) {
+        String name = columns.get(i);
+        TypeHandler<?> handler = typeHandlers.get(i);
+        row.put(name.toUpperCase(Locale.ENGLISH), handler.getResult(rs, name));
       }
+      list.add(row);
     }
+    return list;
   }
 
 }