Merge branch 'master' into jfinal-java8

Conflicts:
	src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortModelBuilder.java
	src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortRecordBuilder.java

src/main/java/com/jfinal/plugin/activerecord/ModelBuilder.java

@@ -49,16 +49,19 @@ public class ModelBuilder {
 			Map<String, Object> attrs = ar._getAttrs();
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] < Types.BLOB)
-					value = rs.getObject(i);
-				else if (types[i] == Types.CLOB)
-					value = handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = handleBlob(rs.getBlob(i));
-				else
+				if (types[i] < Types.BLOB) {
 					value = rs.getObject(i);
+				} else {
+					if (types[i] == Types.CLOB) {
+						value = handleClob(rs.getClob(i));
+					} else if (types[i] == Types.NCLOB) {
+						value = handleClob(rs.getNClob(i));
+					} else if (types[i] == Types.BLOB) {
+						value = handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				attrs.put(labelNames[i], value);
 			}

src/main/java/com/jfinal/plugin/activerecord/RecordBuilder.java

@@ -45,16 +45,19 @@ public class RecordBuilder {
 			Map<String, Object> columns = record.getColumns();
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] < Types.BLOB)
-					value = rs.getObject(i);
-				else if (types[i] == Types.CLOB)
-					value = ModelBuilder.me.handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = ModelBuilder.me.handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = ModelBuilder.me.handleBlob(rs.getBlob(i));
-				else
+				if (types[i] < Types.BLOB) {
 					value = rs.getObject(i);
+				} else {
+					if (types[i] == Types.CLOB) {
+						value = ModelBuilder.me.handleClob(rs.getClob(i));
+					} else if (types[i] == Types.NCLOB) {
+						value = ModelBuilder.me.handleClob(rs.getNClob(i));
+					} else if (types[i] == Types.BLOB) {
+						value = ModelBuilder.me.handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				columns.put(labelNames[i], value);
 			}

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

@@ -54,24 +54,30 @@ public class KeepByteAndShortModelBuilder extends ModelBuilder {
 			Map<String, Object> attrs = CPI.getAttrs(ar);
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] == Types.TINYINT)
-					value = rs.getByte(i);
-				else if (types[i] == Types.SMALLINT)
-					value = rs.getShort(i);
-				else if (types[i] < Types.DATE)
-					value = rs.getObject(i);
-				else if (types[i] == Types.TIMESTAMP)
-					value = rs.getTimestamp(i);
-				else if (types[i] == Types.DATE)
-					value = rs.getDate(i);
-				else if (types[i] == Types.CLOB)
-					value = handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = handleBlob(rs.getBlob(i));
-				else
-					value = rs.getObject(i);
+				int t = types[i];
+				if (t < Types.DATE) {
+					if (t == Types.TINYINT) {
+						value = rs.getByte(i);
+					} else if (t == Types.SMALLINT) {
+						value = rs.getShort(i);
+					} else {
+						value = rs.getObject(i);
+					}
+				} else {
+					if (t == Types.TIMESTAMP) {
+						value = rs.getTimestamp(i);
+					} else if (t == Types.DATE) {
+						value = rs.getDate(i);
+					} else if (t == Types.CLOB) {
+						value = handleClob(rs.getClob(i));
+					} else if (t == Types.NCLOB) {
+						value = handleClob(rs.getNClob(i));
+					} else if (t == Types.BLOB) {
+						value = handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				attrs.put(labelNames[i], value);
 			}

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

@@ -57,24 +57,30 @@ public class KeepByteAndShortRecordBuilder extends RecordBuilder {
 			Map<String, Object> columns = record.getColumns();
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] == Types.TINYINT)
-					value = rs.getByte(i);
-				else if (types[i] == Types.SMALLINT)
-					value = rs.getShort(i);
-				else if (types[i] < Types.DATE)
-					value = rs.getObject(i);
-				else if (types[i] == Types.TIMESTAMP)
-					value = rs.getTimestamp(i);
-				else if (types[i] == Types.DATE)
-					value = rs.getDate(i);
-				else if (types[i] == Types.CLOB)
-					value = ModelBuilder.me.handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = ModelBuilder.me.handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = ModelBuilder.me.handleBlob(rs.getBlob(i));
-				else
-					value = rs.getObject(i);
+				int t = types[i];
+				if (t < Types.DATE) {
+					if (t == Types.TINYINT) {
+						value = rs.getByte(i);
+					} else if (t == Types.SMALLINT) {
+						value = rs.getShort(i);
+					} else {
+						value = rs.getObject(i);
+					}
+				} else {
+					if (t == Types.TIMESTAMP) {
+						value = rs.getTimestamp(i);
+					} else if (t == Types.DATE) {
+						value = rs.getDate(i);
+					} else if (t == Types.CLOB) {
+						value = ModelBuilder.me.handleClob(rs.getClob(i));
+					} else if (t == Types.NCLOB) {
+						value = ModelBuilder.me.handleClob(rs.getNClob(i));
+					} else if (t == Types.BLOB) {
+						value = ModelBuilder.me.handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				columns.put(labelNames[i], value);
 			}

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

@@ -49,20 +49,23 @@ public class TimestampProcessedModelBuilder extends ModelBuilder {
 			Map<String, Object> attrs = CPI.getAttrs(ar);
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] < Types.DATE)
-					value = rs.getObject(i);
-				else if (types[i] == Types.TIMESTAMP)
-					value = rs.getTimestamp(i);
-				else if (types[i] == Types.DATE)
-					value = rs.getDate(i);
-				else if (types[i] == Types.CLOB)
-					value = handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = handleBlob(rs.getBlob(i));
-				else
+				if (types[i] < Types.DATE) {
 					value = rs.getObject(i);
+				} else {
+					if (types[i] == Types.TIMESTAMP) {
+						value = rs.getTimestamp(i);
+					} else if (types[i] == Types.DATE) {
+						value = rs.getDate(i);
+					} else if (types[i] == Types.CLOB) {
+						value = handleClob(rs.getClob(i));
+					} else if (types[i] == Types.NCLOB) {
+						value = handleClob(rs.getNClob(i));
+					} else if (types[i] == Types.BLOB) {
+						value = handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				attrs.put(labelNames[i], value);
 			}

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

@@ -52,20 +52,23 @@ public class TimestampProcessedRecordBuilder extends RecordBuilder {
 			Map<String, Object> columns = record.getColumns();
 			for (int i=1; i<=columnCount; i++) {
 				Object value;
-				if (types[i] < Types.DATE)
-					value = rs.getObject(i);
-				else if (types[i] == Types.TIMESTAMP)
-					value = rs.getTimestamp(i);
-				else if (types[i] == Types.DATE)
-					value = rs.getDate(i);
-				else if (types[i] == Types.CLOB)
-					value = ModelBuilder.me.handleClob(rs.getClob(i));
-				else if (types[i] == Types.NCLOB)
-					value = ModelBuilder.me.handleClob(rs.getNClob(i));
-				else if (types[i] == Types.BLOB)
-					value = ModelBuilder.me.handleBlob(rs.getBlob(i));
-				else
+				if (types[i] < Types.DATE) {
 					value = rs.getObject(i);
+				} else {
+					if (types[i] == Types.TIMESTAMP) {
+						value = rs.getTimestamp(i);
+					} else if (types[i] == Types.DATE) {
+						value = rs.getDate(i);
+					} else if (types[i] == Types.CLOB) {
+						value = ModelBuilder.me.handleClob(rs.getClob(i));
+					} else if (types[i] == Types.NCLOB) {
+						value = ModelBuilder.me.handleClob(rs.getNClob(i));
+					} else if (types[i] == Types.BLOB) {
+						value = ModelBuilder.me.handleBlob(rs.getBlob(i));
+					} else {
+						value = rs.getObject(i);
+					}
+				}
 				
 				columns.put(labelNames[i], value);
 			}