Server:format格式化Response仅在成功时才生效；优化代码

TommyLemon · TommyLemon · commit 477ce8ac04d9 · 2018-12-02T01:29:47.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONObject.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONObject.java
@@ -403,9 +403,9 @@ public Object put(String key, Object value) {
 			return null;
 		}
 		if (StringUtil.isEmpty(key, true)) {
-			Class<?> clazz = value.getClass();
-			if (clazz == null || clazz.getAnnotation(MethodAccess.class) == null) {
-				throw new IllegalArgumentException("puts  StringUtil.isNotEmpty(key, true) == false" +
+			Class<?> clazz = value.getClass(); //should not return null
+			if (clazz.getAnnotation(MethodAccess.class) == null) {
+				throw new IllegalArgumentException("puts  StringUtil.isEmpty(key, true)" +
 						" && clazz == null || clazz.getAnnotation(MethodAccess.class) == null" +
 						" \n key为空时仅支持 类型被@MethodAccess注解 的value !!!" +
 						" \n 如果一定要这么用，请对 " + clazz.getName() + " 注解！" +
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONResponse.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONResponse.java
@@ -167,7 +167,7 @@ public static boolean isSuccess(JSONResponse response) {
 	 * @return
 	 */
 	public static boolean isSuccess(JSONObject response) {
-		return isSuccess(response.getIntValue(KEY_CODE));
+		return response != null && isSuccess(response.getIntValue(KEY_CODE));
 	}
 
 	/**校验服务端是否存在table
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -315,7 +315,7 @@ public JSONObject parseResponse(JSONObject request) {
 		Log.d(TAG, "parseResponse  endTime = " + endTime + ";  duration = " + (endTime - startTime)
 				+ ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n\n");
 
-		return globleFormat ? new JSONResponse(requestObject) : requestObject;
+		return globleFormat && JSONResponse.isSuccess(requestObject) ? new JSONResponse(requestObject) : requestObject;
 	}
 
 
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java
@@ -126,8 +126,8 @@ public JSONObject execute(SQLConfig config) throws Exception {
 
 		config.setPrepared(prepared);
 
-		if (StringUtil.isNotEmpty(sql, true) == false) {
-			Log.e(TAG, "select  StringUtil.isNotEmpty(sql, true) == false >> return null;");
+		if (StringUtil.isEmpty(sql, true)) {
+			Log.e(TAG, "select  StringUtil.isEmpty(sql, true) >> return null;");
 			return null;
 		}
 		JSONObject result = null;

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public static boolean isSuccess(JSONResponse response) {`
`167`	`167`	`* @return`
`168`	`168`	`*/`
`169`	`169`	`public static boolean isSuccess(JSONObject response) {`
`170`		`- return isSuccess(response.getIntValue(KEY_CODE));`
	`170`	`+ return response != null && isSuccess(response.getIntValue(KEY_CODE));`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/**校验服务端是否存在table`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public JSONObject parseResponse(JSONObject request) {`
`315`	`315`	`Log.d(TAG, "parseResponse endTime = " + endTime + "; duration = " + (endTime - startTime)`
`316`	`316`	`+ ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n\n");`
`317`	`317`
`318`		`- return globleFormat ? new JSONResponse(requestObject) : requestObject;`
	`318`	`+ return globleFormat && JSONResponse.isSuccess(requestObject) ? new JSONResponse(requestObject) : requestObject;`
`319`	`319`	`}`
`320`	`320`
`321`	`321`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ public JSONObject execute(SQLConfig config) throws Exception {`
`126`	`126`
`127`	`127`	`config.setPrepared(prepared);`
`128`	`128`
`129`		`- if (StringUtil.isNotEmpty(sql, true) == false) {`
`130`		`- Log.e(TAG, "select StringUtil.isNotEmpty(sql, true) == false >> return null;");`
	`129`	`+ if (StringUtil.isEmpty(sql, true)) {`
	`130`	`+ Log.e(TAG, "select StringUtil.isEmpty(sql, true) >> return null;");`
`131`	`131`	`return null;`
`132`	`132`	`}`
`133`	`133`	`JSONObject result = null;`