Merge pull request #1867 from hazendaz/copyright

[cleanup] Simplify code based on PR #1652

Author: hazendaz

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

@@ -486,12 +486,7 @@ private SqlSource getSqlSourceFromAnnotations(Method method, Class<?> parameterT
   }
 
   private SqlSource buildSqlSourceFromStrings(String[] strings, Class<?> parameterTypeClass, LanguageDriver languageDriver) {
-    final StringBuilder sql = new StringBuilder();
-    for (String fragment : strings) {
-      sql.append(fragment);
-      sql.append(" ");
-    }
-    return languageDriver.createSqlSource(configuration, sql.toString().trim(), parameterTypeClass);
+    return languageDriver.createSqlSource(configuration, String.join(" ", strings).trim(), parameterTypeClass);
   }
 
   private SqlCommandType getSqlCommandType(Method method) {

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

@@ -18,6 +18,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -393,8 +394,8 @@ private ResultMapping buildResultMappingFromContext(XNode context, Class<?> resu
   }
 
   private String processNestedResultMappings(XNode context, List<ResultMapping> resultMappings, Class<?> enclosingType) {
-    if (("association".equals(context.getName()) || "collection".equals(context.getName())
-        || "case".equals(context.getName())) && context.getStringAttribute("select") == null) {
+    if (Arrays.asList("association", "collection", "case").contains(context.getName())
+        && context.getStringAttribute("select") == null) {
       validateCollection(context, enclosingType);
       ResultMap resultMap = resultMapElement(context, resultMappings, enclosingType);
       return resultMap.getId();