Merge pull request #3352 from hazendaz/next

Null safety, diamond operator, and lambda cleanup

Author: hazendaz

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

@@ -712,7 +712,7 @@ private void sqlClause(SafeAppendable builder, String keyword, List<String> part
         String last = "________";
         for (int i = 0, n = parts.size(); i < n; i++) {
           String part = parts.get(i);
-          if (i > 0 && !part.equals(AND) && !part.equals(OR) && !last.equals(AND) && !last.equals(OR)) {
+          if (i > 0 && !AND.equals(part) && !OR.equals(part) && !AND.equals(last) && !OR.equals(last)) {
             builder.append(conjunction);
           }
           builder.append(part);

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -106,7 +106,7 @@ void shouldSelectBlogWithPostsUsingSubSelect() {
   void shouldFindPostsInList() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class);
-      List<Post> posts = mapper.findPostsInList(new ArrayList<Integer>() {
+      List<Post> posts = mapper.findPostsInList(new ArrayList<>() {
         private static final long serialVersionUID = 1L;
         {
           add(1);
@@ -430,7 +430,7 @@ void shouldExecuteBoundSelectOneBlogStatementWithConstructorUsingXMLConfig() {
   void shouldSelectOneBlogAsMap() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-      Map<String, Object> blog = mapper.selectBlogAsMap(new HashMap<String, Object>() {
+      Map<String, Object> blog = mapper.selectBlogAsMap(new HashMap<>() {
         private static final long serialVersionUID = 1L;
         {
           put("id", 1);

src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java

@@ -42,9 +42,7 @@ class DataClass {
     List<Future<Object>> futures = new ArrayList<>();
     context.put("data", new DataClass());
     ExecutorService executor = Executors.newCachedThreadPool();
-    IntStream.range(0, run).forEach(i -> {
-      futures.add(executor.submit(() -> OgnlCache.getValue("data.id", context)));
-    });
+    IntStream.range(0, run).forEach(i -> futures.add(executor.submit(() -> OgnlCache.getValue("data.id", context))));
     for (int i = 0; i < run; i++) {
       assertNotNull(futures.get(i).get());
     }