修改版本号

.gitignore

@@ -35,4 +35,4 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -0,0 +1,6 @@
+# SimpleJDBC
+对 JDBC 的简单封装。
+
+之前遇到的一个老项目，没有引入任何 ORM 框架，使用的 JDK7 明明支持泛型，所依赖的 spring-jdbc 居然是没有泛型的远古版本，该项目又不允许随意添加依赖，对数据库的操作几乎都在写原生 JDBC。故自己写了几个工具类，对 JDBC 进行简单封装，后来逐渐改进完善。
+
+本项目不比成熟的工具，如若使用请自行承担风险。建议仅作为 JDBC 的学习参考。

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.zhouxy.jdbc</groupId>
     <artifactId>simple-jdbc</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/xyz/zhouxy/jdbc/DbRecord.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ package xyz.zhouxy.jdbc;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
-import org.apache.commons.lang3.StringUtils;
 import xyz.zhouxy.plusone.commons.collection.AbstractMapWrapper;
 import xyz.zhouxy.plusone.commons.util.OptionalTools;
+import xyz.zhouxy.plusone.commons.util.StringTools;
 
 import java.util.*;
 
@@ -28,11 +28,11 @@ import java.util.*;
 public class DbRecord extends AbstractMapWrapper<String, Object, DbRecord> {
 
     public DbRecord() {
-        super(new HashMap<>(), k -> Preconditions.checkArgument(StringUtils.isNotBlank(k), "Key must has text."), null);
+        super(new HashMap<>(), k -> Preconditions.checkArgument(StringTools.isNotBlank(k), "Key must has text."), null);
     }
 
     public DbRecord(Map<String, Object> map) {
-        super(map, k -> Preconditions.checkArgument(StringUtils.isNotBlank(k), "Key must has text."), null);
+        super(map, k -> Preconditions.checkArgument(StringTools.isNotBlank(k), "Key must has text."), null);
     }
 
     public Optional<String> getValueAsString(String key) {

src/main/java/xyz/zhouxy/jdbc/DefaultBeanRowMapper.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2022-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.jdbc;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.CaseFormat;
+
+public class DefaultBeanRowMapper<T> implements RowMapper<T> {
+
+    private final Constructor<T> constructor;
+    private final Map<String, PropertyDescriptor> colPropertyMap;
+
+    private DefaultBeanRowMapper(Constructor<T> constructor, Map<String, PropertyDescriptor> colPropertyMap) {
+        this.constructor = constructor;
+        this.colPropertyMap = colPropertyMap;
+    }
+
+    public static <T> DefaultBeanRowMapper<T> of(Class<T> beanType) throws SQLException {
+        return of(beanType, null);
+    }
+
+    public static <T> DefaultBeanRowMapper<T> of(Class<T> beanType, @Nullable Map<String, String> propertyColMap)
+            throws SQLException {
+        try {
+            // 获取无参构造器
+            Constructor<T> constructor = beanType.getDeclaredConstructor();
+            constructor.setAccessible(true); // NOSONAR
+
+            // 构建 column name 和 PropertyDescriptor 的 映射
+            BeanInfo beanInfo = Introspector.getBeanInfo(beanType);
+            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+
+            Function<? super PropertyDescriptor, String> keyMapper;
+            if (propertyColMap == null || propertyColMap.isEmpty()) {
+                keyMapper = p -> CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, p.getName());
+            }
+            else {
+                keyMapper = p -> {
+                    String propertyName = p.getName();
+                    String colName = propertyColMap.get(propertyName);
+                    return colName != null ? colName
+                            : CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, propertyName);
+                };
+            }
+            Map<String, PropertyDescriptor> colPropertyMap = Arrays.stream(propertyDescriptors).collect(
+                    Collectors.toMap(keyMapper, Function.identity(), (a, b) -> b));
+            return new DefaultBeanRowMapper<>(constructor, colPropertyMap);
+        }
+        catch (IntrospectionException e) {
+            throw new SQLException("There is an exception occurs during introspection.", e);
+        }
+        catch (NoSuchMethodException e) {
+            throw new SQLException("Could not find a no-args constructor in " + beanType.getName(), e);
+        }
+    }
+
+    @Override
+    public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
+        try {
+            T newInstance = this.constructor.newInstance();
+            ResultSetMetaData metaData = rs.getMetaData();
+            for (int i = 1; i <= metaData.getColumnCount(); i++) {
+                String colName = metaData.getColumnName(i);
+                PropertyDescriptor propertyDescriptor = this.colPropertyMap.get(colName);
+                if (propertyDescriptor != null) {
+                    Method setter = propertyDescriptor.getWriteMethod();
+                    if (setter != null) {
+                        Class<?> propertyType = propertyDescriptor.getPropertyType();
+                        setter.setAccessible(true); // NOSONAR
+                        setter.invoke(newInstance, rs.getObject(colName, propertyType));
+                    }
+                }
+            }
+            return newInstance;
+        }
+        catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
+            throw new SQLException(e);
+        }
+    }
+}

