Replace Property with Optional

Author: zhangrongfan

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

@@ -1,16 +1,12 @@
 package cn.mybatisboost.json;
 
-import cn.mybatisboost.support.Property;
 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.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
@@ -28,15 +24,15 @@ public Object intercept(Invocation invocation) throws Throwable {
         Class<?> type = proceed.get(0).getClass();
         List<Field> fields = fieldCache.computeIfAbsent(type,
                 key -> Collections.unmodifiableList(Arrays.stream(type.getDeclaredFields())
-                        .filter(it -> it.getType() == Property.class)
+                        .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 = ((Property<?>) field.get(object)).orElse(null);
+                Object value = ((Optional<?>) field.get(object)).orElse(null);
                 if (value instanceof String) {
-                    field.set(object, Property.of(JsonTypeHandler.objectMapper.readValue((String) value,
+                    field.set(object, Optional.of(JsonTypeHandler.objectMapper.readValue((String) value,
                             (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0])));
                 }
             }

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

@@ -1,6 +1,5 @@
 package cn.mybatisboost.json;
 
-import cn.mybatisboost.support.Property;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.ibatis.type.BaseTypeHandler;
@@ -11,8 +10,9 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Optional;
 
-@MappedTypes(Property.class)
+@MappedTypes(Optional.class)
 public class JsonTypeHandler extends BaseTypeHandler<Object> {
 
     static ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
@@ -21,9 +21,9 @@ public class JsonTypeHandler extends BaseTypeHandler<Object> {
     public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType)
             throws SQLException {
         try {
-            Property<?> property = (Property<?>) parameter;
-            if (property.isPresent()) {
-                ps.setString(i, objectMapper.writeValueAsString(property.get()));
+            Optional<?> optional = (Optional<?>) parameter;
+            if (optional.isPresent()) {
+                ps.setString(i, objectMapper.writeValueAsString(optional.get()));
             } else {
                 ps.setObject(i, null);
             }

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

@@ -1,7 +1,6 @@
 package cn.mybatisboost.util;
 
 import cn.mybatisboost.core.adaptor.NameAdaptor;
-import cn.mybatisboost.support.Property;
 import cn.mybatisboost.util.function.UncheckedFunction;
 import cn.mybatisboost.util.function.UncheckedPredicate;
 import org.apache.commons.lang3.StringUtils;
@@ -68,10 +67,7 @@ public static List<String> getProperties(Object entity, boolean selective) {
             properties = properties.stream()
                     .map(UncheckedFunction.of(type::getDeclaredField))
                     .peek(f -> f.setAccessible(true))
-                    .filter(UncheckedPredicate.of(f -> {
-                        Object value = f.get(entity);
-                        return value != null && (!(value instanceof Property) || ((Property<?>) value).isPresent());
-                    }))
+                    .filter(UncheckedPredicate.of(f -> f.get(entity) != null))
                     .map(UncheckedFunction.of(Field::getName))
                     .collect(Collectors.toList());
         }
@@ -88,10 +84,7 @@ public static List<String> getProperties(List<?> entities) {
             try {
                 Field field = type.getDeclaredField(iterator.next());
                 boolean nonNull = entities.stream()
-                        .anyMatch(UncheckedPredicate.of(it -> {
-                            Object value = field.get(it);
-                            return value != null && (!(value instanceof Property) || ((Property<?>) value).isPresent());
-                        }));
+                        .anyMatch(UncheckedPredicate.of(it -> field.get(it) != null));
                 if (!nonNull) iterator.remove();
             } catch (NoSuchFieldException e) {
                 throw new RuntimeException(e);