jfinal 3.6

src/main/java/com/jfinal/plugin/activerecord/builder/BuilderKit.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
+ *
+ * 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.
+ */
+
+package com.jfinal.plugin.activerecord.builder;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * JDBC 获取 Byte 和 Short 时，把 null 转换成了 0，很多时候 0 是有意义的，容易引发业务错误
+ * 
+ * @author tanyaowu
+ */
+public class BuilderKit {
+	
+	public static Byte getByte(ResultSet rs, int i) throws SQLException {
+		Object value = rs.getObject(i);
+		if (value != null) {
+			value = Byte.parseByte(value + "");
+			return (Byte)value;
+		} else {
+			return null;
+		}
+	}
+	
+	public static Short getShort(ResultSet rs, int i) throws SQLException {
+		Object value = rs.getObject(i);
+		if (value != null) {
+			value = Short.parseShort(value + "");
+			return (Short)value;
+		} else {
+			return null;
+		}
+	}
+}
+

src/main/java/com/jfinal/plugin/activerecord/builder/JdbcKit.java

@@ -1,50 +0,0 @@
-/**
- * 
- */
-package com.jfinal.plugin.activerecord.builder;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * @author tanyaowu
- *
- */
-public class JdbcKit {
-
-	public static Byte getByte(ResultSet rs, int i) throws SQLException {
-		Object value = rs.getObject(i);
-		if (value != null) {
-			value = Byte.parseByte(value + "");
-			return (Byte) value;
-		} else {
-			return null;
-		}
-	}
-	
-	public static Short getShort(ResultSet rs, int i) throws SQLException {
-		Object value = rs.getObject(i);
-		if (value != null) {
-			value = Short.parseShort(value + "");
-			return (Short) value;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public JdbcKit() {
-	}
-
-	/**
-	 * @param args
-	 * @author tanyaowu
-	 */
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-
-}

src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortModelBuilder.java

@@ -57,9 +57,9 @@ public class KeepByteAndShortModelBuilder extends ModelBuilder {
 				int t = types[i];
 				if (t < Types.DATE) {
 					if (t == Types.TINYINT) {
-						value = JdbcKit.getByte(rs, i);
+						value = BuilderKit.getByte(rs, i);
 					} else if (t == Types.SMALLINT) {
-						value = JdbcKit.getShort(rs, i);
+						value = BuilderKit.getShort(rs, i);
 					} else {
 						value = rs.getObject(i);
 					}

src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortRecordBuilder.java

@@ -61,9 +61,9 @@ public class KeepByteAndShortRecordBuilder extends RecordBuilder {
 				int t = types[i];
 				if (t < Types.DATE) {
 					if (t == Types.TINYINT) {
-						value = JdbcKit.getByte(rs, i);
+						value = BuilderKit.getByte(rs, i);
 					} else if (t == Types.SMALLINT) {
-						value = JdbcKit.getShort(rs, i);
+						value = BuilderKit.getShort(rs, i);
 					} else {
 						value = rs.getObject(i);
 					}