src/main/java/xyz/zhouxy/jdbc/ParamBuilder.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.jdbc;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Preconditions;
+
+import xyz.zhouxy.plusone.commons.collection.CollectionTools;
+import xyz.zhouxy.plusone.commons.util.ArrayTools;
+import xyz.zhouxy.plusone.commons.util.OptionalTools;
+
+public class ParamBuilder {
+    public static final Object[] EMPTY_OBJECT_ARRAY = {};
+
+    public static Object[] buildParams(final Object... params) {
+        if (ArrayTools.isNullOrEmpty(params)) {
+            return EMPTY_OBJECT_ARRAY;
+        }
+        return Arrays.stream(params)
+                .map(param -> {
+                    if (param instanceof Optional) {
+                        return OptionalTools.orElseNull((Optional<?>) param);
+                    }
+                    if (param instanceof OptionalInt) {
+                        return OptionalTools.toInteger(((OptionalInt) param));
+                    }
+                    if (param instanceof OptionalLong) {
+                        return OptionalTools.toLong(((OptionalLong) param));
+                    }
+                    if (param instanceof OptionalDouble) {
+                        return OptionalTools.toDouble(((OptionalDouble) param));
+                    }
+                    return param;
+                })
+                .toArray();
+    }
+
+    public static <T> List<Object[]> buildBatchParams(final Collection<T> c, final Function<T, Object[]> func) {
+        Preconditions.checkNotNull(c, "The collection can not be null.");
+        Preconditions.checkNotNull(func, "The func can not be null.");
+        if (CollectionTools.isEmpty(c)) {
+            return Collections.emptyList();
+        }
+        return c.stream().map(func).collect(Collectors.toList());
+    }
+
+    private ParamBuilder() {
+        throw new IllegalStateException("Utility class");
+    }
+}

src/main/java/xyz/zhouxy/jdbc/ResultHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,10 @@
 
 package xyz.zhouxy.jdbc;
 
-import com.google.common.annotations.Beta;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-@Beta
 @FunctionalInterface
