格式化

src/main/java/com/jfinal/core/paragetter/BeanGetter.java

@@ -20,7 +20,6 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
-
 import com.jfinal.core.Action;
 import com.jfinal.core.ActionHandler;
 import com.jfinal.core.Controller;
@@ -73,16 +72,16 @@ public class BeanGetter<T> extends ParaGetter<T> {
 	private T toBean(com.alibaba.fastjson.JSONObject jsonObj) {
 		String paraName = this.getParameterName();
 		if (jsonObj.containsKey(paraName)) {
-			if(List.class.isAssignableFrom(beanClass)){
+			if (List.class.isAssignableFrom(beanClass)) {
 				return toList(jsonObj.getJSONArray(paraName));
-			}else if(Map.class.isAssignableFrom(beanClass)){
+			} else if (Map.class.isAssignableFrom(beanClass)) {
 				return jsonObj.getJSONObject(paraName).toJavaObject(beanClass);
 			}
 			// 存在与 action 形参名相同的 request 参数则使用其 value 值进行转换
 			return jsonObj.getObject(paraName, beanClass);
 		} else {
 			//如果不是集合、数组、Map，则返回 null
-			if(List.class.isAssignableFrom(beanClass) || beanClass.isArray() || Map.class.isAssignableFrom(beanClass)){
+			if (List.class.isAssignableFrom(beanClass) || beanClass.isArray() || Map.class.isAssignableFrom(beanClass)) {
 				return null;
 			}
 			// 否则使用整个请求中的 json 进行转换

src/main/java/com/jfinal/core/paragetter/IntegerArrayGetter.java

@@ -17,7 +17,6 @@ package com.jfinal.core.paragetter;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.core.Action;
 import com.jfinal.core.ActionHandler;
@@ -37,22 +36,22 @@ public class IntegerArrayGetter extends ParaGetter<Integer[]> {
 		if (ActionHandler.resolveJson && c.isJsonRequest()) {
 			JsonRequest jsonRequest = (JsonRequest) c.getRequest();
 			JSONObject jsonObject = jsonRequest.getJSONObject();
-			if(jsonObject != null && !jsonObject.isEmpty() && jsonObject.containsKey(paraName)){
+			if (jsonObject != null && jsonObject.containsKey(paraName)) {
 				Object values = jsonObject.get(paraName);
-				if(values !=null){
-					if(values instanceof String){
+				if (values != null) {
+					if (values instanceof String) {
 						ret = to(values.toString());
-					}else if(values instanceof List){
-						ret = ((List<Integer>)values).toArray(new Integer[0]);
-					}else if(values instanceof String[]){
-						ret = (Integer[])values;
+					} else if (values instanceof List) {
+						ret = ((List<Integer>) values).toArray(new Integer[0]);
+					} else if (values instanceof String[]) {
+						ret = (Integer[]) values;
 					}
 				}
 			}
-		}else{
+		} else {
 			ret = c.getParaValuesToInt(paraName);
 		}
-		if(null == ret) {
+		if (null == ret) {
 			ret =  this.getDefaultValue();
 		}
 		return ret;
@@ -60,11 +59,11 @@ public class IntegerArrayGetter extends ParaGetter<Integer[]> {
 
 	@Override
 	protected Integer[] to(String v) {
-		if(StrKit.notBlank(v)){
+		if (StrKit.notBlank(v)) {
 			String[] ss = v.split(",");
 			List<Integer> ls = new ArrayList<Integer>(ss.length);
-			for(String s : ss){
-				if(StrKit.notBlank(s)){
+			for (String s : ss) {
+				if (StrKit.notBlank(s)) {
 					ls.add(Integer.parseInt(s.trim()));
 				}
 			}

src/main/java/com/jfinal/core/paragetter/KvGetter.java

@@ -22,9 +22,10 @@ import com.jfinal.core.ActionHandler;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
+
 public class KvGetter extends ParaGetter<Kv> {
 
-	public KvGetter(String parameterName, String defaultValue){
+	public KvGetter(String parameterName, String defaultValue) {
 		super(parameterName, defaultValue);
 	}
 
@@ -35,13 +36,13 @@ public class KvGetter extends ParaGetter<Kv> {
 		if (ActionHandler.resolveJson && c.isJsonRequest()) {
 			JsonRequest jsonRequest = (JsonRequest) c.getRequest();
 			JSONObject jsonObject = jsonRequest.getJSONObject();
-			if(jsonObject != null && !jsonObject.isEmpty() && jsonObject.containsKey(paraName)){
+			if (jsonObject != null && jsonObject.containsKey(paraName)) {
 				ret = Kv.create().set(jsonObject.getJSONObject(paraName).getInnerMap());
 			}
-		}else{
+		} else {
 			ret = to(c.getPara(paraName));
 		}
-		if(null == ret) {
+		if (null == ret) {
 			ret =  this.getDefaultValue();
 		}
 		return ret;
@@ -49,7 +50,7 @@ public class KvGetter extends ParaGetter<Kv> {
 
 	@Override
 	protected Kv to(String v) {
-		if(StrKit.notBlank(v)){
+		if (StrKit.notBlank(v)) {
 			return Kv.create().set(JSON.parseObject(v).getInnerMap());
 		}
 		return null;

src/main/java/com/jfinal/core/paragetter/LongArrayGetter.java

@@ -17,7 +17,6 @@ package com.jfinal.core.paragetter;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.core.Action;
 import com.jfinal.core.ActionHandler;
@@ -37,22 +36,22 @@ public class LongArrayGetter extends ParaGetter<Long[]> {
 		if (ActionHandler.resolveJson && c.isJsonRequest()) {
 			JsonRequest jsonRequest = (JsonRequest) c.getRequest();
 			JSONObject jsonObject = jsonRequest.getJSONObject();
-			if(jsonObject != null && !jsonObject.isEmpty() && jsonObject.containsKey(paraName)){
+			if (jsonObject != null && jsonObject.containsKey(paraName)) {
 				Object values = jsonObject.get(paraName);
-				if(values !=null){
-					if(values instanceof String){
-						ret =to(values.toString());
-					}else if(values instanceof List){
-						ret = ((List<Long>)values).toArray(new Long[0]);
-					}else if(values instanceof String[]){
-						ret = (Long[])values;
+				if (values != null) {
+					if (values instanceof String) {
+						ret = to(values.toString());
+					} else if (values instanceof List) {
+						ret = ((List<Long>) values).toArray(new Long[0]);
+					} else if (values instanceof String[]) {
+						ret = (Long[]) values;
 					}
 				}
 			}
-		}else{
+		} else {
 			ret = c.getParaValuesToLong(paraName);
 		}
-		if(null == ret) {
+		if (null == ret) {
 			ret =  this.getDefaultValue();
 		}
 		return ret;
@@ -60,11 +59,11 @@ public class LongArrayGetter extends ParaGetter<Long[]> {
 
 	@Override
 	protected Long[] to(String v) {
-		if(StrKit.notBlank(v)){
+		if (StrKit.notBlank(v)) {
 			String[] ss = v.split(",");
-			List<Long> ls = new ArrayList<Long>(ss.length);
-			for(String s : ss){
-				if(StrKit.notBlank(s)){
+			List<Long> ls = new ArrayList<>(ss.length);
+			for (String s : ss) {
+				if (StrKit.notBlank(s)) {
 					ls.add(Long.parseLong(s.trim()));
 				}
 			}

src/main/java/com/jfinal/core/paragetter/StringArrayGetter.java

@@ -20,7 +20,6 @@ import com.jfinal.core.Action;
 import com.jfinal.core.ActionHandler;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.StrKit;
-
 import java.util.List;
 
 public class StringArrayGetter extends ParaGetter<String[]> {
@@ -35,29 +34,29 @@ public class StringArrayGetter extends ParaGetter<String[]> {
 		if (ActionHandler.resolveJson && c.isJsonRequest()) {
 			JsonRequest jsonRequest = (JsonRequest) c.getRequest();
 			JSONObject jsonObject = jsonRequest.getJSONObject();
-			if(jsonObject != null && !jsonObject.isEmpty() && jsonObject.containsKey(paraName)){
+			if (jsonObject != null && jsonObject.containsKey(paraName)) {
 				Object values = jsonObject.get(paraName);
-				if(values !=null){
-					if(values instanceof String){
+				if (values != null) {
+					if (values instanceof String) {
 						ret = to(values.toString());
-					}else if(values instanceof List){
-						ret = ((List<String>)values).toArray(new String[0]);
-					}else if(values instanceof String[]){
-						ret = (String[])values;
+					} else if (values instanceof List) {
+						ret = ((List<String>) values).toArray(new String[0]);
+					} else if (values instanceof String[]) {
+						ret = (String[]) values;
 					}
 				}
 			}
-		}else{
+		} else {
 			ret = c.getParaValues(paraName);
 		}
-		if(null == ret) {
+		if (null == ret) {
 			ret =  this.getDefaultValue();
 		}
 		return ret;
 	}
 	@Override
 	protected String[] to(String v) {
-		if(StrKit.notBlank(v)){
+		if (StrKit.notBlank(v)) {
 			return v.split(",");
 		}
 		return null;