Skip to content

Commit 29c594b

Browse files
committed
解决返回 database, schema 等信息,解决返回多余的 version: null
1 parent d5676a6 commit 29c594b

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

src/main/java/apijson/framework/APIJSONParser.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ public M parseResponse(M request) {
114114
if (request.get(FORMAT) == null) {
115115
request.put(FORMAT, session.getAttribute(FORMAT));
116116
}
117+
if (request.get(VERSION) == null) {
118+
request.put(VERSION, session.getAttribute(VERSION));
119+
}
120+
117121
if (request.get(DEFAULTS) == null) {
118122
M defaults = (M) session.getAttribute(DEFAULTS);
119123
Set<Map.Entry<String, Object>> set = defaults == null ? null : defaults.entrySet();
@@ -183,17 +187,4 @@ public APIJSONObjectParser<T, M, L> createObjectParser(@NotNull M request, Strin
183187
}.setMethod(getMethod()).setParser(this);
184188
}
185189

186-
187-
188-
@Override
189-
public void onVerifyContent() throws Exception {
190-
//补充全局缺省版本号 //可能在默认为1的前提下这个请求version就需要为0 requestObject.getIntValue(VERSION) <= 0) {
191-
HttpSession session = getSession();
192-
if (session != null && requestObject.get(VERSION) == null) {
193-
requestObject.put(VERSION, session.getAttribute(VERSION));
194-
}
195-
super.onVerifyContent();
196-
}
197-
198-
199190
}

src/main/java/apijson/framework/javax/APIJSONParser.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ public M parseResponse(M request) {
114114
if (request.get(FORMAT) == null) {
115115
request.put(FORMAT, session.getAttribute(FORMAT));
116116
}
117+
if (request.get(VERSION) == null) {
118+
request.put(VERSION, session.getAttribute(VERSION));
119+
}
120+
117121
if (request.get(DEFAULTS) == null) {
118122
M defaults = (M) session.getAttribute(DEFAULTS);
119123
Set<Map.Entry<String, Object>> set = defaults == null ? null : defaults.entrySet();
@@ -183,17 +187,4 @@ public APIJSONObjectParser<T, M, L> createObjectParser(@NotNull M request, Strin
183187
}.setMethod(getMethod()).setParser(this);
184188
}
185189

186-
187-
188-
@Override
189-
public void onVerifyContent() throws Exception {
190-
//补充全局缺省版本号 //可能在默认为1的前提下这个请求version就需要为0 requestObject.getIntValue(VERSION) <= 0) {
191-
HttpSession session = getSession();
192-
if (session != null && requestObject.get(VERSION) == null) {
193-
requestObject.put(VERSION, session.getAttribute(VERSION));
194-
}
195-
super.onVerifyContent();
196-
}
197-
198-
199190
}

0 commit comments

Comments
 (0)