Merge pull request #1863 from hazendaz/master

Various checkstyle formatting issues

Author: hazendaz

src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java

@@ -76,7 +76,7 @@ public ProviderSqlSource(Configuration configuration, Object provider) {
    */
   @Deprecated
   public ProviderSqlSource(Configuration configuration, Object provider, Class<?> mapperType, Method mapperMethod) {
-    this(configuration, (Annotation) provider , mapperType, mapperMethod);
+    this(configuration, (Annotation) provider, mapperType, mapperMethod);
   }
 
   /**
@@ -162,8 +162,8 @@ private SqlSource createSqlSource(Object parameterObject) {
       String sql;
       if (parameterObject instanceof Map) {
         int bindParameterCount = providerMethodParameterTypes.length - (providerContext == null ? 0 : 1);
-        if (bindParameterCount == 1 &&
-            (providerMethodParameterTypes[Integer.valueOf(0).equals(providerContextIndex) ? 1 : 0].isAssignableFrom(parameterObject.getClass()))) {
+        if (bindParameterCount == 1
+            && providerMethodParameterTypes[Integer.valueOf(0).equals(providerContextIndex) ? 1 : 0].isAssignableFrom(parameterObject.getClass())) {
           sql = invokeProviderMethod(extractProviderMethodArguments(parameterObject));
         } else {
           @SuppressWarnings("unchecked")

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

@@ -30,10 +30,12 @@ public class CacheKey implements Cloneable, Serializable {
   private static final long serialVersionUID = 1146682552656046210L;
 
   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.");

src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java

@@ -80,7 +80,7 @@ public List<JdbcType> getJdbcTypes() {
   }
 
   public JdbcType getJdbcType(String columnName) {
-    for (int i = 0 ; i < columnNames.size(); i++) {
+    for (int i = 0; i < columnNames.size(); i++) {
       if (columnNames.get(i).equalsIgnoreCase(columnName)) {
         return jdbcTypes.get(i);
       }

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

@@ -122,11 +122,11 @@ public List<String> list(URL url, String path) throws IOException {
           if ("file".equals(url.getProtocol())) {
             File file = new File(url.getFile());
             if (log.isDebugEnabled()) {
-                log.debug("Listing directory " + file.getAbsolutePath());
+              log.debug("Listing directory " + file.getAbsolutePath());
             }
             if (file.isDirectory()) {
               if (log.isDebugEnabled()) {
-                  log.debug("Listing " + url);
+                log.debug("Listing " + url);
               }
               children = Arrays.asList(file.list());
             }

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

@@ -289,8 +289,8 @@ protected void addIfMatching(Test test, String fqn) {
         matches.add((Class<T>) type);
       }
     } catch (Throwable t) {
-      log.warn("Could not examine class '" + fqn + "'" + " due to a " +
-          t.getClass().getName() + " with message: " + t.getMessage());
+      log.warn("Could not examine class '" + fqn + "'" + " due to a "
+          + t.getClass().getName() + " with message: " + t.getMessage());
     }
   }
 }

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

@@ -58,11 +58,9 @@ static VFS createVFS() {
         Class<? extends VFS> impl = impls.get(i);
         try {
           vfs = impl.getDeclaredConstructor().newInstance();
-          if (!vfs.isValid()) {
-            if (log.isDebugEnabled()) {
-              log.debug("VFS implementation " + impl.getName() +
-                  " is not valid in this environment.");
-            }
+          if (!vfs.isValid() && log.isDebugEnabled()) {
+            log.debug("VFS implementation " + impl.getName()
+                + " is not valid in this environment.");
           }
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
           log.error("Failed to instantiate " + impl, e);

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

@@ -52,7 +52,7 @@ public static String SQL() {
     try {
       return sql().toString();
     } finally {
-        RESET();
+      RESET();
     }
   }
 

src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java

@@ -39,6 +39,7 @@
 public class ArrayTypeHandler extends BaseTypeHandler<Object> {
 
   private static final ConcurrentHashMap<Class<?>, String> STANDARD_MAPPING;
+
   static {
     STANDARD_MAPPING = new ConcurrentHashMap<>();
     STANDARD_MAPPING.put(BigDecimal.class, JdbcType.NUMERIC.name());