Merge pull request #1858 from hazendaz/checkstyle

Checkstyle

Author: hazendaz

src/main/java/org/apache/ibatis/annotations/package-info.java

@@ -17,4 +17,3 @@
  * Contains all the annotation that are used in mapper interfaces.
  */
 package org.apache.ibatis.annotations;
-

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

@@ -46,18 +46,20 @@ public class ProviderSqlSource implements SqlSource {
   private final Integer providerContextIndex;
 
   /**
-   * @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)} instead of this.
    * This constructor will remove at a future version.
+   *
+   * @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)} instead of this.
    */
   @Deprecated
   public ProviderSqlSource(Configuration configuration, Object provider) {
     this(configuration, provider, null, null);
   }
 
   /**
+   * This constructor will remove at a future version.
+   *
    * @since 3.4.5
    * @deprecated Since 3.5.3, Please use the {@link #ProviderSqlSource(Configuration, Annotation, Class, Method)} instead of this.
-   * This constructor will remove at a future version.
    */
   @Deprecated
   public ProviderSqlSource(Configuration configuration, Object provider, Class<?> mapperType, Method mapperMethod) {
@@ -138,7 +140,7 @@ private SqlSource createSqlSource(Object parameterObject) {
       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()))) {
+            (providerMethodParameterTypes[Integer.valueOf(0).equals(providerContextIndex) ? 1 : 0].isAssignableFrom(parameterObject.getClass()))) {
           sql = invokeProviderMethod(extractProviderMethodArguments(parameterObject));
         } else {
           @SuppressWarnings("unchecked")

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -379,7 +379,7 @@ private ResultMapping buildResultMappingFromContext(XNode context, Class<?> resu
     String jdbcType = context.getStringAttribute("jdbcType");
     String nestedSelect = context.getStringAttribute("select");
     String nestedResultMap = context.getStringAttribute("resultMap", () ->
-      processNestedResultMappings(context, Collections.emptyList(), resultType));
+        processNestedResultMappings(context, Collections.emptyList(), resultType));
     String notNullColumn = context.getStringAttribute("notNullColumn");
     String columnPrefix = context.getStringAttribute("columnPrefix");
     String typeHandler = context.getStringAttribute("typeHandler");

src/main/java/org/apache/ibatis/executor/ErrorContext.java

@@ -35,7 +35,7 @@ private ErrorContext() {
   }
 
   public static ErrorContext instance() {
-   return LOCAL.get();
+    return LOCAL.get();
   }
 
   public ErrorContext store() {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 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.
@@ -69,8 +69,8 @@ public static void setDefaultClassLoader(ClassLoader defaultClassLoader) {
    * @throws java.io.IOException If the resource cannot be found or read
    */
   public static URL getResourceURL(String resource) throws IOException {
-      // issue #625
-      return getResourceURL(null, resource);
+    // issue #625
+    return getResourceURL(null, resource);
   }
 
   /**

src/main/java/org/apache/ibatis/io/VFS.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.
@@ -102,7 +102,7 @@ public static void addImplClass(Class<? extends VFS> clazz) {
   protected static Class<?> getClass(String className) {
     try {
       return Thread.currentThread().getContextClassLoader().loadClass(className);
-//      return ReflectUtil.findClass(className);
+      // return ReflectUtil.findClass(className);
     } catch (ClassNotFoundException e) {
       if (log.isDebugEnabled()) {
         log.debug("Class not found: " + className);

src/main/java/org/apache/ibatis/jdbc/AbstractSQL.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.
@@ -395,20 +395,20 @@ public String toString() {
   }
 
   private static class SafeAppendable {
-    private final Appendable a;
+    private final Appendable appendable;
     private boolean empty = true;
 
     public SafeAppendable(Appendable a) {
       super();
-      this.a = a;
+      this.appendable = a;
     }
 
     public SafeAppendable append(CharSequence s) {
       try {
         if (empty && s.length() > 0) {
           empty = false;
         }
-        a.append(s);
+        appendable.append(s);
       } catch (IOException e) {
         throw new RuntimeException(e);
       }

src/main/java/org/apache/ibatis/logging/LogFactory.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.
@@ -43,8 +43,8 @@ private LogFactory() {
     // disable construction
   }
 
-  public static Log getLog(Class<?> aClass) {
-    return getLog(aClass.getName());
+  public static Log getLog(Class<?> clazz) {
+    return getLog(clazz.getName());
   }
 
   public static Log getLog(String logger) {

src/main/java/org/apache/ibatis/session/Configuration.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.
@@ -971,7 +971,7 @@ public V get(Object key) {
     }
 
     protected static class Ambiguity {
-      final private String subject;
+      private final String subject;
 
       public Ambiguity(String subject) {
         this.subject = subject;