Introduce a type mapping

Detect the type of the Array from the component type of the Object[] that's passed in as parameter.

Only regular Java types are mapped - for mapping interface types like java.sql.Clob etc. users would have to override the resolveTypeName() method.

Author: dirk-olmes

src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java

@@ -15,18 +15,63 @@
  */
 package org.apache.ibatis.type;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
 import java.sql.Array;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.util.Calendar;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Clinton Begin
  */
 public class ArrayTypeHandler extends BaseTypeHandler<Object> {
 
+  private static final ConcurrentHashMap<Class<?>, String> STANDARD_MAPPING;
+  static {
+    STANDARD_MAPPING = new ConcurrentHashMap<>();
+    STANDARD_MAPPING.put(BigDecimal.class, "NUMERIC");
+    STANDARD_MAPPING.put(BigInteger.class, "BIGINT");
+    STANDARD_MAPPING.put(boolean.class, "BOOLEAN");
+    STANDARD_MAPPING.put(Boolean.class, "BOOLEAN");
+    STANDARD_MAPPING.put(byte[].class, "VARBINARY");
+    STANDARD_MAPPING.put(byte.class, "TINYINT");
+    STANDARD_MAPPING.put(Byte.class, "TINYINT");
+    STANDARD_MAPPING.put(Calendar.class, "TIMESTAMP");
+    STANDARD_MAPPING.put(java.sql.Date.class, "DATE");
+    STANDARD_MAPPING.put(java.util.Date.class, "TIMESTAMP");
+    STANDARD_MAPPING.put(double.class, "DOUBLE");
+    STANDARD_MAPPING.put(Double.class, "DOUBLE");
+    STANDARD_MAPPING.put(float.class, "REAL");
+    STANDARD_MAPPING.put(Float.class, "REAL");
+    STANDARD_MAPPING.put(int.class, "INTEGER");
+    STANDARD_MAPPING.put(Integer.class, "INTEGER");
+    STANDARD_MAPPING.put(LocalDate.class, "DATE");
+    STANDARD_MAPPING.put(LocalDateTime.class, "TIMESTAMP");
+    STANDARD_MAPPING.put(LocalTime.class, "TIME");
+    STANDARD_MAPPING.put(long.class, "BIGINT");
+    STANDARD_MAPPING.put(Long.class, "BIGINT");
+    STANDARD_MAPPING.put(OffsetDateTime.class, "TIMESTAMP_WITH_TIMEZONE");
+    STANDARD_MAPPING.put(OffsetTime.class, "TIME_WITH_TIMEZONE");
+    STANDARD_MAPPING.put(Short.class, "SMALLINT");
+    STANDARD_MAPPING.put(String.class, "VARCHAR");
+    STANDARD_MAPPING.put(Time.class, "TIME");
+    STANDARD_MAPPING.put(Timestamp.class, "TIMESTAMP");
+    STANDARD_MAPPING.put(URL.class, "DATALINK");
+  };
+  
   public ArrayTypeHandler() {
     super();
   }
@@ -38,23 +83,26 @@ protected void setNullParameter(PreparedStatement ps, int i, JdbcType jdbcType)
 
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException {
-    Array array = null;
     if (parameter instanceof Array) {
       // it's the user's responsibility to properly free() the Array instance
       ps.setArray(i, (Array)parameter);
-      
     }
     else {
       if (!parameter.getClass().isArray()) {
         throw new TypeException("ArrayType Handler requires SQL array or java array parameter and does not support type " + parameter.getClass());
       }
-      Object[] values = (Object[])parameter;
-      array = ps.getConnection().createArrayOf(jdbcType.name(), values);
+      Class<?> componentType = parameter.getClass().getComponentType();
+      String arrayTypeName = resolveTypeName(componentType);
+      Array array = ps.getConnection().createArrayOf(arrayTypeName, (Object[])parameter);
       ps.setArray(i, array);
       array.free();
     }
   }
 
+  protected String resolveTypeName(Class<?> type) {
+    return STANDARD_MAPPING.getOrDefault(type, "JAVA_OBJECT");
+  }
+  
   @Override
   public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
     return extractArray(rs.getArray(columnName));

src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java

@@ -18,12 +18,17 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
+
 import java.sql.Array;
+import java.sql.Connection;
 import java.sql.Types;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -40,6 +45,19 @@ public void shouldSetParameter() throws Exception {
     TYPE_HANDLER.setParameter(ps, 1, mockArray, null);
     verify(ps).setArray(1, mockArray);
   }
+  
+  @Test
+  public void shouldSetStringArrayParameter() throws Exception {
+    Connection connection = mock(Connection.class);
+    when(ps.getConnection()).thenReturn(connection);
+    
+    Array array = mock(Array.class);
+    when(connection.createArrayOf(anyString(), any(String[].class))).thenReturn(array);
+    
+    TYPE_HANDLER.setParameter(ps, 1, new String[] { "Hello World" }, JdbcType.ARRAY);
+    verify(ps).setArray(1, array);
+    verify(array).free();
+  }
 
   @Test
   public void shouldSetNullParameter() throws Exception {