-public interface ResultMap<T> {
-    T map(ResultSet rs, int rowNumber) throws SQLException;
+public interface ResultHandler<T> {
+    T handle(ResultSet resultSet) throws SQLException;
 }

src/main/java/xyz/zhouxy/jdbc/RowMapper.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.jdbc;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+@FunctionalInterface
+public interface RowMapper<T> {
+    T mapRow(ResultSet rs, int rowNumber) throws SQLException;
+
+    public static final RowMapper<Map<String, Object>> HASH_MAP_MAPPER = (rs, rowNumber) -> {
+        Map<String, Object> result = new HashMap<>();
+        ResultSetMetaData metaData = rs.getMetaData();
+        int columnCount = metaData.getColumnCount();
+        for (int i = 1; i <= columnCount; i++) {
+            String colName = metaData.getColumnName(i);
+            result.put(colName, rs.getObject(colName));
+        }
+        return result;
+    };
+
+    public static final RowMapper<DbRecord> RECORD_MAPPER =
+            (rs, rowNumber) -> new DbRecord(HASH_MAP_MAPPER.mapRow(rs, rowNumber));
+
+    public static <T> RowMapper<T> beanRowMapper(Class<T> beanType) throws SQLException {
+        return DefaultBeanRowMapper.of(beanType);
+    }
+
+    public static <T> RowMapper<T> beanRowMapper(Class<T> beanType, Map<String, String> propertyColMap)
+            throws SQLException {
+        return DefaultBeanRowMapper.of(beanType, propertyColMap);
+    }
+}

src/test/java/xyz/zhouxy/jdbc/SimpleJdbcTemplateTests.java

@@ -1,124 +0,0 @@
-package xyz.zhouxy.jdbc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static xyz.zhouxy.jdbc.SimpleJdbcTemplate.ParamBuilder.*;
-import static xyz.zhouxy.plusone.commons.sql.JdbcSql.IN;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.sql.DataSource;
-
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-import xyz.zhouxy.jdbc.SimpleJdbcTemplate.JdbcExecutor;
-import xyz.zhouxy.plusone.commons.sql.SQL;
-import xyz.zhouxy.plusone.commons.util.IdGenerator;
-import xyz.zhouxy.plusone.commons.util.IdWorker;
-
-class SimpleJdbcTemplateTests {
-
-    private static final Logger log = LoggerFactory.getLogger(SimpleJdbcTemplateTests.class);
-
-    private static final DataSource dataSource;
-
-    String[] cStruct = {
-            "id",
-            "created_by",
-            "create_time",
-            "updated_by",
-            "update_time",
-            "status"
-    };
-
-    static {
-        HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:postgresql://localhost:5432/plusone");
-        config.setUsername("postgres");
-        config.setPassword("zhouxy108");
-        config.setMaximumPoolSize(800);
-        config.setConnectionTimeout(1000000);
-        dataSource = new HikariDataSource(config);
-    }
-
-    @Test
-    void testQuery() throws SQLException {
-        try (Connection conn = dataSource.getConnection()) {
-            Object[] ids = buildParams("501533", "501554", "544599");
-            String sql = SQL.newJdbcSql()
-                    .SELECT("*")
-                    .FROM("test_table")
-                    .WHERE(IN("id", ids))
-                    .toString();
-            log.info(sql);
-            List<DbRecord> rs = SimpleJdbcTemplate.connect(conn)
-                    .queryToRecordList(sql, ids);
-            assertNotNull(rs);
-            for (DbRecord baseEntity : rs) {
-                // log.info("id: {}", baseEntity.getValueAsString("id"));
-                log.info(baseEntity.toString());
-                assertEquals(Optional.empty(), baseEntity.getValueAsString("updated_by"));
-            }
-        }
-    }
-
-    final IdWorker idGenerator = IdGenerator.getSnowflakeIdGenerator(0);
-
-    @Test
-    void testTransaction() throws SQLException {
-        try (Connection conn = dataSource.getConnection()) {
-            long id = this.idGenerator.nextId();
-            JdbcExecutor jdbcExecutor = SimpleJdbcTemplate.connect(conn);
-            try {
-                jdbcExecutor.tx(jdbc -> {
-                    jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
-                            buildParams(id, 585757, LocalDateTime.now(), 0));
-                    throw new NullPointerException();
-                });
-            }
-            catch (NullPointerException e) {
-                // ignore
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-            Optional<Map<String, Object>> first = jdbcExecutor
-                    .queryFirst("SELECT * FROM base_table WHERE id = ?", id);
-            log.info("first: {}", first);
-            assertTrue(!first.isPresent());
-        }
-
-        try (Connection conn = dataSource.getConnection()) {
-            long id = this.idGenerator.nextId();
-            JdbcExecutor jdbcExecutor = SimpleJdbcTemplate.connect(conn);
-            try {
-                jdbcExecutor.tx(jdbc -> {
-                    jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
-                            buildParams(id, 585757, LocalDateTime.now(), 0));
-                    // throw new NullPointerException();
-                });
-            }
-            catch (NullPointerException e) {
-                // ignore
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-            Optional<Map<String, Object>> first = jdbcExecutor
-                    .queryFirst("SELECT * FROM base_table WHERE id = ?", id);
-            log.info("first: {}", first);
-            assertTrue(first.isPresent());
-        }
-    }
-}

src/test/java/xyz/zhouxy/jdbc/test/SimpleJdbcTemplateTests.java

@@ -0,0 +1,277 @@
+package xyz.zhouxy.jdbc.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static xyz.zhouxy.jdbc.ParamBuilder.*;
+import static xyz.zhouxy.plusone.commons.sql.JdbcSql.IN;
+
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import xyz.zhouxy.jdbc.DbRecord;
+import xyz.zhouxy.jdbc.RowMapper;
+import xyz.zhouxy.jdbc.SimpleJdbcTemplate;
+import xyz.zhouxy.jdbc.SimpleJdbcTemplate.JdbcExecutor;
+import xyz.zhouxy.plusone.commons.sql.SQL;
+import xyz.zhouxy.plusone.commons.util.ArrayTools;
+import xyz.zhouxy.plusone.commons.util.IdGenerator;
+import xyz.zhouxy.plusone.commons.util.IdWorker;
+import xyz.zhouxy.plusone.commons.util.Numbers;
+
+class SimpleJdbcTemplateTests {
+
+    private static final Logger log = LoggerFactory.getLogger(SimpleJdbcTemplateTests.class);
+
+    private static final DataSource dataSource;
+
+    private static final SimpleJdbcTemplate jdbcTemplate;
+
+    static {
+        HikariConfig config = new HikariConfig();
+        config.setJdbcUrl("jdbc:postgresql://localhost:5432/plusone");
+        config.setUsername("postgres");
+        config.setPassword("zhouxy108");
+        config.setMaximumPoolSize(8);
+        config.setConnectionTimeout(1000000);
+        dataSource = new HikariDataSource(config);
+        jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+    }
+
+    @Test
+    void testQuery() throws SQLException {
+        Object[] ids = buildParams(22915, 22916, 22917, 22918, 22919, 22920, 22921);
+        String sql = SQL.newJdbcSql()
+                .SELECT("*")
+                .FROM("test_table")
+                .WHERE(IN("id", ids))
+                .toString();
+        log.info(sql);
+        List<DbRecord> rs = jdbcTemplate.queryRecordList(sql, ids);
+        assertNotNull(rs);
+        for (DbRecord baseEntity : rs) {
+            // log.info("id: {}", baseEntity.getValueAsString("id")); // NOSONAR
+            log.info(baseEntity.toString());
+            assertTrue(baseEntity.getValueAsString("username").isPresent());
+        }
+    }
+
+    @Test
+    void testInsert() throws SQLException {
+        List<DbRecord> keys = jdbcTemplate.update(
+                "INSERT INTO base_table(status, created_by) VALUES (?, ?)",
+                buildParams(1, 886L),
+                RowMapper.RECORD_MAPPER);
+        log.info("keys: {}", keys);
+        assertEquals(1, keys.size());
+        DbRecord result = keys.get(0);
+        assertEquals(1, result.getValueAsInt("status").getAsInt());
+        assertEquals(886L, result.getValueAsLong("created_by").getAsLong());
+        assertTrue(result.get("id").isPresent());
+    }
+
+    @Test
+    void testUpdate() throws SQLException {
+        List<DbRecord> keys = jdbcTemplate.update(
+                "UPDATE base_table SET status = ?, version = version + 1, update_time = now(), updated_by = ? WHERE id = ? AND version = ?",
+                buildParams(2, 886, 571328822575109L, 0),
+                RowMapper.RECORD_MAPPER);
+        log.info("keys: {}", keys);
+    }
+
+    final IdWorker idGenerator = IdGenerator.getSnowflakeIdGenerator(0);
+
+    @Test
+    void testTransaction() throws SQLException {
+        // 抛异常，回滚
+        {
+            long id = this.idGenerator.nextId();
+            try {
+                jdbcTemplate.executeTransaction((JdbcExecutor jdbc) -> {
+                    jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
+                            buildParams(id, 100, LocalDateTime.now(), 0));
+                    throw new NullPointerException();
+                });
+            }
+            catch (NullPointerException e) {
+                // ignore
+            }
+            Optional<Map<String, Object>> first = jdbcTemplate
+                    .queryFirst("SELECT * FROM base_table WHERE id = ?", buildParams(id));
+            log.info("first: {}", first);
+            assertTrue(!first.isPresent());
+        }
+
+        // 没有异常，提交事务
+        {
+            long id = this.idGenerator.nextId();
+            jdbcTemplate.executeTransaction(jdbc -> {
+                jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
+                        buildParams(id, 101, LocalDateTime.now(), 0));
+            });
+
+            Optional<Map<String, Object>> first = jdbcTemplate
+                    .queryFirst("SELECT * FROM base_table WHERE id = ?", buildParams(id));
+            log.info("first: {}", first);
+            assertTrue(first.isPresent());
+        }
+
+        // 抛异常，回滚
+        {
+            long id = this.idGenerator.nextId();
+            try {
+                jdbcTemplate.commitIfTrue(jdbc -> {
+                    jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
+                            buildParams(id, 102, LocalDateTime.now(), 0));
+                    throw new NullPointerException();
+                });
+            }
+            catch (NullPointerException e) {
+                // ignore
+            }
+            Optional<Map<String, Object>> first = jdbcTemplate
+                    .queryFirst("SELECT * FROM base_table WHERE id = ?", buildParams(id));
+            log.info("first: {}", first);
+            assertTrue(!first.isPresent());
+        }
+
+        // 返回 false，回滚
+        {
+            long id = this.idGenerator.nextId();
+            jdbcTemplate.commitIfTrue(jdbc -> {
+                jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
+                        buildParams(id, 103, LocalDateTime.now(), 0));
+                return false;
+            });
+
+            Optional<Map<String, Object>> first = jdbcTemplate
+                    .queryFirst("SELECT * FROM base_table WHERE id = ?", buildParams(id));
+            log.info("first: {}", first);
+            assertTrue(!first.isPresent());
+        }
+
+        // 返回 true，提交事务
+        {
+            long id = this.idGenerator.nextId();
+            jdbcTemplate.commitIfTrue(jdbc -> {
+                jdbc.update("INSERT INTO base_table (id, created_by, create_time, status) VALUES (?, ?, ?, ?)",
+                        buildParams(id, 104, LocalDateTime.now(), 0));
+                return true;
+            });
+
+            Optional<Map<String, Object>> first = jdbcTemplate
+                    .queryFirst("SELECT * FROM base_table WHERE id = ?", buildParams(id));
+            log.info("first: {}", first);
+            assertTrue(first.isPresent());
+        }
+    }
+
+    @Test
+    void testBatch() throws Exception {
+
+        Random random = ThreadLocalRandom.current();
+
+        LocalDate handleDate = LocalDate.of(1949, 10, 1);
+        List<DbRecord> datas = Lists.newArrayList();
+        while (handleDate.isBefore(LocalDate.of(2008, 8, 8))) {
+            DbRecord r1 = new DbRecord();
+            r1.put("username", "张三2");
+            r1.put("usage_date", handleDate);
+            r1.put("usage_duration", random.nextInt(500));
+            datas.add(r1);
+            DbRecord r2 = new DbRecord();
+            r2.put("username", "李四2");
+            r2.put("usage_date", handleDate);
+            r2.put("usage_duration", random.nextInt(500));
+            datas.add(r2);
+
+            handleDate = handleDate.plusDays(1L);
+        }
+        try {
+            List<int[]> result = jdbcTemplate.batchUpdate(
+                    "insert into test_table (username, usage_date, usage_duration) values (?,?,?)",
+                    buildBatchParams(datas, item -> buildParams(
+                            item.getValueAsString("username"),
+                            item.getValueAsString("usage_date"),
+                            item.getValueAsString("usage_duration"))),
+                    400);
+            long sum = Numbers.sum(ArrayTools.concatIntArray(result));
+            assertEquals(datas.size(), sum);
+            log.info("sum: {}", sum);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    @Test
+    void testBean() throws Exception {
+        Optional<TestBean> t = jdbcTemplate.queryFirst(
+                "SELECT * FROM test_table WHERE id = ?",
+                buildParams(22915),
+                RowMapper.beanRowMapper(TestBean.class));
+        log.info("t: {}", t);
+    }
+}
+
+class TestBean {
+    Long id;
+    String username;
+    LocalDate usageDate;
+    Long usageDuration;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public LocalDate getUsageDate() {
+        return usageDate;
+    }
+
+    public void setUsageDate(LocalDate usageDate) {
+        this.usageDate = usageDate;
+    }
+
+    public Long getUsageDuration() {
+        return usageDuration;
+    }
+
+    public void setUsageDuration(Long usageDuration) {
+        this.usageDuration = usageDuration;
+    }
+
+    @Override
+    public String toString() {
+        return "TestBean [id=" + id + ", username=" + username + ", usageDate=" + usageDate + ", usageDuration="
+                + usageDuration + "]";
+    }
+}