✏️ fixed typos

06094051 · Dec 16, 2018 · 3a1be7f · 3a1be7f
1 parent 872aedd
commit 3a1be7f
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 26 deletions.
diff --git a/src/main/java/com/blade/mvc/RouteContext.java b/src/main/java/com/blade/mvc/RouteContext.java
@@ -128,32 +128,11 @@ public String fromString(String paramName) {
  return this.request.query(paramName).orElse(null);
  }
 
- /**
- * Get a request parameter
- *
- * @param paramName Parameter name
- * @return Return request parameter value
- */
- public String formString(String paramName) {
- return this.request.query(paramName).orElse(null);
- }
-
  @Deprecated
  public String fromString(String paramName, String defaultValue) {
  return this.request.query(paramName, defaultValue);
  }
 
- /**
- * Get a request parameter, if NULL is returned to defaultValue
- *
- * @param paramName parameter name
- * @param defaultValue default String value
- * @return Return request parameter values
- */
- public String formString(String paramName, String defaultValue) {
- return this.request.query(paramName, defaultValue);
- }
-
  @Deprecated
  public Integer fromInt(String paramName) {
  return this.request.queryInt(paramName).orElse(null);
@@ -174,13 +153,34 @@ public Long fromLong(String paramName, Long defaultValue) {
  return this.request.queryLong(paramName, defaultValue);
  }
 
+ /**
+ * Get a request parameter
+ *
+ * @param paramName Parameter name
+ * @return Return request parameter value
+ */
+ public String query(String paramName) {
+ return this.request.query(paramName).orElse(null);
+ }
+
+ /**
+ * Get a request parameter, if NULL is returned to defaultValue
+ *
+ * @param paramName parameter name
+ * @param defaultValue default String value
+ * @return Return request parameter values
+ */
+ public String query(String paramName, String defaultValue) {
+ return this.request.query(paramName, defaultValue);
+ }
+
  /**
  * Returns a request parameter for a Int type
  *
  * @param paramName Parameter name
  * @return Return Int parameter values
  */
- public Integer formInt(String paramName) {
+ public Integer queryInt(String paramName) {
  return this.request.queryInt(paramName).orElse(null);
  }
 
@@ -191,7 +191,7 @@ public Integer formInt(String paramName) {
  * @param defaultValue default int value
  * @return Return Int parameter values
  */
- public Integer formInt(String paramName, Integer defaultValue) {
+ public Integer queryInt(String paramName, Integer defaultValue) {
  return this.request.queryInt(paramName, defaultValue);
  }
 
@@ -201,7 +201,7 @@ public Integer formInt(String paramName, Integer defaultValue) {
  * @param paramName Parameter name
  * @return Return Long parameter values
  */
- public Long formLong(String paramName) {
+ public Long queryLong(String paramName) {
  return this.request.queryLong(paramName).orElse(null);
  }
 
@@ -212,10 +212,26 @@ public Long formLong(String paramName) {
  * @param defaultValue default long value
  * @return Return Long parameter values
  */
- public Long formLong(String paramName, Long defaultValue) {
+ public Long queryLong(String paramName, Long defaultValue) {
  return this.request.queryLong(paramName, defaultValue);
  }
 
+ public Double queryDouble(String paramName) {
+ return this.request.queryDouble(paramName, null);
+ }
+
+ public Double queryDouble(String paramName, Double defaultValue) {
+ return this.request.queryDouble(paramName, defaultValue);
+ }
+
+ public Boolean queryBoolean(String paramName) {
+ return this.request.queryBoolean(paramName, null);
+ }
+
+ public Boolean queryBoolean(String paramName, Boolean defaultValue) {
+ return this.request.queryBoolean(paramName, defaultValue);
+ }
+
  /**
  * Get a URL parameter
  *

diff --git a/src/main/java/com/blade/mvc/http/Request.java b/src/main/java/com/blade/mvc/http/Request.java
@@ -247,11 +247,21 @@ default Optional<Double> queryDouble(@NonNull String name) {
  * @param defaultValue default double value
  * @return Return Double parameter values
  */
- default double queryDouble(@NonNull String name, double defaultValue) {
+ default double queryDouble(@NonNull String name, Double defaultValue) {
  Optional<String> value = query(name);
  return value.map(Double::parseDouble).orElse(defaultValue);
  }
 
+ default Optional<Boolean> queryBoolean(@NonNull String name) {
+ Optional<String> value = query(name);
+ return value.map(Boolean::valueOf);
+ }
+
+ default boolean queryBoolean(@NonNull String name, Boolean defaultValue) {
+ Optional<String> value = query(name);
+ return value.map(Boolean::valueOf).orElse(defaultValue);
+ }
+
  /**
  * Get current request http method. e.g: GET
  *