Refactor mybatisboost.json

Author: zhangrongfan

mybatis-boost-core/src/main/java/cn/mybatisboost/json/JsonResultSetsHandler.java

@@ -1,43 +1,45 @@
 package cn.mybatisboost.json;
 
+import cn.mybatisboost.util.ReflectionUtils;
+import cn.mybatisboost.util.function.UncheckedFunction;
 import org.apache.ibatis.executor.resultset.ResultSetHandler;
 import org.apache.ibatis.plugin.*;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
 import java.sql.Statement;
-import java.util.*;
+import java.util.List;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
 
 @Intercepts(@Signature(type = ResultSetHandler.class, method = "handleResultSets", args = Statement.class))
 public class JsonResultSetsHandler implements Interceptor {
 
-    private ConcurrentMap<Class<?>, List<Field>> fieldCache = new ConcurrentHashMap<>();
+    private ConcurrentMap<String, Field> fieldCache = new ConcurrentHashMap<>();
 
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
-        List<?> proceed = (List<?>) invocation.proceed();
-        if (proceed.isEmpty()) return proceed;
-
-        Class<?> type = proceed.get(0).getClass();
-        List<Field> fields = fieldCache.computeIfAbsent(type,
-                key -> Collections.unmodifiableList(Arrays.stream(type.getDeclaredFields())
-                        .filter(it -> it.getType() == Optional.class)
-                        .peek(it -> it.setAccessible(true)).collect(Collectors.toList())));
-        if (fields.isEmpty()) return proceed;
-
-        for (Object object : proceed) {
-            for (Field field : fields) {
-                Object value = ((Optional<?>) field.get(object)).orElse(null);
-                if (value instanceof String) {
-                    field.set(object, Optional.of(JsonTypeHandler.objectMapper.readValue((String) value,
-                            (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0])));
+        try {
+            List<?> proceed = (List<?>) invocation.proceed();
+            List<String> properties = JsonTypeHandler.tlProperties.get();
+            if (proceed.isEmpty() || properties.isEmpty()) return proceed;
+
+            Class<?> type = proceed.get(0).getClass();
+            List<String> results = JsonTypeHandler.tlResults.get();
+            for (int i = 0; i < results.size(); i++) {
+                String content = results.get(i);
+                if (content != null) {
+                    Field field = fieldCache.computeIfAbsent(properties.get(i % properties.size()),
+                            UncheckedFunction.of(key -> ReflectionUtils.makeAccessible(type.getDeclaredField(key))));
+                    field.set(proceed.get(i / properties.size()),
+                            JsonTypeHandler.objectMapper.readValue(content, field.getType()));
                 }
             }
+            return proceed;
+        } finally {
+            JsonTypeHandler.tlProperties.remove();
+            JsonTypeHandler.tlResults.remove();
         }
-        return proceed;
     }
 
     @Override

mybatis-boost-core/src/main/java/cn/mybatisboost/json/JsonTypeHandler.java

@@ -1,49 +1,60 @@
 package cn.mybatisboost.json;
 
+import cn.mybatisboost.support.Bean;
+import cn.mybatisboost.util.PropertyUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedTypes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Optional;
+import java.util.ArrayList;
+import java.util.List;
 
-@MappedTypes(Optional.class)
-public class JsonTypeHandler extends BaseTypeHandler<Object> {
+@MappedTypes(Bean.class)
+public class JsonTypeHandler extends BaseTypeHandler<Bean> {
 
+    private static Logger logger = LoggerFactory.getLogger(JsonTypeHandler.class);
     static ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
+    static ThreadLocal<List<String>> tlProperties = ThreadLocal.withInitial(ArrayList::new);
+    static ThreadLocal<List<String>> tlResults = ThreadLocal.withInitial(ArrayList::new);
 
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType)
+    public void setNonNullParameter(PreparedStatement ps, int i, Bean parameter, JdbcType jdbcType)
             throws SQLException {
         try {
-            Optional<?> optional = (Optional<?>) parameter;
-            if (optional.isPresent()) {
-                ps.setString(i, objectMapper.writeValueAsString(optional.get()));
-            } else {
-                ps.setObject(i, null);
-            }
+            ps.setString(i, objectMapper.writeValueAsString(parameter));
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
     }
 
     @Override
-    public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
-        return rs.getString(columnName);
+    public Bean getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        List<String> resultNames = tlProperties.get();
+        String property = PropertyUtils.normalizeProperty(columnName);
+        if (!resultNames.contains(property)) {
+            resultNames.add(property);
+        }
+        tlResults.get().add(rs.getString(columnName));
+        return null;
     }
 
     @Override
-    public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-        return rs.getString(columnIndex);
+    public Bean getNullableResult(ResultSet rs, int columnIndex) {
+        logger.warn("Json type is not supported when using CallableStatement");
+        return null;
     }
 
     @Override
-    public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-        return cs.getString(columnIndex);
+    public Bean getNullableResult(CallableStatement cs, int columnIndex) {
+        logger.warn("Json type is not supported when using CallableStatement");
+        return null;
     }
 }

mybatis-boost-core/src/main/java/cn/mybatisboost/support/Bean.java

@@ -0,0 +1,4 @@
+package cn.mybatisboost.support;
+
+public abstract class Bean {
+}

mybatis-boost-core/src/main/java/cn/mybatisboost/util/ReflectionUtils.java

@@ -0,0 +1,11 @@
+package cn.mybatisboost.util;
+
+import java.lang.reflect.AccessibleObject;
+
+public abstract class ReflectionUtils {
+
+    public static <T extends AccessibleObject> T makeAccessible(T accessibleObject) {
+        accessibleObject.setAccessible(true);
+        return accessibleObject;
+    }
+}

mybatis-boost-test/src/main/java/cn/mybatisboost/test/Project.java

@@ -1,7 +1,5 @@
 package cn.mybatisboost.test;
 
-import java.util.Optional;
-
 public class Project {
 
     private Integer id;
@@ -78,9 +76,8 @@ public Project setDeveloper(String developer) {
         return this;
     }
 
-
-    public Optional<Website> getWebsite() {
-        return Optional.ofNullable(website);
+    public Website getWebsite() {
+        return website;
     }
 
     public void setWebsite(Website website) {

mybatis-boost-test/src/main/java/cn/mybatisboost/test/Website.java

@@ -1,6 +1,8 @@
 package cn.mybatisboost.test;
 
-public class Website {
+import cn.mybatisboost.support.Bean;
+
+public class Website extends Bean {
 
     private String protocol;
     private String host;

mybatis-boost-test/src/test/java/cn/mybatisboost/test/JsonTest.java

@@ -22,7 +22,7 @@ public class JsonTest {
     private ProjectMapper mapper;
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    private ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
+    private ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules().enableDefaultTyping();
 
     @After
     public void tearDown() {
@@ -37,7 +37,7 @@ public void testSave() {
         mapper.insert(project);
         jdbcTemplate.query("select * from project", resultSet -> {
             try {
-                assertEquals(objectMapper.writeValueAsString(project.getWebsite().get()), resultSet.getString("website"));
+                assertEquals(objectMapper.writeValueAsString(project.getWebsite()), resultSet.getString("website"));
             } catch (JsonProcessingException e) {
                 fail();
             }
@@ -52,8 +52,8 @@ public void testQuery() throws Exception {
         jdbcTemplate.execute("insert into project (id, group_id, website) values (999, 'cn.mybatisboost', '" + objectMapper.writeValueAsString(project.getWebsite()) + "')");
         project = mapper.selectById(999);
         assertNotNull(project);
-        assertEquals("HTTPS", project.getWebsite().get().getProtocol());
-        assertEquals("mybatisboost.cn", project.getWebsite().get().getHost());
-        assertEquals(80, project.getWebsite().get().getPort());
+        assertEquals("HTTPS", project.getWebsite().getProtocol());
+        assertEquals("mybatisboost.cn", project.getWebsite().getHost());
+        assertEquals(80, project.getWebsite().getPort());
     }
 }