Fixed the problem that when the jdbc type is Array and Array.free() is called, the log parameter printed by BaseJdbcLogger is null.

Author: smagical

src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java

@@ -15,23 +15,17 @@
  */
 package org.apache.ibatis.logging.jdbc;
 
+import org.apache.ibatis.builder.SqlSourceBuilder;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.reflection.ArrayUtil;
+
 import java.lang.reflect.Method;
 import java.sql.Array;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import org.apache.ibatis.builder.SqlSourceBuilder;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.reflection.ArrayUtil;
-
 /**
  * Base class for proxies to do logging.
  *
@@ -75,9 +69,16 @@ public BaseJdbcLogger(Log log, int queryStack) {
   }
 
   protected void setColumn(Object key, Object value) {
-    columnMap.put(key, value);
+    Object tempValue = value;
+    if (tempValue!=null && tempValue instanceof Array){
+      try {
+        tempValue = ((Array)value).getArray();
+      } catch (SQLException e) {
+      }
+    }
+    columnMap.put(key, tempValue);
     columnNames.add(key);
-    columnValues.add(value);
+    columnValues.add(tempValue);
   }
 
   protected Object getColumn(Object key) {
@@ -90,7 +91,10 @@ protected String getParameterValueString() {
       if (value == null) {
         typeList.add("null");
       } else {
-        typeList.add(objectValueString(value) + "(" + value.getClass().getSimpleName() + ")");
+        typeList.add(objectValueString(value) +
+          "(" + (value.getClass().isArray() ?
+          Array.class.getSimpleName():value.getClass().getSimpleName()) + ")"
+        );
       }
     }
     final String parameters = typeList.toString();
@@ -104,6 +108,8 @@ protected String objectValueString(Object value) {
       } catch (SQLException e) {
         // Intentialy fall through to return value.toString()
       }
+    }else if (value.getClass().isArray()){
+      return ArrayUtil.toString(value);
     }
     return value.toString();
   }

src/test/java/org/apache/ibatis/logging/jdbc/BaseJdbcLoggerTest.java

@@ -15,24 +15,25 @@
  */
 package org.apache.ibatis.logging.jdbc;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.sql.Array;
-
 import org.apache.ibatis.logging.Log;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.sql.Array;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
 @ExtendWith(MockitoExtension.class)
 class BaseJdbcLoggerTest {
 
   @Mock
   Log log;
-  @Mock
+  @Mock(strictness = Mock.Strictness.LENIENT)
   Array array;
   private BaseJdbcLogger logger;
 
@@ -55,4 +56,18 @@ void shouldDescribeObjectArrayParameter() throws Exception {
     when(array.getArray()).thenReturn(new String[] { "one", "two", "three" });
     assertThat(logger.getParameterValueString()).startsWith("[one, two, three]");
   }
+
+  @Test
+  void shouldDescribeObjectArrayCallFreeParameter() throws Exception {
+
+    when(array.getArray()).thenReturn(new String[] { "one", "two", "three" });
+    logger.setColumn("1", array);
+    doAnswer(e->{
+      when(array.getArray()).thenReturn(null);
+      return null;
+    }).when(array).free();
+    array.free();
+    assertThat(logger.getParameterValueString()).startsWith("[one, two, three]");
+
+  }
 }