Server:远程函数key():function(...)新增优先级key-() > key() > key+()，优化Function执行后的报错

Author: TommyLemon

APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoFunction.java

@@ -14,13 +14,15 @@
 
 package apijson.demo.server;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.demo.server.model.BaseModel;
 import zuo.biao.apijson.Log;
+import zuo.biao.apijson.RequestRole;
 import zuo.biao.apijson.server.Function;
 import zuo.biao.apijson.server.NotNull;
 
@@ -87,10 +89,33 @@ public static Object invoke(JSONObject request, String function) throws Exceptio
 
 
 
-
-public String search(@NotNull JSONObject request, String key) {
+
+/**TODO 仅用来测试 "key-()":"getIdList()" 和 "key()":"getIdList()"
+ * @param request
+ * @return
+ * @throws Exception
+ */
+public JSONArray getIdList(@NotNull JSONObject request) throws Exception {
+return new JSONArray(Arrays.asList(12, 15, 301, 82001, 82002, 38710)); //只能用JSONArray，用long[]会在SQLConfig解析崩溃
+}
+
+/**TODO 仅用来测试 "key-()":"verifyAccess()"
+ * @param request
+ * @return
+ * @throws Exception
+ */
+public Object verifyAccess(@NotNull JSONObject request) throws Exception {
+long userId = request.getLongValue(zuo.biao.apijson.JSONObject.KEY_USER_ID);
+RequestRole role = RequestRole.get(request.getString(zuo.biao.apijson.JSONObject.KEY_ROLE));
+if (userId != 70793 && role == RequestRole.ADMIN) {
+throw new IllegalAccessException("verifyAccess:ADMIN账号只能为70793！");
+}
 return null;
 }
+
+
+
+
 
 public double plus(@NotNull JSONObject request, String i0, String i1) {
 return request.getDoubleValue(i0) + request.getDoubleValue(i1);
@@ -260,4 +285,7 @@ public double doubleValue(@NotNull JSONObject request, String value) {
 }
 //获取非基本类型对应基本类型的非空值 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
+
+
+
 }

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java

@@ -193,8 +193,21 @@ public boolean isBreakParse() {
 protected JSONObject response;
 protected JSONObject sqlRequest;
 protected JSONObject sqlReponse;
+/**
+ * 自定义关键词
+ */
 protected Map<String, Object> customMap;
-protected Map<String, String> functionMap;
+/**
+ * 远程函数
+ * {"-":{ "key-()":value }, "0":{ "key()":value }, "+":{ "key+()":value } }
+ * - : 在executeSQL前解析
+ * 0 : 在executeSQL后、onChildParse前解析
+ * + : 在onChildParse后解析
+ */
+protected Map<String, Map<String, String>> functionMap;
+/**
+ * 子对象
+ */
 protected Map<String, JSONObject> childMap;
 
 /**解析成员
@@ -221,7 +234,7 @@ public AbstractObjectParser parse() throws Exception {
 customMap = new LinkedHashMap<String, Object>();
 childMap = new LinkedHashMap<String, JSONObject>();
 }
-functionMap = new LinkedHashMap<String, String>();//必须执行
+functionMap = new LinkedHashMap<String, Map<String, String>>();//必须执行
 
 
 //条件<<<<<<<<<<<<<<<<<<<
@@ -283,6 +296,8 @@ else if (method == PUT && value instanceof JSONArray
 invalidate();//忽略错误，还原request
 }
 }
+
+onFunctionResponse("-");
 }
 }
 
@@ -352,10 +367,35 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 if (value instanceof String == false) {
 throw new IllegalArgumentException(path + "/" + key + ":function() 后面必须为函数String！");
 }
-functionMap.put(key, (String) value);
-} else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(key) == false) {
+
+String k = key.substring(0, key.length() - 2);
+
+String type; //远程函数比较少用，一般一个Table:{}内用到也就一两个，所以这里用 "-","0","+" 更直观，转用 -1,0,1 对性能提升不大。
+if (k.endsWith("-")) {
+type = "-";
+k = k.substring(0, k.length() - 1);
+}
+else if (k.endsWith("+")) {
+type = "+";
+k = k.substring(0, k.length() - 1);
+}
+else {
+type = "0";
+}
+
+//远程函数比较少用，一般一个Table:{}内用到也就一两个，所以这里循环里new出来对性能影响不大。
+Map<String, String> map = functionMap.get(type);
+if (map == null) {
+map = new LinkedHashMap<>();
+}
+map.put(k, (String) value);
+
+functionMap.put(type, map);
+}
+else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(key) == false) {
 customMap.put(key, value);
-} else {
+}
+else {
 sqlRequest.put(key, value);
 }
 
@@ -554,18 +594,45 @@ public JSONObject response() throws Exception {
 }
 
 
+onFunctionResponse("0");
+
+onChildResponse();
+
+onFunctionResponse("+");
+
+onComplete();
+
+return response;
+}
+
+
+@Override
+public void onFunctionResponse(String type) throws Exception {
+Map<String, String> map = functionMap == null ? null : functionMap.get(type);
 
 //解析函数function
-if (functionMap != null) {
-Set<Entry<String, String>> functionSet = functionMap == null ? null : functionMap.entrySet();
-if (functionSet != null && functionSet.isEmpty() == false) {
-for (Entry<String, String> entry : functionSet) {
-response.put(AbstractSQLConfig.getRealKey(method, entry.getKey(), false, false)
-, onFunctionParse(response, entry.getValue()));
+Set<Entry<String, String>> functionSet = map == null ? null : map.entrySet();
+if (functionSet != null && functionSet.isEmpty() == false) {
+JSONObject json = "-".equals(type) ? request : response;
+
+String key;
+Object value;
+for (Entry<String, String> entry : functionSet) {
+
+value = onFunctionParse(json, entry.getValue());
+
+if (value != null) {
+key = AbstractSQLConfig.getRealKey(method, entry.getKey(), false, false);
+
+response.put(key, value);
+parser.putQueryResult(AbstractParser.getAbsPath(path, key), value);
 }
 }
 }
-
+}
+
+@Override
+public void onChildResponse() throws Exception {
 //把isTable时取出去child解析后重新添加回来
 Set<Entry<String, JSONObject>> set = childMap == null ? null : childMap.entrySet();
 if (set != null) {
@@ -577,12 +644,9 @@ public JSONObject response() throws Exception {
 }
 }
 }
-
-onComplete();
-
-return response;
 }
 
+
 @Override
 public Object onFunctionParse(JSONObject json, String function) throws Exception {
 return null;
@@ -712,7 +776,7 @@ public Map<String, Object> getCustomMap() {
 return customMap;
 }
 @Override
-public Map<String, String> getFunctionMap() {
+public Map<String, Map<String, String>> getFunctionMap() {
 return functionMap;
 }
 @Override

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Function.java

@@ -95,6 +95,10 @@ public static Object invoke(@NotNull Function fun, @NotNull JSONObject request,
 + "\n调用时不要有空格！");
 }
 if (e instanceof InvocationTargetException) {
+Throwable te = ((InvocationTargetException) e).getTargetException();
+if (StringUtil.isEmpty(te.getMessage(), true) == false) { //到处把函数声明throws Exception改成throws Throwable挺麻烦
+throw te instanceof Exception ? (Exception) te : new Exception(te.getMessage());
+}
 throw new IllegalArgumentException("字符 " + function + " 对应的远程函数传参类型错误！"
 + "\n请检查 key:value 中value的类型是否满足已定义的函数 " + getFunction(method, keys) + " 的要求！");
 }

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/ObjectParser.java

@@ -117,6 +117,10 @@ public interface ObjectParser {
  */
 JSONObject response() throws Exception;
 
+void onFunctionResponse(String type) throws Exception;
+
+void onChildResponse() throws Exception;
+
 
 SQLConfig newSQLConfig() throws Exception;
 
@@ -147,7 +151,7 @@ public interface ObjectParser {
 JSONObject getSqlReponse();
 
 Map<String, Object> getCustomMap();
-Map<String, String> getFunctionMap();
+Map<String, Map<String, String>> getFunctionMap();
 Map<String, JSONObject> getChildMap();