James 7 年 前
コミット
f33614601e

+ 9 - 3
src/main/java/com/jfinal/core/paragetter/DateGetter.java

@@ -16,11 +16,12 @@
 package com.jfinal.core.paragetter;
 package com.jfinal.core.paragetter;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
-
 import com.jfinal.core.Action;
 import com.jfinal.core.Action;
+import com.jfinal.core.ActionException;
 import com.jfinal.core.Controller;
 import com.jfinal.core.Controller;
 import com.jfinal.core.converter.Converters.DateConverter;
 import com.jfinal.core.converter.Converters.DateConverter;
 import com.jfinal.kit.StrKit;
 import com.jfinal.kit.StrKit;
+import com.jfinal.render.RenderManager;
 
 
 public class DateGetter extends ParaGetter<java.util.Date> {
 public class DateGetter extends ParaGetter<java.util.Date> {
 	private static DateConverter converter = new DateConverter();
 	private static DateConverter converter = new DateConverter();
@@ -30,7 +31,11 @@ public class DateGetter extends ParaGetter<java.util.Date> {
 
 
 	@Override
 	@Override
 	public java.util.Date get(Action action, Controller c) {
 	public java.util.Date get(Action action, Controller c) {
-		return c.getParaToDate(getParameterName(), getDefaultValue());
+		String value = c.getPara(this.getParameterName());
+		if(StrKit.notBlank(value)){
+			return to(value);
+		}
+		return this.getDefaultValue();
 	}
 	}
 
 
 	@Override
 	@Override
@@ -41,7 +46,8 @@ public class DateGetter extends ParaGetter<java.util.Date> {
 		try {
 		try {
 			return converter.convert(v);
 			return converter.convert(v);
 		} catch (ParseException e) {
 		} catch (ParseException e) {
-			return null;
+			// return null;
+			throw new ActionException(400, RenderManager.me().getRenderFactory().getErrorRender(400),  "Can not parse the parameter \"" + v + "\" to java.util.Date");
 		}
 		}
 	}
 	}
 
 

+ 4 - 2
src/main/java/com/jfinal/core/paragetter/SqlDateGetter.java

@@ -16,11 +16,12 @@
 package com.jfinal.core.paragetter;
 package com.jfinal.core.paragetter;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
-
 import com.jfinal.core.Action;
 import com.jfinal.core.Action;
+import com.jfinal.core.ActionException;
 import com.jfinal.core.Controller;
 import com.jfinal.core.Controller;
 import com.jfinal.core.converter.Converters.SqlDateConverter;
 import com.jfinal.core.converter.Converters.SqlDateConverter;
 import com.jfinal.kit.StrKit;
 import com.jfinal.kit.StrKit;
+import com.jfinal.render.RenderManager;
 
 
 public class SqlDateGetter extends ParaGetter<java.sql.Date> {
 public class SqlDateGetter extends ParaGetter<java.sql.Date> {
 	private static SqlDateConverter converter = new SqlDateConverter();
 	private static SqlDateConverter converter = new SqlDateConverter();
@@ -45,7 +46,8 @@ public class SqlDateGetter extends ParaGetter<java.sql.Date> {
 		try {
 		try {
 			return converter.convert(v);
 			return converter.convert(v);
 		} catch (ParseException e) {
 		} catch (ParseException e) {
-			return null;
+			// return null;
+			throw new ActionException(400, RenderManager.me().getRenderFactory().getErrorRender(400),  "Can not parse the parameter \"" + v + "\" to java.sql.Date");
 		}
 		}
 	}
 	}
 
 

+ 4 - 2
src/main/java/com/jfinal/core/paragetter/TimeGetter.java

@@ -16,11 +16,12 @@
 package com.jfinal.core.paragetter;
 package com.jfinal.core.paragetter;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
-
 import com.jfinal.core.Action;
 import com.jfinal.core.Action;
+import com.jfinal.core.ActionException;
 import com.jfinal.core.Controller;
 import com.jfinal.core.Controller;
 import com.jfinal.core.converter.Converters.TimeConverter;
 import com.jfinal.core.converter.Converters.TimeConverter;
 import com.jfinal.kit.StrKit;
 import com.jfinal.kit.StrKit;
+import com.jfinal.render.RenderManager;
 
 
 public class TimeGetter extends ParaGetter<java.sql.Time> {
 public class TimeGetter extends ParaGetter<java.sql.Time> {
 	private static TimeConverter converter = new TimeConverter();
 	private static TimeConverter converter = new TimeConverter();
@@ -45,7 +46,8 @@ public class TimeGetter extends ParaGetter<java.sql.Time> {
 		try {
 		try {
 			return converter.convert(v);
 			return converter.convert(v);
 		} catch (ParseException e) {
 		} catch (ParseException e) {
-			return null;
+			// return null;
+			throw new ActionException(400, RenderManager.me().getRenderFactory().getErrorRender(400),  "Can not parse the parameter \"" + v + "\" to java.sql.Time");
 		}
 		}
 	}
 	}
 
 

+ 4 - 2
src/main/java/com/jfinal/core/paragetter/TimestampGetter.java

@@ -16,11 +16,12 @@
 package com.jfinal.core.paragetter;
 package com.jfinal.core.paragetter;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
-
 import com.jfinal.core.Action;
 import com.jfinal.core.Action;
+import com.jfinal.core.ActionException;
 import com.jfinal.core.Controller;
 import com.jfinal.core.Controller;
 import com.jfinal.core.converter.Converters.TimestampConverter;
 import com.jfinal.core.converter.Converters.TimestampConverter;
 import com.jfinal.kit.StrKit;
 import com.jfinal.kit.StrKit;
+import com.jfinal.render.RenderManager;
 
 
 public class TimestampGetter extends ParaGetter<java.sql.Timestamp> {
 public class TimestampGetter extends ParaGetter<java.sql.Timestamp> {
 	private static TimestampConverter converter = new TimestampConverter();
 	private static TimestampConverter converter = new TimestampConverter();
@@ -45,7 +46,8 @@ public class TimestampGetter extends ParaGetter<java.sql.Timestamp> {
 		try {
 		try {
 			return converter.convert(v);
 			return converter.convert(v);
 		} catch (ParseException e) {
 		} catch (ParseException e) {
-			return null;
+			// return null;
+			throw new ActionException(400, RenderManager.me().getRenderFactory().getErrorRender(400),  "Can not parse the parameter \"" + v + "\" to java.sql.Timestamp");
 		}
 		}
 	}
 	}