Merge pull request #1629 from kazuki43zoo/fix-some-sonar-report

Fix some sonar reports

Author: kazuki43zoo

src/main/java/org/apache/ibatis/cache/CacheKey.java

@@ -29,7 +29,16 @@ public class CacheKey implements Cloneable, Serializable {
 
   private static final long serialVersionUID = 1146682552656046210L;
 
-  public static final CacheKey NULL_CACHE_KEY = new NullCacheKey();
+  public static final CacheKey NULL_CACHE_KEY = new CacheKey(){
+    @Override
+    public void update(Object object) {
+      throw new CacheException("Not allowed to update a null cache key instance.");
+    }
+    @Override
+    public void updateAll(Object[] objects) {
+      throw new CacheException("Not allowed to update a null cache key instance.");
+    }
+  };
 
   private static final int DEFAULT_MULTIPLYER = 37;
   private static final int DEFAULT_HASHCODE = 17;

src/main/java/org/apache/ibatis/cache/NullCacheKey.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2019 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.
@@ -17,7 +17,9 @@
 
 /**
  * @author Clinton Begin
+ * @deprecated Since 3.5.3, This class never used and will be removed future version.
  */
+@Deprecated
 public final class NullCacheKey extends CacheKey {
 
   private static final long serialVersionUID = 3704229911977019465L;

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

@@ -95,19 +95,19 @@ public List<String> list(URL url, String path) throws IOException {
              * then we assume the current resource is not a directory.
              */
             is = url.openStream();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
             List<String> lines = new ArrayList<>();
-            for (String line; (line = reader.readLine()) != null;) {
-              if (log.isDebugEnabled()) {
-                log.debug("Reader entry: " + line);
-              }
-              lines.add(line);
-              if (getResources(path + "/" + line).isEmpty()) {
-                lines.clear();
-                break;
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+              for (String line; (line = reader.readLine()) != null;) {
+                if (log.isDebugEnabled()) {
+                  log.debug("Reader entry: " + line);
+                }
+                lines.add(line);
+                if (getResources(path + "/" + line).isEmpty()) {
+                  lines.clear();
+                  break;
+                }
               }
             }
-
             if (!lines.isEmpty()) {
               if (log.isDebugEnabled()) {
                 log.debug("Listing " + url);
@@ -223,15 +223,17 @@ protected URL findJarForResource(URL url) throws MalformedURLException {
     }
 
     // If the file part of the URL is itself a URL, then that URL probably points to the JAR
-    try {
-      for (;;) {
+    boolean continueLoop = true;
+    while (continueLoop) {
+      try {
         url = new URL(url.getFile());
         if (log.isDebugEnabled()) {
           log.debug("Inner URL: " + url);
         }
+      } catch (MalformedURLException e) {
+        // This will happen at some point and serves as a break in the loop
+        continueLoop = false;
       }
-    } catch (MalformedURLException e) {
-      // This will happen at some point and serves as a break in the loop
     }
 
     // Look for the .jar extension and chop off everything after that

src/main/java/org/apache/ibatis/parsing/XPathParser.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -230,6 +231,7 @@ private Document createDocument(InputSource inputSource) {
     // important: this must only be called AFTER common constructor
     try {
       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+      factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
       factory.setValidating(validation);
 
       factory.setNamespaceAware(false);
@@ -253,6 +255,7 @@ public void fatalError(SAXParseException exception) throws SAXException {
 
         @Override
         public void warning(SAXParseException exception) throws SAXException {
+          // NOP
         }
       });
       return builder.parse(inputSource);