diff --git a/build.gradle b/build.gradle index 4f6f64e..6e13f1b 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' } group = "org.bdware.sc" -version = "1.5.6" +version = "1.5.8" tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) task copyLibs(type: Copy) { diff --git a/src/main/entry/org/bdware/sc/bean/JoinInfo.java b/src/main/entry/org/bdware/sc/bean/JoinInfo.java index 6cfe8d7..95900a4 100644 --- a/src/main/entry/org/bdware/sc/bean/JoinInfo.java +++ b/src/main/entry/org/bdware/sc/bean/JoinInfo.java @@ -7,12 +7,14 @@ import org.bdware.sc.util.JsonUtil; import java.io.Serializable; public class JoinInfo implements Serializable { - public String joinRule; + public DefaultJoinRule useDefault; + public String joinFuncName; public int joinCount; + public String joinCountFuncName; public static JoinInfo create(AnnotationNode annotationNode, ContractNode contractNode) { JoinInfo info = new JoinInfo(); - info.joinRule = null; + info.useDefault = null; if (annotationNode.getArgs().size() == 1) { String str = annotationNode.getArgs().get(0); info = JsonUtil.fromJson(str, JoinInfo.class); diff --git a/src/main/entry/org/bdware/sc/bean/RouteInfo.java b/src/main/entry/org/bdware/sc/bean/RouteInfo.java index b923ebb..674f093 100644 --- a/src/main/entry/org/bdware/sc/bean/RouteInfo.java +++ b/src/main/entry/org/bdware/sc/bean/RouteInfo.java @@ -8,7 +8,8 @@ import java.io.Serializable; public class RouteInfo implements Serializable { public DefaultRouteRule useDefault; - + // The signature of RouteFunction is + // function myFunc(requester, sourceArg) public String funcName; public static RouteInfo create(AnnotationNode annotationNode, ContractNode contractNode) {