From 30e69a52e02be0559da9a034ac72a3fb145d77aa Mon Sep 17 00:00:00 2001 From: Bing Ran Date: Mon, 14 Mar 2016 00:19:40 +0800 Subject: [PATCH] fixed websocket reverse absolute lookup --- dist-lib/japidplay-0.9.6.jar | Bin 107485 -> 107270 bytes lib/japidplay-0.9.6.jar | Bin 107485 -> 107270 bytes readme.txt | 4 +++- src.japidplay/cn/bran/play/RouteAdapter.java | 17 +++-------------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dist-lib/japidplay-0.9.6.jar b/dist-lib/japidplay-0.9.6.jar index bd3b8871ee2586b642bb1c4764f4b14bce73cadd..ec5265a735485f3d30e2d0fe37823f6dba16694c 100644 GIT binary patch delta 3960 zcmZvf2{e@5AIG0N$P$eq$-ZxckzJ+Ikfjl-SICkmDND*yDkdRb%gFlJGS;XpX+cS3 zuZXCmvP?=TNsD+x{hzrry(jPa&pFSzpY#2F@9+0}?p)^Hp^jx|+m{L0Q8+mH5QGOo z*5Le;1ynh-u)*jC9Hyn2Ln;9%aA3hyL!b&r51R{!S}3k2tNa6HVF5~@Bu zoQnUYel2)0g%#ra)ePZA56D=yg6WAV?z|DfjUbZ*G>{vpP(zOi4@fmA@Fp53Y|}_^ z<>!oU({8TGUiSR7lpwDn+Bz}DEBP$8YK&LR zmgsG|-I}BrU}tHpw5#r`Ky=;6U(t8LSj2o)0-2D9kG|SkKPdO=q5*lxg z4_w&Z^0-6&>$O|K)ZICnN0lbr3`(5NX3ocJm%2X_s!8F+dpXcn;dY?)i;@_f)RM4d9=zs47(>$P~7wFNrVlVwc_&SkU%5l`N^*mKUZb+lWls-T=Wps!Iuq^f9A~eb^6|@<<#iOHH-!n+Jbi-e z+1R0}fDS}A1ro#mertdGw6>Vm#p7aCoyYClsy<8f9dHp%ELWz|zIC4fq_J9Jc+AMo zh=jOJqe(=!mJh_?rX1qWC~XlZ>$157Z}aJlgm@x}p~E}uZXt4bOiF~yT9+a5vGi3> z*?q?y)d}iC>jn%~?n!8G=}*?Oephr~?#2u2qj%Ue-#bSR$g$UEq!}Y()Do^U!YWdww-1o1 z#f2~aGP|?!{w@uQ;o9fVT?02))Ro+vvyEU z%=6}_{|q&~o_=dqe>m*Pz~wmJp{~IL{H3z*_jYE9eLnQw%Z+E+Rr-Q>$o{9_Wg5Rv zF&K7^gVgn{^I@(WRZ#{5nt~Zu1%i!VFA7Nac;9@bS2p=+NdB~{#?G^E{<>c1VA5A$ z8~dRmIxysdc}A(Bek&F4`LaiOZ`<87dFN9DsF|i@(6Xno&T?7m=Ao0qmme#IQ6m?! z!y8F5@4sGbfBW;+M?c0T&Ar9P%Wjgs91(2{o|l!2R23>L4_MF+@308addn?7&h0ZU zW1-to&hW(_dE@q7XkK7K$r5!*Zt-oyBhzuK@6NB?u|bZ1H2k{|l{Q+2pO#fK8?3FA z)sb=~2T^TBs)+_J{7tW>7)2zz`@-KNTHmD_jZf9SGFlc&ZWgrpFM}AM*SFa*ua(`nnS>VD=mD720=Zqd%%#3XI(V>QNw2Bm`0&8P)0}bFTa9a)T34j?Mz)DB|JcMYJw6#2tbQOY zM@cp;R$7cc8#uOn-)x)yU~qXyrKe_y?es&HdsDc>;c=6B4QlKC1VXNP3+>r_NBHMG zXOHHF2Xmc{c+Z0$?1N~tR5w%SbqxuAFEXmbZmSGAx6yPPL_2l`y#2-(l5!+&Z@9xz z2a)hm< zlV7I5A}U3y^U;ItQ=j%p<_3DYcg`5UOy*Hm>m67hnz4gCQW3i#QC~*YikxeFnRw-Z z>VwXH&FCi0cz-?Idaa_%arI$TMTf<^_Qa=Qkuq)yogd0M4+s2I{6Zs|Ps;hHbA`r#MERkV1w>}`s3IKJL~o8m{l z!8{LQbO5Co3! zcf8h22n?}EaV0S0f>9qa;Lg$>iUTJW5hXzsi>jpnl|{NTAc94;vfwO>OyqxStqQ+= z=1O24D;lW`#5rM&d?IjU(L4!U<%Zf71K=V832zOK@I#7p1Q+03RAV=ohLVgk@PJ1b zG|CmsKfgYX4Q&5=VD!ian`E%{u&lqtn|2jDmXBbM;~# z1|H_6!BWF<;_xIVg6LqfMWyuNzk&s3Zu_Zk|_XFrde;|%-Dq^R!DZ;ANoI-tyuzz{jSA^zb0wADuML=em KVD-zIVUqlFbj^}6uta8;eBcN1h9U!1cPQw0; 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 nqq)RuP9}0m4lUfpd<52$tjfkxB diff --git a/lib/japidplay-0.9.6.jar b/lib/japidplay-0.9.6.jar index bd3b8871ee2586b642bb1c4764f4b14bce73cadd..ec5265a735485f3d30e2d0fe37823f6dba16694c 100644 GIT binary patch delta 3960 zcmZvf2{e@5AIG0N$P$eq$-ZxckzJ+Ikfjl-SICkmDND*yDkdRb%gFlJGS;XpX+cS3 zuZXCmvP?=TNsD+x{hzrry(jPa&pFSzpY#2F@9+0}?p)^Hp^jx|+m{L0Q8+mH5QGOo z*5Le;1ynh-u)*jC9Hyn2Ln;9%aA3hyL!b&r51R{!S}3k2tNa6HVF5~@Bu zoQnUYel2)0g%#ra)ePZA56D=yg6WAV?z|DfjUbZ*G>{vpP(zOi4@fmA@Fp53Y|}_^ z<>!oU({8TGUiSR7lpwDn+Bz}DEBP$8YK&LR zmgsG|-I}BrU}tHpw5#r`Ky=;6U(t8LSj2o)0-2D9kG|SkKPdO=q5*lxg z4_w&Z^0-6&>$O|K)ZICnN0lbr3`(5NX3ocJm%2X_s!8F+dpXcn;dY?)i;@_f)RM4d9=zs47(>$P~7wFNrVlVwc_&SkU%5l`N^*mKUZb+lWls-T=Wps!Iuq^f9A~eb^6|@<<#iOHH-!n+Jbi-e z+1R0}fDS}A1ro#mertdGw6>Vm#p7aCoyYClsy<8f9dHp%ELWz|zIC4fq_J9Jc+AMo zh=jOJqe(=!mJh_?rX1qWC~XlZ>$157Z}aJlgm@x}p~E}uZXt4bOiF~yT9+a5vGi3> z*?q?y)d}iC>jn%~?n!8G=}*?Oephr~?#2u2qj%Ue-#bSR$g$UEq!}Y()Do^U!YWdww-1o1 z#f2~aGP|?!{w@uQ;o9fVT?02))Ro+vvyEU z%=6}_{|q&~o_=dqe>m*Pz~wmJp{~IL{H3z*_jYE9eLnQw%Z+E+Rr-Q>$o{9_Wg5Rv zF&K7^gVgn{^I@(WRZ#{5nt~Zu1%i!VFA7Nac;9@bS2p=+NdB~{#?G^E{<>c1VA5A$ z8~dRmIxysdc}A(Bek&F4`LaiOZ`<87dFN9DsF|i@(6Xno&T?7m=Ao0qmme#IQ6m?! z!y8F5@4sGbfBW;+M?c0T&Ar9P%Wjgs91(2{o|l!2R23>L4_MF+@308addn?7&h0ZU zW1-to&hW(_dE@q7XkK7K$r5!*Zt-oyBhzuK@6NB?u|bZ1H2k{|l{Q+2pO#fK8?3FA z)sb=~2T^TBs)+_J{7tW>7)2zz`@-KNTHmD_jZf9SGFlc&ZWgrpFM}AM*SFa*ua(`nnS>VD=mD720=Zqd%%#3XI(V>QNw2Bm`0&8P)0}bFTa9a)T34j?Mz)DB|JcMYJw6#2tbQOY zM@cp;R$7cc8#uOn-)x)yU~qXyrKe_y?es&HdsDc>;c=6B4QlKC1VXNP3+>r_NBHMG zXOHHF2Xmc{c+Z0$?1N~tR5w%SbqxuAFEXmbZmSGAx6yPPL_2l`y#2-(l5!+&Z@9xz z2a)hm< zlV7I5A}U3y^U;ItQ=j%p<_3DYcg`5UOy*Hm>m67hnz4gCQW3i#QC~*YikxeFnRw-Z z>VwXH&FCi0cz-?Idaa_%arI$TMTf<^_Qa=Qkuq)yogd0M4+s2I{6Zs|Ps;hHbA`r#MERkV1w>}`s3IKJL~o8m{l z!8{LQbO5Co3! zcf8h22n?}EaV0S0f>9qa;Lg$>iUTJW5hXzsi>jpnl|{NTAc94;vfwO>OyqxStqQ+= z=1O24D;lW`#5rM&d?IjU(L4!U<%Zf71K=V832zOK@I#7p1Q+03RAV=ohLVgk@PJ1b zG|CmsKfgYX4Q&5=VD!ian`E%{u&lqtn|2jDmXBbM;~# z1|H_6!BWF<;_xIVg6LqfMWyuNzk&s3Zu_Zk|_XFrde;|%-Dq^R!DZ;ANoI-tyuzz{jSA^zb0wADuML=em KVD-zIVUqlFbj^}6uta8;eBcN1h9U!1cPQw0; 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 nqq)RuP9}0m4lUfpd<52$tjfkxB diff --git a/readme.txt b/readme.txt index bbde330..c63f6fd 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Bing Ran -Latest version: 0.9.5.2 +Latest version: 0.9.6 * Links: @@ -50,6 +50,8 @@ repositories: * Version History: +2016/3/11: V0.9.6: + 1. bug: absolute reverse lookup for websocket (WS) protocol failed. 2016/3/11: V0.9.6: 1. bug: get methods reverse lookup not working for AutoPath generated routes. 2. change: some JDK8 usage in AutoPath. Compiled with JDK8 diff --git a/src.japidplay/cn/bran/play/RouteAdapter.java b/src.japidplay/cn/bran/play/RouteAdapter.java index ac31923..f460d53 100755 --- a/src.japidplay/cn/bran/play/RouteAdapter.java +++ b/src.japidplay/cn/bran/play/RouteAdapter.java @@ -60,28 +60,17 @@ public RouteAdapter() { */ @Override public String lookup(String actionString, Object[] params) { - - String actionStringForLocalLookup = actionString; - if (actionString.indexOf(".") > 0) { - } else { - Request req = Request.current(); - if (req != null) { - actionStringForLocalLookup = req.controller + "." + actionString; - } - } - ActionDefinition ad = lookupActionDefinition(actionString, params); - return ad.toString(); + return new ActionBridge(false).invokeMethod(actionString, params).toString(); } public ActionDefinition lookupActionDefinition(String actionString, Object[] params) { - ActionDefinition ad = new ActionBridge(false).invokeMethod(actionString, params); - return ad; + return new ActionBridge(false).invokeMethod(actionString, params); } @Override public String lookupAbs(String action, Object[] args) { - return getBaseUrl() + this.lookup(action, args); + return new ActionBridge(true).invokeMethod(action, args).toString(); } // Gets baseUrl from current request or application.baseUrl in application.conf