keep the code style consistent with Maves in BaseBuilder

Author: ct

src/main/java/org/apache/ibatis/builder/BaseBuilder.java

@@ -64,56 +64,41 @@ protected Set<String> stringSetValueOf(String value, String defaultValue) {
   }
 
   protected JdbcType resolveJdbcType(String alias) {
-    if (alias == null) {
-      return null;
-    }
     try {
-      return JdbcType.valueOf(alias);
+      return alias == null ? null : JdbcType.valueOf(alias);
     } catch (IllegalArgumentException e) {
       throw new BuilderException("Error resolving JdbcType. Cause: " + e, e);
     }
   }
 
   protected ResultSetType resolveResultSetType(String alias) {
-    if (alias == null) {
-      return null;
-    }
     try {
-      return ResultSetType.valueOf(alias);
+      return alias == null ? null : ResultSetType.valueOf(alias);
     } catch (IllegalArgumentException e) {
       throw new BuilderException("Error resolving ResultSetType. Cause: " + e, e);
     }
   }
 
   protected ParameterMode resolveParameterMode(String alias) {
-    if (alias == null) {
-      return null;
-    }
     try {
-      return ParameterMode.valueOf(alias);
+      return alias == null ? null : ParameterMode.valueOf(alias);
     } catch (IllegalArgumentException e) {
       throw new BuilderException("Error resolving ParameterMode. Cause: " + e, e);
     }
   }
 
   protected Object createInstance(String alias) {
     Class<?> clazz = resolveClass(alias);
-    if (clazz == null) {
-      return null;
-    }
     try {
-      return clazz.getDeclaredConstructor().newInstance();
+      return clazz == null ? null : clazz.getDeclaredConstructor().newInstance();
     } catch (Exception e) {
       throw new BuilderException("Error creating instance. Cause: " + e, e);
     }
   }
 
   protected <T> Class<? extends T> resolveClass(String alias) {
-    if (alias == null) {
-      return null;
-    }
     try {
-      return resolveAlias(alias);
+      return alias == null ? null : resolveAlias(alias);
     } catch (Exception e) {
       throw new BuilderException("Error resolving class. Cause: " + e, e);
     }
@@ -139,11 +124,8 @@ protected TypeHandler<?> resolveTypeHandler(Class<?> javaType, Class<? extends T
     }
     // javaType ignored for injected handlers see issue #746 for full detail
     TypeHandler<?> handler = typeHandlerRegistry.getMappingTypeHandler(typeHandlerType);
-    if (handler == null) {
-      // not in registry, create a new one
-      handler = typeHandlerRegistry.getInstance(javaType, typeHandlerType);
-    }
-    return handler;
+    // if handler not in registry, create a new one, otherwise return directly
+    return handler == null ? typeHandlerRegistry.getInstance(javaType, typeHandlerType) : handler;
   }
 
   protected <T> Class<? extends T> resolveAlias(String alias) {

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

@@ -152,7 +152,7 @@ private Properties settingsAsProperties(XNode context) {
 
   private void loadCustomVfs(Properties props) throws ClassNotFoundException {
     String value = props.getProperty("vfsImpl");
-    if(value == null) {
+    if (value == null) {
       return;
     }
     String[] clazzes = value.split(",");
@@ -171,7 +171,7 @@ private void loadCustomLogImpl(Properties props) {
   }
 
   private void typeAliasesElement(XNode context) {
-    if(context == null) {
+    if (context == null) {
       return;
     }
     for (XNode child : context.getChildren()) {
@@ -200,7 +200,8 @@ private void pluginElement(XNode context) throws Exception {
       for (XNode child : context.getChildren()) {
         String interceptor = child.getStringAttribute("interceptor");
         Properties properties = child.getChildrenAsProperties();
-        Interceptor interceptorInstance = (Interceptor) resolveClass(interceptor).getDeclaredConstructor().newInstance();
+        Interceptor interceptorInstance = (Interceptor) resolveClass(interceptor).getDeclaredConstructor()
+            .newInstance();
         interceptorInstance.setProperties(properties);
         configuration.addInterceptor(interceptorInstance);
       }
@@ -234,7 +235,7 @@ private void reflectorFactoryElement(XNode context) throws Exception {
   }
 
   private void propertiesElement(XNode context) throws Exception {
-    if(context == null) {
+    if (context == null) {
       return;
     }
     Properties defaults = context.getChildrenAsProperties();