Skip to content

Commit dadad60

Browse files
TommyLemonTommyLemon
committed
Java：APIJSONBoot 和 APIJSONFinal 优化代码和注释；APIJSONFinal 删除 DemoObjectParser.java 和 DemoSQLExecutor.java，看起来更简洁
1 parent a91c417 commit dadad60

File tree

8 files changed

+57
-162
lines changed

8 files changed

+57
-162
lines changed

Diff for: ‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoFunctionParser.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public DemoFunctionParser(RequestMethod method, String tag, int version, JSONObj
4747

4848
/**
4949
* @param current
50+
* @param idList
5051
* @return
5152
* @throws Exception
5253
*/
@@ -72,7 +73,8 @@ public Object verifyIdList(@NotNull JSONObject current, @NotNull String idList)
7273

7374

7475
/**
75-
* @param request
76+
* @param current
77+
* @param urlList
7678
* @return
7779
* @throws Exception
7880
*/
@@ -98,7 +100,7 @@ public Object verifyURLList(@NotNull JSONObject current, @NotNull String urlList
98100

99101

100102
/**
101-
* @param rq
103+
* @param current
102104
* @param momentId
103105
* @return
104106
* @throws Exception
@@ -126,7 +128,7 @@ public int deleteCommentOfMoment(@NotNull JSONObject current, @NotNull String mo
126128

127129

128130
/**删除评论的子评论
129-
* @param rq
131+
* @param current
130132
* @param toId
131133
* @return
132134
*/
@@ -194,7 +196,7 @@ private JSONArray getChildCommentIdList(long tid) {
194196

195197

196198
/**TODO 仅用来测试 "key-()":"getIdList()" 和 "key()":"getIdList()"
197-
* @param request
199+
* @param current
198200
* @return JSONArray 只能用JSONArray，用long[]会在SQLConfig解析崩溃
199201
* @throws Exception
200202
*/
@@ -204,7 +206,7 @@ public JSONArray getIdList(@NotNull JSONObject current) {
204206

205207

206208
/**TODO 仅用来测试 "key-()":"verifyAccess()"
207-
* @param request
209+
* @param current
208210
* @return
209211
* @throws Exception
210212
*/

Diff for: ‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoObjectParser.java

+12-26
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,25 @@
2222

2323
import apijson.NotNull;
2424
import apijson.RequestMethod;
25-
import apijson.orm.AbstractObjectParser;
26-
import apijson.orm.AbstractParser;
25+
import apijson.framework.APIJSONObjectParser;
2726
import apijson.orm.Join;
2827
import apijson.orm.SQLConfig;
2928

3029

3130
/**简化Parser，getObject和getArray(getArrayConfig)都能用
3231
* @author Lemon
3332
*/
34-
public class DemoObjectParser extends AbstractObjectParser {
35-
36-
public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
37-
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
38-
super(request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable);
39-
}
40-
41-
@Override
42-
public DemoObjectParser setMethod(RequestMethod method) {
43-
super.setMethod(method);
44-
return this;
45-
}
46-
47-
@Override
48-
public DemoObjectParser setParser(AbstractParser<?> parser) {
49-
super.setParser(parser);
50-
return this;
51-
}
52-
53-
54-
@Override
55-
public SQLConfig newSQLConfig(RequestMethod method, String table, String alias, JSONObject request, List<Join> joinList, boolean isProcedure) throws Exception {
56-
return DemoSQLConfig.newSQLConfig(method, table, alias, request, joinList, isProcedure);
57-
}
33+
public class DemoObjectParser extends APIJSONObjectParser {
34+
35+
public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
36+
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
37+
super(session, request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable);
38+
}
39+
40+
@Override
41+
public SQLConfig newSQLConfig(RequestMethod method, String table, String alias, JSONObject request, List<Join> joinList, boolean isProcedure) throws Exception {
42+
return DemoSQLConfig.newSQLConfig(method, table, alias, request, joinList, isProcedure);
43+
}
5844

5945

6046
}

Diff for: ‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoParser.java

+27-16
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,40 @@
1414

1515
package apijson.demo;
1616

17+
import com.alibaba.fastjson.JSONObject;
18+
1719
import apijson.RequestMethod;
20+
import apijson.framework.APIJSONObjectParser;
1821
import apijson.framework.APIJSONParser;
22+
import apijson.orm.SQLConfig;
1923

2024

2125
/**请求解析器
2226
* @author Lemon
2327
*/
2428
public class DemoParser extends APIJSONParser {
2529

26-
public DemoParser() {
27-
super();
28-
}
29-
public DemoParser(RequestMethod method) {
30-
super(method);
31-
}
32-
public DemoParser(RequestMethod method, boolean needVerify) {
33-
super(method, needVerify);
34-
}
35-
36-
// //可重写来设置最大查询数量
37-
// @Override
38-
// public int getMaxQueryCount() {
39-
// return 50;
40-
// }
41-
30+
public DemoParser() {
31+
super();
32+
}
33+
public DemoParser(RequestMethod method) {
34+
super(method);
35+
}
36+
public DemoParser(RequestMethod method, boolean needVerify) {
37+
super(method, needVerify);
38+
}
39+
40+
// 可重写来设置最大查询数量
41+
// @Override
42+
// public int getMaxQueryCount() {
43+
// return 50;
44+
// }
45+
46+
47+
@Override
48+
public APIJSONObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
49+
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
50+
return new DemoObjectParser(getSession(), request, parentPath, arrayConfig
51+
, isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);
52+
}
4253
}

Diff for: ‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoFunctionParser.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
package apijson.demo;
1616

17+
import com.alibaba.fastjson.JSONArray;
18+
import com.alibaba.fastjson.JSONObject;
19+
1720
import java.util.ArrayList;
1821
import java.util.Arrays;
1922
import java.util.Collection;
2023

2124
import javax.servlet.http.HttpSession;
2225

23-
import com.alibaba.fastjson.JSONArray;
24-
import com.alibaba.fastjson.JSONObject;
25-
2626
import apijson.JSONResponse;
2727
import apijson.NotNull;
2828
import apijson.RequestMethod;
@@ -47,6 +47,7 @@ public DemoFunctionParser(RequestMethod method, String tag, int version, JSONObj
4747

4848
/**
4949
* @param current
50+
* @param idList
5051
* @return
5152
* @throws Exception
5253
*/
@@ -72,7 +73,8 @@ public Object verifyIdList(@NotNull JSONObject current, @NotNull String idList)
7273

7374

7475
/**
75-
* @param request
76+
* @param current
77+
* @param urlList
7678
* @return
7779
* @throws Exception
7880
*/
@@ -98,7 +100,7 @@ public Object verifyURLList(@NotNull JSONObject current, @NotNull String urlList
98100

99101

100102
/**
101-
* @param rq
103+
* @param current
102104
* @param momentId
103105
* @return
104106
* @throws Exception
@@ -126,7 +128,7 @@ public int deleteCommentOfMoment(@NotNull JSONObject current, @NotNull String mo
126128

127129

128130
/**删除评论的子评论
129-
* @param rq
131+
* @param current
130132
* @param toId
131133
* @return
132134
*/
@@ -194,7 +196,7 @@ private JSONArray getChildCommentIdList(long tid) {
194196

195197

196198
/**TODO 仅用来测试 "key-()":"getIdList()" 和 "key()":"getIdList()"
197-
* @param request
199+
* @param current
198200
* @return JSONArray 只能用JSONArray，用long[]会在SQLConfig解析崩溃
199201
* @throws Exception
200202
*/
@@ -204,7 +206,7 @@ public JSONArray getIdList(@NotNull JSONObject current) {
204206

205207

206208
/**TODO 仅用来测试 "key-()":"verifyAccess()"
207-
* @param request
209+
* @param current
208210
* @return
209211
* @throws Exception
210212
*/

Diff for: ‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoObjectParser.java

-60
This file was deleted.

Diff for: ‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public DemoParser(RequestMethod method, boolean needVerify) {
3333
super(method, needVerify);
3434
}
3535

36-
// //可重写来设置最大查询数量
36+
// 可重写来设置最大查询数量
3737
// @Override
3838
// public int getMaxQueryCount() {
3939
// return 50;

Diff for: ‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoSQLExecutor.java

-40
This file was deleted.

Diff for: ‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/jfinal/DemoAppConfig.java

-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@
3737
import apijson.demo.DemoFunctionParser;
3838
import apijson.demo.DemoParser;
3939
import apijson.demo.DemoSQLConfig;
40-
import apijson.demo.DemoSQLExecutor;
4140
import apijson.demo.DemoVerifier;
4241
import apijson.framework.APIJSONApplication;
4342
import apijson.framework.APIJSONCreator;
4443
import apijson.orm.AbstractVerifier;
4544
import apijson.orm.FunctionParser;
4645
import apijson.orm.Parser;
4746
import apijson.orm.SQLConfig;
48-
import apijson.orm.SQLExecutor;
4947
import apijson.orm.Verifier;
5048

5149

@@ -84,10 +82,6 @@ public Verifier<Long> createVerifier() {
8482
public SQLConfig createSQLConfig() {
8583
return new DemoSQLConfig();
8684
}
87-
@Override
88-
public SQLExecutor createSQLExecutor() {
89-
return new DemoSQLExecutor();
90-
}
9185

9286
};
9387

0 commit comments

Comments
 (0)