repo_name
stringclasses 5
values | pr_number
int64 1.52k
15.5k
| pr_title
stringlengths 8
143
| pr_description
stringlengths 0
10.2k
| author
stringlengths 3
18
| date_created
timestamp[ns, tz=UTC] | date_merged
timestamp[ns, tz=UTC] | previous_commit
stringlengths 40
40
| pr_commit
stringlengths 40
40
| query
stringlengths 11
10.2k
| filepath
stringlengths 6
220
| before_content
stringlengths 0
597M
| after_content
stringlengths 0
597M
| label
int64 -1
1
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/gray-release/full-release-confirm-dialog.png | PNG
IHDR Q IDATxieWyԒZBԚЌ4`a08`ر$$8NUʧ$8& l#f4G4OygxZLݭ Ug^gkߞiq!!!!!!!!!{<e{|
RN b_:B@@@@@@@@%V%H5B B B B B`"011[' LJicD1 J@@@@tD/7܌c@%lٲ~5kZ%"%
j@@@@ O?EիWX R@= /M6>xXj;@ľ 2Ʉ@@@@ aA XDK K4˾g}KEpo[?2;ڙP d̎B B B #`ndڵmŊ+-}W )%j}"mz;NڑyK>ܚ;
ozӛw(goC=֯_CP w ԟ>@ //0 D`}DA;hYoGO^[oMNN.rz s=חDZn];fE4yC^;l~:t?]쫺ö#=]Lg8wyK.8!!!!0$0: 8B B`Xc8&+ Fb#Q=N7o]VY oνU8+v5Xwa9b>W|?O<L38<*\!\uNes:4j[(R$*"<3L@@@@@@@ I`>
nZ%6:-E G]pR .`
>wygcժUzՁ(GEU 6*O" ʀ+ ڂpuCio|c=kY- L9v|Lҩtk?y%U.||w1N#8/
[zՍq Ť0!!!!!!!!!b߆
RM9gތ7a^!=_ SC1O]PP[fiֈSki5wuW^8+:_VU DײL,q{u&GP,G,,u~Ȫ DazC?Sy\bBR e%( ҪB?B B B B B B Bm܃,+ xlا>=ax5VmUmXJm7ο<^6n uϱcmʏE WցuQ~ toqmq=-N*Ѱw}w_*\ۨlExs9y ~}op䧌\ zSO킟zbyw+M ݙ@ͷ|s
_t|}RξC(5
G=. b;ܧ w7t݅_p 3}:# Fbt Mw ;3%^|nW]cZT
*qESk?_
SZ,>( "0ᤓNTիU iz}'hK4;#8|XIo){m8~5~pUn/ \rI;:믿s|ɽ/Vs)C B B B`[ Y sa
k5?Vp8mj~O:?x7/g Wsa}t_s3q+0 }|ů|3GT+n-K>]a'|6+U Uar א=uWד1K4|qqT`+p뺭ҷy|0G uԼchY{eCIh{n7ggk_gžzG?b97ʙJ 6:g4V吞]P&70s[$Bvڞ'YqR^qdϛj t ,U4 snv:ŞVR
f&-e a3n/?u _;p ZQ9JG }ls!!!![3}wl&<\<sw^8̑Ozz/\U'?ԱV*e`Q3W$P\&_7PN٤kG8gnx>U |#oiȿүt8zh瞨 |n~V} nixtN̏ݳ ?*VZه@Ou p`3ι]w:>n m \4l7lV
ݙgW
p
oxcG ?.HQָׇv}:ID9 r:
t SN邔Λp
Ag/Sa@&^:Q"Lu\`:I`B|(Ǚ>~9u2|3WF^^&p9oB2괛P)a q&R&]Qƹ%߀6I'|oe N΅@@@$` e#IGd9ǏX?Ϳ8s#/b o o5:W[S\k^&{g6xunv9PsJsO)W"
VeO@Dzdet,a|sc7 7z,;+3Z? Y6Ur)\3`脷k_(U_ ,1 ߅ pjekʟ"מq\Lv/4#ݓ|3j 0&
9Rcf\7IgWܶ{q~FǢ)x7|5~4犳fO&|@8֡twNcf\#g4
=(4
<A~' sޏ8Qo^t+ P IϏ v|GJPa8à2WzҴ)8';L[TV x&I wgd%gK0&$ ]Igl^ß-53fP_ r74'5 /]sk)t;&Oo ͳ^b'<j^Ys\m"vYU e?knɏ@z8W©5uSƛ3?dLto3̯-/sDL9lOZʁ6 Ge\bȝ ބ |ǃK`w̉?B G5vZ74)GTډqYXbڷ7nԘj 26
n'@1fJV`0dtX\v\7
:91f<$VpuU\ ɿO ==Zc|O<uwtG߷YS?ƙL~tjΏ\`
J`s(nIGg +o 4hEBC=G }:1eLë 4C-&;WI}a 3t(h ڍh|G9u|뼲x}V
Sa_)g;b Sن6i'Qf{@@@Ẹ̉5Y$ <<<L qxŚO9 jS*Un(q<O /S>iFىJnM<+M{7WXfyVTkktg.P,uOY͟bQGikGf\Y7/_~
=Qn3E1Ȯ|,,aaT )!?&#W یqZ1ӵWc@Y$T\cpƌ댍Cc5*},82_\m&;ht욫f SV4 5Ak1Nc5O?s_ڑ Wc~9e;O \lƥ3mاJR`*GbGPs9}nqm\D$ȿJÞQ ֿhhD':iթT^{T~?:p)\l¹9LPVt\6NچN1 xXFů+0 20e@[(|ex\).B B B vs3(0ϱ
P]5 f Z8xK
$7/p㎅e&\ˍ9a0m~*?KT:NM먓 8eō9?ݸIS!:Ƀ6_y_IO_=
#ntݨr/^VDk
Jur-q } 7 p4Nϰ7s ~\z i8/}_=o?Pu]L dܟn(tzwc #7YGZio?Jxk 4v[xkIBՎ~CL3QmӆXQZB:ΩC:Vx?:s LqRa?PUiTIӀ:ƭγ>#i u m[է:Z)$8^AZCF -N+9xnOQeV:&.7Loܱ1O*Pt0npj>n}l1XoB B B B`{ !K[ ̕lgeNG8,5n7:⚓a0c5-y;vVz|N<7Y8nX|\7n/2.(a8xǺgT90rcgxx0r)C'QqG0r_Yy{c+wNpB8 2.^W[:/{
n/r˳e+{b֘4{}["Xc[]5:gu}LR_pSgZEUo]ps]Á `#
ọ!N9|NY#)csNﾻQ k+kqq+&OA*U
\~dX@9vn
jcH/O [% a4'
{
ܶF!Y]䩼U% * qy;Mű]yԍ;7 #O ʐ0*:-f 0^8] ƾ67oӞG0NU MLoj'ĸ*~!!!!~Cs2+Yfŗ?Wqșw{+ۛ{JnX{I1i
>0uqhO|릭؛*M\+ Яiԭҫu7c\:_~0q~ps W
2G~AbP7ącF>,GC`w%PR]N17X]g1{qKU7f3tr lsKܒ>K\שWckH1
2=29~ Qx=Sg}c?dԓï8ߵg.]rg kz|c%qNxMXK m>_,GG%qTdBTy`
jar10a8` F2T)s<+xsOh3@܍sүauwnp[ũ
z Su~E$t yaiG85!6@ &BQf !!!%Ps/6 JnyLAj)c7F511?5,
"\͠r 'rK
Wj_Ҫ\݈'9Ջ
srvܼPݓ7\q}ܾSJ*ǸƝ)rw9[){b 9q%zP[nPu|yn.\F:; =@ݝo]ۮ5c.v
,tMZj[ו8x3V[rj =ܣCw!0ȤK._W]uUVY \q> {4G
=eo
q1P_OߋqȾ\ol zN碋.zM4lW$OV%[ 8t\a6?80nk^*]Wpvtl;Յ80O\J꧳HrBmQs4u|=3#*3s©\0]i-]U6G~K 0LU{!gDž/ WakO:o&?+~5Y8ه@@@R o>B#0OraOu7@ nSz
/Y
bˍϼPYGH_Y|lqa|
0pC.0s Al4Gd Pa˩sc sqV*!{1,g.-.n*_ܶε ~U?u$YUUJS~ڟPu.?3Ō F_9c_a+C`w&0;uo|]CuW\w Xbo\?3{<ր߲#S:,ߌ㨴WۮrgqDZ~X馛څ^9@1z:a +:2mE1a|
76~v}4dA a]wЧ|KD2Pj0umF% :~9ikpiW5C r%H*PUYt]&&K#Ő_*Pƙx3Y4[I6,8&}m6^9<]ª^;Ο0..Oɳ]ZDQq}s=W?05ih#NMt} m%Ps,% UIs70Asyfyy ͑qWky Us+.78Kę1K9gn̜B9~ssM5#:\\)
syev,͍bQs=y;.Anyq+su^yN݄7)As%Zu|`R.UPcѩ--ۮIұ> S(fqb(g4^b/
5,ØTVlWדؽ?M+_g{xlkjܫqe 2Fl":~=',/1NPVb$8qG86<:*c߉;t]w](OapAT̊S{cc3@2>2Rh*_ا~t^ǜ=~y@J]+<Vc&)e%
Rq5N_g?_Nչ@qq[atH[&@: :NKɳ:ΰ^>?z+G;\_a[ՀSոɅ|IM\;7wN_QvҚMS|&3.FLmx !!!B!K\ƾ17213Aaj eJ͡:Q\oj
?k<J6sښ{\W K97lϽ,.N:6uc; ʿ}Sy<+9s-v!\N kq c/& G*muwY+?3u^a8vN-W }CP QqݕZ*c]o *Ze9tkc1EXq8e&عN 9 h K۫m+g)ØŤQGw_P ͈9>U'cfIUTy IDAT[7,5֘VaZc'qNGc+NP}m̵Jd3GaeJ t߉jh7xc: 6СLd:} S䄱a[u@M<N:2\& L|_Cte:aTPs!7'v_rQ\T唥3ױn'M5 k0??2{*#mhP22T=0O100X30?11?7!K::>+;g|| Ŝql5-/r5[kͅ W%N)9i)8'M fCMjyxh=@O{6s] a`+H+8uW՜C p c F[ F,~%.ؗsh#*~N<<{m {
~>pzcz̵LXbMfϵgV\+?aڬ%/cx^bGI xWu]LSu 6ޘϟrq +sT{iVIVwf͕4.Ϗ<\{inq
Ϋ%UaW `C;Gs8t4 QVXҐC?T:)'^]Ph؊[y.e 9Sz:I9yrXtaįZVi؏sUW~Mx備 BNي|a8u\< ..|NY$E]'N%mG&UѸ !!!%`.f^1n>2_93\p5ݼb4Hp)G_?86Wm Y6qaSuMvӥ#?N8.eVa}+nR+
_WǕ}x)G ~s}YQة_bSaݙjҟw7^{}|?McM GK0ql%
3 )ͻ8?Uq狓6` EWGb\cE}:ۨ;矧 v"8
9OHo!!Dl{dO'
]5 ~_CǿҪ my9/$`O+hָ&$ J9c9b }L1R/Vg/ y ! !-nX~b0c5/ݨ8ه@@@@@@F^wچ%}x{Иa;PsiwV4!Z }pS zjh-Xdb[bO GK|{
4y=(TWq
"F#Y@eY8߫r@㘮KSV~)ؿD2tA˓+1K? XZ(=
WXesPJ$:'^ 1ZNibf\ ++> +K1; iwb'?ƹ~2 !!!!!!!`IoͿR:s쾺6t<U-PK- :jі}fM@qD8C:3m~C^ e"bxsu
@X 3w,mð0b 9'>A?A*۰ c1YB q+
T:ï=[핳(}CX9+xv%\.G'v_nx^ydc6cRsRYاZ%0-;0 awD4 +Sϯ/øch$VcfʼyE_аgIg7Ք6LqY6աtYAD=Wǵ)c]th=B B B B B B
[o|c֨gx\xt*[Xط[~/( 1Qб;s@%'^tRe op;b_B^5̻zP>B B B B B B t Xܓ7}[z~vاܨXaz}KŨ7c\+Ş/y_l !!!!!!{u N૽sq!z%bn9g9l4^&ׇ@
X nUק4I5B B B B B B v =0a,q]W伷ebd sUmXYB B B B B B B`o&PDzf_ AOuﺪ'כ@Aq
vwI?B B B B B B v%%9.oW)y;~}ΩLD>q}u.B]F` w.ĻI#Sͽs+[ sKB B B B B B B`^" P 5x׀HUC B B B B B Au;:Iw};E
Zun_c@@@@@@;\}Fj Djz_|@@@@@@sg!|G b|t$)|헔h@@@@@@ Hj\C`Gط#(& d[Q@@@@@@er/5 R}{HCiŜ럋= )o@@@@@@ObD[ m ` ކ!!!!!!zn><I7vLۼyشyjG4aD \SSSmzzMNNɩyr3v4|=#}{_;cB.X|vC95i?So w\[bE{|vi;h7|s{:ğ-Ҿկk'|\r>B B B B B B`O?t{ډ'oB?s n'pB[fV~K>ӽ6Z[֦g&ڊ֦[[>ڲe3=p[J {܊:(B`1lIsa6n}{]ԧ>>N:i.+>{ްO>d#Is}u]~ ܈<@/ vW |#7ꪫ3<;:}@@@@@ bPnrʬG{ڦM}O^b<M`ŢC&`X}ozk{{ۭ^_vy[UV^z_o\rlb߭ j?Bk߿ q?>c9f6][lz{enݺ.4η,sYl9}{,t ~D=."`貏 =@ľ=RN;},s}z>>t3w]،# x3 n q B;Y1UQG =( ? wW7'E/(Y"=cdp !!!!!:K|^~vgW7}[\"-ś巶8گVb c Xovγ<;oj4Kn=o>'O}QGdǚO~~(,o #? oo_V^>?M]w]V[FC'!4ni0LC B B B B B`_'P_Y+s#TԖGMp|;5w6l%=n7͍ +G } t]vYo,ҳ1`7?Á _! s)B+brIycb1sy K?yL<O|"^>B B B B B H =А裏зD {ط{KJ5Y/va~rx 3P9V}t5.=ZG#jy{nbbl'ҟy{)2
2qXY;˿<+=^i8B B B B B B`kXW1(a{ĭSϷ"6H @?- ~]$c^M+K.,ɟ7'=+Ͽ7γ 2X
z:YIy s,8Yyz!R
nc Bя~ϒ&_i)o\? g&F^8֬Y Lإ~,{2}{re?gk~% ;`ǂϋ:v Y}+_ K|v> g?rJgtOppD;-?n?q}^ҡ,DB@<ҏt0Xe-XyV_ux穻r~1{:}{z !@[UN8%YY*˒zuWdZg0 ??,?iZ+M2O~]d|{>%TzN?٥Eo X g>/㨗0[zYŅN bߞނh igߢ[ϫc5PGPZe_ 6S8wqǬe<#\3 ްe 7tS6/[]tE[=go}[Ro],CSb_Xnx\x-/E<餓}#W*O?}Xg {}{Rk[ b AH=\l,gI%W<?KlX} o<䳟l?s/9G?:[a
/!!!!!!LC/| gA $ 1v} z~}C[% koj +\.Ks xA ο= -(o
4gхqs~/ !!!!!!0\B7>
ݏ@ľݯMRE7̜wh^n% [N<V>"h:v[ .2v9n=[nQc T !!!!!!{' + {gR%̎:+<76tίZy o x JZcG s A-]?>+b Sٟυ[omw^VYF: +lW]uUkkזw!!!!!!!0}pUrݡ5<?<c X?e鈸aÆnǂnԟw=Yc=} .6 /S?S]`^AB*x vVe hw/晀Ug$bƅ@@@@@@@@ľ= n(+9ب#[dzL ˾U_a'znNǬ9ެ;7MSOmDīK=J ;Ϣ\, ˺d !!!!!!!8lX½ޞ$fyE? suntO\dgLQ .hg}V~}@@@@@@@ / v0xuGrŒM7 ,7Z@@@@@@@@G`,&7onS[\QjnY7$,SjS}M{Ҍ@@@@@@@ ,Y۴L~mٲK11:Cq-ȂkzA^ R݂ľ]7vB`T7 ǽe !!!!!!!!}db559VZ}>C B B B B B B B B`GX7}mb& ,Ihwb!!!!!!!!! ,Ziy>.ld !!!!!!!! Xط`J !!!!!!!!!K Dۥy@@@@@@@@8v ˤ!!!!!!!!@ľ]?@@@@@@@@#oDZLJ!!!!!!!!!K bDk˖68[lun3 nٲem>9yzi-6ܜ#B B B B B B B B`&bn66mj}m'[j Ж |\[~Im63Zm+nuD4秧g=6nV\'T{ꩧA VZF"UNL4yFnӦM=Ͽ mmŊ]l4!!!!!!!!U&oM?HkSmZz6m1g/nW*-gi/x G|֭[7+?l'pB{E@a8bm֯_߷:/=+Ҟ| WW^_;gG^G qD;z^U[om'|r?&+A @@@@@@@@vطlypoxW+/fi &ho/=f66{UR[};[P~ĵ=beOZK];vaC=tVcmGؓ棏> {i=ЬG$ n=c=,<~BP${3K}ٞưOwOpvZ;f˿U| 'obY6.浕'\V yVX}`vn+3ɇߖwP[y¥sZXn6lhozӛwϊg믿zꬨ'>?nGDtL;{\yė^Ӹ۱ -#m/0Е89<@oڵq7nI0X&''wb,!!!!!!!]h6<=:J,C` 6Mm
-_VrY[y[^1&Vז vJoC+b6?tS[S۲km}͚5]p##q6s=}2ʉ:U?by;<ց:鱾`":ī|\|kO<#g >K{#X LS]OAkA/`JObalzMmزuNj+ys} l~8줶5ڪ^rߩg~Ԗ E]8%JވwC?? .=|<Gx#G?cGt/!8G ke,G@WUn:k
Vu-.B B B B B B 6^brm-{zAmimol}brrs{WUmѐ^`»@qh3<צ7nyNߊCO}3/?6.k IDAT6Sڦg nmʶr%mAGe ڦ{x[ lX<[t9D8 oVrrJ#yp
}e.z8DC9d o'xb?/OwUBlA]gqV\Xz/8ۓ+ xZW/vWHL@f^]Zk;_c7֖homMx~.LO
_Mڲuf9_ <Vq>qY,8o%<OnG }tЈqΤe/ ;:a,碋. ,L^aI-F_－ CiU!3gxg !!!!!!!!obLkWwMn"yݪmb63QLz[Zdяj_|qX-oBo^# -%I3:&y>yy;z=sY?肟2($-O\'V6O<џW`s !!!!!!!!b_nkn Ҧ}M=p[qYm#S~m̾GVk~66lE[~u} G ydM2e KQ˻JǞrp( ֳ! ;K Aց6K}+.ŏ%gU,lׯ_߮.:Z"Ƀ#?"a\@@@@@@@K`},V Ж vR~6 mu'u863-֖jmjc̦ ?3KP#</"8]9o,0-JT#*Xq wq]! ?;sWeGFʬ'tR%:piY2#}i+:M>zKyٶ鶯U-?ngtk{& ]qYmb!MmF,ےLڛn/%Y;*,=oݳ;9ӗ?c{o8qxQG4K-8, &t1$>i^uU
ه@@@@@@@@v7&?<o闟iKma'y6ĝ}.qpAGǜ;U 졇 Ye֭bP&&ҭ^m^XͪpHp{ꩧM|B я<#aBg '()4->3(>Ooا\q!!!!!!!!!<3XM=qWzvno3cٖek'Yb6o%Jhم<3ϲY_z,Xڱ< sqwgt?BgD_>ķU| A g=s]l߳m. 6 M>B B B B B B B B` ž6rM[ym/ͭ-XmYEGV ~sy[f+!z0p?zs8a|Xy +?b,eyGs*o/nQ8 >`F ^xUvNz` u2ЛW_}uA)#B B B B B B B B`$>COl+Om;[az-[{d[u۶X/$!cW0ӡȟ弖+G \ <t 'O:Ûvg7Iڵk{zT\pA#Yƅ@@@@@@@@v؇t[qmGw&vok;K9҄27p6W|B ;8ca pN8aV,ðy Ďm¡s\cXaZ97bLX> 핗m?{/mםÄj|Ҙh s; 'Qo_NjIf !!!!!!!!آly;&Vd[qmq]] !!!!!!!!]oW4'Co+O~[zꞶ˶<ե,v Oʣj+<}˳"oe, ǥmakZ)ܷb-6ܰg?!!!!!!KNb ggn??1g l^{<' 0裏1~ۯʯ|ۣ[ɟٰʞ>q[7ټao}k?嗷g}
7#??m^xlHov袋SO=՟ 9L|9~~ w}} kҕ?6o>v5״w o
64|K/z4gϷ?^#<r{>//̶&= h˗/=Q}~dxOo{unrr mrjS}R{=a|'wf_m-[lC{!_ڻ7 ~ G'|rokX|>9_إ}P..ϣ:jmzKUW]YGk-oyVGq^ӣa=B B B B B )dghCP"1Znw}N'D{?lsά $ zjAXz.0 "+V QC~]h!0$]
-- QFHF `{ｳb{:=Ы BڵkD3 +岉%j f͚FH QQa]ﻷG9_{ՏE@)ጘ(Mu%Hn馞o/]cnݺ. TBsĮ~U8rţN}/SfuTM6M UV'h _ .: uqr4_e?Oss ~foKt∦ꩬy^ĕ_;AX8G'xeşj!b/~l&qu嫾^Xp_~맘o I#wyy듮Ub~_JG#s(B뚋 %}[\{3o
=X?!6n˹Yw#O:I'pBrw|;3ۉ'?? D>n .BX(yG~ <kqxw*~??ń뮻 bed3h@
"rpD|O>r\LX{ ̊q+q98*Gwn;묳Dܓ?1DՕ0v#&+X"Mp L=^BH;J|Նc)Xes V+ 1U{p!(}MĩY>W[7huNI E X*wO" qLbzWwP_"
<.V'eA<R OI~]>p1K+o۽ nC RU;έD~=O(/']"><C˿= Kӵ>}pJN9v-tnApMOk<_x3Dn8~lqRv wqǬ?- !!!!!Zݘ/dB`7 FDqN@sSNȰo~RWbc7K*KLrEa䡇
<&t,"G>.hԧ>,$(+,wg %>K}|'@q2Ϫ+E*qxN"::u]=<k<ņ^ǒWW8E 8+2qXV8U.Cfyփ H"4cYgOGuLT<)[ c'U\.1MX:տXo!sF "2?.I`mpooaM}MA^D8fm&mN}]LA}o#K7Wꤌ.~Ωc9eįc&78pYb! gbٯگm?+@X( ƞ>ׯѪ`O\;.KXcGtV<|ABIO 'vyO
!!!!!;@ľ A1i4zkz"g*X@pNa)C\! fwfu"8b4ݬ,,JB"< Dy{QHL!ูwnɃ C!BJXEIXKs ,E n 8ဨuc Xχh"om/)mJa-ih;?e#**8RfBK# ԈYS??= !Svy#h7Vj0ʤD4K1K%=. y+>D4őѿ+ė ь;&"JWP⮞e]HD&4 g%YNX*1?^ e rq2t#i7]ʨ @8qm`Z+' l ra_Kԙ~w[ź8|}{,7]S#,-sʧ\1a6Qh"}@@@@$oGLZ;2fGDaMj2<" 1E#6ٳx#8b/%h8ϊP1QčKs_6%0ďZh))D4PIp X^D-$<H9 ,0
8eK,"H⡼]³"f0W>@MqpIQfK3շX=X]S7LՑE*6'l,#/n*w e+ g~)9ǺR9ԛE6ڗ .TV'ay[K=GOB6/o~IK99 wԝ HRe"
,׆BOd#4sJi+#Y'^O/!&S(#[}XigbR}:' mT+ c'? {ZN;X\./Ґ&Ƨh>B B B B B @ľm8 D&_DqK9X~l
/Cuk#0r"sn'0JP^ .^JTRv"H!H_H("CD>|Y5jio(t|..хGL"
x"oB+*+i39b
0u !D'b2 CFބ TΒGB!ȩ7Ae<'My.ng!Õ(C|Q>VnzODEǫX zv qCL՝l& ra["pKG; c fF<6b=( .e/_Cw< 9iyLqDDUm#}
ZZ/ehI<K^ezS73qARt-]ʰ ;G\dg? 85͒ye"V5[mHGdt}B B B B B B`GطH&JnblBÛ. _b D+BGh8U
W HX c.<ȍt#rw(䦟H@ )GlR 7Et#8I> k'f AGQnr8LetYs &> =Q (1C%,^F rh'/L=ϰ^A8Rᓧ,
'hoxKl,QfK$b]O} D2^b IeϲNVB~ -y>!1O?. ;MrL8̆bR\H%=_YiV8֗e{{^D*0:wayα|8S#X.Xkٱ[2'u~k8uM?(NZ>nDa&ܫzaw=O:x"k֫k8" 0\=uK@ b_ IM:(bGd ~Bb)UBQ E8/
I%% JX7oVN/%9~ H%G dME``|g/ F?%:,{$Fg(Oօg/ſ/!0Ve:سxrZK"hȋU 16I_>w6!nYK=NEQN6Vp'$҈6YbtXE#x&1Wz^ BU[#"d6ca-և|/GQ9O0QG\%VZMaȲU>Y:L2?ђ:E_oo{W?Ԟk8tY~V0uL% 6՞ As ]cKqpQa'٤Cs
zd
aֹ:X#<y!F^zlqe%k]kڰW{F|U\Cq!!!!!!TKojS&-v:K26nVidzMNNɩyr˱ۥ2! 6/ 6 хGl" 2j5W߉,ChE#8VS0! Zȏ(@DS0ǜceZ-% D Wcbe^SgXrqeSnyW0a)e#fpGX̿Q6XXʛ ,S&`*>'H Lk3|=0D%z*SxRW_O"Mp̟H*ǚL6-QX8yC!\e)ceІ\qqX=a٤/LXqkN v!T}ڏeO^ŲT wleׄ>[&NjY[<,,WQWkG\& y[VxiOm;O ח<<#sOa:9QK{+/oVY6(~LnTwͱB8" J|p6Aɍ2qӨ#'0
Oo٧=Cr#Ɵux'T~XcynYy H#rE7 \UWFQ5 s'X8Η<K8!3QRd X) kzL=dسؤxN ,o +[ /<!` Yg,$ޱ~'~?vzFI!izޡ4KQN -.. 畕ڎe ^WUœft,&-_Nns%ZƖ/䔉 =.xz
%e~Q#8Y"'`6+M+n%V|Ñxk#`[^, V~rL|U XsjrϹ]Yϵ:!\=OH~rY D9¨IY
}@@@@@G`Ib-hO 6W6On7_.۫ l3f̀ IDAT4Ͱ iKZ'd{6:yy IX8<[w{YC-, D+ B 8"j<qX Ϫe %e &mW~WzYk P t" e6RǏ:~"8&J Qe/U__l%jUskԑ Ax!fpb'#:Gc E!T0Å8B`TOlsUK9o%&B0ځ3tʎmp0F-&
jOD,%0K#!FTM/fPNm.N]~QkQK Vg'$_ī=1N?b Y0 \}UzcB/e <q t7-Q]ҐvM`s-'f±Ĕ]\cys
yun8{)z#gmX0Dqw=[PxeYb/-}r-[J{oX @@@@@8-
ʦW^n̬h߹˓mA-J U~ YK{_7mC(!I.xK9
w0Ps!.BXT X
Fi0Eް[ID!
Tp!X%$Ha A?#%Ճ },! e$cՅ*X[JC^ccaGTı fH覾!OKu&: Cx uڙ%
W±.$YϵSV!U X,~٤KzFY[o z4Ecz{A<Q;UCGS SJy~X]!S[9jڏƳKuNوvm $ N1a# H/ CeX7 6@*1z=L %>jG}9:HCa=krler2B B B B`$ _ufoW9p-+Bt͛ /˽؏EgIb/ <ƶ|J8 [Č˾yľo}{$B`{ pMFM7C B B B B`[ DVr<+-
!!jtח&%]O`yZ@@@@@@@@>G`b>G(=@ľ=RX@ľ?B B B B B B B B J1C B B B B B B B B`!"CDC* D[PC B B B B B B B B`!bw-%'̫'&&&Z7w =n)=nm[fEkMo/mnm-6Mʹs= z6=]QgpK/Me
{f!!!!!!!!!Z2ovC֬lLΪvطqrȋmjfpؚv1kL{乍큧^i s65=VXV,iL̴emKmË[O<r&B B B B B B B B XW$gZ{[l&g۾LtK+߰m&NLۿ=;i˗=N] _mOu5 1+{nj<H{;֬Y3g }v}. n~z[Ǐ|饗3<ӎ:699پ/ . s1ꫯnozӛ >.s/B. ocmjjI'lO<D;6_^{m_~ {o/J;l {le {vWtFgqF[oƍ矟w8K@@@@@@m>U<7OW6Oom7ڑj]vuہW7Me)uqMSmX~zIa o}k_k{ｷ}# i tزz뭍uyF#=mӦMSOJw],g^yvu/} m wlĹ#]s5K/m~
E?,_|K8#)+e]6G?/~sϸ|bp~5ʕ+{6;vg#8s=M֮]U6oPip
mݺu]$T'm/}iM~>PѳAv_oW/o?qʺ-Uhm~vakxw/i? }vcAPs\dvī|++l 'N_~הrF0T UVթ=裏nWn6l<.z} o>ϴO|l/rΊ%]}s[ {w /{ N#fs&"b
$ReYTnyږÖh2%(J)A9 HD '癎[=p{߭jt}gPwy]`x뫭zx =cꫯ6q"H]vh طxblo=# ϟo Gݽ>;Y .H |waվn@;5Jg,X#X&X,g͚ExErÌ'D $dZnVYbM.ZK$~+GmN}uYWGmzkgصkZZZQb
_,oַpU!!!B D#DxѢE@A\L/=DA Žꫯ79مN>Fpac_|]{c":䙸z)?#"5't}ւӑ >7_﮿p7ovq+@yAAD@D@D@D@D@& #ƢQG#F,N=&/ү5)|&RÊƱy=s"7;pQ0W!,LNXuY:&#R EB#lݾ\~a"Wr1o6j;wtz#sȅOi&q!p!q?p!=C!sG.=rk_q>\uo {Q~d7P\tO 2O~68F=܇qA9Ϧ ~?QH?ցGH/ϧ1y\5őF#" " " " " @>pW(썶? 1hIA 8 n)Z/#9
s!\,h(w]F.>*NNؒi6{v <}G\p|&b?OwuY䟣xypqhPm۶@؇''~ =cwq_ 9@
3'Bq eNӸ
`+Z6Z1"'% ,xg?Yw
$<is &)J2m-q=\d>[lq=Kq0TqD@D@D@D@D@D@D@N>jx> 6*6ĚnWe29m. ʻ@2N̏# hC\g>3Z v
A+Ѹ?'cqƽ徏EQBd*}8ᮼJ?ǎ-S" g'?8(Xqw1} YW!4;ydp[ }n=Dd.́uHDĻH
uu!2oDEDR#nܸ3~)`8" " " " " " " Fh>?+l3jK-x^xcQ]ޛ IRmJ UyR8'0y ra=>/Gq !
!<C{g=t5;y>?1
c\<;lTwuFQ U}ȟG#6-9f<+HPP aT p"]r%Cyn&' % /<u/܅MC"o;o< ǚ ?p39{|C*FT/0 l{Snd8o&k-֗ʺv{egapPwx7u aC 0/ppџPU=iٞywQ܁ 7 B#
iC
08<oG<ւcp}#xСGl5
v ±
a"#GpVb2e{@@ói #2/\D?5K>LЛ' PRBHem`R
h#(O N>*;D$rb .tA 1*,~܇1!>9
5( r5x1 s*/ɓG+8p|QpQ!{#xd~sR
pG?r2t$0\:Y/5app"T&^1nP~mE@D@D@D@D@D@D@N@Q},k1REk#8?C7hg@6r<[SGlpq.9 6ƽUW]b =tnἅmx.ᵸFJ^@^+r!!Zxp1k?a|8%L?.$簸 Çy(ʹ1>~9w!~틀8N|iam W 2.k{}K
! !cCuZD??n &ыyo?fõV(!| 37H@\u0 04uBġ
hژSIĹn69 %t0[։ @
O}S^D㩧B aQ_ȅr̼ q V3hOx8/ &0\94z8pbQ(H!6??<q?~>N{
O;vp!0]O~.f}_oT% ! 6sE CWsYіZ8qpP@"#
9qۅ /nj܃hI>?6ơI;l| p<8 Cag 20~p}nXQ N
_RD#}BHed=20b 6?"fA,w8^sW] {jϞcM=Yq! f͖5f,Z6,l3il_;zŲ^ ] )
0S
u^XXx 1 Vq7n4
tp<1/Bp/^<?8- aa`RpvZkll {b<HaK^Yf 0$OHDx/l\i= >!2k:J`Mv>aeUuxŴHԂH$oD7
}c,WmF[<3B_zR[kkRC=Ϊ ^n]p\ ߣSuwZiiy2"m;Nt 䅜'8 6C,Še%7J"З\_>7Id"t\[8ᗳԮY}1L!ǨLK6mhcNا0 dE`laH=tED@D@D@D@D@Dt@W$ cD?D1&GʦTݭ.9 bt V6vXM1ӺբsȬ<#SCE@D@D@D@D@D@D@D@ y邬|p
NAaG>FbߑLtFD@D@D@D@D@D@D@D@&$}mӤE@D@D@D@D@D@D@D@DHd3" " " " " " " " "0! H원o&-" " " " " " "PrS7l.g1n><r.kV8F:1 ~ 혫1 ( &N`rAI:чFD@D@D@D@D@D`{r$Xyiz|Q/;v5ޱ:ĽKgrїX$T&kh65D%Y A-z%Ͳ|eH+]G.Px-Z62^vqaYPReX.՛Ƒ#"Q/<xc],rLu陧 4
_lֲe˰M-NY:CI+Pz =JD@D@D@D@D@D4@Fhai7vwږ=
ԍstZ]]NW]m67]e9tqA`/lW.n:lgs]b6ܟ7|*Jcvͽ봵lڂK}L[&R3Sϳ',/EPL͂rY Us,ӱïEXx^e->|e,y`-bzlY4'Zl2 J-u`xgF tL Ҹ!q=U7M*B }.!e2NG,
|WnL* Z @[=ަT&lWs]pUV{:]ԋF,Y4 o#v/ HD}TDԖLuY"mazmGS]ut\`[uyΛ[gh`YyIj6Į<gP&C yÓF*gX/7&-6ey>:pݢnA"aC]Xlʹ[ d
E˧ZzJ,Ȧ->e 6qEJkͲ"N.ˋ%wβ}- O8ӻ$" " " " " " " "Pb=鐵7c.jSk+mҝ4QqټH-5KgsE̅ҘY[<ⱈ'6gJii5evkd&kU.$">N)%1*9zR YnEc.MY|ƅ9h Y|y].mL~P(SW[.Ԟ\7[sY.덗[.u[ן3q_Yue:w[bK zݲ,HTZbK5ml exFq 3S{ľSWEȣw*k~ۖϩ.mw RUjL^u73VQ3mGSW/k+Z/kR! Ƣ1;wv=A{x w͊W9.CNkoXrߋ[RH|Om]\ԁW.Yŧ_hA{*Y֢u -ӵϲ݇"q˴nL&w&,}`ezdՖ cKTq3hrٌ"dbSW5q5S3 IDAT0_j=X?}#t,cfMnoD"5މ{,s' 5 ˳WD@D@D@D@D@&*ᶛ1c& F`GvJ[>sQ4#U{SKݽw~s7?2-C {608 9.Z<Ŗ̨}6fϟ_6IKƢ ٤ϾrEʧQÂ|8S=CpE뗙{->mz|=eRϺԒ;{-7Z,Z3ϲ.$,?speZk1#48ӹ Xk_~ js,۾2}͖M|) M8xܹ.XZZZs9VZZl~ꪫle{l2K$m?͝;.1'}ϮyGkGt+l> w1 Cpo
3_k@
Y߁l]f3gN ЮZ9suBD@D@D@D@D@D`tnn9dzA=s.!%qKgz-6}s&֛a剘 OoAiKdfx^|s?^+M0E[<JQ.{x/sǡH uj$-Z;r}f٬;vZ6k9FL6wLʢ5s-Yם KLTϲ@ "E-}+ 2 ;-Z"fe~=Zge;89&?{N>Sx `xNeܽlItzmӦM.R){m[nu1
1ޏ/b۷oy#ef_W~؆
lݺuVUUeK. ٳ X{
ߴiӬ |@̋F~Fp]vmܸџu뭷kCdm۶ V^^b h455 !4WD@D@D@D@D@D@E#6J܅7ҹⱘ<g0D<n<D@Ӓ/ӟv|zX`y FQc:=:jn-^iTs-h"!ony
ڎ6۰ݮ?oUg/vMg
;SXKxN<DxK z݂ϼċsd{pE5+\{yJ͢U_jnٔ/- +3K[|Jo{onE*,R9Ͳ-3(A>?_b}~ P2)@נ )TB4YJ/gOgvfmog^k0[5=FmYp!!|_E-
;tڵk]OjK/dw}c E8? <go[Zʕ+}N熈xm
q"5k561 sE>W^i\p >_ k+b۷ows. =-[D@D@D@D@D@J i6vfD<foWåk.ޒ6ʬ"ds]q(%W]:7V3ٲ՞o[0^n-.j鶇-h$hN |ӳ;^6:A "y-kAK)/vj,Gn̢5s,Z=;?H~ѪYfARH|>H] $*e̓}ϋn2 TLl!%; ѪޗU)g{flK ȻZ6 #Qx bB~` :tC}-bW\q}C/l\T/iSNu!. 4D7L&̯s aEE9yfq 0&c,E6E A^\A1ϗ Iw en>hK`|STQf a
\|=ҸU.C:r
2Kes6ĮX6vڷ[gnY=4VXSgfTvXCZ]E5To9r|%U^ zA=Wb cf]{0xWRmW[kiKXb^#ӼihF.t#$7 ura/RRcF+9$A/sf f-}aPoHB A`ݾOϬlħ$Y_/fl ߿8濼8DPdc5so{np ;7M26 :yq!!1y* aC4$dQ!gأ98 3 q/̗c܊ _~# a,:s& u툀Mxˬ2.Yu,XKw:Ҟ//:he"^, |ph*K,ͰllVŷj^K}Ͷ{:9ƪKދN%ӫgzNcq *s2KZϲp 3}o[ly8Y,ݼCgaW,t {sze3>>PQ2dbs-ְrm*A+&`,۽"3-1!ULK]ܣ/h" ap殌KDdx']IDvA~gm]:gtp!!=S^^uc
]J B[ox?ߋv
5݀~Ap^(!!~ !ַ\# r7!
ŋӟtx?݆S?Nf {Ú|M{G eV8:x mL6k+ȱC[t۶v)f9b:!j-^Y" S*K>eX~a]Wض]nGt
xUslͲ6 {m Fpοr݁ }U'*!%aCqZqe{YjKKe?wA0|.?7]g%`w{nv;3Kg\b9WZ
5^#1=殿\2] JkÄK0}w p21$"xzG6 Yi_Lpޜ
#n{gai6dY1 w ąv[1_vjp-Ys= K>ǙOx, |R}@ Q!g?١ǑO1OQ ^(>05B}߹xI>B%Ԙsg[ z!?K]el*?c\~j" " " " " " cK셭MVv0cA4fA$jĤh(̑15{#Sí&nd:c{(}^UtݽmV_0
{` !.}.!ÆS鬥tV#-c/섯^A7y/+jRI75 z
~m^#}p(m.=â1bKɋpR=븂`Yb]y.Hy3)La0abM J*-Z6= :a0'}䤏Exawv/=ͮZI{tkⱼ폐^M2?p!b8v(G.TōCQg?wy ƋG;>O6o<ox]ĻP G܆B y.hG/ň|
"N@n0 A
aỡ؇x=xA Nȳ$ƔTEӗ |=,>b&ᾄnq Q/ R; Xs׀5u;OyD<22h
$A^DC G/ر?//0G].kΝB^w~te:v`Dh3a0ρ:W2\^ L ^8TNXc7 hFm(d _K`_g E]s`JԾ|EM`wu 䬓P4vq!cK/!8x?QЂ{ 孬_@
f;}#ܖpXn^}U W3C Аk{țx+Y .\z6l~ Ώ9Qu < q \r: sٹ?EΑQ~t1|" " " " " " G@r( ;|G[5*w ?c]'Bap vNhХǂ S&'zLxowa. ;b,Ŀwo=gభ㈧#~ ͜9s5(F6\Nvr%J1bE?
m4' W"@"e-VsG;F7!'o N> pc|l Z
=D0e Q] {E,)g 8pvm|m۶aTEd-B t
{ y?q
;|| t @f}O_Bwq06<p8$yƍ~ cc0ex]wsw.]?" " " " " " " E(>9r
ž؇Ki.>>}PCAAWa$b
8h6# L2{Pޡ5l|*c;mO{
`uYUȑ A~p!vBK]2ij! _{.Sq .я{ %D.rяg|x,}.>c>W\q]~sUW
8Bcڊ+iHF|T~ 2lLHC[(>E) b6yL}DD
# \BلP7stPhm[fGm[g}Z, @Pjը{-1[Xà/z
' !"!g
7(
q a4r!}k_sqg s~о̏}crJpLaaǘoaDD>|<3H(0/ ܄ = TF{:~5 h?/" " " " " " "pf 7 ,84l8&pMC E=*$VlqzA~Fv%kVZ$jbQwk2{wcω`QE
ܣ8 !tJx. : xCUp^O~ҋ|[(Gq1yp%O sB8 ]< AF!EE+0:nC捘GqXă/܊sޛoyh״/" " " " " " "P&G^>DPĹ0̷xkfJ,/^UfTۥ
t3w .@DZn(-t_J ndC?ÎD [mk|k- @HN%q?I5]d wxٳ͚EGНε +{:gpCFN3"xB o "DmjY_ʌP]=pdfir}dUW-hj" " " " " " dze(zMےukܒ+֢,3Qog+6f-Vp 0v4,\# <R
F&W#g#p-m6f=9kY:cV[ز{N.=uiE" " " " " "pdsXvͧE,pccDx-Ug\7rfglK90S 9
3 b~Ek# Qb B .=;a쓣fTR%O ᆸhUشi577{$!0:?,f1OW ̹d' Y-CD@D@D@D@D@DDsfԩӼ(gQ23H N'2yo,Ds7\zن R1ȟFe͛7{1~!ͷh"Z)y w#J%P5+2yWL-G4X,j8ؐW(eW )s]3\mc|Ëg# g>s(0rO.={x]>S Ruw.qLpR Ŝ xp" " " " " " " a: =|f
&՟ 3/Jt˖-9s減sCẄY sB }_p>|q Rx$Pb N>h # {F^lxoa_틀d!Pb_P υۣw#<VD@D@D@D@D@D@D@D@& dY!" " " " " " " " g;}g'@4$MR 9QL渇8/T긋PtD:E @q(}ŁI8^yʔ)^:a˞5k90&۲emٮ*?GA?2,]ԫF}Ϯ:[`A#q=>~V8G;wZM:՞z)5|KK߿vsr^#V8jO9N>bgJv6mŋOSJKK}\fk\8c_WsygEX NC0D\c^_җD8ݻ{On.=.Uۭ"""cY.r_Ǟ={[ou!ꫯ'm688Q ߣR%Z`9X&X,g͚ExEr=kOPN 1-Yb1Rb!δVpQ* 5g e/չ_aoBgfϞm G sK.1p~sڃ>迸%_Z[[駟va P`oV\k|~}ڵB!y5#0 ^^x ~DbB/b s|饗쭷&J^pCD;" " " " " " NUXm4h$~
'
6<$ ?;yZ۾};A-++ d2:jqΝ{KIH+b-b溻:
[+//w矷+kUUU.cnk>Ϻ`+/l}ޏ<M6ͅ8:~>s8t G r 9 !܋qF_ẌCİֺǘ K=3c04c(,h+" " " " " "p ^QL }'BOvRo-Y-DPb2_UV
gMW?Bx9xN;"Ljy?7q!]tE~`3u4ȃ؆ȈGh/N>ʰ!fȳ;::uu;yN}L[_p-2 am_Nưmذ <0- VD@D@D@D@D@D@DH+Dp# IDATD3 >0e"_x BVMMC 7suC,Bg>wk O2:D2D7 u̇{%܌3 x7sr B$?;]SP_}<\7]|C#O?6D<лX~asc DX2!o1 y D@D@D@D@D@D@D@ľ~4wb
gG%N?Dk?x
\~wpK8,2sW%WߓO>:Cxr8(ށ0SW\a~k@DX#<{p!f|Cp|B(6D@-Hwǧ/&%DX(NB(_l8aMa
|&&" " " " " " "PFW@at uu!d!vQhbpBp!-Zu(pF~@D;o(TaoΝ7pҥ.˗/w 8#lTE@5(F1}߰!0Qa ax Kxa4DAvqvLHlٲ!g c>C O|.s=.HVD@D@D@D@D@D@D 䒩L2tD3:c
_.B9f,X&S~pō,1p>
~= nBCr#!B"xk^"p R^\5Pd k@<=:ÑspO7 9ȼJTG.
a? \zTyBC JLH1@8&& Z, `S|NP l`Y$c bֱ< 1Xbx
ߎUBXwaַ塬{
n0D1BmX?0,k[oG`*""r7;Æc$ pϖ0dx>nBĸЭ1sH` eF\ԧHC1
" eN #pLb_8{ K ih;PyR#ьpV*iax#f3*TE h뮻\c ~? -:)19>988O%o|vmya{a݄"# bޕW^ᾬ\lD;
Q|T(IHE @ MQMn&f.k
i+" " " " " " "P<K+k&gBxqUTTk`h ŅpG>=B`Cgb6D/c 1xTEDt }=>.t!6B䨖KX/B#@xCCk\#x|K1"ٳݕ q!'!n{MP 7 8$Yz1 ' -p555y_wj䷣EauZw ,"\{|\q|#YƒﯰB r#1b#}?Asy;<D;r.(\x̙3mܹއyC r{si8//?[n9(k_D@D@D@D@D@D@DwfA 7]Xvag[ T[rex8ET5ZC<C;ZCPީ!-ܧphSxp.Ӹ0G_x ˱ñ@W|ft"N6,7hFKX-F2.' o¿g(RGnkk0 8p I" " " " " " " "0I H웤od_xQH","o<w';OD@D@D@D@D@D@D% }')BИ "D@D@D@D@D@D@D@Ds\>N k=ID@D@D@D@D@D@D@D@N)}GhsQladj6\.g
¾r^&D@D@D@D@D@D@D@D@D`2(Jqnǎ =1Vg͚e}F
v6m { g kooꭥV__osaց%p}Hrۿ
X2 ۹s+vmO snݺu6[vݻתmܲeJFu MCD@D@D@D@D@D@D@D@M(} w \p.UUUyyC^ x! Qޅ^h
gm6ۺuڵ/^pqdQD@D@D@D@D@D@D@DX `wŬ# ||%\e2 w (H.?&" " " " " " " " @Q;%!p}}B' o Ljw>}rns!D&Pb 96m|p-_; {z K'
Ï<XGs" " " " " " " " "PVCC#g n<9톍>K,9syr𑋏
D1r/b cb|5FɊJJJ\c7R#CC#_ii 8pH/@)Sq,Y&PξP 0Ɩn=>D=n{q* H0x xG8h9(V} o5t
?D<=|TE۾}_kjjlٲeޗc5Riz1"QIw͚5C ޥ^:̭7|cڋ P(oL̺ " " " " " " " "0CxGkaA(F_D@D@D@D@D@D@D@D@D`"(ZdÔwj<b#0<]N7}F" " " " " " " " "P$ى H7*u& ND@D@D@D@D@D@D@D@M@b߸Q7}hv" " " " " " " " "0nqTG8I٬RF@w';:#og~ftz¯E @,3$ L?K]WWgglLu2/Ok Y˙Y.Mi@y8b[Y
fN8;]8lX[8Id,k
<oD /Yse2f,X&T:1}D@D@D@D@D@D@&tr]]f٬r_refOs!S y
$SeL2E"YDF02LS<]l6mh~1} ǣQ'blƍxw,fD2h`rX"x,: p
E@D@D@D@D@D`flfJّIq.#͜e[-F]/I%,9oL̲EQb.E"Q}|Vu E I;F I 尨!@R_@bYf[yY}%%%VVVj,Z$uAPξ pJ'Óђ]8hO:+U\D@D@D@D@D@D@&0k- |QVVY6F k:[x 2tVֹBx߇-:(qD
vGn'DS?Iv"$F /,6ŬwO ְgT>C_cv,rw՟% 9NI;A]D@D@D@D@D@D@&-{Lښ.z{,VRbxH!-[užHbM*JL&U`6㌘Wlo#" " " " " " E@ {80EtJq2geFBcuuߥlΒt:}I;Փw"'krNI#" " " " " " ( P(D"1W<rՇ;xHX6d椏}x;QhJQfl>K}'N~8b _iibE")-.
/i/n=dz-SPatx %bbN[?XLHbߙ~<udu6Yk" " " " " @ ,p-=K'l73Ζ>)~J-MV5g'H~$=~SĤ1SQFJ3" " " " " " "0_w /$ ;A`HԶ %3jT$1|===g kjjػΌw*NNZHbf93A>A`6gb } 7|?SҥK]x2вD@D@D@D@D@nkdI% paj"~
UG&9M~ o^ s͍'&}Rs<P7 ϳY' f{7<TcJϛ7χ2eUWW{<!" " " " " F 8)Ѹ]f͚7[S;no d Kk%v[V۴ 6{MWwŘ{m{>[hQm۶Y[[-_\Q.};n
Y16K~-[cªCyÜ}?b9;wڌ3?E˗[| ؟S֓[IiEP3C}w潭/_JN=EQ D+_8Vx}[رK5Z߰xo1~W^9aO|πÊWUUsNG } 8ac̙awɉ{9sw8 /k֛MXyyE# ĉ"| =e5-'͍l% 熎9X5 }cI _6/E
ϏvXcSxwDQ D,rq
Ylÿvp߯ 9w i >P? qy3!M.Bz3k&` Nk|W#k4R1uwu մAѦ^{`R)v4e[L e#ےX]jL^CKgxe- 4!xKVY{9r8Vl^c0ј{xδ2RY _L֦TڬrOxSoW39ma?k:hwXŲ0Q )o@Źr_{!ԹL_ .Ů͛78 N>@<}۷owK/1wqlذ?q!H6 \$%bw᜵/" " " " " C=|;di5N-X_2c%ɲv"ٗzOYx?GP[^bQ;^pl>Y<UmV}b+{Vipu{<{Ͳ<n]ks+'/B z0?&.^8R{ elΙUc {Kes.Z0*J\d2z< q1 =5u [.[h3j˼JK+fcёJa~
$xca[nJ˖-s
_6m D9,{ʳ \ RpZ}饗\gP(~<YdYz 13v7c0Bo27r:'>QNE!r5T;iOmndG.ϯ3\}Ɍ;n`O<am=I;g/A
,
]"{mjM>S텷mΔ
[>E6;_<Dž6tB-MћK5XMyS+G}Vs*o7VY붃]~ c 5f֗zSJ| v+Ji_[geN#}/CF
(xEnSz*!TŁ> -s;ǽػGF)DBĘ[lb sBmii+VxBz&" " " " " " "p Háv Ҷfno ]8lROe/2hQ
";Nrmws f:]C{ug;Z\hVSj;{?e3aMCBdzЅȴiL[v5u[uy®?ojۛw b!B <5 ,fy͝R >\71άaD\<j(x4h<5}'$ZD6 iY~#s[E1
9Z[TXy4n,0'23~|{6YsMMp-5 D@D@D@D@D@D@D,"@
X`KgXEIܪbP]j%1wɢ=`gx<ԵWϲL݀;{iʪܵ[:mN]4h }v{p5T(؟zήӫ|\~oI,j/b/G^cTU:čw:w\D u)x)6CyɌɴ|>\hu`gboFyB B -,21w\[`WC㾰 #w.ÞH?Bv鸆I)B d`&" " " " " " csWSȵ8c|vG
^3ʬ/i%;C$ffXuY8B\=o^:kUeq{mW]10Q%$xռz3.ABlKý۞`{;+gCEvXGoe<D9E7" lzmf<ʺX7 CY'y[ciBCż
O
JCpN>!`K-7zP_a#t!o˖-F08 HE_pq Cpbg-7Dc ;F Yj" " " " " " g76VRe?;p^
= T}EɄp\>FHxH-5ا".b^uylu`h6o)Ƕ rq`G=v IDAT>Ÿ}/Mݞ<8(B^Ҹ q)HNmF(o@шή܀kyyKgd U9wYVSn%qMٞ^w"qr Mڡ>{@PGk4yq~_u<9FC`˗H! 8Ku
r!4W̙
B!})f;#qx4E.j|̓"" *Ĵ0s]^p/ 8 `ٶm;/OΞ={L:$[nqÖ,Y_> =
-cz. D+
U};p"w斳L.k6/@+~u 6 ~!
qu+ *vy #t%
k)k];onuS{X@ʋqyȍnڼz
D4Gw-n}h$b]V9F=v= B Y:պR.cj?G0&B tqg1wM_o<syϋ*Ӑ!(Mb(dߨ. n fC/5k/hQcyCH/n
_@ cp !a/c
s 鈨kX_L5'Kw {b# oᆡ)'b>*hKէ?iۿ[_/֮]k}K/_e(Lz,/r3Cv>ErQPao[_q1"a_y>R[::/0BuAL?POczG t%SY?5Dd&;Î7v.ٌ2N2*規"yinϟehCB- |.[y ~eg=<oy"fwz
²i" fTnLekۼ? N)pc !! ^AFL 2Xp98HMBB s!P!>i y" <A^Q8
x"n3gδFwת0t0t,4-8- Wҗdw}=ﱇ z q'>a߭0`x饗ܡ9;調Sڟٍٟ۟7EZ}kv5تUN˚Z8s&C#ܟzW^߶:R.NnZ* j|F
VU/S`l
/Gu{'`3 }:RN#X5Vښ%S<_ If
*e) Ͻ`A<(
qF[9 zMYOfEݚW,١~_q=
3 7aB
ۭbz *.Zi:axÇQ`֛t!| >JMT`Ms2wXqcAŻw&NF+<. o=+ "J2C!tIb#r7w#O;[;] 뮻<dQpƌ RE]}oE?^4w oŊ.$M [Mn=pyv ]n2r-hUs|ډXe0j"/_ᾣ {[mE>=h}&9*r
!ZZ&L̆}Bs\D4PawK-wFF5wy.]:*B,Uqq!=~f{%3kj*qnαภʋl09S] .MDm:m;5X0$k=)ܗ'c]= ):LqN)swig_D[zosaţ6
0!bJ+wD8`wc ӧO 8piӦc_{~}٣>jO>$%=s ,vy?{wcוމʝBZԋc qxd$a`xqn lǁL$6nLEV5}HQ\ĝUN+]>WX{UAݺ=ޭD%].߸ 8r\y]vɚrեWUoG+͗?rn|~acG9|\G3G!}\cv4v#Q֏&.A >W~i ;$c ;]6 yžJM3IǮJH;N ߵ+uǕg߿}hxN? , >Q<"iH%z#$> [jݿܻ dהCS+7֝G_o\w!jUe4i2&ʚ vEyC1g_ulE5$@"$@"$@",+sxdQч G }>Byln߮N>]~'~ϮA$__=hvRo
/{#7/.__GO.?W~IOo$7W6x$NmG;ޔ?'>~_/uiG5=~Wj ?]1,]ޭxI?b+Jh g ?yœo?Iާg߽<rG|ؕwvl >~CJ."RqWޛ8 $ޡg㯼_a#{o ®htz!,ɾ^腬C"$@"$@"$E+~}e}}>!noͿdx߅ vn->ȩOQX.Z;R/[+ _gGu㋰v 8z|k嶫/*7w)o :Q?VCy6P*q5IE[Ėn|qv58
TlqxSg'_ <ubo+kʓ;=6^< _ n֥en<N+Nmh%ܼ'Wz<C0$Ϟe{) 6Smu}}ށYD HD HD HE qiӦΝ;kr
7__>w^Co믗WBϣ:td߫Z =/5k[Z>O?_>V*?+)7OAcg?t]yeɠ.]WɃ֝}'Ζ+9vؙOSI-}ĹuDBk\VV-9WB5(H'x< ܍]ԣ a/s}˽}@"$@"$@"$=@< | ۿE؏+۷Obј__+KT|WW#~_W}<{+֎]xF*$"838Ɏ<SYțrY} o )#;T~KwLL~{{[ o%ayVIΖ&@"$@"$@"W. ý?_}˯ʯٟavC4w.??Y/'H|@yvݰG/+W\S =~{v$j5{>ueoC籗ϗ =;VNq'b?K$?HD HD HD hooϞ=uG|'O$UW]UWyY |/|~'R/rܹrז B=駟nSzbf_U︡.nX]֯ . ?U?3_Y~=^~s nX=\N+_ܼ>(Ⱦ (ҰQҥm},,I-,{"$@"$@"$@"G *_~yٱcGyg#<R//nݺ~//) cǎyƍzp>a ̙3 _ڀaHCC7]VN>W|܁i||a||wn-k̻z~{+zdwX8[N ft<ڡI-mgҗ$Vp&@"$@"$@"
[l h7߬ aݱeÆ
G~Gʳ>[}PweEWr3g]Oe? 6#'ϔv.][sx=W'ϖ +???R ^^.ߴ/R賣'k{tzD1q_tIYTӻ'%ٷgى@"$@"$@"$@{ｷ
i]~ܚ5kʗ]z>1222S=T믟 e`qO>^;z*zXfX%~l\;R^òvt͋{x_ݹwU
`}W V +CKKwߦuʵ/{9v^5Lpa;T-./\I<k _ > ])xRPv&@"$@"$@"0{<h ~K/8¯cWcOvvwxy5܇dfz=748TA?|*wSOrEYjv266QIدY(e-KΗ"ƹ2~vp $ &{|lsعrvlԗz)YD HD HD HEDI! nJ9 (mϏ_GG˧n{xY-cݢi \Ίudh'a q_~(c24Pʹ2P`(#C}}Geu?HD HD HD`OYɏ@d}L/uMD HD HD HD HD 2q"$@"$@"$@"$@";$;}5ID HD HD H @`
}̊'@"$@"$@"$ `}7XZR7sΕږ/C .VXkdzm'm?ZƗlڢ. 0ɾ L$@"$@"$@" -###e˖-}+7_6ELklh]K/ *km(IS峷֮]ٳ$3B4&ߝv/v{?}ˡ
@"$@"$@"$K c۶me߾}Kvߙ3g/T&&K'j|b ǻ˿ѣe}K3/ZЍs OȼkזW<<<\DŽqg''ƍ[&,uL =zAp$wAeD HD HD HDTroD٫Zwt#.H) Hۯ\ G\kˉSg(e5wX~;n)kWce@}9 ֻ{
̌D HD HD XBV^]ھ~ou[nMm;MyN$zޔ-ɶ{Gw{ԩ{Z"$@"$@"M¬(UA.JD`#dߊ رc7ި/EY!9]"$@"$@"$@"$#d 6 EyQ|<yzp7z|.HD HD HDh<g5_& kz ^p4xգv9r49[ AEx'7,zuJ?-Y 8P}Z
袋W\.Vd9@"$@"$@". (֪CCezuheo8})h|y@>Hʖip/(٩se뮫$Çgկ" 套^*W]uUK+_W^y]s5^|;o3ݗ_~y. |Au
6TM:~k o~^4o^F[o馲nݺ>x"q⼂%@"$@"$@"GL\s;֯rʫה u
j`)ǎۓ=9>QN^ծ>٬rF ɾ6kW{+m۶rWQ{^hpV}H/%\R~v!)k߾}<2 E ~{jYwuT_~ZޕW^9UE{Oݑz>e|Ύt@"$@"$@"$w2G ;Z6{`R[Lr䎾ރ+ecŭκ1iFvi;ϦnH gGRyA]}Օ;n:Y ߮<!.?vJ!S휲=$a!bY(ܮCĢGe\*2}ˣ<LٱcG
&t@"$@"$@"$Ď;/˚/2pD)Ce` ^FɆ?'wco^w~6kekl4c= n%"MoUVakͳ@} 1gxvmܸr<q ~BBY\_v!w{<_ ߿yʷn>p6QB M0
Yۖ:u"$@"$@"$ S?🗃m)#_?ʪ}{3+U2<u[y_(v_ʪѺF
x2f'= @ؑ#G#ׯ/=\ 嬩w'/<p駟pbs^{rw2\Ӄl
$?2ٺuk% yJ4t#lȻ([ -M6 y: "ck
k~ ^ <SOGwY4Ӷ4iQ~,L㫼%]"$@"$@"$@ `7:8X|[wcS'Oֵo* w
q +*#u]oSu>Z'{G? k {[n*K<O'pA) .aq }[ gϞZ|B͂(+HC_i;tP=
zg ,av͏@#8]w&, q/J53ys#O GzY#.?uƦs6kqLڞ.HD HD HDV NR֯/ÃG~ NM8ֿ:8 C8y$t]vMq >N:UBn&%٭gcQזn IDAT\o;PG|3C69"䏾@ ɾn2 A!8?B"8 Ej$ !Þ#w.>a8tߔ/=! B<.G9>q:ED( yND HD HD aaWyXkd_s
MXY:쾃 pO<D]'2{`|o3p[k/bl
=A/@ b#sé0X pS?I!!{6H9{*Y|.7&/$hm[8#=?anu!K[m68L<`e1??+=SΥo$@"$@"$@"=֟H8#P
RܖOLx8b
lkWJټ;b3#gΜ殾
6{+Zrm6 GaS5@(
#hxQ_x뭷*/>vX]'|zie$ɾ~'&L.zNNBqU
7P]^0#_
YBiS8yζtnt|X[ݵM??]~7\zfY@"$@"$@"$sCϑ=]o ' !iA !
G 6ߡ'& AYO>dݨ |N'@ ɾ6 dm1 "DۑW!ᏝGz A%d/ng[M *n߾~7YFgCT|eK`(^~@}٭S"q.6>cbi%9c%.RvG?f+{6eō;zܙk][Dc i5}VI6k]OY۰_\~cld?q <Oqv)O|z)|~W_}u'o4m$B *g:M
yS~iZbF_!*B!@} t=P'Ԙr.ҵ<_vyd[oRPV<L eDٳjE]
w n?6ߪxDlkT3ābp| 7:Q1ΞѵIuF@?ĩ3F2?X 3 ]M<=[{aܰ7 Xs6[<=gMi-m*O~~یbs ;뼎cQ<#_kTz_[tvI1Y׆S'+q.G ZC7>0$Wyp:K` n d_$X]z!hZok u4k-+9^9Iʣ&#D)y릿k:mrt no~f};^k@)gΜ:INŎey@(ĩ; c8-|*&sB6O LB 7&]o!`M_Mo̵oufݍcY"|_EyO2* xG kQuҪc2j~}x1/ mkk tlỏ/O٨39͑džgJ@}3p,[̲=1Af&=&1.K# )0pISf rmB^*ob|ryCbnQ4-D8OX37KSv*c%@Sn/ϽuBżk߰u'#6xr/~kWpe!لہ aY߮oR6RΆ'bN ny) Hy 2ESg;1aͳ![GG g%oa'AE#E<8 344I-tYSԬs&P Sq<St $c0 t@" Sv+c%`}bNK[̥otvyM }'Cg7 yW_G{yr3 鐷WX,ង\\"ѵW)ϻv]w]=eǎ S Q /LWSw;ۭ)?sWrn٫+d MN bM.&䡡n >%Dp*$G[?Q8e#`9r]8A6G;X9ϖ&sCp 7z fme.hwsv>iMJovo#y.lCu Xw='n=窇pe#]|;#b'aƳCƓ>d]muVbǘ~_jAqԉ~22:,o:&s &g+~ Q3~ݓ% J)O`w+KbaO@%3P|X`3 ]mǕ, %B&-oz?DVnB75H8;Cng`Cō,6"@O ]{6Ⱦ'## t ?-=?:uVgZIƚ=y?l6ҵmtsG ߘ]k֖/y;
1r vp&lI,&s$642\ v1N2<69R 0F.S :c:)s!;{YD`ZTo7 X3GY~3=.M_7.6)fw+FۂЋhoĉ"8#*|(kCxLq?$?}5mN\*w89\Ln& bN,&QZwrLW9w\ƓĊ19q4M J@9C W0vNXd`9#,*7
/oVD,our_H qs;i=ɿtqb.m3^^>I~ ]
MV&e38s1ɉp1E &>YX仪e>wbB~Jr<7&Kvk_1_-]mD07|?Ϛ&K 7fijvBG7?3=jGFxt%HT}zݙ_ qnna$v$͉Z1
cD <ϩsH4I,>m>[&&&
~#|6q; pԞ^gYD=ɦ t9XCC`b=FMفu#0ױH?fZGMm+% }My9 }3nd[lHV[Jun]ǡq hwx
t# ;n.Iݗޛ1~Y
km "Bx!dyo
fhx R|ӚD s N%B10)Rz~skZ4)ޙ GPʠ)(]Y$S|x3/S91>3W~|Wꗽnugs*1Bz=S5qF|1Ya\ Y, 'y5WDvc}0(<u<);ѯ˵ ٮ7\ڕي1o %~$CFuvMO"C|2|U]dQC{qs3^w#^7ε+7~cCE\M, m Z>:~,nhwmZ6/^~O[| +>KQ<Kߴg~$yn 7+w_ ėp_|r-[k WZ:`m ~ɦ F}vd_Xח@5' 5y i,ye1aq eQ3pad߾}dvUWU%
;ٳNTzU5
Rvw~b"IP?|UH y ;۷_ zy8&twW)n~r^IUN^ 1Vo믗7x /P5_\,]vSH 8d\=rq_q?gBL ?g.XiEa7瓨xC{ｷ.`駟.]vY5#]/}M7կi{W^}Ղv j?]gX$>
2gjؚ GnZ t4 \Jrdie]?ꫯz=5. /IeU>8Lh뷐c.mzcǎd}_ ~ת}x7O٢Ɠۗ:q1 7۾&v۶mfCh#di:~5MǒYN\6ن
ʍ7X#Gj<ąg7&]tQz èW; Gӥȹ+Z:;Y6ouf7mKݹ_5$6ºykI\X+`MyW:#9BIu$z~)HwLf|B&Es wpО#fЫ?#e1jbz饗2ɏkq[o 1)t eIK9-v6:GYaX̄}`4S9\1[l[\!!`k!wD7Gq0vwcM=1z.t~pbad̑usNa~{ ƍqs9a 4AGcC7Y9'Z])O:/9ⷼȍ<`~Uj%1dž<wu3b0H 2g |z&{IN[cU>|!;N,DYou{] " ǐi#.a A$lGu76<P s*[/'3@4`H+gust`EhR /8%6^c;ʼnC^ SՇf"LFw$ y t 9G5([k~3hH3G1ϰ5+b
Nyc)b71hw/aџno}w}H)'ۺ& okjr.D%& cܬ> g3KR lߓUB^ZDŽh:tS sJH`hQ&%i3GYTb"4Y6˵p @9vsI/81љ,䑂GV:IΊEǐ48&~?ї ͛7Wl,, X3.hE柴s`GnҌ1&,PDX/ʼnc8|\;0o1'oc'4g' af, ;CgN RE]ܤ0'oaj0_iQ+&ΨJ?7e'~4dXgԸ[BȘ 6= ->}b1FPFW {bE
v2)v#-8eǣf9{˘!8d ƭl6'vOơyM5\Sw %uM߈K6 & ' Qv#r$/~p>ʋ<>SS<}vs3|OߩȺ|! ?l}1E 4s#gA|"ctEG [hgf sKk82F67P#< ,ً;ccǎ:`vBďeѽ4YM8&kVd q=g9;yW5=j~i3?~ )ɭ\L | I)
epsp=
䮟f1Asq\J&&/L8(`
QxM㎭;ċ- n6MŃ=| Diq0`YdJӌ0F Xw'qO:"k{9X1`Xƙy%d ̖//*pk99E: c.19\cbNC1 3;Qb$Қ-vrʶÀqЖ b<*MѾo'rN Ơ9옿pJzϢ8Ʈ\c>6[i醐1ydAƭ1m) wOE8yy!OTҫKOߐS-^Ljfwjm5}۶mcD[_lPi̛-H*c6^s/'l9YF8⒕(6U.qMt)Y'ɗMޅ|Yd["@ )CܦS_gFqZ[o%cQ'lsk~;q^J7]:[2CV` xwR eK2,YƭC` c>sߺ# n
en3\B3 )L;# oI!I'St+ ƛ/Μd~B]`]%gGbM)K3~u @n&?Lf&<ÂY&?E&0d%^,<542Q8 6D݀mqt h k Iѷ ݻwWC.Hy1cK>S{qI8۵o9|cΰ3q1G/ Ɵ9AXh
k`b^\Ko\{d00sc̑79 HՅSgS i GO"$>f: c5cHl㓳h76qS9/I0,EZK/,ro2L d/ uoF^3:[muI2jcgAhLxE0!spb?kS&rAIKF;yCC|';?l(ҿ;s݀4މ+pQG٨ʉ8&¿5ߑy]u),hSng/+;QCwy<݆Уn e b?)7{]h l%
Y? ۮ͊맆e]{I[(/.5ɶξ| PJ$f۲k ֦CYr68?\u>b?S k Gwp@TY , ^!@w {&ә\$f3pʆc'9}w$ 3 @i).F3l=KI_ȵnOs}9Bb q ټ 1إ*<Xxd0- _zqo6kG0 $eglN|2 \\3
ݼ=<tG 9B Ȇƥ#HidƶiC7ӫ!jnN8Y9i`8H {.sN -sfܘSMg$<qDc8i=g[p;APwŚM߈ %dVڧݮ 1CvzvgU|G68O<HNPzy[gu~DʛެoA #w&>:8{sM[^BwqMS}.Y2:W8}iLȳ~ֺMNT~}IGW&AcR$/D)j\fPڔ0wv ~&-\y9زxz9g,ow$i Tr$E8/ġl~FL s e\Q>; @c$c;!R0V#~5ۺ\x!hA5ꚃkwcLsw\oz/qi%bA3W &t d>BR0bGBY+WuxG Y\)W8gѪL/~o~2g7y<qjo
&0
ȋi0 횉T4q:x
# tC5 ˉ c5bOt<7夣o U %u}p IDAT"mfD
\gL
fGlf 3xtvS|߬飽l4vK.mߐEܳ bL%peǑ-yctcװbb!r Y[S~q^ԁcӥH[} ]F覞y ٧c@kw+9 f:7)n/? ư5 e
3֍A2Aȓi; +nNodq'˽uK: BP&#:ARLL&<bٝV0y0Hp&E0kP`DQ>&EF8O^v
kbW/}>WE>X ":75!q_aPԗAu)]A0,6Kȸ1'Y<8%@yݘݬ1Aʳh1p)K:k)bF= }jYy4î;-N8鄩p01 <7 k'0%;1Kқ6^O>]yõv c&OtWat8YhʇՍp!'zeqb>5>
cQn]1FasJ/qbluӯfKF#0$Lj2muMV$grƏӥ l W }gGLuWP9y7~ vtMꇜo.Oiќ j VΜkG+:0I`1׳edܓc,V[VqLg_װ_ŕ_~wsbKo1P2yDebx<cpMX6P֔7$GLvWMhE6 \ gw'
LjS 05(X ws} 6Ș#] C !ɈЧQ;6G`{Dyg|pƝqd 1! A]!cIߍ s BQb.Cifs Le| 5Gsƿ0嚻%E 4Qc*̣wcYy2&9,-s stbuLȇ:M{Ȅs\Gzu@;ȓkF U7ƟE\gs:g^7V8cn#t5R Ћ6$Ó6l,d:A8r' [_?OU7qBÉ 6"ZHјSB敩 O?⛋n8c/]m3U}nP'7٘JsML4W in1O䑣װ_A8y9sØOn8 zd_P/hADĨ Jr0)QF%K6V|zcA~⺶{' qD<FEE0D&V0J\ތ (y5#@^6qv} <`ʸc(!7<~/xۭW`k"rX.}<o#`4
#7$Cs ߢQf $yDEb͏w< o^'nЋOG#9+Ɯ2su3~t+(߂شHm.vϘ5v1!HJCĵIPV' dgXdE ƥyA ;%l7 icu̵H L䖶Sһ4G ɛ&tr Wy@Orn l>:?~ٝMMg Op5?X%Jsp3?$䁽
ka2 53ƻkd
o|Z#ydt.OuG*$
7X ( `3 |CwM [|LP&@q$FAC1qRN 0Q$ B # ee X#M"࣏B!1 Z EQ^ Y[0cL˃EvhSRVG=8}G+c8467>33!&3 ɽjZ82&9c_F"ü宬9 XmƬ&dL'm8H$8洘Kds"0WȈ֙.76c|;Dݭz 2h<Z#_w<
㖬G oW.:F@5#Ҟ|t G6C"} cb HM'̘4؉lVx' ~cq-ȯ|̯ ՝\Bf7零8#%Y&d1YIܦ :U>1 ]r-<tbN};ϖDѱ[]m,0 A\@;륱`߇moѫtcC_'\#~/糶cX <u 1]2 qÌ\ %[H3FWd?'IuOz mi1lK MQ w(r`"Bgl5 Ln¨p-]LtrǟBGFyAè? o D;, QǕ|f \`}`Pb1,SS12 Ȼ,_ ƶ2ytBc\摿WƦ[ [$8B! a]FEƱŏ `s ch̚ !qu7g
yY9Pȍ |ƘIwnU1<2 o<#M7-x߮LX )ܘ,a1) :z3~5q1nMNp d17uE>fBY_! G]G=d-'
8u3|/0,#FM1yEՁm4z?2-yE{B +ڵ+y}8 G>
ppV欕` ` \c(]w 4sXor0.* Y,pu_yԉ~22:zwRJڎ8;N' %кu~2QN8x5Ft*%laJ(c7]_
R.o3n\Ѣ<^2 ߬D"H+lR?iK8EyG8?o3cPܚrnvXc X.~ue.qj`hmboۊqV]M
pmޔwӐHT'GogSNڅT?G+۸rs̘ 1 nB, ;2ƘG4Ä7C2A>`/ #咛o2I>EӧA굓ocFfl~uխUȀ3٤89D>OElf|+w&"9j:~}N |OrԕH?ck&:qµ n1ͦo{&bչroK_r̅lȨlA~d ӛ`0 qC epp^ o6.ɾ٠qBt8 Mv?X *f^&DD5G',5L:#~;TN3\I: ɹ\Gc(<m_h$yļkGKkfXZe:uWؑvdDZj::f|Dk stZ߭y|2{/NitSq4-lns!Zkq)k;VlZveG8?n "z^mh0Mկ5υ vB# '5<BY Pr B7AΒ# 1<ROD0&g#J[9,WѼM Z6ú6'ffs3^\ .<9O/壉ʻn u
n<t*5Oi~n8R!0X)5Vjׅd !%Rvzc:u^%v;_ ;<:ewxgEDy)3^!!0ɰD`Yb%@"$@"$@",-Iu?v!OxOEto ךY@ŻrY|^xAzy (Cjk|* װ P ½=]"$@"$@"$@"$@)IuH)B`yq ڍK/կ*y?
1%A_AŗّƿC|yr"?锧N uU/#!zSOvǮ<xم k͟ B^x1ߜ]`'/YNA_/ XԊD HD HD HD H_DbP+" 3TʻH.dyDT_Zx km;ȑ#SDU=|BП|zVץvڢ 8#pMd_q /BK<8o}[5 {
Cy6^j,D HD HD HD Hׂ> фP۶m[YH.9^~~9DC0{34k;klDڵkcO]`oiʢ$rHЧzgo=+ Di \<(@8ŮD HD HD HD X, @"!bGgJ*! ʼn]hBSN y{ԛIk 86DD C.SߦЌ 3 =뀕pՈ0䐛6mW9%@"$@"$@"$@"ȝ}-^8dw}(6l$]ev!cO|FR/"v +N&V'C9z# yCi~ (W]uvY]=\%Bi|)}^$$@"$@"$@"$b#d_} gw vvѽ;p{dh&"{8$ÇeU
z<kʧ߭$2?:!twyg݅ H &Qd8T~M H3'fy$@"$@"$@"$JC ɾ G yԣvm߾~aw Q7;<fjbq ew\,bx+<J,M8Dի+ﻋtg)f{ݖ-[j<-v! S(쐦vB;Bȇ:G^~WLzecn;iz2X 5sH?!/di,g #k7spR }P=x+f.TAu\sM9*"iϞ= 9BBbu Y>%o}_/"/&-Nz$}Î6/0 얦,OW sHJT}CyLwΝuz z s[nyu] xWk\dkvWvH.5
1nziz2t~0c [%]"t qs?]!}{}5ʾ $zl]s~69.%ׂ.2L & 緸\# ni H0h BЗzߺuk% A_E9vuY,?رcGE; R8{
%a KF"8i"qL/V{ H:!@2sZ9>t@"03Wvo|ncȾY,g_u5f[|ltsG 5 F}m !8#8Cy$n&3 Fݐ\:!L ̋|
h>[@:xv}ݵ ANy2 fH;佔NC!2+ =XtĢYG Cj7,M HT|B3ω@"$@"$@"$@"3?K9uDYvm}u v!}ِKiGąs0Vi"^\HDC!]#L}خzƗw!k[>7 t=hW GOϋD)e<qLLWq^8ϙny4@d@"z:wu'csg_[h3fɻcsg_Gx4 xwa
bpp^ o6miI-H;£ ~ۺ<D uV_;peA,^k/'@"$@"$@"$@"p$7ETP̌Xk=n _".lO$@"$@"$@"$@? _^:&@"$@"$@"$@"$] d_ eD HD HD HD HD x@;
Q ߮* K]喑D HD HD H$ײΉ@N>ݳ -YjU/0iʊ (D9yv|΄*_ (1ND H l<4?&@#`マ+{Qd_}"0oQN:Փ
7PV^ r .;tz<rtd]k*֎q%@"$@"0|4@
} k>1 &ɓ> <R4f͚5D X 81qޚ<q؇e7˦n+CsHѱ> HO:*$!d~uw9,\ֺM4Qޣ+7<8Pwsqύ.W
\0Fjx W9D:u|ۅ͵.%bS;C]XLa!?K"0W3bgV% .G -W^ye9vX9wܔT.\~S2.j˙3gʷ}ythm[7t{o]nrמ&9hE`:}a!Gέ
l%[?9M2FvaLiZ}~p9{L*5Gś6j3o y{œe'N*;w0eϦѷ^fX|"O5 I-Yd"SZ['&MMuK.ڵkˋ/XrEg.EnwK)!6\!t HFx9;>Qɾ!p06nXnZbwk%\R3jBwy.6mTCÓ*Y^,숽+rgua[ 9Ru_\k"{Wuf'@ d[`&=dqطo_%"q͞@z_?י :tVxddG.+~ozm˖-UF=67 *zko2/B*9 #
)@S 9.8c>ax4FoLf̳6l06qLGɋLX(G^ ٠؋Q~uqt$G?^zhU^Qv'۶m++}oǞ~wk\ˏrͶ-]CN:]G˕W\V ={~rK6ޡڛ ;14dn<|[իFeN;L' !v1iQ<I_\Ɠԇ ~X4fcsf`wBYŹ]y GQSZ_Pc2 ᤉtS<[H{#玒*8[wQ+?->Ȃ
1y wԳ \Yx믯SO=U> ØNhdsO~ۅ!ڽȚ IDAT`n98 dcǎJZ<L]xӑ ®ꪋx≪d_|}:džk]=Y"ȳe@l36;,n ڰ= Dxw/E>
_? D!1><En#t* 4wuW%]W}j "Y ] mQt.Z 5 "m7iZX;
Bܚ0f^{Ɯl;w1n<o2=\]Y Aw]wqZ yUK/TJ9]SmM:..W㈜^s5톙ei\r,҅`YvMy`NeOLU&w <t<ط˵ۮ(ݹ
{ꅲvMtʵ2 tJ##~{# /}{Yzo6&ױ3 IY5DOaF1$-8-NyI/ȓR8
NԇI|pԄQfL,"M>Ncj7e Jˏ*E^ ʰD:F'jyȹ;NNЧ.[_֍ rXy3K֖r{7PI(N0>ܝ5. % IgQ(C,Ț|1 h,+7]"Я@ۍtM7 zO?t% C^MUaʔ^2'++;ĂIl@W +-R OH F; C
%;\IGoYg'WgSNO1rt ' 'pƌx!aSw}5LWıOjg /սYVgej;LafbF 3 G7zl)8O:vLN~p_]̚)r
v682N0FP \e5YIl2;3cclF1I'1) 8&13ݤrnOk4!|h Y;#L1Z4d5R^fUٺesc5CH}tǟv~sYju8lǩ;]My x{U$~|XOL]Jygr䩲f
S?+@ȗ/Nd)@~Y0( FFWB# ~X,(DCGYjQ ZlʗaQd08ӊRԑ> ?(VEo=NPN aKˇ Ws_}R+&Jy2<0P.^5\. .F/^[{9V ؔ [cɸЏW,Ȋ# ̹f1 +xlĘ !?26,ĕ y[lZH 31l L7B9ř# p%?Cb / wGʂڍiꪚWK zg l G!sOCdP.s2{86R]>trK:qZ͛Es.u燘d/J/ B]2AQ)-mոM|"BAa&^`_y.GXIBic?q}nw#BsC_IҩQK ;v~v9
%X1}EG]cAdŘwQ њNɗ}f ܣ24Ñk2h|O-JE@ җPk j|h]u7G y
}ٲjtܱZl|Nծo*O-WǟS]{n0?|G(w֯[S>] =6\TwMyCpU$ƭ c:)]L&y' 0.nd2@Q3Lt J!Q&2:(;(&HKEH3#HRt h8uXUgs Bfj7b, j0R#SZ T40n W7rpzh9zf<wdug˩oaㅌgLrdL ;ȚƧGH$2܉ӊ%X\i (s Mt qc^ ~䆌XDǼz?#]̭ABYZ"l<7u y@"_9a+! b7:-&bG2#~Hzc=VLkDFN9a,Jҩ57h2AVRأs KOGz VlP6dOaML ikodRy0eI3Un^JqƔ1>|s2#l.6tpa$[ ;9 iׯO G 1)[+dZy{m6Ωi6~t;r / ۸a]ٸ~mNlT#&y`)ϼ>enGw~X';[[>+yp쳚 .gΝw. "0]"ЏL&Uc331Ha8QD (:?bLP0 J./Y1/ŹYp[)^eH"gm Oa
7]ۣNqn֭z|6*7lX]?+ EOTgo+4= GaY Xp<Zc"Dxs"Я4Ǵkcaζt0iZBu"9,5>;17*] Ćc٥ CNT72I~ӇHA9K' ؘl0!c6UzĕA Y>hfe^L<mRƏd7+{9pKY< [#6'̅ur#8Cя.WDo cH9c'\Sg\6 #,+neuO3/eF^aA}}J&g$dD[&' ml~t |t }r Ur'M[av^ߑ{˕<|b 6t}!qú U?blh.Ν-ǏfSe4/tB` OiIޤ iu;aPz `~{4sͨt6f47kg8P"
G"q/nvrwe`}lC'vVo%ç' 3Ǚ0V\9dbP[$32ős8
O 7%~Ew TV{$# c p@ 9&O֔~,L A ߌ}'\ȇd$qڙ ȋl)-$_ yR E;v!:8̒o4atfxERЩϹ*-=^n-_mֵ&XVO 9ݙݓ7 : ɉ3A!8s-P}Vwk[7a3tGD8?a'<C*G|\ Y|ȋ2ɝp?}Jɍ]dFC_kЭsG }AK.Xw]q%q5˺k漧G!ϻ_x/O[z9r
Ϧ
>u$c26+Vmxd
w~FE'hE`.vڬϙ)71F|!e10ݍdPbq G Cv (ä:*n ip``ܕ)g!hNW?<]
wNrգˇg=9 .5NbG7.!ҸsOȑ1d"5yx#[v6\˳)Ë,'/Ȃ S#!1t1w aƿ3]c%; I`>v-Y9dlܔg) 3<tM8t gt
=Ӎ b!nd!wv)5Z2d-dɀ|BI#A:#)O(QSqu4(K[S 3^?cYl
ꏈ: d,3 ͠p8_tp";{pnj%9x 9;>t_Ʈ1__&V'dB|i41)z 9qpTG7rl1b!uu#?0Ox1h }_|ǃ
χ
~rݟNP r9{wѦ
Yo=x+s'-ed_}rٶ _-(
(t7a"m
1p4袌8<
^ͨ9^d
cA7LDrQg*;` .
" U(m^_.O\4jwK)ʪrDך6/ En}=2=EGc\1&>Y cqf-_gK s.YgϞ,M6X Ӹل40y17,0 (Ek%!&6aA;D''ppF|/G\;"lJc `|v!CoљHdz 7⒌Kw86VzRrOz"Hgmfv"~4s:xW5) 5߱')Mb φoPkL{dx- \ƨO|agGf.ꪟ?e̹N8G^OZF3f[ֶor䊍If<mn禫OKwXY5:R\vI >Q ]_=賛)xv^*837m{rZ\ܲlp'??$ !PSq-ΝGʎ!`h1W 0 *$i v N
):7D*d8&/!vDo+=`a!w
g Ghx~x(N+;/Y[ }惓
gl, 8V ~b3" AӑƟ
P F #ޘjݥqKƩtN'cYv^' YO,J,q$sqnв+!% y<OfEN̷6742VYD6ۄ WtDcpB>~! [>(SÎ4Cꄘ
AY|. EO/<U|yۙ;{GvJ.S9
%7y9';MbQ_H\ t a 5Q˿p_:خTc-~;64Mp")kyג;vw&vnnߺ53; yג^'œG:$ *}> ^|I}'wv7v}!.3~'{ yyF ϔ8/iic Ϝ2y 8g/TByt<WDiۿݸkmm-'0w7΅BW{ r''Μ8 uYj ϝK"RsSV* -ǻ@ ^3%%:|
~ s<^be?V _x#P+ %_r?lj =rFbJ Nazpp~Qu ٿُ;ג%Lvepg!ɎvصS!W7R tX{:)kRZ\ y7COe/'@~ϏD|ϽjI KcLJ/f'9̈́y
ƏN F @ĢAsF4 1 1{ = D;EXq q[\J GO,Ljuߨ# l( ئNU,u|{M^Ky6iYy%{fvs Xr&)|r_e940Y|8|K)r{}eUGޯ}jɏ|?wweo" Ry0>ow#cv ~} b ػcϿ5-G&.n٨M@vtۃGςE_:/O '˟oqce\O|N&S6KPV^j-_D AD9`k ǯ 8ㅆk^xh^SE{G_5- Yi {67v}1Gjf϶8 q}h > ǭ_" 9p ~K_l\EC踊k؈|lD^1 yTw~q ͇/x8,sX|8!f3nLχ{./rf g)Y{]w >ɱGx c)8g竗4 }+ Ǣϵ2}>./«ג6ǯkɯr=:ߏ/WnYKK]8s̊o5Ȯ &d_ lw_ baӎb~~V/O~1x5ܼ$-҉"BPqƏ^{_lb( U~-k!wLك _$rt__¨&Ks{¨W%Mj <dxGDrGZHX Ѱ:/V*G\QDN?~g
ӡd陕Eiynr^V^yo mvlpn;wZ6.}_^) }˻ZdaJ
~T$MP"Pw c_[6Z*-1wV lI[3ږVE@D@D@DV+y\w֕ԣֶ; mBԙm֛@JfR /֖knd~{}fǯ/2,k ]c;y$Yo |X%Lf[U%?^o2IR:ZGe&" " " "PnGa\40Bd˵rJv{d:Zo>c_wҹƝamΛwmP58:=]=I[eSְeg͇^T
/Lf+ʋW]=)U_uF
[V;ϗ" pDb@Zīƅ0N ?6x~ԾS:~uD{If>R:' 1mc?@U{R`a%J6beR7 esu! Ges iu" %0=o[*X Ւ b\ԥ/dU{[}{Qޞ}u >k]:w
}nQM\剀
X=YTLß/ 8"A|߿o7oχM!DFcϟjM%B v%{l``KgX
.:*GǖqaѸE2"on'^ڿ_Mbv`_ c;}ג)ϫͶuմ/ϒ{ón }<mu 00;;kO>
;wheVD}\LXN={ft:d`H&&&Y(Bԃ/ˤ۱c=z(& qD` /mdd$Q/} LW^H|(q0ܹs>gmmN[]2yD/%#RD;J [ IDAT[JYkWbZU" " " " " "J :
AL;x`(۷o%%˗HyW\ "" #rܹ *r;R/"c:0b r"PQ_\r wtt> 1ƍJ3ٳg(x F\c+Z< X<f <yɓF>ǎ ݻw/F-Ϡ ˭gY[ԷR+ľz |B//^"#,L@@uVc-"EwwwGܠ,8=ʉ@= o!!:_v-Xa
ǏSϱC~MrÇ|~ݵkWțiX"0ʕ|\c"!! O!zix~r+'PWrXC
| 3mpέXW<,4A0A DԈ
x|1w/:)
f8r`͇E 1s05u'ڂ*a ` ֪~ϴ>{gp&+iҊ@ YQ4/b~/VAx[C`3g!))tH85!N.\O^ ,»'4AE {o91 <5}M@DB2 ŋ!:a E'N ؠ\< >|h ,N>=/F8}NBghP
X p+u&SyD ,*w>݇8K(4b
EZʉ@ H7Ά1.V#̱[qvWy͎_G9EcJ/ȑ#a=^"$E!" " " " " kD a3_JBF=qʋpLAdsGpc Ł#|3br" loXa}>kIC ƓO_GsY;أG"bǘAr6.ԃX#>bytطzJ+" " " " " kL +>
vEC`vΝ5s oPy VQX#O VRXPQ/CD6"@WC<}KԧO+X2KWK_x@$GcѣGØ!." e3`,* T#lo>4jf&v" j&@kE[ATkWk
;"\0EM:\@c"g?I<DkX+n#!y 1EFQ={Y5 }<XaHЎ7z k^e<Pq;LŢ X?XK脹\_gVXGNg,=7` E@D@D@D@D
l ࢀ$9?AXB<B (3 +' 0){'-2]8DX!/]: 1XDuk=\9pc BEC4?uTMw +?X%}t\v:Rï5ީWPdrrJ LȺUF@ 3_ˣ @ F 1j b"K^~ 'O2). :´G' B!qΈ▉9Xk.\_c >6>?kq9`|y>Xb爋u qMEc"VJ /o5bїJCzܕ Va-mKf%+ԤJߣS/ OU_"N
h6]6#U@/*=勾~ p) 8` 9 ["5BxΤG $sT<$![!fpM~#7[ʳilї>e,팫>v%ix6X4. |> O&Sf Kj+ ki+/"BW p`DND@D@D@D@z-&U yF䚲j˦;'h~ | 2穳4"h^գ8j`RčCB56/[" " " " K%\Q!.]_>5q*t-" ">\}r"Y wo'v"Pط" " " " " " " " "HxL5XbSD@D@D@D@D@D@D@D@6 }" " " " " " " " "K@b_,y#n*' 3`7fUU+X!DV5؇4KfVMZ_"jr8_S<8bcjrՒw#AE-m7L~}KuF"ƃ6P(V\JE+<ٷ0JӣV͚!d-ٱ=-%Z:͊Kk<ТQŲ5\%yC{r9۽{wȗ<gffŋk.kjj/9Z> >|wC[< ~*V()SIcEUgggàEn@|tk
BNTG'}5=z ]qz6+{|>nPΪ)+e,7G}}JiK2hfɶVVMX_Yz籚V"~wܱy qq? :sLƎ 9pG ?V۷o_-+JӧOtG
DPai mLo/_Ed ڸ!U<l6[%TN>&քf%߳tծ"qVdWUz6kEvo]`e эH?_[_/ Vyfɶn {ɶ K[T*Z);n6=cũִ+Djn]x jAT#A600;NE&`+X;˗/mAZQBDυ<Ğv{왵vA$o,]=q >bBW_}|
pA&gGad̞zkZ1 <ƶZR 'n555슮ؗHZifԲw~kű=hMGd Xױf_hɎpYu=凿7Keʂ"Sz|;z~:v\c?" hv7 ˵k===vС'b Sk b B"<?*Q.BuuӧEHLzDG ŊѸ|M; =}iGƬT,l߮F
V~<o9K }÷{+tAk>ϖh6_JiV cdΡ e\ |×-RU]7D62
?+v0 +;7naɓaG n[;
>ľcǎ!*˭
)<
Xq 0%Fuq&w ST^~gz:~m7mغVCX U( o4 MD&fsV K"m`顳V WKu%hJeb 5~|lp ͛7CX{ƺ}L
B xчC\#577Ļ}g Dt!0N^|IԻTָgp/ȼͻlh<8gq !6
8aޅybqbn=XELK y `kO
q ain
wg z{(u8E(gZz|OyLF
A81x"i<N#\ɩi{ /" ?eufmb-MMܴڻaU&Pan"b X%,ٳߒYtr,սϮYa%Gq
k<vE|ò.
4b 15q yaÇÙ{Q9Ⱋ.iYzo߾&kk[ ՛?[.?kXggX,Y2:v bG]eikdl`}s錥]C>gUJD@D@D@D@D@D@D/YJp$[Y;FKVl6ǓHZL{w"-ί2+DA8AiLe
0q7! 7F|&U[O0G\ohl~&&,5&a*QTN,ӯ65#0Nb Ma6촛H76>K$83j&{ؒ ;?kj-?|6F0\h@B0s?"^ܔZ wKQӂ+S Ewڍ5 ;bUf ǁ#m*|L}?W?٘Kkslv pW-bf&P(5X
7Ja?O!4K9>6"}OYC8cȈ]|9X1ME2?&6_)qƆ a!=}?ʸxX^z5\)rQW,.]d|8CdJ
8+?68pر#I > %Bbe!P,ڞ>/?MM,7f_:j_>Z;2C%?-Hb_d,ҵi<Lyn'&eȰM2zzz ! /:;;EBhW)E5yQ .<]#- B;A{E#mW\s΅FGG& gΜ,w`%?M,ۿ٥sC<ְ
TD@D@D@D@D@D@D@D/!5uXuGtSݟN]Bl6'R_c,brX!!! "!a-@uXU[QkZ 9jq|!#Gt_, B{ih[/Rz)`lGAwtmkSGQZ,-c><;q<e7Nk}*e0ݖj؇H梚O q qرc ݻg?:ubFjeU ?:U^e\F)իWL S.\3w`-e
.Vo vg0Zfm&j/" " " " " " " [@>X2;Vxf߰s,qdzn=%RM P2e1rJ3{1~ E\rƍa,`/^hdgkLƈU vq}vۿ|~rFRˋ;R?Ēp2zpyxxx>i#"ڵ+?Te'ZƺNX.)KGKG&_"a !O[jj#" " " " " " "
@`ľ%vXo-{{d҃z%[[43nedJ1?ցZE@b->:}!F<c@۽{w=M|)yD 1ٳA<Cc
1y 6 ^Gamt'A<DKv4vLlf&n)?6[&IKMyTM]eԗ}Xt +N/YqeNY'L ܮ)+<XKu`vbaIU,*Eh.pp9D6ȋQ1/PG\Du{X:',57g!;sⰵ4ͻvc
;3#鯍$KD@D@D@D@D@D@D@օ}a}50-77|f_d砥-aV[+<^[Ԏ|9(9Z8Q!;W8QJ9υG6u"L o?}Ԇ{u"su}qh]u<lcKl" " " " " " " ":Q%D2dg^}u'~&wtQKDm}t8.w7@_T9o2vxq:XgVhھRCV~o7VxcY2eɖ &,^ZE:qV1MRJa*oet+^D@D@D@D@D@D@D@2#%RliɎgR* ,ߍK P^an#R\D@D@D@D@D@D@D@֎@}5#E@D@D@D@D@D@D@D@D`4˵:`˨< IENDB` | PNG
IHDR Q IDATxieWyԒZBԚЌ4`a08`ر$$8NUʧ$8& l#f4G4OygxZLݭ Ug^gkߞiq!!!!!!!!!{<e{|
RN b_:B@@@@@@@@%V%H5B B B B B`"011[' LJicD1 J@@@@tD/7܌c@%lٲ~5kZ%"%
j@@@@ O?EիWX R@= /M6>xXj;@ľ 2Ʉ@@@@ aA XDK K4˾g}KEpo[?2;ڙP d̎B B B #`ndڵmŊ+-}W )%j}"mz;NڑyK>ܚ;
ozӛw(goC=֯_CP w ԟ>@ //0 D`}DA;hYoGO^[oMNN.rz s=חDZn];fE4yC^;l~:t?]쫺ö#=]Lg8wyK.8!!!!0$0: 8B B`Xc8&+ Fb#Q=N7o]VY oνU8+v5Xwa9b>W|?O<L38<*\!\uNes:4j[(R$*"<3L@@@@@@@ I`>
nZ%6:-E G]pR .`
>wygcժUzՁ(GEU 6*O" ʀ+ ڂpuCio|c=kY- L9v|Lҩtk?y%U.||w1N#8/
[zՍq Ť0!!!!!!!!!b߆
RM9gތ7a^!=_ SC1O]PP[fiֈSki5wuW^8+:_VU DײL,q{u&GP,G,,u~Ȫ DazC?Sy\bBR e%( ҪB?B B B B B B Bm܃,+ xlا>=ax5VmUmXJm7ο<^6n uϱcmʏE WցuQ~ toqmq=-N*Ѱw}w_*\ۨlExs9y ~}op䧌\ zSO킟zbyw+M ݙ@ͷ|s
_t|}RξC(5
G=. b;ܧ w7t݅_p 3}:# Fbt Mw ;3%^|nW]cZT
*qESk?_
SZ,>( "0ᤓNTիU iz}'hK4;#8|XIo){m8~5~pUn/ \rI;:믿s|ɽ/Vs)C B B B`[ Y sa
k5?Vp8mj~O:?x7/g Wsa}t_s3q+0 }|ů|3GT+n-K>]a'|6+U Uar א=uWד1K4|qqT`+p뺭ҷy|0G uԼchY{eCIh{n7ggk_gžzG?b97ʙJ 6:g4V吞]P&70s[$Bvڞ'YqR^qdϛj t ,U4 snv:ŞVR
f&-e a3n/?u _;p ZQ9JG }ls!!!![3}wl&<\<sw^8̑Ozz/\U'?ԱV*e`Q3W$P\&_7PN٤kG8gnx>U |#oiȿүt8zh瞨 |n~V} nixtN̏ݳ ?*VZه@Ou p`3ι]w:>n m \4l7lV
ݙgW
p
oxcG ?.HQָׇv}:ID9 r:
t SN邔Λp
Ag/Sa@&^:Q"Lu\`:I`B|(Ǚ>~9u2|3WF^^&p9oB2괛P)a q&R&]Qƹ%߀6I'|oe N΅@@@$` e#IGd9ǏX?Ϳ8s#/b o o5:W[S\k^&{g6xunv9PsJsO)W"
VeO@Dzdet,a|sc7 7z,;+3Z? Y6Ur)\3`脷k_(U_ ,1 ߅ pjekʟ"מq\Lv/4#ݓ|3j 0&
9Rcf\7IgWܶ{q~FǢ)x7|5~4犳fO&|@8֡twNcf\#g4
=(4
<A~' sޏ8Qo^t+ P IϏ v|GJPa8à2WzҴ)8';L[TV x&I wgd%gK0&$ ]Igl^ß-53fP_ r74'5 /]sk)t;&Oo ͳ^b'<j^Ys\m"vYU e?knɏ@z8W©5uSƛ3?dLto3̯-/sDL9lOZʁ6 Ge\bȝ ބ |ǃK`w̉?B G5vZ74)GTډqYXbڷ7nԘj 26
n'@1fJV`0dtX\v\7
:91f<$VpuU\ ɿO ==Zc|O<uwtG߷YS?ƙL~tjΏ\`
J`s(nIGg +o 4hEBC=G }:1eLë 4C-&;WI}a 3t(h ڍh|G9u|뼲x}V
Sa_)g;b Sن6i'Qf{@@@Ẹ̉5Y$ <<<L qxŚO9 jS*Un(q<O /S>iFىJnM<+M{7WXfyVTkktg.P,uOY͟bQGikGf\Y7/_~
=Qn3E1Ȯ|,,aaT )!?&#W یqZ1ӵWc@Y$T\cpƌ댍Cc5*},82_\m&;ht욫f SV4 5Ak1Nc5O?s_ڑ Wc~9e;O \lƥ3mاJR`*GbGPs9}nqm\D$ȿJÞQ ֿhhD':iթT^{T~?:p)\l¹9LPVt\6NچN1 xXFů+0 20e@[(|ex\).B B B vs3(0ϱ
P]5 f Z8xK
$7/p㎅e&\ˍ9a0m~*?KT:NM먓 8eō9?ݸIS!:Ƀ6_y_IO_=
#ntݨr/^VDk
Jur-q } 7 p4Nϰ7s ~\z i8/}_=o?Pu]L dܟn(tzwc #7YGZio?Jxk 4v[xkIBՎ~CL3QmӆXQZB:ΩC:Vx?:s LqRa?PUiTIӀ:ƭγ>#i u m[է:Z)$8^AZCF -N+9xnOQeV:&.7Loܱ1O*Pt0npj>n}l1XoB B B B`{ !K[ ̕lgeNG8,5n7:⚓a0c5-y;vVz|N<7Y8nX|\7n/2.(a8xǺgT90rcgxx0r)C'QqG0r_Yy{c+wNpB8 2.^W[:/{
n/r˳e+{b֘4{}["Xc[]5:gu}LR_pSgZEUo]ps]Á `#
ọ!N9|NY#)csNﾻQ k+kqq+&OA*U
\~dX@9vn
jcH/O [% a4'
{
ܶF!Y]䩼U% * qy;Mű]yԍ;7 #O ʐ0*:-f 0^8] ƾ67oӞG0NU MLoj'ĸ*~!!!!~Cs2+Yfŗ?Wqșw{+ۛ{JnX{I1i
>0uqhO|릭؛*M\+ Яiԭҫu7c\:_~0q~ps W
2G~AbP7ącF>,GC`w%PR]N17X]g1{qKU7f3tr lsKܒ>K\שWckH1
2=29~ Qx=Sg}c?dԓï8ߵg.]rg kz|c%qNxMXK m>_,GG%qTdBTy`
jar10a8` F2T)s<+xsOh3@܍sүauwnp[ũ
z Su~E$t yaiG85!6@ &BQf !!!%Ps/6 JnyLAj)c7F511?5,
"\͠r 'rK
Wj_Ҫ\݈'9Ջ
srvܼPݓ7\q}ܾSJ*ǸƝ)rw9[){b 9q%zP[nPu|yn.\F:; =@ݝo]ۮ5c.v
,tMZj[ו8x3V[rj =ܣCw!0ȤK._W]uUVY \q> {4G
=eo
q1P_OߋqȾ\ol zN碋.zM4lW$OV%[ 8t\a6?80nk^*]Wpvtl;Յ80O\J꧳HrBmQs4u|=3#*3s©\0]i-]U6G~K 0LU{!gDž/ WakO:o&?+~5Y8ه@@@R o>B#0OraOu7@ nSz
/Y
bˍϼPYGH_Y|lqa|
0pC.0s Al4Gd Pa˩sc sqV*!{1,g.-.n*_ܶε ~U?u$YUUJS~ڟPu.?3Ō F_9c_a+C`w&0;uo|]CuW\w Xbo\?3{<ր߲#S:,ߌ㨴WۮrgqDZ~X馛څ^9@1z:a +:2mE1a|
76~v}4dA a]wЧ|KD2Pj0umF% :~9ikpiW5C r%H*PUYt]&&K#Ő_*Pƙx3Y4[I6,8&}m6^9<]ª^;Ο0..Oɳ]ZDQq}s=W?05ih#NMt} m%Ps,% UIs70Asyfyy ͑qWky Us+.78Kę1K9gn̜B9~ssM5#:\\)
syev,͍bQs=y;.Anyq+su^yN݄7)As%Zu|`R.UPcѩ--ۮIұ> S(fqb(g4^b/
5,ØTVlWדؽ?M+_g{xlkjܫqe 2Fl":~=',/1NPVb$8qG86<:*c߉;t]w](OapAT̊S{cc3@2>2Rh*_ا~t^ǜ=~y@J]+<Vc&)e%
Rq5N_g?_Nչ@qq[atH[&@: :NKɳ:ΰ^>?z+G;\_a[ՀSոɅ|IM\;7wN_QvҚMS|&3.FLmx !!!B!K\ƾ17213Aaj eJ͡:Q\oj
?k<J6sښ{\W K97lϽ,.N:6uc; ʿ}Sy<+9s-v!\N kq c/& G*muwY+?3u^a8vN-W }CP QqݕZ*c]o *Ze9tkc1EXq8e&عN 9 h K۫m+g)ØŤQGw_P ͈9>U'cfIUTy IDAT[7,5֘VaZc'qNGc+NP}m̵Jd3GaeJ t߉jh7xc: 6СLd:} S䄱a[u@M<N:2\& L|_Cte:aTPs!7'v_rQ\T唥3ױn'M5 k0??2{*#mhP22T=0O100X30?11?7!K::>+;g|| Ŝql5-/r5[kͅ W%N)9i)8'M fCMjyxh=@O{6s] a`+H+8uW՜C p c F[ F,~%.ؗsh#*~N<<{m {
~>pzcz̵LXbMfϵgV\+?aڬ%/cx^bGI xWu]LSu 6ޘϟrq +sT{iVIVwf͕4.Ϗ<\{inq
Ϋ%UaW `C;Gs8t4 QVXҐC?T:)'^]Ph؊[y.e 9Sz:I9yrXtaįZVi؏sUW~Mx備 BNي|a8u\< ..|NY$E]'N%mG&UѸ !!!%`.f^1n>2_93\p5ݼb4Hp)G_?86Wm Y6qaSuMvӥ#?N8.eVa}+nR+
_WǕ}x)G ~s}YQة_bSaݙjҟw7^{}|?McM GK0ql%
3 )ͻ8?Uq狓6` EWGb\cE}:ۨ;矧 v"8
9OHo!!Dl{dO'
]5 ~_CǿҪ my9/$`O+hָ&$ J9c9b }L1R/Vg/ y ! !-nX~b0c5/ݨ8ه@@@@@@F^wچ%}x{Иa;PsiwV4!Z }pS zjh-Xdb[bO GK|{
4y=(TWq
"F#Y@eY8߫r@㘮KSV~)ؿD2tA˓+1K? XZ(=
WXesPJ$:'^ 1ZNibf\ ++> +K1; iwb'?ƹ~2 !!!!!!!`IoͿR:s쾺6t<U-PK- :jі}fM@qD8C:3m~C^ e"bxsu
@X 3w,mð0b 9'>A?A*۰ c1YB q+
T:ï=[핳(}CX9+xv%\.G'v_nx^ydc6cRsRYاZ%0-;0 awD4 +Sϯ/øch$VcfʼyE_аgIg7Ք6LqY6աtYAD=Wǵ)c]th=B B B B B B
[o|c֨gx\xt*[Xط[~/( 1Qб;s@%'^tRe op;b_B^5̻zP>B B B B B B t Xܓ7}[z~vاܨXaz}KŨ7c\+Ş/y_l !!!!!!{u N૽sq!z%bn9g9l4^&ׇ@
X nUק4I5B B B B B B v =0a,q]W伷ebd sUmXYB B B B B B B`o&PDzf_ AOuﺪ'כ@Aq
vwI?B B B B B B v%%9.oW)y;~}ΩLD>q}u.B]F` w.ĻI#Sͽs+[ sKB B B B B B B`^" P 5x׀HUC B B B B B Au;:Iw};E
Zun_c@@@@@@;\}Fj Djz_|@@@@@@sg!|G b|t$)|헔h@@@@@@ Hj\C`Gط#(& d[Q@@@@@@er/5 R}{HCiŜ럋= )o@@@@@@ObD[ m ` ކ!!!!!!zn><I7vLۼyشyjG4aD \SSSmzzMNNɩyr3v4|=#}{_;cB.X|vC95i?So w\[bE{|vi;h7|s{:ğ-Ҿկk'|\r>B B B B B B`O?t{ډ'oB?s n'pB[fV~K>ӽ6Z[֦g&ڊ֦[[>ڲe3=p[J {܊:(B`1lIsa6n}{]ԧ>>N:i.+>{ްO>d#Is}u]~ ܈<@/ vW |#7ꪫ3<;:}@@@@@ bPnrʬG{ڦM}O^b<M`ŢC&`X}ozk{{ۭ^_vy[UV^z_o\rlb߭ j?Bk߿ q?>c9f6][lz{enݺ.4η,sYl9}{,t ~D=."`貏 =@ľ=RN;},s}z>>t3w]،# x3 n q B;Y1UQG =( ? wW7'E/(Y"=cdp !!!!!:K|^~vgW7}[\"-ś巶8گVb c Xovγ<;oj4Kn=o>'O}QGdǚO~~(,o #? oo_V^>?M]w]V[FC'!4ni0LC B B B B B`_'P_Y+s#TԖGMp|;5w6l%=n7͍ +G } t]vYo,ҳ1`7?Á _! s)B+brIycb1sy K?yL<O|"^>B B B B B H =А裏зD {ط{KJ5Y/va~rx 3P9V}t5.=ZG#jy{nbbl'ҟy{)2
2qXY;˿<+=^i8B B B B B B`kXW1(a{ĭSϷ"6H @?- ~]$c^M+K.,ɟ7'=+Ͽ7γ 2X
z:YIy s,8Yyz!R
nc Bя~ϒ&_i)o\? g&F^8֬Y Lإ~,{2}{re?gk~% ;`ǂϋ:v Y}+_ K|v> g?rJgtOppD;-?n?q}^ҡ,DB@<ҏt0Xe-XyV_ux穻r~1{:}{z !@[UN8%YY*˒zuWdZg0 ??,?iZ+M2O~]d|{>%TzN?٥Eo X g>/㨗0[zYŅN bߞނh igߢ[ϫc5PGPZe_ 6S8wqǬe<#\3 ްe 7tS6/[]tE[=go}[Ro],CSb_Xnx\x-/E<餓}#W*O?}Xg {}{Rk[ b AH=\l,gI%W<?KlX} o<䳟l?s/9G?:[a
/!!!!!!LC/| gA $ 1v} z~}C[% koj +\.Ks xA ο= -(o
4gхqs~/ !!!!!!0\B7>
ݏ@ľݯMRE7̜wh^n% [N<V>"h:v[ .2v9n=[nQc T !!!!!!{' + {gR%̎:+<76tίZy o x JZcG s A-]?>+b Sٟυ[omw^VYF: +lW]uUkkזw!!!!!!!0}pUrݡ5<?<c X?e鈸aÆnǂnԟw=Yc=} .6 /S?S]`^AB*x vVe hw/晀Ug$bƅ@@@@@@@@ľ= n(+9ب#[dzL ˾U_a'znNǬ9ެ;7MSOmDīK=J ;Ϣ\, ˺d !!!!!!!8lX½ޞ$fyE? suntO\dgLQ .hg}V~}@@@@@@@ / v0xuGrŒM7 ,7Z@@@@@@@@G`,&7onS[\QjnY7$,SjS}M{Ҍ@@@@@@@ ,Y۴L~mٲK11:Cq-ȂkzA^ R݂ľ]7vB`T7 ǽe !!!!!!!!}db559VZ}>C B B B B B B B B`GX7}mb& ,Ihwb!!!!!!!!! ,Ziy>.ld !!!!!!!! Xط`J !!!!!!!!!K Dۥy@@@@@@@@8v ˤ!!!!!!!!@ľ]?@@@@@@@@#oDZLJ!!!!!!!!!K bDk˖68[lun3 nٲem>9yzi-6ܜ#B B B B B B B B`&bn66mj}m'[j Ж |\[~Im63Zm+nuD4秧g=6nV\'T{ꩧA VZF"UNL4yFnӦM=Ͽ mmŊ]l4!!!!!!!!U&oM?HkSmZz6m1g/nW*-gi/x G|֭[7+?l'pB{E@a8bm֯_߷:/=+Ҟ| WW^_;gG^G qD;z^U[om'|r?&+A @@@@@@@@vطlypoxW+/fi &ho/=f66{UR[};[P~ĵ=beOZK];vaC=tVcmGؓ棏> {i=ЬG$ n=c=,<~BP${3K}ٞưOwOpvZ;f˿U| 'obY6.浕'\V yVX}`vn+3ɇߖwP[y¥sZXn6lhozӛwϊg믿zꬨ'>?nGDtL;{\yė^Ӹ۱ -#m/0Е89<@oڵq7nI0X&''wb,!!!!!!!]h6<=:J,C` 6Mm
-_VrY[y[^1&Vז vJoC+b6?tS[S۲km}͚5]p##q6s=}2ʉ:U?by;<ց:鱾`":ī|\|kO<#g >K{#X LS]OAkA/`JObalzMmزuNj+ys} l~8줶5ڪ^rߩg~Ԗ E]8%JވwC?? .=|<Gx#G?cGt/!8G ke,G@WUn:k
Vu-.B B B B B B 6^brm-{zAmimol}brrs{WUmѐ^`»@qh3<צ7nyNߊCO}3/?6.k IDAT6Sڦg nmʶr%mAGe ڦ{x[ lX<[t9D8 oVrrJ#yp
}e.z8DC9d o'xb?/OwUBlA]gqV\Xz/8ۓ+ xZW/vWHL@f^]Zk;_c7֖homMx~.LO
_Mڲuf9_ <Vq>qY,8o%<OnG }tЈqΤe/ ;:a,碋. ,L^aI-F_－ CiU!3gxg !!!!!!!!obLkWwMn"yݪmb63QLz[Zdяj_|qX-oBo^# -%I3:&y>yy;z=sY?肟2($-O\'V6O<џW`s !!!!!!!!b_nkn Ҧ}M=p[qYm#S~m̾GVk~66lE[~u} G ydM2e KQ˻JǞrp( ֳ! ;K Aց6K}+.ŏ%gU,lׯ_߮.:Z"Ƀ#?"a\@@@@@@@K`},V Ж vR~6 mu'u863-֖jmjc̦ ?3KP#</"8]9o,0-JT#*Xq wq]! ?;sWeGFʬ'tR%:piY2#}i+:M>zKyٶ鶯U-?ngtk{& ]qYmb!MmF,ےLڛn/%Y;*,=oݳ;9ӗ?c{o8qxQG4K-8, &t1$>i^uU
ه@@@@@@@@v7&?<o闟iKma'y6ĝ}.qpAGǜ;U 졇 Ye֭bP&&ҭ^m^XͪpHp{ꩧM|B я<#aBg '()4->3(>Ooا\q!!!!!!!!!<3XM=qWzvno3cٖek'Yb6o%Jhم<3ϲY_z,Xڱ< sqwgt?BgD_>ķU| A g=s]l߳m. 6 M>B B B B B B B B` ž6rM[ym/ͭ-XmYEGV ~sy[f+!z0p?zs8a|Xy +?b,eyGs*o/nQ8 >`F ^xUvNz` u2ЛW_}uA)#B B B B B B B B`$>COl+Om;[az-[{d[u۶X/$!cW0ӡȟ弖+G \ <t 'O:Ûvg7Iڵk{zT\pA#Yƅ@@@@@@@@v؇t[qmGw&vok;K9҄27p6W|B ;8ca pN8aV,ðy Ďm¡s\cXaZ97bLX> 핗m?{/mםÄj|Ҙh s; 'Qo_NjIf !!!!!!!!آly;&Vd[qmq]] !!!!!!!!]oW4'Co+O~[zꞶ˶<ե,v Oʣj+<}˳"oe, ǥmakZ)ܷb-6ܰg?!!!!!!KNb ggn??1g l^{<' 0裏1~ۯʯ|ۣ[ɟٰʞ>q[7ټao}k?嗷g}
7#??m^xlHov袋SO=՟ 9L|9~~ w}} kҕ?6o>v5״w o
64|K/z4gϷ?^#<r{>//̶&= h˗/=Q}~dxOo{unrr mrjS}R{=a|'wf_m-[lC{!_ڻ7 ~ G'|rokX|>9_إ}P..ϣ:jmzKUW]YGk-oyVGq^ӣa=B B B B B )dghCP"1Znw}N'D{?lsά $ zjAXz.0 "+V QC~]h!0$]
-- QFHF `{ｳb{:=Ы BڵkD3 +岉%j f͚FH QQa]ﻷG9_{ՏE@)ጘ(Mu%Hn馞o/]cnݺ. TBsĮ~U8rţN}/SfuTM6M UV'h _ .: uqr4_e?Oss ~foKt∦ꩬy^ĕ_;AX8G'xeşj!b/~l&qu嫾^Xp_~맘o I#wyy듮Ub~_JG#s(B뚋 %}[\{3o
=X?!6n˹Yw#O:I'pBrw|;3ۉ'?? D>n .BX(yG~ <kqxw*~??ń뮻 bed3h@
"rpD|O>r\LX{ ̊q+q98*Gwn;묳Dܓ?1DՕ0v#&+X"Mp L=^BH;J|Նc)Xes V+ 1U{p!(}MĩY>W[7huNI E X*wO" qLbzWwP_"
<.V'eA<R OI~]>p1K+o۽ nC RU;έD~=O(/']"><C˿= Kӵ>}pJN9v-tnApMOk<_x3Dn8~lqRv wqǬ?- !!!!!Zݘ/dB`7 FDqN@sSNȰo~RWbc7K*KLrEa䡇
<&t,"G>.hԧ>,$(+,wg %>K}|'@q2Ϫ+E*qxN"::u]=<k<ņ^ǒWW8E 8+2qXV8U.Cfyփ H"4cYgOGuLT<)[ c'U\.1MX:տXo!sF "2?.I`mpooaM}MA^D8fm&mN}]LA}o#K7Wꤌ.~Ωc9eįc&78pYb! gbٯگm?+@X( ƞ>ׯѪ`O\;.KXcGtV<|ABIO 'vyO
!!!!!;@ľ A1i4zkz"g*X@pNa)C\! fwfu"8b4ݬ,,JB"< Dy{QHL!ูwnɃ C!BJXEIXKs ,E n 8ဨuc Xχh"om/)mJa-ih;?e#**8RfBK# ԈYS??= !Svy#h7Vj0ʤD4K1K%=. y+>D4őѿ+ė ь;&"JWP⮞e]HD&4 g%YNX*1?^ e rq2t#i7]ʨ @8qm`Z+' l ra_Kԙ~w[ź8|}{,7]S#,-sʧ\1a6Qh"}@@@@$oGLZ;2fGDaMj2<" 1E#6ٳx#8b/%h8ϊP1QčKs_6%0ďZh))D4PIp X^D-$<H9 ,0
8eK,"H⡼]³"f0W>@MqpIQfK3շX=X]S7LՑE*6'l,#/n*w e+ g~)9ǺR9ԛE6ڗ .TV'ay[K=GOB6/o~IK99 wԝ HRe"
,׆BOd#4sJi+#Y'^O/!&S(#[}XigbR}:' mT+ c'? {ZN;X\./Ґ&Ƨh>B B B B B @ľm8 D&_DqK9X~l
/Cuk#0r"sn'0JP^ .^JTRv"H!H_H("CD>|Y5jio(t|..хGL"
x"oB+*+i39b
0u !D'b2 CFބ TΒGB!ȩ7Ae<'My.ng!Õ(C|Q>VnzODEǫX zv qCL՝l& ra["pKG; c fF<6b=( .e/_Cw< 9iyLqDDUm#}
ZZ/ehI<K^ezS73qARt-]ʰ ;G\dg? 85͒ye"V5[mHGdt}B B B B B B`GطH&JnblBÛ. _b D+BGh8U
W HX c.<ȍt#rw(䦟H@ )GlR 7Et#8I> k'f AGQnr8LetYs &> =Q (1C%,^F rh'/L=ϰ^A8Rᓧ,
'hoxKl,QfK$b]O} D2^b IeϲNVB~ -y>!1O?. ;MrL8̆bR\H%=_YiV8֗e{{^D*0:wayα|8S#X.Xkٱ[2'u~k8uM?(NZ>nDa&ܫzaw=O:x"k֫k8" 0\=uK@ b_ IM:(bGd ~Bb)UBQ E8/
I%% JX7oVN/%9~ H%G dME``|g/ F?%:,{$Fg(Oօg/ſ/!0Ve:سxrZK"hȋU 16I_>w6!nYK=NEQN6Vp'$҈6YbtXE#x&1Wz^ BU[#"d6ca-և|/GQ9O0QG\%VZMaȲU>Y:L2?ђ:E_oo{W?Ԟk8tY~V0uL% 6՞ As ]cKqpQa'٤Cs
zd
aֹ:X#<y!F^zlqe%k]kڰW{F|U\Cq!!!!!!TKojS&-v:K26nVidzMNNɩyr˱ۥ2! 6/ 6 хGl" 2j5W߉,ChE#8VS0! Zȏ(@DS0ǜceZ-% D Wcbe^SgXrqeSnyW0a)e#fpGX̿Q6XXʛ ,S&`*>'H Lk3|=0D%z*SxRW_O"Mp̟H*ǚL6-QX8yC!\e)ceІ\qqX=a٤/LXqkN v!T}ڏeO^ŲT wleׄ>[&NjY[<,,WQWkG\& y[VxiOm;O ח<<#sOa:9QK{+/oVY6(~LnTwͱB8" J|p6Aɍ2qӨ#'0
Oo٧=Cr#Ɵux'T~XcynYy H#rE7 \UWFQ5 s'X8Η<K8!3QRd X) kzL=dسؤxN ,o +[ /<!` Yg,$ޱ~'~?vzFI!izޡ4KQN -.. 畕ڎe ^WUœft,&-_Nns%ZƖ/䔉 =.xz
%e~Q#8Y"'`6+M+n%V|Ñxk#`[^, V~rL|U XsjrϹ]Yϵ:!\=OH~rY D9¨IY
}@@@@@G`Ib-hO 6W6On7_.۫ l3f̀ IDAT4Ͱ iKZ'd{6:yy IX8<[w{YC-, D+ B 8"j<qX Ϫe %e &mW~WzYk P t" e6RǏ:~"8&J Qe/U__l%jUskԑ Ax!fpb'#:Gc E!T0Å8B`TOlsUK9o%&B0ځ3tʎmp0F-&
jOD,%0K#!FTM/fPNm.N]~QkQK Vg'$_ī=1N?b Y0 \}UzcB/e <q t7-Q]ҐvM`s-'f±Ĕ]\cys
yun8{)z#gmX0Dqw=[PxeYb/-}r-[J{oX @@@@@8-
ʦW^n̬h߹˓mA-J U~ YK{_7mC(!I.xK9
w0Ps!.BXT X
Fi0Eް[ID!
Tp!X%$Ha A?#%Ճ },! e$cՅ*X[JC^ccaGTı fH覾!OKu&: Cx uڙ%
W±.$YϵSV!U X,~٤KzFY[o z4Ecz{A<Q;UCGS SJy~X]!S[9jڏƳKuNوvm $ N1a# H/ CeX7 6@*1z=L %>jG}9:HCa=krler2B B B B`$ _ufoW9p-+Bt͛ /˽؏EgIb/ <ƶ|J8 [Č˾yľo}{$B`{ pMFM7C B B B B`[ DVr<+-
!!jtח&%]O`yZ@@@@@@@@>G`b>G(=@ľ=RX@ľ?B B B B B B B B J1C B B B B B B B B`!"CDC* D[PC B B B B B B B B`!bw-%'̫'&&&Z7w =n)=nm[fEkMo/mnm-6Mʹs= z6=]QgpK/Me
{f!!!!!!!!!Z2ovC֬lLΪvطqrȋmjfpؚv1kL{乍큧^i s65=VXV,iL̴emKmË[O<r&B B B B B B B B XW$gZ{[l&g۾LtK+߰m&NLۿ=;i˗=N] _mOu5 1+{nj<H{;֬Y3g }v}. n~z[Ǐ|饗3<ӎ:699پ/ . s1ꫯnozӛ >.s/B. ocmjjI'lO<D;6_^{m_~ {o/J;l {le {vWtFgqF[oƍ矟w8K@@@@@@m>U<7OW6Oom7ڑj]vuہW7Me)uqMSmX~zIa o}k_k{ｷ}# i tزz뭍uyF#=mӦMSOJw],g^yvu/} m wlĹ#]s5K/m~
E?,_|K8#)+e]6G?/~sϸ|bp~5ʕ+{6;vg#8s=M֮]U6oPip
mݺu]$T'm/}iM~>PѳAv_oW/o?qʺ-Uhm~vakxw/i? }vcAPs\dvī|++l 'N_~הrF0T UVթ=裏nWn6l<.z} o>ϴO|l/rΊ%]}s[ {w /{ N#fs&"b
$ReYTnyږÖh2%(J)A9 HD '癎[=p{߭jt}gPwy]`x뫭zx =cꫯ6q"H]vh طxblo=# ϟo Gݽ>;Y .H |waվn@;5Jg,X#X&X,g͚ExErÌ'D $dZnVYbM.ZK$~+GmN}uYWGmzkgصkZZZQb
_,oַpU!!!B D#DxѢE@A\L/=DA Žꫯ79مN>Fpac_|]{c":䙸z)?#"5't}ւӑ >7_﮿p7ovq+@yAAD@D@D@D@D@& #ƢQG#F,N=&/ү5)|&RÊƱy=s"7;pQ0W!,LNXuY:&#R EB#lݾ\~a"Wr1o6j;wtz#sȅOi&q!p!q?p!=C!sG.=rk_q>\uo {Q~d7P\tO 2O~68F=܇qA9Ϧ ~?QH?ցGH/ϧ1y\5őF#" " " " " @>pW(썶? 1hIA 8 n)Z/#9
s!\,h(w]F.>*NNؒi6{v <}G\p|&b?OwuY䟣xypqhPm۶@؇''~ =cwq_ 9@
3'Bq eNӸ
`+Z6Z1"'% ,xg?Yw
$<is &)J2m-q=\d>[lq=Kq0TqD@D@D@D@D@D@D@N>jx> 6*6ĚnWe29m. ʻ@2N̏# hC\g>3Z v
A+Ѹ?'cqƽ徏EQBd*}8ᮼJ?ǎ-S" g'?8(Xqw1} YW!4;ydp[ }n=Dd.́uHDĻH
uu!2oDEDR#nܸ3~)`8" " " " " " " Fh>?+l3jK-x^xcQ]ޛ IRmJ UyR8'0y ra=>/Gq !
!<C{g=t5;y>?1
c\<;lTwuFQ U}ȟG#6-9f<+HPP aT p"]r%Cyn&' % /<u/܅MC"o;o< ǚ ?p39{|C*FT/0 l{Snd8o&k-֗ʺv{egapPwx7u aC 0/ppџPU=iٞywQ܁ 7 B#
iC
08<oG<ւcp}#xСGl5
v ±
a"#GpVb2e{@@ói #2/\D?5K>LЛ' PRBHem`R
h#(O N>*;D$rb .tA 1*,~܇1!>9
5( r5x1 s*/ɓG+8p|QpQ!{#xd~sR
pG?r2t$0\:Y/5app"T&^1nP~mE@D@D@D@D@D@D@N@Q},k1REk#8?C7hg@6r<[SGlpq.9 6ƽUW]b =tnἅmx.ᵸFJ^@^+r!!Zxp1k?a|8%L?.$簸 Çy(ʹ1>~9w!~틀8N|iam W 2.k{}K
! !cCuZD??n &ыyo?fõV(!| 37H@\u0 04uBġ
hژSIĹn69 %t0[։ @
O}S^D㩧B aQ_ȅr̼ q V3hOx8/ &0\94z8pbQ(H!6??<q?~>N{
O;vp!0]O~.f}_oT% ! 6sE CWsYіZ8qpP@"#
9qۅ /nj܃hI>?6ơI;l| p<8 Cag 20~p}nXQ N
_RD#}BHed=20b 6?"fA,w8^sW] {jϞcM=Yq! f͖5f,Z6,l3il_;zŲ^ ] )
0S
u^XXx 1 Vq7n4
tp<1/Bp/^<?8- aa`RpvZkll {b<HaK^Yf 0$OHDx/l\i= >!2k:J`Mv>aeUuxŴHԂH$oD7
}c,WmF[<3B_zR[kkRC=Ϊ ^n]p\ ߣSuwZiiy2"m;Nt 䅜'8 6C,Še%7J"З\_>7Id"t\[8ᗳԮY}1L!ǨLK6mhcNا0 dE`laH=tED@D@D@D@D@Dt@W$ cD?D1&GʦTݭ.9 bt V6vXM1ӺբsȬ<#SCE@D@D@D@D@D@D@D@ y邬|p
NAaG>FbߑLtFD@D@D@D@D@D@D@D@&$}mӤE@D@D@D@D@D@D@D@DHd3" " " " " " " " "0! H원o&-" " " " " " "PrS7l.g1n><r.kV8F:1 ~ 혫1 ( &N`rAI:чFD@D@D@D@D@D`{r$Xyiz|Q/;v5ޱ:ĽKgrїX$T&kh65D%Y A-z%Ͳ|eH+]G.Px-Z62^vqaYPReX.՛Ƒ#"Q/<xc],rLu陧 4
_lֲe˰M-NY:CI+Pz =JD@D@D@D@D@D4@Fhai7vwږ=
ԍstZ]]NW]m67]e9tqA`/lW.n:lgs]b6ܟ7|*Jcvͽ봵lڂK}L[&R3Sϳ',/EPL͂rY Us,ӱïEXx^e->|e,y`-bzlY4'Zl2 J-u`xgF tL Ҹ!q=U7M*B }.!e2NG,
|WnL* Z @[=ަT&lWs]pUV{:]ԋF,Y4 o#v/ HD}TDԖLuY"mazmGS]ut\`[uyΛ[gh`YyIj6Į<gP&C yÓF*gX/7&-6ey>:pݢnA"aC]Xlʹ[ d
E˧ZzJ,Ȧ->e 6qEJkͲ"N.ˋ%wβ}- O8ӻ$" " " " " " " "Pb=鐵7c.jSk+mҝ4QqټH-5KgsE̅ҘY[<ⱈ'6gJii5evkd&kU.$">N)%1*9zR YnEc.MY|ƅ9h Y|y].mL~P(SW[.Ԟ\7[sY.덗[.u[ן3q_Yue:w[bK zݲ,HTZbK5ml exFq 3S{ľSWEȣw*k~ۖϩ.mw RUjL^u73VQ3mGSW/k+Z/kR! Ƣ1;wv=A{x w͊W9.CNkoXrߋ[RH|Om]\ԁW.Yŧ_hA{*Y֢u -ӵϲ݇"q˴nL&w&,}`ezdՖ cKTq3hrٌ"dbSW5q5S3 IDAT0_j=X?}#t,cfMnoD"5މ{,s' 5 ˳WD@D@D@D@D@&*ᶛ1c& F`GvJ[>sQ4#U{SKݽw~s7?2-C {608 9.Z<Ŗ̨}6fϟ_6IKƢ ٤ϾrEʧQÂ|8S=CpE뗙{->mz|=eRϺԒ;{-7Z,Z3ϲ.$,?speZk1#48ӹ Xk_~ js,۾2}͖M|) M8xܹ.XZZZs9VZZl~ꪫle{l2K$m?͝;.1'}ϮyGkGt+l> w1 Cpo
3_k@
Y߁l]f3gN ЮZ9suBD@D@D@D@D@D`tnn9dzA=s.!%qKgz-6}s&֛a剘 OoAiKdfx^|s?^+M0E[<JQ.{x/sǡH uj$-Z;r}f٬;vZ6k9FL6wLʢ5s-Yם KLTϲ@ "E-}+ 2 ;-Z"fe~=Zge;89&?{N>Sx `xNeܽlItzmӦM.R){m[nu1
1ޏ/b۷oy#ef_W~؆
lݺuVUUeK. ٳ X{
ߴiӬ |@̋F~Fp]vmܸџu뭷kCdm۶ V^^b h455 !4WD@D@D@D@D@D@E#6J܅7ҹⱘ<g0D<n<D@Ӓ/ӟv|zX`y FQc:=:jn-^iTs-h"!ony
ڎ6۰ݮ?oUg/vMg
;SXKxN<DxK z݂ϼċsd{pE5+\{yJ͢U_jnٔ/- +3K[|Jo{onE*,R9Ͳ-3(A>?_b}~ P2)@נ )TB4YJ/gOgvfmog^k0[5=FmYp!!|_E-
;tڵk]OjK/dw}c E8? <go[Zʕ+}N熈xm
q"5k561 sE>W^i\p >_ k+b۷ows. =-[D@D@D@D@D@J i6vfD<foWåk.ޒ6ʬ"ds]q(%W]:7V3ٲ՞o[0^n-.j鶇-h$hN |ӳ;^6:A "y-kAK)/vj,Gn̢5s,Z=;?H~ѪYfARH|>H] $*e̓}ϋn2 TLl!%; ѪޗU)g{flK ȻZ6 #Qx bB~` :tC}-bW\q}C/l\T/iSNu!. 4D7L&̯s aEE9yfq 0&c,E6E A^\A1ϗ Iw en>hK`|STQf a
\|=ҸU.C:r
2Kes6ĮX6vڷ[gnY=4VXSgfTvXCZ]E5To9r|%U^ zA=Wb cf]{0xWRmW[kiKXb^#ӼihF.t#$7 ura/RRcF+9$A/sf f-}aPoHB A`ݾOϬlħ$Y_/fl ߿8濼8DPdc5so{np ;7M26 :yq!!1y* aC4$dQ!gأ98 3 q/̗c܊ _~# a,:s& u툀Mxˬ2.Yu,XKw:Ҟ//:he"^, |ph*K,ͰllVŷj^K}Ͷ{:9ƪKދN%ӫgzNcq *s2KZϲp 3}o[ly8Y,ݼCgaW,t {sze3>>PQ2dbs-ְrm*A+&`,۽"3-1!ULK]ܣ/h" ap殌KDdx']IDvA~gm]:gtp!!=S^^uc
]J B[ox?ߋv
5݀~Ap^(!!~ !ַ\# r7!
ŋӟtx?݆S?Nf {Ú|M{G eV8:x mL6k+ȱC[t۶v)f9b:!j-^Y" S*K>eX~a]Wض]nGt
xUslͲ6 {m Fpοr݁ }U'*!%aCqZqe{YjKKe?wA0|.?7]g%`w{nv;3Kg\b9WZ
5^#1=殿\2] JkÄK0}w p21$"xzG6 Yi_Lpޜ
#n{gai6dY1 w ąv[1_vjp-Ys= K>ǙOx, |R}@ Q!g?١ǑO1OQ ^(>05B}߹xI>B%Ԙsg[ z!?K]el*?c\~j" " " " " " cK셭MVv0cA4fA$jĤh(̑15{#Sí&nd:c{(}^UtݽmV_0
{` !.}.!ÆS鬥tV#-c/섯^A7y/+jRI75 z
~m^#}p(m.=â1bKɋpR=븂`Yb]y.Hy3)La0abM J*-Z6= :a0'}䤏Exawv/=ͮZI{tkⱼ폐^M2?p!b8v(G.TōCQg?wy ƋG;>O6o<ox]ĻP G܆B y.hG/ň|
"N@n0 A
aỡ؇x=xA Nȳ$ƔTEӗ |=,>b&ᾄnq Q/ R; Xs׀5u;OyD<22h
$A^DC G/ر?//0G].kΝB^w~te:v`Dh3a0ρ:W2\^ L ^8TNXc7 hFm(d _K`_g E]s`JԾ|EM`wu 䬓P4vq!cK/!8x?QЂ{ 孬_@
f;}#ܖpXn^}U W3C Аk{țx+Y .\z6l~ Ώ9Qu < q \r: sٹ?EΑQ~t1|" " " " " " G@r( ;|G[5*w ?c]'Bap vNhХǂ S&'zLxowa. ;b,Ŀwo=gభ㈧#~ ͜9s5(F6\Nvr%J1bE?
m4' W"@"e-VsG;F7!'o N> pc|l Z
=D0e Q] {E,)g 8pvm|m۶aTEd-B t
{ y?q
;|| t @f}O_Bwq06<p8$yƍ~ cc0ex]wsw.]?" " " " " " " E(>9r
ž؇Ki.>>}PCAAWa$b
8h6# L2{Pޡ5l|*c;mO{
`uYUȑ A~p!vBK]2ij! _{.Sq .я{ %D.rяg|x,}.>c>W\q]~sUW
8Bcڊ+iHF|T~ 2lLHC[(>E) b6yL}DD
# \BلP7stPhm[fGm[g}Z, @Pjը{-1[Xà/z
' !"!g
7(
q a4r!}k_sqg s~о̏}crJpLaaǘoaDD>|<3H(0/ ܄ = TF{:~5 h?/" " " " " " "pf 7 ,84l8&pMC E=*$VlqzA~Fv%kVZ$jbQwk2{wcω`QE
ܣ8 !tJx. : xCUp^O~ҋ|[(Gq1yp%O sB8 ]< AF!EE+0:nC捘GqXă/܊sޛoyh״/" " " " " " "P&G^>DPĹ0̷xkfJ,/^UfTۥ
t3w .@DZn(-t_J ndC?ÎD [mk|k- @HN%q?I5]d wxٳ͚EGНε +{:gpCFN3"xB o "DmjY_ʌP]=pdfir}dUW-hj" " " " " " dze(zMےukܒ+֢,3Qog+6f-Vp 0v4,\# <R
F&W#g#p-m6f=9kY:cV[ز{N.=uiE" " " " " "pdsXvͧE,pccDx-Ug\7rfglK90S 9
3 b~Ek# Qb B .=;a쓣fTR%O ᆸhUشi577{$!0:?,f1OW ̹d' Y-CD@D@D@D@D@DDsfԩӼ(gQ23H N'2yo,Ds7\zن R1ȟFe͛7{1~!ͷh"Z)y w#J%P5+2yWL-G4X,j8ؐW(eW )s]3\mc|Ëg# g>s(0rO.={x]>S Ruw.qLpR Ŝ xp" " " " " " " a: =|f
&՟ 3/Jt˖-9s減sCẄY sB }_p>|q Rx$Pb N>h # {F^lxoa_틀d!Pb_P υۣw#<VD@D@D@D@D@D@D@D@& dY!" " " " " " " " g;}g'@4$MR 9QL渇8/T긋PtD:E @q(}ŁI8^yʔ)^:a˞5k90&۲emٮ*?GA?2,]ԫF}Ϯ:[`A#q=>~V8G;wZM:՞z)5|KK߿vsr^#V8jO9N>bgJv6mŋOSJKK}\fk\8c_WsygEX NC0D\c^_җD8ݻ{On.=.Uۭ"""cY.r_Ǟ={[ou!ꫯ'm688Q ߣR%Z`9X&X,g͚ExEr=kOPN 1-Yb1Rb!δVpQ* 5g e/չ_aoBgfϞm G sK.1p~sڃ>迸%_Z[[駟va P`oV\k|~}ڵB!y5#0 ^^x ~DbB/b s|饗쭷&J^pCD;" " " " " " NUXm4h$~
'
6<$ ?;yZ۾};A-++ d2:jqΝ{KIH+b-b溻:
[+//w矷+kUUU.cnk>Ϻ`+/l}ޏ<M6ͅ8:~>s8t G r 9 !܋qF_ẌCİֺǘ K=3c04c(,h+" " " " " "p ^QL }'BOvRo-Y-DPb2_UV
gMW?Bx9xN;"Ljy?7q!]tE~`3u4ȃ؆ȈGh/N>ʰ!fȳ;::uu;yN}L[_p-2 am_Nưmذ <0- VD@D@D@D@D@D@DH+Dp# IDATD3 >0e"_x BVMMC 7suC,Bg>wk O2:D2D7 u̇{%܌3 x7sr B$?;]SP_}<\7]|C#O?6D<лX~asc DX2!o1 y D@D@D@D@D@D@D@ľ~4wb
gG%N?Dk?x
\~wpK8,2sW%WߓO>:Cxr8(ށ0SW\a~k@DX#<{p!f|Cp|B(6D@-Hwǧ/&%DX(NB(_l8aMa
|&&" " " " " " "PFW@at uu!d!vQhbpBp!-Zu(pF~@D;o(TaoΝ7pҥ.˗/w 8#lTE@5(F1}߰!0Qa ax Kxa4DAvqvLHlٲ!g c>C O|.s=.HVD@D@D@D@D@D@D 䒩L2tD3:c
_.B9f,X&S~pō,1p>
~= nBCr#!B"xk^"p R^\5Pd k@<=:ÑspO7 9ȼJTG.
a? \zTyBC JLH1@8&& Z, `S|NP l`Y$c bֱ< 1Xbx
ߎUBXwaַ塬{
n0D1BmX?0,k[oG`*""r7;Æc$ pϖ0dx>nBĸЭ1sH` eF\ԧHC1
" eN #pLb_8{ K ih;PyR#ьpV*iax#f3*TE h뮻\c ~? -:)19>988O%o|vmya{a݄"# bޕW^ᾬ\lD;
Q|T(IHE @ MQMn&f.k
i+" " " " " " "P<K+k&gBxqUTTk`h ŅpG>=B`Cgb6D/c 1xTEDt }=>.t!6B䨖KX/B#@xCCk\#x|K1"ٳݕ q!'!n{MP 7 8$Yz1 ' -p555y_wj䷣EauZw ,"\{|\q|#YƒﯰB r#1b#}?Asy;<D;r.(\x̙3mܹއyC r{si8//?[n9(k_D@D@D@D@D@D@DwfA 7]Xvag[ T[rex8ET5ZC<C;ZCPީ!-ܧphSxp.Ӹ0G_x ˱ñ@W|ft"N6,7hFKX-F2.' o¿g(RGnkk0 8p I" " " " " " " "0I H웤od_xQH","o<w';OD@D@D@D@D@D@D% }')BИ "D@D@D@D@D@D@D@Ds\>N k=ID@D@D@D@D@D@D@D@N)}GhsQladj6\.g
¾r^&D@D@D@D@D@D@D@D@D`2(Jqnǎ =1Vg͚e}F
v6m { g kooꭥV__osaց%p}Hrۿ
X2 ۹s+vmO snݺu6[vݻתmܲeJFu MCD@D@D@D@D@D@D@D@M(} w \p.UUUyyC^ x! Qޅ^h
gm6ۺuڵ/^pqdQD@D@D@D@D@D@D@DX `wŬ# ||%\e2 w (H.?&" " " " " " " " @Q;%!p}}B' o Ljw>}rns!D&Pb 96m|p-_; {z K'
Ï<XGs" " " " " " " " "PVCC#g n<9톍>K,9syr𑋏
D1r/b cb|5FɊJJJ\c7R#CC#_ii 8pH/@)Sq,Y&PξP 0Ɩn=>D=n{q* H0x xG8h9(V} o5t
?D<=|TE۾}_kjjlٲeޗc5Riz1"QIw͚5C ޥ^:̭7|cڋ P(oL̺ " " " " " " " "0CxGkaA(F_D@D@D@D@D@D@D@D@D`"(ZdÔwj<b#0<]N7}F" " " " " " " " "P$ى H7*u& ND@D@D@D@D@D@D@D@M@b߸Q7}hv" " " " " " " " "0nqTG8I٬RF@w';:#og~ftz¯E @,3$ L?K]WWgglLu2/Ok Y˙Y.Mi@y8b[Y
fN8;]8lX[8Id,k
<oD /Yse2f,X&T:1}D@D@D@D@D@D@&tr]]f٬r_refOs!S y
$SeL2E"YDF02LS<]l6mh~1} ǣQ'blƍxw,fD2h`rX"x,: p
E@D@D@D@D@D`flfJّIq.#͜e[-F]/I%,9oL̲EQb.E"Q}|Vu E I;F I 尨!@R_@bYf[yY}%%%VVVj,Z$uAPξ pJ'Óђ]8hO:+U\D@D@D@D@D@D@&0k- |QVVY6F k:[x 2tVֹBx߇-:(qD
vGn'DS?Iv"$F /,6ŬwO ְgT>C_cv,rw՟% 9NI;A]D@D@D@D@D@D@&-{Lښ.z{,VRbxH!-[užHbM*JL&U`6㌘Wlo#" " " " " " E@ {80EtJq2geFBcuuߥlΒt:}I;Փw"'krNI#" " " " " " ( P(D"1W<rՇ;xHX6d椏}x;QhJQfl>K}'N~8b _iibE")-.
/i/n=dz-SPatx %bbN[?XLHbߙ~<udu6Yk" " " " " @ ,p-=K'l73Ζ>)~J-MV5g'H~$=~SĤ1SQFJ3" " " " " " "0_w /$ ;A`HԶ %3jT$1|===g kjjػΌw*NNZHbf93A>A`6gb } 7|?SҥK]x2вD@D@D@D@D@nkdI% paj"~
UG&9M~ o^ s͍'&}Rs<P7 ϳY' f{7<TcJϛ7χ2eUWW{<!" " " " " F 8)Ѹ]f͚7[S;no d Kk%v[V۴ 6{MWwŘ{m{>[hQm۶Y[[-_\Q.};n
Y16K~-[cªCyÜ}?b9;wڌ3?E˗[| ؟S֓[IiEP3C}w潭/_JN=EQ D+_8Vx}[رK5Z߰xo1~W^9aO|πÊWUUsNG } 8ac̙awɉ{9sw8 /k֛MXyyE# ĉ"| =e5-'͍l% 熎9X5 }cI _6/E
ϏvXcSxwDQ D,rq
Ylÿvp߯ 9w i >P? qy3!M.Bz3k&` Nk|W#k4R1uwu մAѦ^{`R)v4e[L e#ےX]jL^CKgxe- 4!xKVY{9r8Vl^c0ј{xδ2RY _L֦TڬrOxSoW39ma?k:hwXŲ0Q )o@Źr_{!ԹL_ .Ů͛78 N>@<}۷owK/1wqlذ?q!H6 \$%bw᜵/" " " " " C=|;di5N-X_2c%ɲv"ٗzOYx?GP[^bQ;^pl>Y<UmV}b+{Vipu{<{Ͳ<n]ks+'/B z0?&.^8R{ elΙUc {Kes.Z0*J\d2z< q1 =5u [.[h3j˼JK+fcёJa~
$xca[nJ˖-s
_6m D9,{ʳ \ RpZ}饗\gP(~<YdYz 13v7c0Bo27r:'>QNE!r5T;iOmndG.ϯ3\}Ɍ;n`O<am=I;g/A
,
]"{mjM>S텷mΔ
[>E6;_<Dž6tB-MћK5XMyS+G}Vs*o7VY붃]~ c 5f֗zSJ| v+Ji_[geN#}/CF
(xEnSz*!TŁ> -s;ǽػGF)DBĘ[lb sBmii+VxBz&" " " " " " "p Háv Ҷfno ]8lROe/2hQ
";Nrmws f:]C{ug;Z\hVSj;{?e3aMCBdzЅȴiL[v5u[uy®?ojۛw b!B <5 ,fy͝R >\71άaD\<j(x4h<5}'$ZD6 iY~#s[E1
9Z[TXy4n,0'23~|{6YsMMp-5 D@D@D@D@D@D@D,"@
X`KgXEIܪbP]j%1wɢ=`gx<ԵWϲL݀;{iʪܵ[:mN]4h }v{p5T(؟zήӫ|\~oI,j/b/G^cTU:čw:w\D u)x)6CyɌɴ|>\hu`gboFyB B -,21w\[`WC㾰 #w.ÞH?Bv鸆I)B d`&" " " " " " csWSȵ8c|vG
^3ʬ/i%;C$ffXuY8B\=o^:kUeq{mW]10Q%$xռz3.ABlKý۞`{;+gCEvXGoe<D9E7" lzmf<ʺX7 CY'y[ciBCż
O
JCpN>!`K-7zP_a#t!o˖-F08 HE_pq Cpbg-7Dc ;F Yj" " " " " " g76VRe?;p^
= T}EɄp\>FHxH-5ا".b^uylu`h6o)Ƕ rq`G=v IDAT>Ÿ}/Mݞ<8(B^Ҹ q)HNmF(o@шή܀kyyKgd U9wYVSn%qMٞ^w"qr Mڡ>{@PGk4yq~_u<9FC`˗H! 8Ku
r!4W̙
B!})f;#qx4E.j|̓"" *Ĵ0s]^p/ 8 `ٶm;/OΞ={L:$[nqÖ,Y_> =
-cz. D+
U};p"w斳L.k6/@+~u 6 ~!
qu+ *vy #t%
k)k];onuS{X@ʋqyȍnڼz
D4Gw-n}h$b]V9F=v= B Y:պR.cj?G0&B tqg1wM_o<syϋ*Ӑ!(Mb(dߨ. n fC/5k/hQcyCH/n
_@ cp !a/c
s 鈨kX_L5'Kw {b# oᆡ)'b>*hKէ?iۿ[_/֮]k}K/_e(Lz,/r3Cv>ErQPao[_q1"a_y>R[::/0BuAL?POczG t%SY?5Dd&;Î7v.ٌ2N2*規"yinϟehCB- |.[y ~eg=<oy"fwz
²i" fTnLekۼ? N)pc !! ^AFL 2Xp98HMBB s!P!>i y" <A^Q8
x"n3gδFwת0t0t,4-8- Wҗdw}=ﱇ z q'>a߭0`x饗ܡ9;調Sڟٍٟ۟7EZ}kv5تUN˚Z8s&C#ܟzW^߶:R.NnZ* j|F
VU/S`l
/Gu{'`3 }:RN#X5Vښ%S<_ If
*e) Ͻ`A<(
qF[9 zMYOfEݚW,١~_q=
3 7aB
ۭbz *.Zi:axÇQ`֛t!| >JMT`Ms2wXqcAŻw&NF+<. o=+ "J2C!tIb#r7w#O;[;] 뮻<dQpƌ RE]}oE?^4w oŊ.$M [Mn=pyv ]n2r-hUs|ډXe0j"/_ᾣ {[mE>=h}&9*r
!ZZ&L̆}Bs\D4PawK-wFF5wy.]:*B,Uqq!=~f{%3kj*qnαภʋl09S] .MDm:m;5X0$k=)ܗ'c]= ):LqN)swig_D[zosaţ6
0!bJ+wD8`wc ӧO 8piӦc_{~}٣>jO>$%=s ,vy?{wcוމʝBZԋc qxd$a`xqn lǁL$6nLEV5}HQ\ĝUN+]>WX{UAݺ=ޭD%].߸ 8r\y]vɚrեWUoG+͗?rn|~acG9|\G3G!}\cv4v#Q֏&.A >W~i ;$c ;]6 yžJM3IǮJH;N ߵ+uǕg߿}hxN? , >Q<"iH%z#$> [jݿܻ dהCS+7֝G_o\w!jUe4i2&ʚ vEyC1g_ulE5$@"$@"$@",+sxdQч G }>Byln߮N>]~'~ϮA$__=hvRo
/{#7/.__GO.?W~IOo$7W6x$NmG;ޔ?'>~_/uiG5=~Wj ?]1,]ޭxI?b+Jh g ?yœo?Iާg߽<rG|ؕwvl >~CJ."RqWޛ8 $ޡg㯼_a#{o ®htz!,ɾ^腬C"$@"$@"$E+~}e}}>!noͿdx߅ vn->ȩOQX.Z;R/[+ _gGu㋰v 8z|k嶫/*7w)o :Q?VCy6P*q5IE[Ėn|qv58
TlqxSg'_ <ubo+kʓ;=6^< _ n֥en<N+Nmh%ܼ'Wz<C0$Ϟe{) 6Smu}}ށYD HD HD HE qiӦΝ;kr
7__>w^Co믗WBϣ:td߫Z =/5k[Z>O?_>V*?+)7OAcg?t]yeɠ.]WɃ֝}'Ζ+9vؙOSI-}ĹuDBk\VV-9WB5(H'x< ܍]ԣ a/s}˽}@"$@"$@"$=@< | ۿE؏+۷Obј__+KT|WW#~_W}<{+֎]xF*$"838Ɏ<SYțrY} o )#;T~KwLL~{{[ o%ayVIΖ&@"$@"$@"W. ý?_}˯ʯٟavC4w.??Y/'H|@yvݰG/+W\S =~{v$j5{>ueoC籗ϗ =;VNq'b?K$?HD HD HD hooϞ=uG|'O$UW]UWyY |/|~'R/rܹrז B=駟nSzbf_U︡.nX]֯ . ?U?3_Y~=^~s nX=\N+_ܼ>(Ⱦ (ҰQҥm},,I-,{"$@"$@"$@"G *_~yٱcGyg#<R//nݺ~//) cǎyƍzp>a ̙3 _ڀaHCC7]VN>W|܁i||a||wn-k̻z~{+zdwX8[N ft<ڡI-mgҗ$Vp&@"$@"$@"
[l h7߬ aݱeÆ
G~Gʳ>[}PweEWr3g]Oe? 6#'ϔv.][sx=W'ϖ +???R ^^.ߴ/R賣'k{tzD1q_tIYTӻ'%ٷgى@"$@"$@"$@{ｷ
i]~ܚ5kʗ]z>1222S=T믟 e`qO>^;z*zXfX%~l\;R^òvt͋{x_ݹwU
`}W V +CKKwߦuʵ/{9v^5Lpa;T-./\I<k _ > ])xRPv&@"$@"$@"0{<h ~K/8¯cWcOvvwxy5܇dfz=748TA?|*wSOrEYjv266QIدY(e-KΗ"ƹ2~vp $ &{|lsعrvlԗz)YD HD HD HEDI! nJ9 (mϏ_GG˧n{xY-cݢi \Ίudh'a q_~(c24Pʹ2P`(#C}}Geu?HD HD HD`OYɏ@d}L/uMD HD HD HD HD 2q"$@"$@"$@"$@";$;}5ID HD HD H @`
}̊'@"$@"$@"$ `}7XZR7sΕږ/C .VXkdzm'm?ZƗlڢ. 0ɾ L$@"$@"$@" -###e˖-}+7_6ELklh]K/ *km(IS峷֮]ٳ$3B4&ߝv/v{?}ˡ
@"$@"$@"$K c۶me߾}Kvߙ3g/T&&K'j|b ǻ˿ѣe}K3/ZЍs OȼkזW<<<\DŽqg''ƍ[&,uL =zAp$wAeD HD HD HDTroD٫Zwt#.H) Hۯ\ G\kˉSg(e5wX~;n)kWce@}9 ֻ{
̌D HD HD XBV^]ھ~ou[nMm;MyN$zޔ-ɶ{Gw{ԩ{Z"$@"$@"M¬(UA.JD`#dߊ رc7ި/EY!9]"$@"$@"$@"$#d 6 EyQ|<yzp7z|.HD HD HDh<g5_& kz ^p4xգv9r49[ AEx'7,zuJ?-Y 8P}Z
袋W\.Vd9@"$@"$@". (֪CCezuheo8})h|y@>Hʖip/(٩se뮫$Çgկ" 套^*W]uUK+_W^y]s5^|;o3ݗ_~y. |Au
6TM:~k o~^4o^F[o馲nݺ>x"q⼂%@"$@"$@"GL\s;֯rʫה u
j`)ǎۓ=9>QN^ծ>٬rF ɾ6kW{+m۶rWQ{^hpV}H/%\R~v!)k߾}<2 E ~{jYwuT_~ZޕW^9UE{Oݑz>e|Ύt@"$@"$@"$w2G ;Z6{`R[Lr䎾ރ+ecŭκ1iFvi;ϦnH gGRyA]}Օ;n:Y ߮<!.?vJ!S휲=$a!bY(ܮCĢGe\*2}ˣ<LٱcG
&t@"$@"$@"$Ď;/˚/2pD)Ce` ^FɆ?'wco^w~6kekl4c= n%"MoUVakͳ@} 1gxvmܸr<q ~BBY\_v!w{<_ ߿yʷn>p6QB M0
Yۖ:u"$@"$@"$ S?🗃m)#_?ʪ}{3+U2<u[y_(v_ʪѺF
x2f'= @ؑ#G#ׯ/=\ 嬩w'/<p駟pbs^{rw2\Ӄl
$?2ٺuk% yJ4t#lȻ([ -M6 y: "ck
k~ ^ <SOGwY4Ӷ4iQ~,L㫼%]"$@"$@"$@ `7:8X|[wcS'Oֵo* w
q +*#u]oSu>Z'{G? k {[n*K<O'pA) .aq }[ gϞZ|B͂(+HC_i;tP=
zg ,av͏@#8]w&, q/J53ys#O GzY#.?uƦs6kqLڞ.HD HD HDV NR֯/ÃG~ NM8ֿ:8 C8y$t]vMq >N:UBn&%٭gcQזn IDAT\o;PG|3C69"䏾@ ɾn2 A!8?B"8 Ej$ !Þ#w.>a8tߔ/=! B<.G9>q:ED( yND HD HD aaWyXkd_s
MXY:쾃 pO<D]'2{`|o3p[k/bl
=A/@ b#sé0X pS?I!!{6H9{*Y|.7&/$hm[8#=?anu!K[m68L<`e1??+=SΥo$@"$@"$@"=֟H8#P
RܖOLx8b
lkWJټ;b3#gΜ殾
6{+Zrm6 GaS5@(
#hxQ_x뭷*/>vX]'|zie$ɾ~'&L.zNNBqU
7P]^0#_
YBiS8yζtnt|X[ݵM??]~7\zfY@"$@"$@"$sCϑ=]o ' !iA !
G 6ߡ'& AYO>dݨ |N'@ ɾ6 dm1 "DۑW!ᏝGz A%d/ng[M *n߾~7YFgCT|eK`(^~@}٭S"q.6>cbi%9c%.RvG?f+{6eō;zܙk][Dc i5}VI6k]OY۰_\~cld?q <Oqv)O|z)|~W_}u'o4m$B *g:M
yS~iZbF_!*B!@} t=P'Ԙr.ҵ<_vyd[oRPV<L eDٳjE]
w n?6ߪxDlkT3ābp| 7:Q1ΞѵIuF@?ĩ3F2?X 3 ]M<=[{aܰ7 Xs6[<=gMi-m*O~~یbs ;뼎cQ<#_kTz_[tvI1Y׆S'+q.G ZC7>0$Wyp:K` n d_$X]z!hZok u4k-+9^9Iʣ&#D)y릿k:mrt no~f};^k@)gΜ:INŎey@(ĩ; c8-|*&sB6O LB 7&]o!`M_Mo̵oufݍcY"|_EyO2* xG kQuҪc2j~}x1/ mkk tlỏ/O٨39͑džgJ@}3p,[̲=1Af&=&1.K# )0pISf rmB^*ob|ryCbnQ4-D8OX37KSv*c%@Sn/ϽuBżk߰u'#6xr/~kWpe!لہ aY߮oR6RΆ'bN ny) Hy 2ESg;1aͳ![GG g%oa'AE#E<8 344I-tYSԬs&P Sq<St $c0 t@" Sv+c%`}bNK[̥otvyM }'Cg7 yW_G{yr3 鐷WX,ង\\"ѵW)ϻv]w]=eǎ S Q /LWSw;ۭ)?sWrn٫+d MN bM.&䡡n >%Dp*$G[?Q8e#`9r]8A6G;X9ϖ&sCp 7z fme.hwsv>iMJovo#y.lCu Xw='n=窇pe#]|;#b'aƳCƓ>d]muVbǘ~_jAqԉ~22:,o:&s &g+~ Q3~ݓ% J)O`w+KbaO@%3P|X`3 ]mǕ, %B&-oz?DVnB75H8;Cng`Cō,6"@O ]{6Ⱦ'## t ?-=?:uVgZIƚ=y?l6ҵmtsG ߘ]k֖/y;
1r vp&lI,&s$642\ v1N2<69R 0F.S :c:)s!;{YD`ZTo7 X3GY~3=.M_7.6)fw+FۂЋhoĉ"8#*|(kCxLq?$?}5mN\*w89\Ln& bN,&QZwrLW9w\ƓĊ19q4M J@9C W0vNXd`9#,*7
/oVD,our_H qs;i=ɿtqb.m3^^>I~ ]
MV&e38s1ɉp1E &>YX仪e>wbB~Jr<7&Kvk_1_-]mD07|?Ϛ&K 7fijvBG7?3=jGFxt%HT}zݙ_ qnna$v$͉Z1
cD <ϩsH4I,>m>[&&&
~#|6q; pԞ^gYD=ɦ t9XCC`b=FMفu#0ױH?fZGMm+% }My9 }3nd[lHV[Jun]ǡq hwx
t# ;n.Iݗޛ1~Y
km "Bx!dyo
fhx R|ӚD s N%B10)Rz~skZ4)ޙ GPʠ)(]Y$S|x3/S91>3W~|Wꗽnugs*1Bz=S5qF|1Ya\ Y, 'y5WDvc}0(<u<);ѯ˵ ٮ7\ڕي1o %~$CFuvMO"C|2|U]dQC{qs3^w#^7ε+7~cCE\M, m Z>:~,nhwmZ6/^~O[| +>KQ<Kߴg~$yn 7+w_ ėp_|r-[k WZ:`m ~ɦ F}vd_Xח@5' 5y i,ye1aq eQ3pad߾}dvUWU%
;ٳNTzU5
Rvw~b"IP?|UH y ;۷_ zy8&twW)n~r^IUN^ 1Vo믗7x /P5_\,]vSH 8d\=rq_q?gBL ?g.XiEa7瓨xC{ｷ.`駟.]vY5#]/}M7կi{W^}Ղv j?]gX$>
2gjؚ GnZ t4 \Jrdie]?ꫯz=5. /IeU>8Lh뷐c.mzcǎd}_ ~ת}x7O٢Ɠۗ:q1 7۾&v۶mfCh#di:~5MǒYN\6ن
ʍ7X#Gj<ąg7&]tQz èW; Gӥȹ+Z:;Y6ouf7mKݹ_5$6ºykI\X+`MyW:#9BIu$z~)HwLf|B&Es wpО#fЫ?#e1jbz饗2ɏkq[o 1)t eIK9-v6:GYaX̄}`4S9\1[l[\!!`k!wD7Gq0vwcM=1z.t~pbad̑usNa~{ ƍqs9a 4AGcC7Y9'Z])O:/9ⷼȍ<`~Uj%1dž<wu3b0H 2g |z&{IN[cU>|!;N,DYou{] " ǐi#.a A$lGu76<P s*[/'3@4`H+gust`EhR /8%6^c;ʼnC^ SՇf"LFw$ y t 9G5([k~3hH3G1ϰ5+b
Nyc)b71hw/aџno}w}H)'ۺ& okjr.D%& cܬ> g3KR lߓUB^ZDŽh:tS sJH`hQ&%i3GYTb"4Y6˵p @9vsI/81љ,䑂GV:IΊEǐ48&~?ї ͛7Wl,, X3.hE柴s`GnҌ1&,PDX/ʼnc8|\;0o1'oc'4g' af, ;CgN RE]ܤ0'oaj0_iQ+&ΨJ?7e'~4dXgԸ[BȘ 6= ->}b1FPFW {bE
v2)v#-8eǣf9{˘!8d ƭl6'vOơyM5\Sw %uM߈K6 & ' Qv#r$/~p>ʋ<>SS<}vs3|OߩȺ|! ?l}1E 4s#gA|"ctEG [hgf sKk82F67P#< ,ً;ccǎ:`vBďeѽ4YM8&kVd q=g9;yW5=j~i3?~ )ɭ\L | I)
epsp=
䮟f1Asq\J&&/L8(`
QxM㎭;ċ- n6MŃ=| Diq0`YdJӌ0F Xw'qO:"k{9X1`Xƙy%d ̖//*pk99E: c.19\cbNC1 3;Qb$Қ-vrʶÀqЖ b<*MѾo'rN Ơ9옿pJzϢ8Ʈ\c>6[i醐1ydAƭ1m) wOE8yy!OTҫKOߐS-^Ljfwjm5}۶mcD[_lPi̛-H*c6^s/'l9YF8⒕(6U.qMt)Y'ɗMޅ|Yd["@ )CܦS_gFqZ[o%cQ'lsk~;q^J7]:[2CV` xwR eK2,YƭC` c>sߺ# n
en3\B3 )L;# oI!I'St+ ƛ/Μd~B]`]%gGbM)K3~u @n&?Lf&<ÂY&?E&0d%^,<542Q8 6D݀mqt h k Iѷ ݻwWC.Hy1cK>S{qI8۵o9|cΰ3q1G/ Ɵ9AXh
k`b^\Ko\{d00sc̑79 HՅSgS i GO"$>f: c5cHl㓳h76qS9/I0,EZK/,ro2L d/ uoF^3:[muI2jcgAhLxE0!spb?kS&rAIKF;yCC|';?l(ҿ;s݀4މ+pQG٨ʉ8&¿5ߑy]u),hSng/+;QCwy<݆Уn e b?)7{]h l%
Y? ۮ͊맆e]{I[(/.5ɶξ| PJ$f۲k ֦CYr68?\u>b?S k Gwp@TY , ^!@w {&ә\$f3pʆc'9}w$ 3 @i).F3l=KI_ȵnOs}9Bb q ټ 1إ*<Xxd0- _zqo6kG0 $eglN|2 \\3
ݼ=<tG 9B Ȇƥ#HidƶiC7ӫ!jnN8Y9i`8H {.sN -sfܘSMg$<qDc8i=g[p;APwŚM߈ %dVڧݮ 1CvzvgU|G68O<HNPzy[gu~DʛެoA #w&>:8{sM[^BwqMS}.Y2:W8}iLȳ~ֺMNT~}IGW&AcR$/D)j\fPڔ0wv ~&-\y9زxz9g,ow$i Tr$E8/ġl~FL s e\Q>; @c$c;!R0V#~5ۺ\x!hA5ꚃkwcLsw\oz/qi%bA3W &t d>BR0bGBY+WuxG Y\)W8gѪL/~o~2g7y<qjo
&0
ȋi0 횉T4q:x
# tC5 ˉ c5bOt<7夣o U %u}p IDAT"mfD
\gL
fGlf 3xtvS|߬飽l4vK.mߐEܳ bL%peǑ-yctcװbb!r Y[S~q^ԁcӥH[} ]F覞y ٧c@kw+9 f:7)n/? ư5 e
3֍A2Aȓi; +nNodq'˽uK: BP&#:ARLL&<bٝV0y0Hp&E0kP`DQ>&EF8O^v
kbW/}>WE>X ":75!q_aPԗAu)]A0,6Kȸ1'Y<8%@yݘݬ1Aʳh1p)K:k)bF= }jYy4î;-N8鄩p01 <7 k'0%;1Kқ6^O>]yõv c&OtWat8YhʇՍp!'zeqb>5>
cQn]1FasJ/qbluӯfKF#0$Lj2muMV$grƏӥ l W }gGLuWP9y7~ vtMꇜo.Oiќ j VΜkG+:0I`1׳edܓc,V[VqLg_װ_ŕ_~wsbKo1P2yDebx<cpMX6P֔7$GLvWMhE6 \ gw'
LjS 05(X ws} 6Ș#] C !ɈЧQ;6G`{Dyg|pƝqd 1! A]!cIߍ s BQb.Cifs Le| 5Gsƿ0嚻%E 4Qc*̣wcYy2&9,-s stbuLȇ:M{Ȅs\Gzu@;ȓkF U7ƟE\gs:g^7V8cn#t5R Ћ6$Ó6l,d:A8r' [_?OU7qBÉ 6"ZHјSB敩 O?⛋n8c/]m3U}nP'7٘JsML4W in1O䑣װ_A8y9sØOn8 zd_P/hADĨ Jr0)QF%K6V|zcA~⺶{' qD<FEE0D&V0J\ތ (y5#@^6qv} <`ʸc(!7<~/xۭW`k"rX.}<o#`4
#7$Cs ߢQf $yDEb͏w< o^'nЋOG#9+Ɯ2su3~t+(߂شHm.vϘ5v1!HJCĵIPV' dgXdE ƥyA ;%l7 icu̵H L䖶Sһ4G ɛ&tr Wy@Orn l>:?~ٝMMg Op5?X%Jsp3?$䁽
ka2 53ƻkd
o|Z#ydt.OuG*$
7X ( `3 |CwM [|LP&@q$FAC1qRN 0Q$ B # ee X#M"࣏B!1 Z EQ^ Y[0cL˃EvhSRVG=8}G+c8467>33!&3 ɽjZ82&9c_F"ü宬9 XmƬ&dL'm8H$8洘Kds"0WȈ֙.76c|;Dݭz 2h<Z#_w<
㖬G oW.:F@5#Ҟ|t G6C"} cb HM'̘4؉lVx' ~cq-ȯ|̯ ՝\Bf7零8#%Y&d1YIܦ :U>1 ]r-<tbN};ϖDѱ[]m,0 A\@;륱`߇moѫtcC_'\#~/糶cX <u 1]2 qÌ\ %[H3FWd?'IuOz mi1lK MQ w(r`"Bgl5 Ln¨p-]LtrǟBGFyAè? o D;, QǕ|f \`}`Pb1,SS12 Ȼ,_ ƶ2ytBc\摿WƦ[ [$8B! a]FEƱŏ `s ch̚ !qu7g
yY9Pȍ |ƘIwnU1<2 o<#M7-x߮LX )ܘ,a1) :z3~5q1nMNp d17uE>fBY_! G]G=d-'
8u3|/0,#FM1yEՁm4z?2-yE{B +ڵ+y}8 G>
ppV欕` ` \c(]w 4sXor0.* Y,pu_yԉ~22:zwRJڎ8;N' %кu~2QN8x5Ft*%laJ(c7]_
R.o3n\Ѣ<^2 ߬D"H+lR?iK8EyG8?o3cPܚrnvXc X.~ue.qj`hmboۊqV]M
pmޔwӐHT'GogSNڅT?G+۸rs̘ 1 nB, ;2ƘG4Ä7C2A>`/ #咛o2I>EӧA굓ocFfl~uխUȀ3٤89D>OElf|+w&"9j:~}N |OrԕH?ck&:qµ n1ͦo{&bչroK_r̅lȨlA~d ӛ`0 qC epp^ o6.ɾ٠qBt8 Mv?X *f^&DD5G',5L:#~;TN3\I: ɹ\Gc(<m_h$yļkGKkfXZe:uWؑvdDZj::f|Dk stZ߭y|2{/NitSq4-lns!Zkq)k;VlZveG8?n "z^mh0Mկ5υ vB# '5<BY Pr B7AΒ# 1<ROD0&g#J[9,WѼM Z6ú6'ffs3^\ .<9O/壉ʻn u
n<t*5Oi~n8R!0X)5Vjׅd !%Rvzc:u^%v;_ ;<:ewxgEDy)3^!!0ɰD`Yb%@"$@"$@",-Iu?v!OxOEto ךY@ŻrY|^xAzy (Cjk|* װ P ½=]"$@"$@"$@"$@)IuH)B`yq ڍK/կ*y?
1%A_AŗّƿC|yr"?锧N uU/#!zSOvǮ<xم k͟ B^x1ߜ]`'/YNA_/ XԊD HD HD HD H_DbP+" 3TʻH.dyDT_Zx km;ȑ#SDU=|BП|zVץvڢ 8#pMd_q /BK<8o}[5 {
Cy6^j,D HD HD HD Hׂ> фP۶m[YH.9^~~9DC0{34k;klDڵkcO]`oiʢ$rHЧzgo=+ Di \<(@8ŮD HD HD HD X, @"!bGgJ*! ʼn]hBSN y{ԛIk 86DD C.SߦЌ 3 =뀕pՈ0䐛6mW9%@"$@"$@"$@"ȝ}-^8dw}(6l$]ev!cO|FR/"v +N&V'C9z# yCi~ (W]uvY]=\%Bi|)}^$$@"$@"$@"$b#d_} gw vvѽ;p{dh&"{8$ÇeU
z<kʧ߭$2?:!twyg݅ H &Qd8T~M H3'fy$@"$@"$@"$JC ɾ G yԣvm߾~aw Q7;<fjbq ew\,bx+<J,M8Dի+ﻋtg)f{ݖ-[j<-v! S(쐦vB;Bȇ:G^~WLzecn;iz2X 5sH?!/di,g #k7spR }P=x+f.TAu\sM9*"iϞ= 9BBbu Y>%o}_/"/&-Nz$}Î6/0 얦,OW sHJT}CyLwΝuz z s[nyu] xWk\dkvWvH.5
1nziz2t~0c [%]"t qs?]!}{}5ʾ $zl]s~69.%ׂ.2L & 緸\# ni H0h BЗzߺuk% A_E9vuY,?رcGE; R8{
%a KF"8i"qL/V{ H:!@2sZ9>t@"03Wvo|ncȾY,g_u5f[|ltsG 5 F}m !8#8Cy$n&3 Fݐ\:!L ̋|
h>[@:xv}ݵ ANy2 fH;佔NC!2+ =XtĢYG Cj7,M HT|B3ω@"$@"$@"$@"3?K9uDYvm}u v!}ِKiGąs0Vi"^\HDC!]#L}خzƗw!k[>7 t=hW GOϋD)e<qLLWq^8ϙny4@d@"z:wu'csg_[h3fɻcsg_Gx4 xwa
bpp^ o6miI-H;£ ~ۺ<D uV_;peA,^k/'@"$@"$@"$@"p$7ETP̌Xk=n _".lO$@"$@"$@"$@? _^:&@"$@"$@"$@"$] d_ eD HD HD HD HD x@;
Q ߮* K]喑D HD HD H$ײΉ@N>ݳ -YjU/0iʊ (D9yv|΄*_ (1ND H l<4?&@#`マ+{Qd_}"0oQN:Փ
7PV^ r .;tz<rtd]k*֎q%@"$@"0|4@
} k>1 &ɓ> <R4f͚5D X 81qޚ<q؇e7˦n+CsHѱ> HO:*$!d~uw9,\ֺM4Qޣ+7<8Pwsqύ.W
\0Fjx W9D:u|ۅ͵.%bS;C]XLa!?K"0W3bgV% .G -W^ye9vX9wܔT.\~S2.j˙3gʷ}ythm[7t{o]nrמ&9hE`:}a!Gέ
l%[?9M2FvaLiZ}~p9{L*5Gś6j3o y{œe'N*;w0eϦѷ^fX|"O5 I-Yd"SZ['&MMuK.ڵkˋ/XrEg.EnwK)!6\!t HFx9;>Qɾ!p06nXnZbwk%\R3jBwy.6mTCÓ*Y^,숽+rgua[ 9Ru_\k"{Wuf'@ d[`&=dqطo_%"q͞@z_?י :tVxddG.+~ozm˖-UF=67 *zko2/B*9 #
)@S 9.8c>ax4FoLf̳6l06qLGɋLX(G^ ٠؋Q~uqt$G?^zhU^Qv'۶m++}oǞ~wk\ˏrͶ-]CN:]G˕W\V ={~rK6ޡڛ ;14dn<|[իFeN;L' !v1iQ<I_\Ɠԇ ~X4fcsf`wBYŹ]y GQSZ_Pc2 ᤉtS<[H{#玒*8[wQ+?->Ȃ
1y wԳ \Yx믯SO=U> ØNhdsO~ۅ!ڽȚ IDAT`n98 dcǎJZ<L]xӑ ®ꪋx≪d_|}:džk]=Y"ȳe@l36;,n ڰ= Dxw/E>
_? D!1><En#t* 4wuW%]W}j "Y ] mQt.Z 5 "m7iZX;
Bܚ0f^{Ɯl;w1n<o2=\]Y Aw]wqZ yUK/TJ9]SmM:..W㈜^s5톙ei\r,҅`YvMy`NeOLU&w <t<ط˵ۮ(ݹ
{ꅲvMtʵ2 tJ##~{# /}{Yzo6&ױ3 IY5DOaF1$-8-NyI/ȓR8
NԇI|pԄQfL,"M>Ncj7e Jˏ*E^ ʰD:F'jyȹ;NNЧ.[_֍ rXy3K֖r{7PI(N0>ܝ5. % IgQ(C,Ț|1 h,+7]"Я@ۍtM7 zO?t% C^MUaʔ^2'++;ĂIl@W +-R OH F; C
%;\IGoYg'WgSNO1rt ' 'pƌx!aSw}5LWıOjg /սYVgej;LafbF 3 G7zl)8O:vLN~p_]̚)r
v682N0FP \e5YIl2;3cclF1I'1) 8&13ݤrnOk4!|h Y;#L1Z4d5R^fUٺesc5CH}tǟv~sYju8lǩ;]My x{U$~|XOL]Jygr䩲f
S?+@ȗ/Nd)@~Y0( FFWB# ~X,(DCGYjQ ZlʗaQd08ӊRԑ> ?(VEo=NPN aKˇ Ws_}R+&Jy2<0P.^5\. .F/^[{9V ؔ [cɸЏW,Ȋ# ̹f1 +xlĘ !?26,ĕ y[lZH 31l L7B9ř# p%?Cb / wGʂڍiꪚWK zg l G!sOCdP.s2{86R]>trK:qZ͛Es.u燘d/J/ B]2AQ)-mոM|"BAa&^`_y.GXIBic?q}nw#BsC_IҩQK ;v~v9
%X1}EG]cAdŘwQ њNɗ}f ܣ24Ñk2h|O-JE@ җPk j|h]u7G y
}ٲjtܱZl|Nծo*O-WǟS]{n0?|G(w֯[S>] =6\TwMyCpU$ƭ c:)]L&y' 0.nd2@Q3Lt J!Q&2:(;(&HKEH3#HRt h8uXUgs Bfj7b, j0R#SZ T40n W7rpzh9zf<wdug˩oaㅌgLrdL ;ȚƧGH$2܉ӊ%X\i (s Mt qc^ ~䆌XDǼz?#]̭ABYZ"l<7u y@"_9a+! b7:-&bG2#~Hzc=VLkDFN9a,Jҩ57h2AVRأs KOGz VlP6dOaML ikodRy0eI3Un^JqƔ1>|s2#l.6tpa$[ ;9 iׯO G 1)[+dZy{m6Ωi6~t;r / ۸a]ٸ~mNlT#&y`)ϼ>enGw~X';[[>+yp쳚 .gΝw. "0]"ЏL&Uc331Ha8QD (:?bLP0 J./Y1/ŹYp[)^eH"gm Oa
7]ۣNqn֭z|6*7lX]?+ EOTgo+4= GaY Xp<Zc"Dxs"Я4Ǵkcaζt0iZBu"9,5>;17*] Ćc٥ CNT72I~ӇHA9K' ؘl0!c6UzĕA Y>hfe^L<mRƏd7+{9pKY< [#6'̅ur#8Cя.WDo cH9c'\Sg\6 #,+neuO3/eF^aA}}J&g$dD[&' ml~t |t }r Ur'M[av^ߑ{˕<|b 6t}!qú U?blh.Ν-ǏfSe4/tB` OiIޤ iu;aPz `~{4sͨt6f47kg8P"
G"q/nvrwe`}lC'vVo%ç' 3Ǚ0V\9dbP[$32ős8
O 7%~Ew TV{$# c p@ 9&O֔~,L A ߌ}'\ȇd$qڙ ȋl)-$_ yR E;v!:8̒o4atfxERЩϹ*-=^n-_mֵ&XVO 9ݙݓ7 : ɉ3A!8s-P}Vwk[7a3tGD8?a'<C*G|\ Y|ȋ2ɝp?}Jɍ]dFC_kЭsG }AK.Xw]q%q5˺k漧G!ϻ_x/O[z9r
Ϧ
>u$c26+Vmxd
w~FE'hE`.vڬϙ)71F|!e10ݍdPbq G Cv (ä:*n ip``ܕ)g!hNW?<]
wNrգˇg=9 .5NbG7.!ҸsOȑ1d"5yx#[v6\˳)Ë,'/Ȃ S#!1t1w aƿ3]c%; I`>v-Y9dlܔg) 3<tM8t gt
=Ӎ b!nd!wv)5Z2d-dɀ|BI#A:#)O(QSqu4(K[S 3^?cYl
ꏈ: d,3 ͠p8_tp";{pnj%9x 9;>t_Ʈ1__&V'dB|i41)z 9qpTG7rl1b!uu#?0Ox1h }_|ǃ
χ
~rݟNP r9{wѦ
Yo=x+s'-ed_}rٶ _-(
(t7a"m
1p4袌8<
^ͨ9^d
cA7LDrQg*;` .
" U(m^_.O\4jwK)ʪrDך6/ En}=2=EGc\1&>Y cqf-_gK s.YgϞ,M6X Ӹل40y17,0 (Ek%!&6aA;D''ppF|/G\;"lJc `|v!CoљHdz 7⒌Kw86VzRrOz"Hgmfv"~4s:xW5) 5߱')Mb φoPkL{dx- \ƨO|agGf.ꪟ?e̹N8G^OZF3f[ֶor䊍If<mn禫OKwXY5:R\vI >Q ]_=賛)xv^*837m{rZ\ܲlp'??$ !PSq-ΝGʎ!`h1W 0 *$i v N
):7D*d8&/!vDo+=`a!w
g Ghx~x(N+;/Y[ }惓
gl, 8V ~b3" AӑƟ
P F #ޘjݥqKƩtN'cYv^' YO,J,q$sqnв+!% y<OfEN̷6742VYD6ۄ WtDcpB>~! [>(SÎ4Cꄘ
AY|. EO/<U|yۙ;{GvJ.S9
%7y9';MbQ_H\ t a 5Q˿p_:خTc-~;64Mp")kyג;vw&vnnߺ53; yג^'œG:$ *}> ^|I}'wv7v}!.3~'{ yyF ϔ8/iic Ϝ2y 8g/TByt<WDiۿݸkmm-'0w7΅BW{ r''Μ8 uYj ϝK"RsSV* -ǻ@ ^3%%:|
~ s<^be?V _x#P+ %_r?lj =rFbJ Nazpp~Qu ٿُ;ג%Lvepg!ɎvصS!W7R tX{:)kRZ\ y7COe/'@~ϏD|ϽjI KcLJ/f'9̈́y
ƏN F @ĢAsF4 1 1{ = D;EXq q[\J GO,Ljuߨ# l( ئNU,u|{M^Ky6iYy%{fvs Xr&)|r_e940Y|8|K)r{}eUGޯ}jɏ|?wweo" Ry0>ow#cv ~} b ػcϿ5-G&.n٨M@vtۃGςE_:/O '˟oqce\O|N&S6KPV^j-_D AD9`k ǯ 8ㅆk^xh^SE{G_5- Yi {67v}1Gjf϶8 q}h > ǭ_" 9p ~K_l\EC踊k؈|lD^1 yTw~q ͇/x8,sX|8!f3nLχ{./rf g)Y{]w >ɱGx c)8g竗4 }+ Ǣϵ2}>./«ג6ǯkɯr=:ߏ/WnYKK]8s̊o5Ȯ &d_ lw_ baӎb~~V/O~1x5ܼ$-҉"BPqƏ^{_lb( U~-k!wLك _$rt__¨&Ks{¨W%Mj <dxGDrGZHX Ѱ:/V*G\QDN?~g
ӡd陕Eiynr^V^yo mvlpn;wZ6.}_^) }˻ZdaJ
~T$MP"Pw c_[6Z*-1wV lI[3ږVE@D@D@DV+y\w֕ԣֶ; mBԙm֛@JfR /֖knd~{}fǯ/2,k ]c;y$Yo |X%Lf[U%?^o2IR:ZGe&" " " "PnGa\40Bd˵rJv{d:Zo>c_wҹƝamΛwmP58:=]=I[eSְeg͇^T
/Lf+ʋW]=)U_uF
[V;ϗ" pDb@Zīƅ0N ?6x~ԾS:~uD{If>R:' 1mc?@U{R`a%J6beR7 esu! Ges iu" %0=o[*X Ւ b\ԥ/dU{[}{Qޞ}u >k]:w
}nQM\剀
X=YTLß/ 8"A|߿o7oχM!DFcϟjM%B v%{l``KgX
.:*GǖqaѸE2"on'^ڿ_Mbv`_ c;}ג)ϫͶuմ/ϒ{ón }<mu 00;;kO>
;wheVD}\LXN={ft:d`H&&&Y(Bԃ/ˤ۱c=z(& qD` /mdd$Q/} LW^H|(q0ܹs>gmmN[]2yD/%#RD;J [ IDAT[JYkWbZU" " " " " "J :
AL;x`(۷o%%˗HyW\ "" #rܹ *r;R/"c:0b r"PQ_\r wtt> 1ƍJ3ٳg(x F\c+Z< X<f <yɓF>ǎ ݻw/F-Ϡ ˭gY[ԷR+ľz |B//^"#,L@@uVc-"EwwwGܠ,8=ʉ@= o!!:_v-Xa
ǏSϱC~MrÇ|~ݵkWțiX"0ʕ|\c"!! O!zix~r+'PWrXC
| 3mpέXW<,4A0A DԈ
x|1w/:)
f8r`͇E 1s05u'ڂ*a ` ֪~ϴ>{gp&+iҊ@ YQ4/b~/VAx[C`3g!))tH85!N.\O^ ,»'4AE {o91 <5}M@DB2 ŋ!:a E'N ؠ\< >|h ,N>=/F8}NBghP
X p+u&SyD ,*w>݇8K(4b
EZʉ@ H7Ά1.V#̱[qvWy͎_G9EcJ/ȑ#a=^"$E!" " " " " kD a3_JBF=qʋpLAdsGpc Ł#|3br" loXa}>kIC ƓO_GsY;أG"bǘAr6.ԃX#>bytطzJ+" " " " " kL +>
vEC`vΝ5s oPy VQX#O VRXPQ/CD6"@WC<}KԧO+X2KWK_x@$GcѣGØ!." e3`,* T#lo>4jf&v" j&@kE[ATkWk
;"\0EM:\@c"g?I<DkX+n#!y 1EFQ={Y5 }<XaHЎ7z k^e<Pq;LŢ X?XK脹\_gVXGNg,=7` E@D@D@D@D
l ࢀ$9?AXB<B (3 +' 0){'-2]8DX!/]: 1XDuk=\9pc BEC4?uTMw +?X%}t\v:Rï5ީWPdrrJ LȺUF@ 3_ˣ @ F 1j b"K^~ 'O2). :´G' B!qΈ▉9Xk.\_c >6>?kq9`|y>Xb爋u qMEc"VJ /o5bїJCzܕ Va-mKf%+ԤJߣS/ OU_"N
h6]6#U@/*=勾~ p) 8` 9 ["5BxΤG $sT<$![!fpM~#7[ʳilї>e,팫>v%ix6X4. |> O&Sf Kj+ ki+/"BW p`DND@D@D@D@z-&U yF䚲j˦;'h~ | 2穳4"h^գ8j`RčCB56/[" " " " K%\Q!.]_>5q*t-" ">\}r"Y wo'v"Pط" " " " " " " " "HxL5XbSD@D@D@D@D@D@D@D@6 }" " " " " " " " "K@b_,y#n*' 3`7fUU+X!DV5؇4KfVMZ_"jr8_S<8bcjrՒw#AE-m7L~}KuF"ƃ6P(V\JE+<ٷ0JӣV͚!d-ٱ=-%Z:͊Kk<ТQŲ5\%yC{r9۽{wȗ<gffŋk.kjj/9Z> >|wC[< ~*V()SIcEUgggàEn@|tk
BNTG'}5=z ]qz6+{|>nPΪ)+e,7G}}JiK2hfɶVVMX_Yz籚V"~wܱy qq? :sLƎ 9pG ?V۷o_-+JӧOtG
DPai mLo/_Ed ڸ!U<l6[%TN>&քf%߳tծ"qVdWUz6kEvo]`e эH?_[_/ Vyfɶn {ɶ K[T*Z);n6=cũִ+Djn]x jAT#A600;NE&`+X;˗/mAZQBDυ<Ğv{왵vA$o,]=q >bBW_}|
pA&gGad̞zkZ1 <ƶZR 'n555슮ؗHZifԲw~kű=hMGd Xױf_hɎpYu=凿7Keʂ"Sz|;z~:v\c?" hv7 ˵k===vС'b Sk b B"<?*Q.BuuӧEHLzDG ŊѸ|M; =}iGƬT,l߮F
V~<o9K }÷{+tAk>ϖh6_JiV cdΡ e\ |×-RU]7D62
?+v0 +;7naɓaG n[;
>ľcǎ!*˭
)<
Xq 0%Fuq&w ST^~gz:~m7mغVCX U( o4 MD&fsV K"m`顳V WKu%hJeb 5~|lp ͛7CX{ƺ}L
B xчC\#577Ļ}g Dt!0N^|IԻTָgp/ȼͻlh<8gq !6
8aޅybqbn=XELK y `kO
q ain
wg z{(u8E(gZz|OyLF
A81x"i<N#\ɩi{ /" ?eufmb-MMܴڻaU&Pan"b X%,ٳߒYtr,սϮYa%Gq
k<vE|ò.
4b 15q yaÇÙ{Q9Ⱋ.iYzo߾&kk[ ՛?[.?kXggX,Y2:v bG]eikdl`}s錥]C>gUJD@D@D@D@D@D@D/YJp$[Y;FKVl6ǓHZL{w"-ί2+DA8AiLe
0q7! 7F|&U[O0G\ohl~&&,5&a*QTN,ӯ65#0Nb Ma6촛H76>K$83j&{ؒ ;?kj-?|6F0\h@B0s?"^ܔZ wKQӂ+S Ewڍ5 ;bUf ǁ#m*|L}?W?٘Kkslv pW-bf&P(5X
7Ja?O!4K9>6"}OYC8cȈ]|9X1ME2?&6_)qƆ a!=}?ʸxX^z5\)rQW,.]d|8CdJ
8+?68pر#I > %Bbe!P,ڞ>/?MM,7f_:j_>Z;2C%?-Hb_d,ҵi<Lyn'&eȰM2zzz ! /:;;EBhW)E5yQ .<]#- B;A{E#mW\s΅FGG& gΜ,w`%?M,ۿ٥sC<ְ
TD@D@D@D@D@D@D@D/!5uXuGtSݟN]Bl6'R_c,brX!!! "!a-@uXU[QkZ 9jq|!#Gt_, B{ih[/Rz)`lGAwtmkSGQZ,-c><;q<e7Nk}*e0ݖj؇H梚O q qرc ݻg?:ubFjeU ?:U^e\F)իWL S.\3w`-e
.Vo vg0Zfm&j/" " " " " " " [@>X2;Vxf߰s,qdzn=%RM P2e1rJ3{1~ E\rƍa,`/^hdgkLƈU vq}vۿ|~rFRˋ;R?Ēp2zpyxxx>i#"ڵ+?Te'ZƺNX.)KGKG&_"a !O[jj#" " " " " " "
@`ľ%vXo-{{d҃z%[[43nedJ1?ցZE@b->:}!F<c@۽{w=M|)yD 1ٳA<Cc
1y 6 ^Gamt'A<DKv4vLlf&n)?6[&IKMyTM]eԗ}Xt +N/YqeNY'L ܮ)+<XKu`vbaIU,*Eh.pp9D6ȋQ1/PG\Du{X:',57g!;sⰵ4ͻvc
;3#鯍$KD@D@D@D@D@D@D@օ}a}50-77|f_d砥-aV[+<^[Ԏ|9(9Z8Q!;W8QJ9υG6u"L o?}Ԇ{u"su}qh]u<lcKl" " " " " " " ":Q%D2dg^}u'~&wtQKDm}t8.w7@_T9o2vxq:XgVhھRCV~o7VxcY2eɖ &,^ZE:qV1MRJa*oet+^D@D@D@D@D@D@D@2#%RliɎgR* ,ߍK P^an#R\D@D@D@D@D@D@D@֎@}5#E@D@D@D@D@D@D@D@D`4˵:`˨< IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/GsonType.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.constants;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
public interface GsonType {
Type CONFIG = new TypeToken<Map<String, String>>() {}.getType();
Type RULE_ITEMS = new TypeToken<List<GrayReleaseRuleItemDTO>>() {}.getType();
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.constants;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
public interface GsonType {
Type CONFIG = new TypeToken<Map<String, String>>() {}.getType();
Type RULE_ITEMS = new TypeToken<List<GrayReleaseRuleItemDTO>>() {}.getType();
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/UserInfoController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.UserPO;
import com.ctrip.framework.apollo.portal.spi.LogoutHandler;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.spi.springsecurity.SpringSecurityUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@RestController
public class UserInfoController {
private final UserInfoHolder userInfoHolder;
private final LogoutHandler logoutHandler;
private final UserService userService;
public UserInfoController(
final UserInfoHolder userInfoHolder,
final LogoutHandler logoutHandler,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.logoutHandler = logoutHandler;
this.userService = userService;
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping("/users")
public void createOrUpdateUser(@RequestBody UserPO user) {
if (StringUtils.isContainEmpty(user.getUsername(), user.getPassword())) {
throw new BadRequestException("Username and password can not be empty.");
}
if (userService instanceof SpringSecurityUserService) {
((SpringSecurityUserService) userService).createOrUpdate(user);
} else {
throw new UnsupportedOperationException("Create or update user operation is unsupported");
}
}
@GetMapping("/user")
public UserInfo getCurrentUserName() {
return userInfoHolder.getUser();
}
@GetMapping("/user/logout")
public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
logoutHandler.logout(request, response);
}
@GetMapping("/users")
public List<UserInfo> searchUsersByKeyword(@RequestParam(value = "keyword") String keyword,
@RequestParam(value = "offset", defaultValue = "0") int offset,
@RequestParam(value = "limit", defaultValue = "10") int limit) {
return userService.searchUsers(keyword, offset, limit);
}
@GetMapping("/users/{userId}")
public UserInfo getUserByUserId(@PathVariable String userId) {
return userService.findByUserId(userId);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.UserPO;
import com.ctrip.framework.apollo.portal.spi.LogoutHandler;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.spi.springsecurity.SpringSecurityUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@RestController
public class UserInfoController {
private final UserInfoHolder userInfoHolder;
private final LogoutHandler logoutHandler;
private final UserService userService;
public UserInfoController(
final UserInfoHolder userInfoHolder,
final LogoutHandler logoutHandler,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.logoutHandler = logoutHandler;
this.userService = userService;
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping("/users")
public void createOrUpdateUser(@RequestBody UserPO user) {
if (StringUtils.isContainEmpty(user.getUsername(), user.getPassword())) {
throw new BadRequestException("Username and password can not be empty.");
}
if (userService instanceof SpringSecurityUserService) {
((SpringSecurityUserService) userService).createOrUpdate(user);
} else {
throw new UnsupportedOperationException("Create or update user operation is unsupported");
}
}
@GetMapping("/user")
public UserInfo getCurrentUserName() {
return userInfoHolder.getUser();
}
@GetMapping("/user/logout")
public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
logoutHandler.logout(request, response);
}
@GetMapping("/users")
public List<UserInfo> searchUsersByKeyword(@RequestParam(value = "keyword") String keyword,
@RequestParam(value = "offset", defaultValue = "0") int offset,
@RequestParam(value = "limit", defaultValue = "10") int limit) {
return userService.searchUsers(keyword, offset, limit);
}
@GetMapping("/users/{userId}")
public UserInfo getUserByUserId(@PathVariable String userId) {
return userService.findByUserId(userId);
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-buildtools/style/eclipse-java-google-style.xml | <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<profiles version="13">
<profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
</profile>
</profiles>
| <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<profiles version="13">
<profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
</profile>
</profiles>
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/DefaultPortalMetaServerProvider.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.environment;
import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.ctrip.framework.apollo.portal.util.KeyValueUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
/**
* Only use in apollo-portal
* load all meta server address from
* - System Property [key ends with "_meta" (case insensitive)]
* - OS environment variable [key ends with "_meta" (case insensitive)]
* - user's configuration file [key ends with ".meta" (case insensitive)]
* when apollo-portal start up.
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
* @author wxq
*/
class DefaultPortalMetaServerProvider implements PortalMetaServerProvider {
private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class);
/**
* environments and their meta server address
* properties file path
*/
private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties";
private volatile Map<Env, String> domains;
DefaultPortalMetaServerProvider() {
reload();
}
@Override
public String getMetaServerAddress(Env targetEnv) {
String metaServerAddress = domains.get(targetEnv);
return metaServerAddress == null ? null : metaServerAddress.trim();
}
@Override
public boolean exists(Env targetEnv) {
return domains.containsKey(targetEnv);
}
@Override
public void reload() {
domains = initializeDomains();
logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains);
}
/**
* load all environment's meta address dynamically when this class loaded by JVM
*/
private Map<Env, String> initializeDomains() {
// add to domain
Map<Env, String> map = new ConcurrentHashMap<>();
// lower priority add first
map.putAll(getDomainsFromPropertiesFile());
map.putAll(getDomainsFromOSEnvironment());
map.putAll(getDomainsFromSystemProperty());
// log all
return map;
}
private Map<Env, String> getDomainsFromSystemProperty() {
// find key-value from System Property which key ends with "_meta" (case insensitive)
Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta");
// remove key's suffix "_meta" (case insensitive)
metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length());
return transformToEnvMap(metaServerAddressesFromSystemProperty);
}
private Map<Env, String> getDomainsFromOSEnvironment() {
// find key-value from OS environment variable which key ends with "_meta" (case insensitive)
Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta");
// remove key's suffix "_meta" (case insensitive)
metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length());
return transformToEnvMap(metaServerAddressesFromOSEnvironment);
}
private Map<Env, String> getDomainsFromPropertiesFile() {
// find key-value from properties file which key ends with ".meta" (case insensitive)
Properties properties = new Properties();
properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties);
Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta");
// remove key's suffix ".meta" (case insensitive)
metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length());
return transformToEnvMap(metaServerAddressesFromPropertiesFile);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.environment;
import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.ctrip.framework.apollo.portal.util.KeyValueUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
/**
* Only use in apollo-portal
* load all meta server address from
* - System Property [key ends with "_meta" (case insensitive)]
* - OS environment variable [key ends with "_meta" (case insensitive)]
* - user's configuration file [key ends with ".meta" (case insensitive)]
* when apollo-portal start up.
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
* @author wxq
*/
class DefaultPortalMetaServerProvider implements PortalMetaServerProvider {
private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class);
/**
* environments and their meta server address
* properties file path
*/
private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties";
private volatile Map<Env, String> domains;
DefaultPortalMetaServerProvider() {
reload();
}
@Override
public String getMetaServerAddress(Env targetEnv) {
String metaServerAddress = domains.get(targetEnv);
return metaServerAddress == null ? null : metaServerAddress.trim();
}
@Override
public boolean exists(Env targetEnv) {
return domains.containsKey(targetEnv);
}
@Override
public void reload() {
domains = initializeDomains();
logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains);
}
/**
* load all environment's meta address dynamically when this class loaded by JVM
*/
private Map<Env, String> initializeDomains() {
// add to domain
Map<Env, String> map = new ConcurrentHashMap<>();
// lower priority add first
map.putAll(getDomainsFromPropertiesFile());
map.putAll(getDomainsFromOSEnvironment());
map.putAll(getDomainsFromSystemProperty());
// log all
return map;
}
private Map<Env, String> getDomainsFromSystemProperty() {
// find key-value from System Property which key ends with "_meta" (case insensitive)
Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta");
// remove key's suffix "_meta" (case insensitive)
metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length());
return transformToEnvMap(metaServerAddressesFromSystemProperty);
}
private Map<Env, String> getDomainsFromOSEnvironment() {
// find key-value from OS environment variable which key ends with "_meta" (case insensitive)
Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta");
// remove key's suffix "_meta" (case insensitive)
metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length());
return transformToEnvMap(metaServerAddressesFromOSEnvironment);
}
private Map<Env, String> getDomainsFromPropertiesFile() {
// find key-value from properties file which key ends with ".meta" (case insensitive)
Properties properties = new Properties();
properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties);
Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta");
// remove key's suffix ".meta" (case insensitive)
metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length());
return transformToEnvMap(metaServerAddressesFromPropertiesFile);
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/gray-release/initial-instance-list.png | PNG
IHDR ,IQ IDATx|]ř+]bE.r
l abc1wB R|awMvSIfCؐ[ `z3`L16ݖd+}gĈ{eI\^3gsΙޙjhhh0NO ӗPp$B.B@b^9Q*H5 " " " " " " " " ]ļ.rTLk@D@D@D@D@D@D@D@D@p))" " " " ]@$[Ziiu" " Z^^[(UD B
MQ~N nŊV__o999 1%ꋀ$ Ν;-;; (A/|\& 1s ND@D@D@D XzXaa%''ϡ,"й 0XR[[kkٳg.J' $i D@D@D@D@DeeeNKKKs^yBD@KI)))ֽ{w+..XJOоX<ۧzʭ ӫW/;S- N쥸i&{#t( U'I o>yx)$ $۷oO|JQ:1*(h;v {***
#
2d͚5k#ضm q >}gj!.\7<x3vdӦ=3ע"Flڔ6:ymD@Dֶ3*! B1 |rssD)<ǪvnݺQd*ud=HfN#$">ⲟxvpsxI7 ț|~l@x6s'o7B4|gNsi8N ab B w$H!ۮ
'u6oMޕW^5?@[YYY>^wS*䁋0bo! . ژwuunbKJJq2#w'4`W_/Mʁ lĉ\O?mܸq]- ^ka-2rH'=裎u0`7i(tF -[f֭EY|{̰a:]l+--m fxy/9<ԂFE$ꪫ\tӟl6i$![߾}kqfD\!nv'E&.! <,>AÄ}l>3'@Ɗ@H=͔["0zO`lϨQw H!0+@W%1?v D wF1Obp_>^"C@Dc2
!߰d7ˋ: l+"] |EE" 5`@\/ǹ$PG؋fϞf@~-b"kW@YG G1 (#:kNrb2*- 瑷$ }UV95Z_<8gt HHj2aom8YDLWUO)VXMuV_ℸ3fb r<QGs-Tr*++hMv!Ec.VDE ٢/n(yfѣ]|L 7N7mڴ`-" " " pMvCl#:a=1 =Eo`js%YsǷd_;:.v% x n/^l x`]ϼ/OZBwuzf~0m&b &2C/ ޑ'<ӳg&M%s8cƌ f)/K`}Ο|]tEq E 1SVp
jʕ[}6 Zg XANzAA ;1P%Kr1txh
4(m݁Eyu<1Z`?0!Ȥ;n
CҌlC'$Vx}vG}ɱ4Hx|͙3y!!Nr| o;^$l5q G m=+ ڣ\ zh,]D@D@D@ڝ ~ٲBo,
/D>ľ5k8p.bۏF 3Q Vb q+t 6'y/6?9/5k t|@q<˟DK KR.>'bg*iN- >|:,qu?c]] HݻwwevlkxyS.W?DWMsΛ p8 !rB#` sLD@ZO6
y湃Y{m8N&{nS'4& ś6 q{ϖ-[.sx]ڬs9i <X_?%4W^y
6<.O?5<:܃b]P<xiN8[h F(<O4 Skv'Up[3m sF_w7Ygx& u&ED$ݰaq+Asei Pcy8pg?y6(GԤgO^s?8xQX)#xFh# !"$\1~%aڲt4ؼGMtc\9|F68ҠoNl(e@͋u@xq/yr "6:0"(/1bKA^ex@+~Yԑ{ 25F < zʥ#GY<`-MK ԏ|8QM69ΗMZ/V@0%o@$
@\W,sg3V~&3yWj z0{>8 YҊ_":N2WWs?AW} |viɃ8c|E_/3< \<QG ypP^>IEÆa=Z2E
X. qMi4Z̓s )2uu0 a tc27upe7ҥK&< mo߰0m>Nt#C 4x 3V9 01J/"F uQ~E@D@D@Dx/</D&^F ۜ<t氕 }Nm+F¶ƞBNN" "aOm[f( oA>ʋ]z駻+YsKPNy#I0o0G|@a=L< /
09`۳!"
~?KPorK>p} (b-61bbOR"2)22K=_].Ov7 m iwih;>&->, m"?"!` 2myrjY?S~|FQ<vbB&xNF;E 7&Z;< @*3"x(NR\\^8<#}N / ͱ0 DC.` b~ 醙^z l^<cd
xR=iki ύL_\H<6 #48 ,7Bp$ǣ\ sLSZ~{{~sMQ>ʏq¹|T:)SrOh$@aaaӔ,U+Pc
Rؠ؇ar;K:ؕ|:yt"
C<L*~~9Sсѡ%7 1!@C87p <!@@ p>q h[|1 qE <d ÎpjK~w_?fa>gϓ9b[=Xr>{!& g`N`h9ҷ }.D@ZF/j[)+5vtuD$_f< ༂NB #{4x? 2{2tv2=x0ųv tx.0m'<;8̠
m*:_n݇t ˠ}Qb~s^
M;K`
aַ1jǍ_I"vʏ(|@¥<Pͫ؈ys{p*,
xy!wW4ǁŀGpW`ybFN>ON"oGy"0"#7;VmE ,7u |>Ң| /xWz_ٟOFtF}X߱ F!:Do-'gtGoFk:RO\ EHU' #FaaGc~co`+bቁX` - ]mtGtY.>AۑN$ sC o7|6A=g7 FʎH2AE>)}<p:n ~h osn}7 G% p@ E={sj@,|~ړ[LO?
cEhihˉ1O>) e<xMYG3w {߭@s- gTg]P
8z]}hZ3<?L\ icY)VZK1) :<C|x ;͜9WCwWQZQ zd..*my0ƅ~9.XqB qH) 'O>my< c4< Q碣tтԕ2p3rr)pcË2LN3lr0'#M1$/A /#Wt909/0\=pe?:i.?&)79e旘$" " " I ۆu١-`8xYLVbp {{{ /mOb
[V<zjLT,pS$P*ۨot7&44
#lMʰ a!śFA4 [ [͎@.c)nǠN(q۾ (D?:f#A
Q x;?/\%Ԏ}Hp` +A1XxQwpB# 1Qֱ'.<D! It)Pp<ϯX PGN 9W|s<皺$2|%1:
F!(Cay 6FY3#G8>:p"`>.\сI#o.QDK |lс#ɻ3yć e$ &FHс m #0^ ou{w3LuAƌC o6߸&S&Cݛ+{o ?]aSx7g8A {NvKQ>dЗU:o)4،t$fz%_:!VewaoÎB8&Vzc\G8Ҏ [O-vf|| 7qH/ <"8@ _':\<KǪL /5 $f
:!8mSLe m&|` c¸1ϋ`Б |"} <pbF%3,r -. H 9 vT< \,OAxHXv-c+5uD_! |SZ۲b !* ΅11uԦc s с< o$+ڠoo ^,c}IGc䌋7/<tw,&~_Kq%O>ͅ=u?o}4?:D(
;ҲqMr,7"4|0vboXۖi
3 ;O5%>ky $: Wb
:~L
Τ텍o*Ɔ%hם8|` nOA)s}
=4VXS^Bj%~}XyP?3wb.-6L"|<aFߋy>}) *xS_p!@]r%Nc*Ҟ"JѾe=ꫯ: m7}{ux 7- mk[ ]\b{?so-C>{ <X& ͈9<y9Lyfn BGO3s_{a=Ro|M9/_~KM}jY`O5%Ҋ g-< ٟ
o@R&dEg1(V8N|t X~s ے#<6qb&M"X6 0ݒR/3+({
uMG F}֢ŌI'\iq- (=k\qeJFy`(yc%i)$ ;:oLeB ev k !a ^؍H>:xea```cAa} 2þcߤm7yx≻rr2(hQ6R<XX ؟l{ s0i G a>
V.9穥GH5ӭImsÞ~t0< ^>xb8t-" $܋Sh# 秱s "}P^@ ,@>.b|ȓuF>Fy oH]rKF ¨~ 6Ӧ\Biz! و: <giR>
o-Rx,)8wԃ<n^v.LM95?4'
i\>| 68r ~sp ތ<(E˅Jɋ~x ~>9x} }Qg~b]!=fH>:cPoZB`ov(5 JR``$ѣp<pLkF\g$:xp SGho6؍hT;%t^DK G
A;[|Б lk!D!Ňbk2a!Dq<v/[0NVp]E>hO CIׯG
OLG IXa8!(RX b(#u$`/g3u/D}fþD<PV#c v~Afԏz~ϗcX۹. ,CMD`W}y, מ䞧-?f< 5C[ /dytD?& G 2Ez-':k, O;y3Wm 4ӟdhD 4߰e
@L. 1xIoW]u`7x\kIx@<R
H
|0 5 7?HH i?9b(<H8?<I%m^\X~!CN07'A K+x EG IDAT#B|o[P s~<a-6bxq qn>ŵ_+~i,\LCP`1OlS/" " " m!`Յ}`- yabװA|yia2LGo :LHN*SLZ܇(IG<"` ~ uǛ Sk&67!e~e# _
ND G?}~ G~t]H=b Ok?.c1/z Xj"*cmS,'d@?vY>lCB=m&m6m? n` ea}7<vGh(oo㕅v
Th } ̨7uxޱZ +L;/fz,6\y03 x/2%!a$~[|Diy H"ި|@8<yad
yQrRnPaq( w@Ȩq~A`\6g('8wKpb:'n0.A@= )z('% ?*? qԝtb j>
r /P GZf 5D9 DJh5Mȋ茈&V&" " " - b:طx`w!VƾK[N
^آ >3] S̮A#=-J't [2bRXvuVDcMuB|bv
" AŔ 3J+P`ʔa` 6z=
Ɏ^o. ؚ!VFǹc3u# GcX9@> ֛5 "6C״]w;v! I.ۥ r0 ihi|} ݆ۿiWY/^+D gGqtڂoU8O9'yk ̘o|~x
2hӒl{~ZBC! X6 baDZ\(>}C |sSq{%W fmDd`$D:8Y,7D<6\G>ԉ8с 8U ^Xx3B Oώ
Ty!x.4tp a &Xj>B-tllg3<D&S'(a2pMg;aN F:l#:}=Cl= :vNx)!] ._}J0 Jx1$X'>{ԙ2@ ;i6;#1ͬ ``?Q\=^zG`;l:Y!V߉<
U2|sn "d<gotMD`h[z/ۧxBV .dtT4BA'3?/ KG|c+p K< * @ G $C e4,xG\/ax
DB Θ!
>Ƀ!0x؏(K/uyR'!M<عX4r2yf>]8 VxA` AIaяZ& w|cܜAF0$?7#ÖPW&MmW#
ؤAQ*zfDӉcZm 'Vz
Q6:^ޅ=ۂZ+3~(KsX`b&X5ʹ-" ] Zxx zy]+ֱb }@@ qx3Cq`<B<D%D2Glぎ˨ 5ioj`\ucJpSer
C. /KW^鼼x!QV%FɓQY (M 跄G$&o p5 |y7i2E_쬛h =&0H]5ΌuM_` ػ_Lf&B @ftR$ I ?Vy4,ښ[wcb !0ڑ.t>-
^F`c(mAs鏎1h`k,b kG\ {'GH GXb?{
" &eӜ+]Omن'$eBϧ6oL TAD@D@D@Dc`Q S;GT
Zk.1k;<d駟˂w p]}NT8Q5 O^R Eb՚d/7GGT3Q! /1B(N"FOAD@D@D@D@D@D@D@"ybf\p.EӒoݔ 8WTm55ĺDT:" " " " " " " @yxOi|i
ʓX|Rj" " " " " " " "@y8vS ҈UVh,G^9rJ_U@yuIQE@D@D@D@.fRF\DرceeeuҪ"&MLZJED@D@D@D@{x1Ȋ塷_ "7D"۴i{cAABi@%j=9*@% " "w ݿ;(U$ubt}xTUU;J@D@KOOwkv8" H눕$K G"" " " " " " " " {ļX@bHK G"" " " " " " " " {ļX@bHK G"" " " " " " " " {@RC^C$@BPR" " " " " " " " " {@ <MJ[D@D@D@D@D@D@D@D@A@k%v 1 + Hy4D@D@D@D@D@D@D@D@D HkBD@D@D@D@D@D@D@D@A@b^"(*
hDJCD@D@D@D@D@D@D@D@ځļv,D@D@D@D@D@D@D@D@D $%v 1 + Hy4D@D@D@D@D@D@D@D@D HkBD@D@D@D@D@D@D@D@A@b^"(*
hDJCD@D@D@D@D@D@D@D@ځļv,D@D@D@D@D@D@D@D@D $%v nk PzNA\IYS Yz1h36y
VYYnUUVPEVv"hgTȶp8atb߶
e9ezֿGEu'S*" " " " " " "6mJw0 E,?-g % Lʭt6ɷpe["hRbxb^Y}CE'_R(ɒB\m]d
npw]RR] k#@hǔD<"ַO_K'<tl@zz()e;-7qgSRyw=sW^ee-99~+#'fM8^d\t_E H}"vqvڤݿö(k~jK{%" " " " " " ]@<JER5VaE @Nn,-Ni7/8Ύ;̲S-lK+W9ϼCwN=)E,))X{Ncz3&ZFZ yPk.k콥ki{&)" " " " " " " Z̫:AUH<L<kQ6e}lv k6YZJئ |mؾܴ Sm/1 9LK1J+ Ss*?h붖X8}r'Z%'LT@:Gr(dv[YU,,p 2ϵeel[i4w7>ftD*kGV\ZY<,>_D@D@D@D@D@D@: Vy, "~n8s
/y`svحϽcrlV[qR eO.:u"O/Gڼ fMO^[$" " " " " " m!*1-@\-|Sn\yfOaϼ.80iقݛq yhgO
۟gk[oY2=5l=meg^J )" " " " " " "^$i#_Mlanj-umڧ6ZIyYs xr2ݚyןv\æKlRSc(t
Z k'r?&PGo|ZbJlVnEK2&lyٙ-+.>^dW
O;nWnn+6m5[2Mݏ//U]D@D@D@D@D@DNkw~l{NJ<2떙n~ʭ7ֿG7;o۰m{;yvWZRRȽն6q/@ H}Iۿ)VD@D@D@D@D@Dk4ۮ}T}@R(J+lѺv+ ءC --lk6[NFmؾÖl^QTRjz:j}tVbhuyY鼷 }ixeXZJf}*RD@D@D@D@D@D@%sXޮ.bq vnz+ߎ:h{9/izY,KINXzjgfɡ--5lu'? z>wըB" " " " " " 2N#5ԔYwfkVi5Xr^:xf<YFF%'#|jkkmʕ6` =mUYT$KKKk6-[XNNmo xj[bm,ju:Th}͊ǩ+UT)$7ev#7J+gN-۰^(Fk drx/=%2R,%l;ͲںHYD@D@D@D@D@D@Db^͚V>f͇P]U-my,c5Jh3hF"gL;D"V__oݺu6ۑG iÇwۘH ܦMf'OvSNZR[x 3~ȑ#]\C=dcƌ &M1 }Q;lذ7c(+*s/mnJg5ii)ַM ]rL6x@sI!%'lzz6wm;˝[noo뱼 |c-^ْy.rk=gU*Xwn*:\̫Yx{).2 -{%bt,)hesn-3
7[oܹs-%% xZffa
ak5j.b y555g59///ٳg{:>&Md 7o<']y y:tkfgyۿsΦ_իWqF{-;;ID$>9SgϞ]j^v w?\(B5-aܜl+-kۆM[g_ؾSd}Rh^|λ/3-%pM}rn;*kOn$ =GzS4D@D@D@D@D@D@D@:?"W'"%EcG^ecɹ}BP]f5Y+7YV,9e q]d<@ѣ!-_N>d7-;Cĸ;_~v'muh pveٓO>Һ袋1nLEHr#~po8qӦ\s{ 8)l2oىDz}> |ZѾͶh*9c]v6x`_KKMZ[nWޱۊ翻ͪk쌓u~r:A.HJ]KNJr/fN4`Hux 2o
vknr7u6,s%hJ e[, +y:]Uνi݇-mݍOIIF [\DM6I'UTT8
6X^UUUN$\bK)x! 2/>55vam6'& k'z-`!)3c@|QrȐ!Mb esLZϗTSۿ*HoD--5F h?j7>`q:m3ձ%e OK+IļmV
c1,se Ԯgoˋ-ut˚|%J r[-lFҋj릷7Lū17tqȇ`pvBAA)yyy֧O 7}}rLiW^ye ^Vryz1̙ʎC`kR3/ۻ>uRSNvB^Uu6%6m8;,==.<D{Ϭ.b%;KOw?b7/a^y5c'=U=ћP} e۷[vnnKcuٱ";6%-m PEJ7ڎǿouEK͒z{k/+,u8 bk?͞ ֬CHx!!n o;;߽bMi s q*Xoa
OX!Oe?oaSL: G 47V:mgqq w^_ XCeܜ-j6Z_ ¾lȠBWEKW ><\k =
z[aiۊwZJJ>YxM|XWCT!}[RrݎM'Hqfti:L=`=<76%͒{r!EPjkꫭz+g K<*JxнK%y 1bRwO<\˔q?'6YbMǺu~-:^TWz862}֯Gw͚5y 82wy-ZS :zǏ:kl
5VVXrR/X/;:jוżHj Nͪ" " " " " " "~b01B)P]n
5CRN XCU̳:K8u։fûw IDAT! e5mРAv>ck49<x믿n r& {M~|ehvĤK:7C^i9 -7 "ڋ! >,X`57Ncي5VQQʣhld"]**i3K/, -]1/,dUUqD@D@D@D@D@D@D@D !:L vVf>Rz dV_QbO#uȖ
ZjSz/6D06ֻC|{>ڭCg"شiӜ ㏻7z,03b֭['n: + ~auSaxgmʕxb'@ yr>`q?c
6olP`}{6 J_kw?%'}y^*,/M7
Je :L e[n
O1Zʀ9KuKo4kX[Yt Z#ZD
1yL=
A
@ ĠN;.'1۷owb ;֭~]pAf6yd} {f{wE]M6͋5 DdM3fv/ڼy7N8 <s7 NC梽<MwXEE;/X0lpڱߧoؗtČεYdz[)?!GZrN FVꓧK2=˒s Ա S]W^m\r tA1-ַǫv^{L˭t" " v_}U[^NA ^O88
9 z>c<81u&Nu 7tGFմ߭1s=w1\f;w^Aiӎ" " " " " " " "P1/9eNJmYe:RNPJEYݦ%)ޞ#1:B Zuu\@#k[o7r̤IldI{ac
.kt~i[d[Ï>0>6O?4ݠBnV oa auikqL ؿ`Wd2@KVRZrdd vU/m5+?PMU}nPoY(l m| X<Vs
A5` uQn]:\ /`+b ^x wuK5xk.bߥ^ )>m:|L=c\wƍw W^y{y普: >{ƢKqB!#OlY`r 'N^02bCc{\tu .%Z1[IuPSeS% x,c왖~I-=nܸ=C87͕Ke?C?ӘF@czJKK]z=zM6mn6?#F_MMK8/Ð5A< ˛zyq7l s"?3ӎx=,99u"nVb=Ӗ,_c_,KH]H<9²^-o⽦"oe fx%(deeYXI#*9
{7E3f!9[nG } ?Mm: 9sfuHO< &UW]ex%v@Y/>k9#۸ire[
Xhy˭W_KMc!Ȇ.9gOC" " " " "U +7ֽi_jm┻mЙ6pnX^hn CE6v
pa=x~+ 10 +/ā{mǎ b](-g#Z -cgeCKcَ-VPk7QiċP[i; ު?{{G,iο8:ޡ <+- nJ d@jF~jeNDȫO;~}eoD^:miiU()bu_5= /" " " " `>o K
$Mׯ5sK0{6p; YL80 c ~/fo U AFWӯ_=8n=3ڗ9{ MpXf[l_жGT7^߫c[[~/c)`H[06dX ?ȶUV[Ba`ӿ%!
<!L o??k[K'<=>pv^iY.b2;ߧڮt UVYSjsVd99NĔ.%Y3˟ECb #F2'wxq#OĠf`}]gƈU0CbpCp eAso_kg V1rv1B&w lhn/)_oڷyЯr#6ϭʶ_ted9<thχ guy4 yW5D@D@D@D@$P rHr>,b۫[}C}"b$`ezbL ~r퉃\y8'"N%Q,%s,6ۇ]q4F j>]l/[cۊK'ވl>6~6yK}"" " " " #SoD@D@ZDӉy:c> wSJ -% 7}XxEzZռx \322ܶlZ ĸ&hB{ L." " " " " " )<D۵`Ƶ#vM#i w uQxb^`rI'oxNt`M˗5 x|Ϛ5˕'y4]ѶTZrԢ-Mc_ۗ!n/Wz@tR1/QS:" AkPj(jZ= nKtYmf<[vve,|ވyζm1>vE
Y/U5%" " "pauɡ
]<~ E@D`?$ 1o?<M[p &.{
csqنp7 !Cs [Ҿ NjMGXaZ yO~GC|$0%8>c6D<i6~ O~vU]NI pi6:}ksLfJfmNtXj&==EvxW`=^$|oA?~PtG}|?3V|X[{] \{s۞{{3w-"0V_ݽFƪwvۈ#\>|<y}Gn:oРAݻ7}w7m.] {MqcU5~K}u[o `<sԩ6jԨV\ú{>}1=l0[z͙3jjjf{GO;w6[# kpBw ۨ߁ hӦMsgҥK7p va`[v;k͘1b .}?s $iA}䴪" " "D&v=7yڹ#αHݽ +-wzHhWӆjM +)unjw_,LبؖDQVlZl^x6md^z8?|i5
#u0o<aʔ)vM7ȑ##'vuѣV8
o[eeeL X7|p;wKbǎ ߮,]5lܸnf7ZB8죢"={]-7J.n3sb~vGW\D /&KC-ZȞ~iwҷ6.wߞr)͢ 'tw^aޑAb^GW" 4rw}n Pqc)BƻlŊ.>#@` $˺t2 .>BÊx1 ta lfs9&N:\ķ ۾}#}C< b yosB^ 6lpe!@h9͛ zZAAAtzmxt+
5 ߦ͵[QOiUBD@D`"nMUqa{ksX}}Ċʋln{vYfʵǏn2g
6؉yLwg 8y95ٛߴ[͇p2f̘&6 ˟~WJg"t!`o"&ņ0 9c wڋo̵S?2V/O-Y36+D{ƀ6belܸq%wj6DW_}xE!1pCG:tM0?mرMe'BPo<}7
~|C=dYYY8 t@38íN_,??Z{0&<c9pGZwqGSn㥤-#y]"Yg?Νk{6 0Dt -pZ{\>m\Sq]"'%䟙g |+<ao~9z/~ gno$itQ4R424Tag4x0qCCbJ)ߌ83"
ht\ 輩p!g? F@#:w<>37! ԨϤI\}'!K6?xQ-,,t"zFMCicr}) <@iMpfnm3^'\(y~9%9/>⇓Bw0>VhYɋ폋O]v[~I+#l$w,e }I`n
<_> ӺӠD@D@D a5g cKW[EoZ8+btdڈV^Wauoڌ侇k^{!g zjZ8Չv_zly2TżfrfBms'v';t 6nV'L0O 7֊w%W[V iu{-[**-+#T` t# a#v0p:^r v5=6(v5" %uT!1?OM5|ǝ~ꩧ6m?_:a> 8v;}h1oɊ5Ui mY
}ӧq7x]tENꪫ7Q 為sϹ> 8/CXZ]:*vmY8lu
nu#["B {q>XIߕ~_Du|{Ʊ`5~y{+r=qmؿߴ\sv} o ZVt/쐘*IhoJrŃ5hhG`] |Ѝbxvа<bCcL|D@\y3G^x 2u0y 'xhs<cxhjCW^n.˶?Kx 2Eϥ'!}!HyG #clP~?*v?DcAƆYVJ>ZfϮ)٩v|+$MI,d{e,;5k
;쭢Rn ̳-ut[[VmO)
5+=N oCrҭ:Ro l)v4峽IVb/{nV"ZcuD^+H:~}2!;Mue5[S @Jfڔ)6`G[7\76?-np%YM}]?\:'ܝ9L[Z̞Y}ӸK_W߹.[R Le=g|.:kf6>FΜ 7~g={t$n7Qqnp6.'ܪ|[`P(XlnᔰfgY]] ~jٳf8% b}Dsf`Â/FYf9oFKK,q6wN ۚ@"<g A4$ώ ;ߞ 4rX~]-/7;fEԓ ʱ
}=)8pGO;Į bYYvi¥ֳ{uˉ̀r2c g?R/ظX \7 J\0EDkU~7e ix}/:' :f
q~?uۣoϿ%'m%{ӝgb
78|4< M
'F h >. |>ċ&-UC5B֯Û< x$ i2d\1 hQ 4F eJD=̲IL
Q/B/ΎkzK وn6bz}4gEvAmXnz\(d#*jwɇ aPmk4+icYV8ɭ7(;tϰ}Fei*Ro
68;FO>XguNkLY
Pg{ n
&ZFr&ZqvXSiun}HC o>tk]bKc<lHזbGoN_bNc}&Y6817ڪ 쪽Q4xw[6iܘxC33ҭ_^Ԍ3<!0Z?D<ְC~f @x |!zy 7ޝg=22mҕ6a~%eh 8l}d=vgR6lcI_
3M1vld}`_W6sL
gO{ ` iRxUac#f?яxY
7}
6o
U6kͲ7x w}j3X~,'~#G?" b)끳9
xN\3H
!}w̰6gyrlRRR^ Ŕlʲ믿ޝ`kqLGC!~ ' }4A` X ދx뜀 &O~iG X] 1π`4w)pkraD xxZ7l#
P c h+ mÚ? ;e|i]m<ZmSdsk
tm n+n3;pEa
KXM}]5eC{8!_/kϭ-v5Sjo))vΐ |g<=N넼5Uy6[ Wͺ5>V쨲E%6gi-缯rXO /;BAF kM5ze؆VY[a m}z++kgq*6;kxp
/pRrr }n~g 5쀼Cޙẁ閒6d^>7Ons/͈_)Qjr۲ؾXU֫G#rf W IDATs/M wkU#YG4%;gW]]k/l~)k@#hfgfظ1 -Epc $̄v<B i!H~6;"ɋ/<o X>w A цX
a A)L'e q-ُ4fxfzeGu^=PЫU4 f1EbSn}_ "kOx,aԑ፹ Y89ٺu!
ٯ) a={,/SAZb*_ uуd>c~//Tӑ}zcf%ޣ\[x1M)>'3ɟ y!A YEU5$7.VO UQDeh XsF"h=4R4Fc!KCJC nfo@ӥQqYկa2F#Mޔ7^}HËlaH`Tꊻ4C rC,~rt{ɦd[v8ҾXk6b-jvFCM\ļe$7\U3iRVx ˆt} /At#vҀƇn]CT7ۆ龄>)vad$5d |yI{:;V$@AF5&d2 ڢV)X%ҕn
m8G) c:Mt{o\JͲk^kZgSfd9!- [~z'hҿ]e - L~L455L;{
팓_mz ~>w5ڽ_#Ste_بؗ` -[a": ȂᐁV[[۬랗ڜwSO=S\6ěvkr:<.'v<NM0dCaEZLve( ?; /Haͽ{ϕmȵt
>G{o^x];íx-^>yFܬCc*2`LۤNpf@PF㭪L}2uo;Fq3;V+mW^puͲiSٻ . {}8So{\݀1̀ -Ԅ%|)$@!@
B
j
ݖu|%"g?vg<3\myKN !b+C?9G2 =҆-1)0fE\/)yK KHLvҟW-*DRBdV]`EUVݎ VKMJtrtfsŝ >t.<|31O vmd ˏyZH- ͏?<4i{BYƅ`bNo{ײ>>o.`~WZ.\1j37d )A k-0AXׅ7<,nS3b_E,uv~DV(NHpi%啀`rK &X$+k
p\cyRia s_%<D[ c~I-5ENީI+-7>/td$" " " I{9{؉Ob$YѧVX]h`I$mՕyM[C'1Oޙ#t Y,*YdM9sl|qVXk,{[^*;Q-5mkhZ V4Z[}8A|DKMMk
̓$Đ}0mf{HQ?F0긟u%E۸ 4 ܑbtVw-"؟27.VKH "P,(!Y 151`+oUƽWs/)||m`=i8t`d
%tc<YV.DHox`1b }+t ŌYj )+##1c@\}
XH[ ^W_o??w(;qn VŅ|Mp@EBgs{ |; < <pe J< {uYg9q @Dfz#E ҏ1,LbyfI(>ϷVZ] }Od;jd >ix+疖'o\x01,.txx+6=.PyyyG Bpz,_H&nl }Ǫ4XOaܔ2k.̥/qX~X /lOX6u2#xhL74włuM"?"{JN cGr_VQkeM7NRB݂,fQاUnĠt魬0gM|Hr6;kS؎%e&7`Q9] 6[&H0˫̳V`C2aWVVN 'Uԗڪ<BX1te26x
hW}+_?Qyu߆pƋL-%vt DuM}|,=%5{P> X1g 59q+5 3 ZGʈOʪ7/ gOsP8zӷ!N8Ə \+] Ao f̘)3t "m >lgu
784Dx=kεW_b,-Of̶3gۀ=9ֲ ":G͘7[V+B`Ed b(~ [_Va_M5w=lcFYLrBoIc* o S (k:>~7 Qb9wx!3 sVbǓ>p.03.dHyÓvcLՖy@-̯߿gK`2Fh: " ,Zoڄxٹ(a2̏ 7`U<o@xg
t.zZ\DVϗ & +=Q^.̼8`JΏ %A㝧ZɅx/Kl04t9'~?? '|rRchYG V{&w[QzG^g/= e
]Rl=Snz;hȁ +[vr&ɶ3wuDZ [kʜegCEMͯnps&ܢF^
Lqiv٨ MeVY~MK|[Rc j~E@D@D@ Ue6h.RB"t?Ȋ 4VͯʷqO3e6yd{sśVPmu
`+V[Zb>4>Z,_`\ψp =.s[! >/S6jܓJ2p[ > 'p 6`Nj|pܟcI} v;w 8TVmQ*c "!q(BPw`,Ը
n>
bXaExXbX F ]v.#g͛ .뮻ܜ̗K7nwGӿKVugi.˾rn0 ^͊><'"CbEV1 c
Fm1; CPX1 ^m&^~}͞|M[z/bWo z 6Yx8E@&1^o[9 Œ1y7"G_3a|1`L`8sk x!a<ygƞI{yfR7>
" Εm.9'mS-Ns'EIO 6#p " ?/.nr ?ИncB ||)Ol 0aPCŅ1'z}qqS ng C"OM̛t)'y7 O
ܜO^xE .[[fK-+)QTVt?fUa'U-g8FVXaH7i+b&أlZA[]Z\dWWO I+/?siz{gMU74{9V[QYk Kk\ ŗWQi8dD@D@D@ 6XU7TYJ0dwmkڈV^_j&72~k{ d ~/y^_mҀIvlHW},Hki2{\YevBj: +2Ĥᾙbm
IOၹofQ2n~ !pO_WĪkll}Xb lgtB=1밻@,AQr{p `x}=S !w sq Y0܇s8qx Q4D 3̅j Qݏ?' ȷڞz '/)oq&X K4D͛núg,!9gS̗Np ֓ۃ>ج]6ɼ7,ZgIYQzw(;h=?
|Z3z˲֭& [{ם7lgk+ d X ε_|эw菜 2 ew7mYƎGK9WC(dDRa 2@k/> 9uR`QU^lQ`ֹ9ZM"K k`O &n\#*Ŧ.(;:O~ qY[Sb~$AMa i+ qyb;퓛n*ubL0=Y%UqaWJj\%ua Üq O||\ưiHyb,.HӂE]`;p@tܦtnUvkW[jr
3lRcWTo9tYYVY_iI68Q0Êo?Vx{+ݲƕí3mmZy疄zN̶? sWAx0 o/f<{v)XVfpvl! OX q-8!бayc<m~_Uk g_o-Zjk,!5,1_/E+uF>! M'X.<o)v `#DC!x`(ƭEӇ{}*ڋ*6=6NںzGsXn9Oi3 o]s6zH!"~`>:k-
P!ikJ;jk{kimVHN0U˽>mƫ.` " S/':!mY 0`?}k8L CS~q>9Vzi&/֣-vW}/(( Ֆy ȧwe П7l5\ rqصvKr]4mqY[ o XϧhhX7]trFzk-ʇ6_ջܧhE_E@D@D@v/xsVPY86͝f
&-)dOrK tle/ba~ƫ ~N2i
c~_߶YUup>ǺdeAˋlB}:kIG 잒xAk"/wk;2Z->xʳ9+5v$c_ĐMdo\;x1ƫ z?Z=96i)oKĥ3_^oU,r|#&B #
ՙmmDZͅl--nkq;b6y Q0!""#V.>7Cn+o;t5{)q"["--f7& y[⋀+/8C8[GZgϊ
; mx Gc-inUaX:úkN|,d/% 1cy+7ةx*p|ǂ~埯S+gu[b+OZX47ۖdtn@ As#sV\ND@b^'jlUU0E%aknIz#" " " " " " "$m?C " %sqlNS6Ue" 1o`<ֈ~l ڬYe'mhGk3VԶ@L4#-Ef@ED@D@D`X%" 7y7-%l5LYЌL9.
@ Im$n-k}-푋FAQi@;Nζ=?,h*FC lݤ$KII{L;ᎋd,??ߺtҬ<pnݺ U;999̂Qλ9sP
-779 4m,:DZk;Vè< n2-50M 7 tOo[9.+> " " " " " F Ec/ElfLkkfo P'׆}ͦ ,Ĕ~ʕ+پ ʲ =z4 c<+**jO_ 7aL*v9 ,yj*'lܯ[N Lj;"ĥX
$)&-"VYh}ڊ*WvsP_+n|;s6[7}l# ;!k?8+*plOzx,㾔PuMir!C.1, Z{m c*mС}C
)8UU7"f);aL띝lu&<VLHz{[SZkȵt f,llgٗaby wےw˟:^D@D@D@D@D `=mSx([G bVg1=@8C%.<*sgOγ=틘̔Mkx6{\xIK1l?n 44~[TPe+ও^nH +" " " " " " " " ;@܊ypj>*y1lTtdb qneuWچ&sUVPVļ| z]@\yaD!vї(#Fy cgȲW(`3o:> " " " " " " " " "451hʎE|e'!rY-/vq ^U~AD@D@D@D@D@D@D@D`!b^(`'YEMӜyX2{ȰΥ=xcgY)r]nH@ <Dނ х1&nZkb{4, Ŗqb4." " " " " " " " :ݎpuK}fۢJ;˭!b= ۹ >"מQ`z" " " " " " " " "%~xYu%DpKI { Y]#,=)dKlA~nsSG =S]@BiY\bU lN~%wʰ̍-#ɱ-3Q.zmGW|9I:2Hq+ʾЋvtӂ[yEVZÐ# IDATRd]Z(DW >:ZD@D@D@D@D@D@vm VWSc奖y(nlֺ֖YvC:[W~n+l]Y XW$>E D,biɉGRQD@D@D@D@D@D@D@v@*[7[1X"^,<D9^
\4ͼD@D@D@D@D@D@D@D`sAΙfhN@b^s &" " " " " " " " qK@b^6
&" " " " " " " " HkCD@D@D@D@D@D@D@D@D n H̋ۦQD@D@D@D@D@D@D@D@D9yy-yq4*4' 19}% 1/nFBͿnR]ނ*t $,hzu TJ 1K]+zVZkh5,"ۼݪ3tjK! `g=YJjjWN-%WQOD@D@D@D@D@D@D@vmZ CsR" " " " " " " " 6y." " " " " " " " ;ļ^u[D@D@D@D@D@D@D@D@vy;
2# 1ox)4vze," " " " " " " " [G@bRlp-*" " " " "vTJWDsxlʔ)ֵk6A̚5˖/_n'|hN}y/^{ͮ*KLLM6ͱ;3]-"т YC/V@D"֯_?5>džO>իW۩}[CC&ZnɱԖ{ۀZݿn|7N;V?uĉaFF;nɒ%6sLFVPP``@mhOڟ/\CΝk |y?s9[F"oʢ " " " " ;ļI_y@
lAԩSmyB`ྤzl̴;RRR\BˋR@{`K.n>j('D#f F i=[vnq튋mٲe[ WSUUPϷݻ; zp'O6D9d!I&ZV\iwqˉG^A0yܸq.R'|z̙cYYY@OJJ&hhh`0K=?<n[W bu&K/1tP0}two~GqGG"pmxȊP8x`y};駟3pG̣8CY֮]k
\[8 _M+**\ooM;Rf4f֛
" " " " " H;%Wm˖\CTY' $
]0
{;Q?iTVVv~~ F ĘJpL[buT u&DPB6!7+3Î9@KNhq駟G V?! >
[nvG8 <B aVTTd |MMpDd ."[x!` {cᮯڹD #{x
.+Vc"$] 䅈%b`G։~B~ }CY'LЪ5jk.t;lq3Κ@d?.YMsޏ>^ wnb ,-Zd?O W_Fú#s /ؚ5kvp{<DvC jzĹF<,,
Xbey]0?aQ;bt$y I[y@ ? 7ߟn)IM"ӣZas=ƎݚA4, 3>ꨣ 1guw5E6l, 8p:Ͽi/edAH3 zf 8p;v 1b;= C ">"(VPp%Ξ{)X"*b^c8lf/J;p,%eS5>Cκ
kMSo};99k = ?ka}ωo<2tl(I cEA6?]veFߌ6E袌QXK/Xg>w,ou$i9;malj{\ߊ-?uFc<~!.bs> !bU|y8}/s@[j⋮
ps`9H9 6Fӧc)ӿ/gw/Vƈ I!
" " " " "QZ }٧n ot;XhxDz|0H~we0 @ޚmɉVU]kI! CMVf-TTTYye&b 9;hsݟ{lBk5\yͮ:'tMmM2?ԪkNWM.엷֕w/9oIY=ܛ[̃:x!r^=v3qk_Zt;s FƸaw%*6;}u~=[&~QYUm?cv߰Nt3qqAF3P<m7
D~Yna!"csD Bso;U<\l{vjaQ[oKV2u
VPΖvťKp[email protected]_~Yq #>,"5:8? >m{a20 E#ba[6!-/x!mZy晨.W}Ɠ|Yk11BK1X1z
lr%/s pđPO'&@^dC!r6n7 r M}C{"ߎA-h^8\ciޙG Zped0|Yg9 <fa98ۙp8h5l%+B!a3ߧq]s,9ySk3u7pV?lC/?i՜={+Cu"71;sbѯxr
g]]U:ϲ&"0
K<
waH?'|YKO,?}z!3f̈ZD"d}w}|Lq&0! hb܄#ۜK ~Ζ孱}ƎJ6s+n !%AnsuE\EȄR /Ël\34,氼t-[ X/ȋ@>mG^"""ZX~r B V~'0 V]3g"'SX1 tboca 3 nܝp1zݤXwp3Z:t%;BAHO39 ah˅:J~9H|Ww x; pu. ?~!PtB nB2@-ywlg+Q x6 l{E^Ć3< ԗ!XP +%,~_8с9-_̳3OdW^tfܓ_~#+)3Nfѹc#[ovF-HD@pAd}wWs<8nCw#>!#!P6 G> oy}RbȂ&1s?³3Vy yJ{vvv#`o1V\/8UaEG_l }{{<ڕ{_"چ4 qo >OB>) S OX2 D ż-3.LLFss37ͽD-%x ѿ>eeeeyg_yg"
f,
Vwa1hO<D'TA>YpRo;11Hs"{|wXr{=A^ziU bkx\XEzd}wZfCӜgnNs׃>b( Ě |X<: \@a}5ԗoĞ8 `cwghVNJ_}.Xf-lA؋o|`?F
V-Wخl PPPDQ8_z%'"bEo/X>Kk,Ic."Ӷ?O7&
mZk
7pUO<$@1yG DyxK@q({
E@D@D@D@D`G-<A.Oy϶Xk߿JSvIO>چ cx ?,엷=ƲX0}W W3Lw:a+2>.X!Da
VTݼy# akBoF'a+0QgY_ R yQU@A^SSG\`<\]{ F$)ZWb_]oiVdPBf #&UJK<B c>'xf
1a҉vY8b !nzoapYW\KL Y96oOg+: fA
aB#tqm ?kU}*i@
u_CNvfpłUL\hwW\Sbi)RvS<9{Qזei]D@D@D@D@ڛn!1
\nyʎdAD{Sz"
=r-))rr7[-<ᜋ_v%pu(, tb8 #],mwj, ~XwYDP q[F$enPaLY8wDi2[Vwefb{Sg؍,XG$Dan5^
,_jY9),oDl
ԇG y Q,]K1c~{98q w;O>g[=yy]a8b@[VpQܖh e ?##2`6~cG@ V^#wyn?~g|O?M8c^K Hj7b˥" " " " "ОZ>ɷ87<D Yn <yg_ܺ:|埏;eѲ<gdP9zmCMI#2NB Lx,{ (b!ڠW;)W0j knXu!0o N :n,y&7|sM%٬yj3q0%+*
Vʷ* CqBأk~µϟoXw}eoSO= 35\:i<ß'[D'|XXAN:$Ty~q;=9)ɉQrslnU[|E !!`d[+/LK
θ&s `ZV 8q& ,\+L Z }X" "K;a
q@z~˓ɼw{u<X@u! B <3KBA8l謋XT b z?Fc E:\ ?X@ gOAحyN>p;zX98MboX,8 3c(,pycUJ^zės!K | PtXAR_aX =p;v~b _~yTȋM }[nٟnWT:ᣰ+Lmლk9x`C`C_BpC,f4D!>V1 :thXETr wI"3"$r{2 Y`U !{?@e[,ڀ o kIX鳬f^h~ 1]G
d{:uEgdi)9 {1گ؋ŋEh9Y:.uq XP0ƽ[E aXF~1 y[h>ĜyX+V٠lXrbqygK-'B6@AD@D@D@D@:@BiYv<|/ =7{ncnұif Oع잠_y1OY]'JԩS koctnJirJ%'o vDU%%֧wMW:"& j uWwٹ g콧EbVfMly-qarNˀXg,ӊw:
фxcĩ[z֯/+.<7zti]:`]#ď,}=pY
Ȼ'}~bںz{퉓n]D('a27wx:> .<}˯6 9yq!"<s8pR,P W,p-m# >
C?~~z}I3p#vفbFdG{~UFhGآ^m!#ß?<u$Mڔ3-hlؼXiy\ohPr džiӦy)#}egD?^l:," " " " CႂBn\bB\ylㆆ{{t
Z&G>n=t >Xx\qӻ@3y̘mwYIye.xQ?H77k 7ډG fw&؋.Xjϼ[Y2aӑ}ƌGo3Q@Uuxo
atd~>nq[/
#[!6"BpĕGF)tF W ,#r[A`+ 7-؇U.7X!-|y tf1V/r.w`p_irֵm+fED` ^IYErJ+}9@'D嶳y&7֟G v
ܸNc " " " " ;./(JSb tv1/>l$0TBO1>@ `/&" " " [G N1Sl K cW" " " " " " " " " E@yER鈀@kh0]elv*LbB@<X_lUkexh( $%o};Rҡ" " " " ļڪ.OݹmN^%''|oL3mhfΓ;4 " " " D@#lD- `UE"f mrX IDATvLKCc8boZ`)Ikf3
` s7}V*@HH:kK =uE9"W%# uQUyY3+[_h鳻}{" " " "M=XccBeַn&ah_pxkbED`"У{ݪ>LpX(D@D@D@D@:98ZR֬YmHU=y; " "й:s[hN ]Xo]A,
}HAy;M }`sAbht NXLjD@D@D@D@D@D@D@:/,<mvu}zzAAKzkEv<ư鎧 E@D@D@D@D@D@D@6yKM YJj"˽5nG1ܼ^" " " " " " " " "I눂)dKI}[ D4ζq" qF@b^5#" " " " " A@U6Xc$b e#}rPPgˉ)?hu=;"+W{Fb^{T:" " " " " J ! ~{>3*k5}%9f=Y0 V-@$qS@]% Z]-;;`VUUl_*Wѷiļm¦D@D@D@D@D@v4}̶[b),nH1ltBިQvJNVZe#FR嫩<CVVVT övZKKK}ZG\䛙-W{מ4@*^R3- KJH0'a ;@(r_<{eG<vy}q7ׯNrY" AUil;o[EM\#ݗ BiyC㵳BkjϲHkOJKD@D@D@D@D] 켡XVC@n(Xv,_." " " " " " " " F@ `J%$" " " " "/c
?e M{.GmÑ54F,1'6%-5F"aA1>!"H8͵O2b +hp=[RkE` 0sE"*s)~7i8Z
k{R8$Կ[+F',f( }U月1mkY.Ϥ1l=Smd,liU68A -#% \
V=#D
+mw6Ғ#;VU|ȾVXZcUu&y*5ͲRB6M%l,QT$~JRr3mYaETP''["ڥG*g$ߺK,jVmV ȵ V䤽VhUUU CR&매[N555N0JJJJ=V>uֹ?*,Z( qGC}Ub@HKK ֶ'sckڌ3lɒ%VRR=֭ 6vvm{o[:FK
Ӡ0>DKMMIlN~p^P n[a͚5gҥK4ʶ{{ژ1c\_hxmH żӧ[QQ|322\w5iܒtp!:רQRBOm, E@D@D@D@D`'h<{ŘtG GkXSh]{8guaKUEMŶ8?6iְ/ 52l~vgG ^떙 3}2☑ֈϚ:H
9U|%ͮ?iOKM
:"aqG0C4C9VUh6ilovh J뗝fw_x {vJWnA+LN 41mh3hG.CҰ-(mҘ^)cO[aY/ m2xp']4'lC^eCK-1\m X-ܺ o` .544؏c;3vE}o~3ZtĦzʉg%^KƬ999}233G qiwy_N>d;C B m6p@?{
< 6zj3g}Gvǻ=Qq `H 'r ӧM2%Zٳg_{\|}φ !] ^xO7;䉀;/;.
&e}qZgm{믿neee8K|3p _wNT<[l͟?W^y pr~ /~ %ۧ~hFoɖw: v}u}g N;-@~z-ǒ6-> YfE 6ĵEjʕCp1Nj]v!u]\t.'q?O[~S{.jsiS]n6! 0JGS,ew5 ObmΜ|q'lRW1rl!$`6wXa뛙f\|TFǎ뫬kF$f,[g9!8OJ Z$,` vpMb1mYA3g'쐑=y6ouH7\k7c X]oa~eE"
}ZM}LwXFj!b1nN@3S 8" WSS;G xro?bz'%65m [و"'ddwc=u}]TXfXIB *+Y:! ͜9`U c^{e`ǘ: ^ ,1~=Ǹ6Ƶ.XX1%0E8#ݱl?|y7EC kuI'd .teEXl.-ʏ Vh eeeYqqk 3t?|W.:i$?b ;ԅ=Sԓ?u-L>CǒXkq\ u7ѣ 7x:r y(/e w1E(W_uu?vb{?b Ȉ :՛ Rb%ުUǶX< 2?oJ;\}ծO{QpᮊO; tA֣GЇh./K1oo~O@mϞ=w-JJ+,)1d]d9F[t`Fk1 _С>sׁipNR:ĉHt.<-/]z眩-wq# ^rfȐ!bܕ@;.g <*
qBSVjZWZFrj9k=sԂ5el
m:VjXZ!mպ*{䃥vёdto = k71l'5h|oɷA3-)`^+\k]v <;rVhrӝV\Qk
ᰥ%O D?ݯ̳qn9{
WOϲ9iCzf:;i6cI-/K a21bzfaz?\hsW~Omn^|8'V7IYp͊9<v!;S cC, ؒF`;nXK^ z65qOmG
np} q- k3tbB@LBAB 9cK/uXK1}|l^A ]Yâ !_|ͮ\Æ
s?0fX;֭ =
>{199rO~9!O?n6'"aIG 뮻 4C0~99=#,~9Kv" z# H_W\l9cx-Z=߱o ˌ+,Vx"f",Vvh(
|@,E$p>` [܈i#D mꋸ~v-8ŗ gѢENd?/;-la '/^tE X {5{孏h]%m!vΩـO)N Z-I|]$-Cޱ/\l经wD>.(\hG qDT#栨\d vanD@D@D@D@D@v=u ?饹VT^cX1`7`0^,ϊj-{)c;ǎԤ$sq" "⾋XH nA ıf@Bz7W_4g}dGtrӝݞ8ޤ`"9yɣWvjt. <Wټen?yt7y+su
^Y#zR(hN|i'_g/\eN {}X.3n ֔ZaY >O?{%6[=R{᳕\+(q 0ӗ^ }>-Y4Yk_x"f]V==\CBAT
TXHNC뮻xA
A _n~5D ;40B" 1.~ >/(aqݍݎh%C*
>Aʇ7o<) hXK9S>ޱbcM(u:ʥI ʉUG 6_[oչb Db n&- qW8+Ip b#Bc q9<N䢎Z >
'| bXaЉG hK[1" D 9I@B=C 3s"4? F4DWB[l飸.ӆ~ފKW?- yb-'3fۨaCʪj9{w[Vf[#UE:Y.9I .tNI0;3
u446ONkPHAD@D@D@D@D`#"ޕ6
X%n{no?'dlCP H -\S,uM3^J
6XwOwYfjȾ9a!J!|!1W z j\g 2֔T8avqהTلQ=uv>෮~VQ]o+-o]sEõe9InRgpTl'uLq
7`5ɢB4ju>^PdE.b7}I " OͲo 1&q#ҙ!Dlg xȈ yD$-cuB^3sC7cdelZq .&x~ؐψu&kaU#B Q&p#*
1eB a1&! l*jΝ@^s.P{cvvo2E,3b\1NT"Q^ʅ0x W DQ ,08 ъ4 <h y!P āu&DXA
/#p;.8I.b "ϟ|XhL; >pÚ7жY9mn|5oFzY[ov:!}6"395N:DD %` (7^ a8|GkC Lħ' /
%Q{ x¦͜c{}νw[|6][kGokL8i\BQdw
&bH 6sM:rh-N>m5:WU[e];]
P86N
kЧ7\canzo뙝b8&r/_o5N ta~sU%.|qN\;!ΰ5S?<?RvQ>ʚz 5 ʲS-=9h "yʪm"[VTn
a{EvI{}t)v a`M0&Isֆ 6؎f.r E5b]kpߏ6~,>̢ kK7̽W, g%
뛓jcXȵb%&+ڶFKx c@! `\ 86ըoBBkl6A`\Q v T09yG b6. Qက+~XQ?i?uDHB@\\o)b[bBD \-I +8D3< c vE`aMPO ыsdx!6@#vQCl[(#e-avV[ĉ
{Fz~b'tM79a ߮
/6N@"l-F "^ҿpn/pq>S z#Զ 0ĺXaҟ hJ6,Xh-|
8z?G?x#ٶ,oޚ/C/8ݒư}|7B LkVƖt X%NɃJN;q6:(.@ \-q 8}/t\m߹bƪN z'vb1:/`??s0eKN xnUY.iI^TRQg< m'ؿoc[b(D6Ի`0%Ғ m&nYN""vaVUDHԅ/ͷ. T0^($R:⚌\=I8~ /ɯY۔|3 ~ s.+u`fP8[ ;!l,b^q[^Ti ;m*=S7XX%, <!ɘ AqjCp"?` m D"/0fEhDDB<AB`q ƛ1xyAryX rԍUJc[|[Xtȟ0̸'qnh"x?d,< +,=WZ\a2`iEI#vLv2}@(ڊ2q mˢ P%$u1=FAbBÐvx҇qT^%grL[rOK?x{L^ k"/mU"U`=x w8+;e,[<ڛ>K{-m [ 1sy!aW]uU|yžd>bmhJ%>[4wܜ.vˏG<z9ma[(4KOKE4Ẓ6ȱ5f~O 0AF pNz>`FŊڲq." " " " " p)eQ :lf8W8n͏ϴ`ܜvL*ᕙֹJ5Ήp : Q Sd%Uum7U63.:jX+:߰[fj{Evbc )
܍y IDATð;j5
Q;BWư;tdO0FM}Eu:Mm<HوQ qB۳=ͷr,9`䁋.=؎ c>DGtwnǤ܆βA3 Wݑ}lO'$eYȘHwSSW8W۫ e˷Gr-huhV#<ags
"Jx!1k/*7awy 7XqL`e n OXQIX\ 7Y+zb]??
+?,
K9QIU13ҊcX|I9ͰBCc *,4I@ڔçGn-?|l>˸bQG@"Zw\C ?\`"đw]ƋI~C9jk4杲s<}#Vj Ju#簋͓}"gOX` i W]?<qzp
^aK G8E o@ [[N>dWS:@ H~;m,;:vʰJ[WRf=wbLj Wnr#CبlCiZ!![~%NxhtN4|QQQx'$/љD@D@D@D@D@vmv3[rb k,X8S`F0{z
|z:t G ;3ǻZ?ZPh36ivn1%Uҹq wjܣȓg8gUs#5agx|/v!7D?tF xX#oh]0zZbzv_?58ʪjpeCs톓r{ɢ"{f
c_%elQNpA
V:[,!".}D /!&!Xcn[V
Xs)v{#@ :Y]{JNy0i?
/pME,(1&Ep!0~$v\sQw/n!j <fʔ)EXxkF˰4b5xOے WK76x(vց;O:?!nLEv,~X "@fNB'n0ߴ /CGb1EYlbWm|G0E@[C# @?;\N acMD7%O8%鱢0}UoMq1e@X?֣:# hg>s^Ǻ(.~y?\ۦug;k֜E_َ9@Dq-ŞA/>:OPtbNfN
G osP}$VuaQs xnY 6y~6wUNKK
l2SJr"i)!ȡ=+Ū* "1c~`;kEsM0ڨ>Y{U\ګsrl
$$ALc;axcA$$ ! 圥V[Z[GZM}v]]U^v/r+k҆F#;#խ\C 8lxJq>w Xuj"B9Vi}8G;;X\v> [ 'qbA $t\yvi[#ۊm?5VŅKgw1-v9 |b ,*ǧT_7v װŖԞֵlYE[u1cF@, `1TJE 6+k̙7Bs!\@ 4c%M0*!'XPF'Q,tA a!
B'z ??Y@B`/s I 2XR! ! !!|6FC/sad po# D\@y [Bྫྷ" G{)irYgu 7*D@y@ \ )ևn,oO.. pW>&$_X Vv2{q-.~WO(짜!E(XXR)_z `G th|}`ؕG cGan~6G_]yv昺_F'Ѥż;óupqBޏ~#8P1y`"GQhTvYmi|q3X<?/s%ea_Or)jK[3 V\1&xc=7wv 1y=4cmutje, 臫l'alg6T|?
wuޯ݇w+{ì
nm{9D#GsΉq}o/~^d]uz $Or2w>[<z3nwa7w;uROåp]ocـnm퇏|Z{jNR^nWtFv? amYkb0O`S@[gvbK%BDq!H˰iز>0AƕXɢX E*K~J(bQ
!r-.! q?Q %
ᢌk*ia+- +Ik?}܍WW.na
ǣ7pEA((bpZ`[@AXDy3z k\U' XdK 3G .e~;0:y,6o\ю<b
$xQQ <#"N8_ݐa\x̋G
]0_ Ge
-E"{(/ K<R^~_Ǟ %!
:1a]:⥫o[;y ;p>Ymߕg~ =͢J)W}W!ܮRh@=@ncYYG桱'oUTÐ$0HvXz˿cY^F!7uЭoww0ְbõ;.'+vTv .> K<
%ei Ft4v< S xZN6k{6UPl#zzw9*u
lî3u1c>, UZϩt3d_p +9 WT
iij_qi paNE4p7o%ej>;X\jYXky2""<[gg|kd<lf_m.dژ\d=V㍕$G֯|X g䥶r!oWJ yؽmU}/b
ڊZ0FD6.
Vz#`q NbCp%~40R.p `ᄰU>}}*T:aNzM\ C~"I * o ùw.
' 0"9 &B$D$!paA
'snBJڂWv?jAH=p
sa\S(KZō5/P1s<{Q [>" ruXT&DEq#$,\ܖ,_c?՞}4gwRvUO+އ9aF^H ݻwYzzu!1/JCIK@b^ʸ@%P1/dY7N1b< c\sb*'^`UY,W}"Q># i"|8F()L{ /q, , .K!K˪WC{VXZQWL+v7ܢlOh[S{XH#o"Eӥ 5#VD#!D!T!4V_T( j_s=&QoX O{]yqXޞZ9qc@&1h cpn? ux}+#Fb1AGTh:97 $ێ'k<-1wMO87?9 / ;6}ͲFAZ{KRK2,,ݭӵ6C T|Ja +=,ٰ(S=4u;7>M9Hkʿ&" " " " " IH wZ_J04R(=L%}sAD@D@D@D@D@D ) !p
hb$5 D8B@6YGXhKD@D@ 1O@D@D@D@D@DI`VijL%" "ШX7va:b S+hμ"xE@D@D@D@D@jM:Ͳ{ؔyuVJ.l*** D WYwǎ ־grrr\HXNUT :;\'$ FE"" " " " "PHXZj\݊JJ-R6+ WXfyٲe˒ bS#W oyfQK<w݅;wMk[Hiy5FE@D@D@D@D@ "LۜL/=l|WHM1wٮumҤk npLݻa
{nSqllu왵#1t@=(gޣ
v9|'E xYjTD $
O}ݯVbz)V_! !&$-Zy)VXTbev)cRTƛ=l4P P 1r3,''#) )A`_&RN_ZMba}^D@D@D@D@D@D@D@D@TTD@D@D@D@D@D@D@D@ļ{fD@b^3T&P9r/Cˍ
" " " " " " " G5* HKr 7Q{5-,D %KD@D@D@D@D@D@@nhH֭[7hț^" " " " " " " M@qqmٲ%a$%D"аRSS---ao4)yѱoL9JJJBa,++s*Kiox_m>YYY8m@D@D@D@D@D@D@D@yk&=t}l2˳ :߷o_۾}۷j8>D?MĿ֭[ 88l0k۶
>z=U" " " " " " " "Т Hk?odnK/֭[]=zvm6|۽{]y駟ڼy|8D;ww%؈#ܚӢ"{w믷
69s.ٳg~;sϭ'Ǻ4 ywQd
7n'x
98,.BƎ +34D`k@wAտ݂3feffZNN }W_\pA2aV^E@D@D@D@D@D@D@@3%)D^x}ljWGd/KT]`ՙ3gn|Xͤ)҇(, s{vKb l۶ͭڴicݻwsq%]w /Ν;[kkmh6N 5k| ]yf6m MP
˗/wRg zȅWXpMOOwqO-E0E eddXǎ -77X̿oڪU<.\lU > [h$ w1u!`nD()D;ϺtoX!NZ}ǹXw^\McW{
q5={ N^6^vv!Zr lu 'رÿ " " " " " " " -e%粖y;w[U"TN<]vs=B
7`۷w+2?v=8nO}XSO=L<1c~<O<_|}G.l= '6
ڴiA.|IVl"\,X n[re A %vEmhQdd%7x
d?좋.r8NZ q}{ĺuf/ O9{=zp!gϞ
X sϩ+"*lsXj7;D9·B| ,Xame$؇ ~ {1/ " " " " " " " -,֭#\ru?_~e'BӨQ;nʭCX?W_"saчXX*;nm۶u?⌊X (YWh뮻_~ aKCBn`9o<;3| qo|XrX5r?!p" *@K& 1/@%\
QoʜnwWX`m*}QRB-ޭb!Tða\ #͟|ȱ>}G `\Xw!C1O>nv p X B_D@D@D@D@D@D@D@Zy ~M,pd ,Lùks mvLpם5kaXva UܘÍuС6` êQK:8 ?6TDD0a 9YO<a^xscml29s]|֫W/{} Xn+" " " " " " " "P$% ܿy +
iժU> b̅7g @7uT۽{M4Ž`Isƛ={]\X!D Ƽr2 kcyƳK
k y#xXM6ͭC̰lY#ꋈ7f̘*E7c6X>eUD h'y E<ļ.!8a>C8žoWf : ~x.[|rwӝ8qƢčeb q^ ݻww5^ LFJ̓Gl+"X:-yB2eR z| s{}6lpk ;v8%Kda*3 .!" " " " " " "8Ј<++w(]5i@<bUgp
Ep"`]ЄH"
a8x;.g='ްz+AZ+6gS EҥK] +"T/Ļ`i,B3869v`}I'ѣ.88IVvʪt8k瞼 VQ}VMSʜ@@"dddZNh@m)@CDW
(
]̣D_D@D@D@D@D@D@Df0b
k0#g O̫?#iV@| IAYK IDAT:!Z'(z' 1" " " " " " " " "P7$
G"" " " " " " " " N@b^#
D@D@D@D@D@D@D@D@DnH̫ED@D@D@D@D@D@D@D@ꝀļzG@W7 ;yX7A %,#-RAr3S-;9 k؟zb =i'vML*" " " " " " Mļ&s(1"8جJPC@XO46m@q\Ao<+8Tb)Q.UTrߋpGzf, n;T%\zW`L;D@D@D@D@D@D@DD~%C@jj 8lܼ̾B@Q9p ۞G>|/+d# *.|ֶt~,=-8`|ym;d9 7mL_aO6oMed٧k}/s2Ҏ
>HC\K?^ew 2Ǣɷ4'IlEEQhJmP66v`'hqRgL[a6L"e#Urɧڨ>
M я]d"YJ9 ^t?Oxm{ҲJ+<n@|嶱4;P\j#Yii]4_lWVTRf !:n/ý<l=:M{,摅%a ?Y(ʅ$Zy)VXTjeV"A/JH1X%Iv&ss7}Ea{/좑Cܭ˷dw--vk1nC!v+w[֫suɰ/6Y+w?<ʲ3Rm%1\jnB,5#v xFngXؽ:ZgYXώ.[~JJOuA.oakf
;wXU'Q@b^dgXNNfsȟ(5"/?-+FhpUv\>ڮ]dZ.2̬㭕ߧt c~j8?i?h}6}6a\ +.)s|{- .K[ҝ@b)n8G[;kpg;3g>>4cX~ka[Yn,w Q$" " " " " " Hb^媒a߈ѭE@N "=pii֥m;oPKF1~u(iˍcz~
m[d}P۔W[3s6'Z +-2ݕJlݖ6˭/pŊpQ |i*sg-eo|~vPҫm+n{oeS[+p4nm@S&P+1)gHi8qis ?\g7^ggb[+_D"E^.i)~A3[^]:ΰwL3mt]ʂ-vϤ-n܋ Kmv٘^Lwv)feޒf# -ߺ~2qzv/06>єVYֵm֑x%" " " " " " ̀ļf#)"PX5#,s7[mE֥m mmjَ=EVp
69d%e> }NNpkOV
x ,.uK? bVFٲŜ
{.-5N. ѭJcauzi 8gUZߕWC%Ӗ;//*3ualp)~:% 1Nq*2h~c߾ʘw ]hCz]6-Vm?`7U%1r_qmٖ}گkk{.'W]}bk_ku.kOu7mvԅ9\~VZ1'ޔO7yn%enzeںwȶ]q羴aʰ"Uz/$3y+"e]J#& b9irms^1gݰļBJ+l"`N[n
23/kmuKWe;XvYv]
Xb<[m3-b梭vɩ=|
ҁVɽ_3m
Xb!غ8`! " " " " " " ͑ļ)"PVlowpaA+Oc{ 2ܪ
W\l o3pi]:,(~+1ftva[q nX\\ *bﯱú/dt/7My,+Oi'l[eїft(*ZeWwK@<w^6=;*"" " " " " " ̀@j3H("PRW7stqre [O*^;9dT cV`w|> } +_ Uc||~<a1جk_qv&Q%~0x< E7*1QW}b/--խ%Uaц@3" 1XJT_ #ďE sս6+*-r_ MyV\Rf9nj+ [(+l<C(LOM4HOjF{a痝f.aO`$ץ s2|nk]eYqI["̅8Ĺ`Xܶ>^fiIc@hFfی~Բ2+..RKeS3c {4_XY=(/GHJk{SR;푏ڃE%y[l6zϴnmrWԅ[l`ٺ)9v Qv/_YjW"V{yfc_T+,.?_ϻ6hfn[9_t? lN[5`<m@S& 1):8mO>VXa]ڎ ;<G
M6ٞ={==D4DE=mZII#Ft5j
0SjzI/)t]sK18[n=c [|]{e lGAFXvz/|u+,m7wM{
ݥkr{fF4,~zP{q&.rf jtO&y\^]խn?=rZ
r7ZD(DĚcߙ4n;'!MMPD@D@D@D@D@D@D >}ǚB?,7,0nUVK/dvrmܸq6yd[`.r{FFx[l?v)pWTTdop
qF o]tEvVyfncYYٵVaq'oUTY>}-33VI@Z6'uY+vC
ݮ}v+
][[ώپ W]
#OY2Kؿd>ƒ;
|6Y6o ۲W: soFZ=T2 r<.*)lIúZV_wdaoL@<-egNc`TFFuI ̋H[(aX!0w-UXYcO= <xYaQĶSO=A~cǎu:k6{l˳ |}Ç0Pon]vY]f#)rmp]1 .h66[[7sK* 3d%}e6~`'} tp66g[ er;GKJ+h{Vetwa1ֺ.vTi|oWJ@3" 1 oΜ9nSÆ
s9Zje۶m3gڤI{U1!H͘1N?@²l6~ŋ>x}\J
6/҂28ֹspi mPx*!kt"[XXI]uXq o =z6ĻuֹG }d't
2ďO Zkj4&cf<#VP E q*=.9}ǞUqU@@V+6uTԩM89eۻws?۷Gwܹs|@h@{'
o̘1vg>Vk_x3
۾}ꫯ\lĂ"ϷnC8G̃!VxRwi?-];6}t9P[RL@y ~]\;Kws=㰆Cb3h{~իW[߾}ݕtnuUT ;C ݄ _Yf> :;<i֊GڂZ4-
rʪ9 }Qm]tʐݺukpe=ˀ pBuܠM6 wdGDqc U !" " " " " " " @h n\ʋ6?|[\P
8m)ª"F}Uh唅!A\y/b-Z_p.1W " zh@:1XG>։|DwY\ae cط-<xG1!p na@K# ˼(B ._E{s1 !y2;" bT\x,0rH
1]vnb ;vC!/D~ڞx wkeN`ep 7Z>X c@9$o}@TܑXC$GD@b^5%\ ~b Xx (1ߢ!Jmذسg/`w ^JÂ${D! =z\nB@S4u].bupG@|D# tvYg>x" A.q!f"'aɨ " " " " " " " -ļ.X0 бJ*t,T
i,܀ |K,S;/cbņ{*jM!/g8|pL 9n'CYlw[D{U dAPL@s%uq
}g\D#C<Ê,:?bR4\h|w}wE<,C
a!>peh@#~>M%@D#`i %aϞ=݊^c .aY {6nh4~nǜX!oV8{}M!" " " " " " " F@y вaaֿc%[: E\JY7[VƎ n}'Np喹ٳ}Eݨ q&є\s=#.̑F\dꫯ^~\D:u[M4We߲eˌdx'D A$~>W^y>M"" " " " " " " A@b^N<W^yŭnrQ,pExcŇes!
4(z_?` BC}^8\gY6W^zqGݤW{=o/=,v5ݳ>k;vwa;DR?VM] dÂGc^C)@2H)WX9[
r[^Qa,7Z5ٟoE {X!!ȅ~&9*
~9]98 y{44VŲ!ݰܔN Xb퇥"ݺuVߙ0+eee^Dړ**ʬOUeDwS<<|h)2Xk61>NֱS1&eC X hA؋ g誛.ױcGsmq'uD}45/Oll,a'˼F tshn"K \wR"D"r@P;PhyrTwBPߪ*C jS Ab^}PU"hDq=n'M sn⢯ "p,Տch \M @`Jz"1*bhX=z;cæBwG-[{q#jz)VD٤~K6 vݩ`۷{ f)
F ݻw{hF"LsvHk&AAQ_EP i꿐BuϦN@BJ_c֏L-M@ \q yuR1@Wx yuR1@Wx yuR1@HMV^QQKu@- BK¢R+CS@\e%ʃ@r@8xnRRR FQQZfffqԽJJJ̲گ/"P*UNe%MtԆʇ|m5" - rvZf+h Bd@^lȦR)" -mA\w>\C C|;γO>1<8nsݰalРA~C={gnz^yҥM8ѿgee7w\! ?:t7 m!ݜЪU+O_8tv%Xnnnm~ ꫯ\ܫ:Hh[ P h
w/7TK.UVW\av3gzMH` 6j(>|xH3fxֶm[;SsrJ[x]y啵~:$Б>}w(/2L>#ߜ4iRإ"0Yf::utܸ9>g- 駟ngygM@5'`AD)@m,Z֮]kW]u[oe!Dݻ{}UNmJ>g8qHǎ sގp`Y۷Yf3~a[nwyo?[aVPP`SLqQe˖y z"[l q^ƹ qws͛=nt %q.i& !SN9L
Q>y$p@ż1@' zFUa֭_
3o bmڴ 1.+>:O<w8 KgN ;lB: IDAT?m߾Z3\DzF HSb^ ߔ /F h;NuRw]nIQݹǶm4c az ^{ |I @~[::.q |v嗻(1o<ڵ#\s>sF"`
w7ٳ]ম`}'O=@WG 9~XfݻQx1ڮ];LԩS>R o njZ>W_}=v=9 [|!챍Ȇa/GXD>1p{^,
?2B8E1/?v'? {iC# 1:::&- M(xc<, hxh,yD5`*SϞ=z Y< zKׯ_F!Mٿ;m-@8
2֬XQP桞pu
E @1 O:|ݺu7% ;:s w>}JsGp?#H Y\QF i.ae,B8M 8H 4:Ƽ8 n:Ǥ7\G E ۪ ow}UQ7n2 sN X+Phk(gK:q~lVp.8餓,`:n8/לK9~Q>{:@ ~ ҉Gp":}8V<{#PVPFM胅r((G"p,^<ϡ^ Zѿ@.@}8s<wBq #
b\q x6c\di[CԻ $ Oøm M:LpBo38|оЎ>!G&/e b!Fbi^' y+IN NaX,x#` >T1`} DJ#`w攨I,]x~: 447ެbuD."A>xk~ yO^|EO 6_K}k;e VEX!Et `A/K/44tj"vСE6u"i".R8IG&u.ŊgcG`p'5 :!PP y(ϔ)'Vڔwڍ~eg凲Uz40.y ^Qx /n;q's3^ywu[K ~'
H9ǒBDwdz:y7V
" e4"DP8"R P)cƌ=B/+y ?"~Vq a, n;<^Vb ? f!{߫zC<&nHZ0f"$
C{K)҈/^np
D=>6A4g,a)y5%DA
ThhhtnV 0hAd[<x< oN +@c `M0,,#6u=tD? 7vw/@,6ms olq3`E7Cx'0]g}v*Q9N믻<'=ak) Br b/
A DoDhjܗpA` ];q,X2@ ;60
֭GL# (Vԡ{oć(`P3\k9 E &Nǂz A>&IE Px^2اej&(@S xw^ª>}S@!`ц+uF,M7<}&! #q
b! q/^Mzxs>H7kQC?sOߍ l`?a@;IzIK{@<Q>hhPp`DJJE#FƎHs|0 gַo_'Dc cm<=D)|W8 G<-msC' &:XQ7yLg#XQO x *$
tJ~>CxB9\#`'=&_k]:ӈrX1M0ӊ(
s`HǓk8'"HKe lRyއ}ړv%fqb
w<'/1B`%y ] NPW3lSS/Qy2sEXh#T(@I@'x2WAݠ9
>ݖ)<wp q")s/rB!/8fرnǵU^FMAE ئo\u@˼: !c*ڔDixIDC\䱺kťM q)Kn.ʽH h@ipB` EHBH" PE;4T8DcNY!DsE&(Bl@hx#W]g:B Y-0 XsX E*@ 8HG
Gڪ !.~5T8cpXQ$h!I?|xg,G:(G;x P =E@!pN?/̙mZl8eAXl]c>KQ)XcP> \ܘByeHB|XsH xu2ĩK?5@x 䥣'</xxFQ/ cµ<gthWp g.byMn=0C4/uk^ }=?X.8ƒUoGFq-Mh]"K@b^,}Lna wYΣA @FƏcAx 9^p.L &R&@7K,`rb CFG3mi ŋ{pR 0CC ,6Ǩ\gubyĜdYLV!,([ !v_%n\(SHOkX+0]V(͜? u e) J ] u#܃zz uQ$~,Z8/Vq܋zG]B`HC;4H C+, UO4Nm'7Rx'7 > Øg-0uHyJ{vnX(ӄ@
zSLb c -yU#79V"n^{qB!ܓ:}0)\s5"p<GHǿ ntσ oexPF;ћ>& #@@<4@[ qA'o`(Li-hdskă0_Q4Eb_F`IC=i8E 7\L1 y\3t_mSr-Aa E:,܈H !2%h˳{>= B Bxn,SKCT9!w ȬY5'"Ml8\- uvỳ i7(o짬*Nݧyc=
k:, W z0i$0 nbUx> MVy&u%;/IY]&.ҩM gkrQ SH~kXl}<siD8ю~ M|xd T+cW:&)^$Or B⥽3}tO}6D>B3~ N.|D @0 zF^]\"PE@b^
m%N 'Q gxx Ńx0? \\5S
5#x|01OGe@VzL`/6ߍkh g + 2wFhbwhhk,@
W=Gt6)XP3tS n iQ,g Hht""1>B C[C(H,zQ}Y9$.\E
X"#Ɠ "Pw}'O/</װ'QhK`9Iʙ*<Y oK'Ov%
z 83z4/X:F^R.?B Kb~$@]!M{hO0/y#NC@"/ hϨg
"%s8{xGW<m@2e%s+0&@HcN_^0vēo0y +p^RfL3+7T_kVL6x܃~}3e;gj ?F{*^X9P&^l69.ڣ@{¹3 K0X
"P)
&ǹ
wYnnףǹL tyHsN죓wN5H z0GxHPcЈk ӦM }S1SXVֱT}|<2ӧo'g3+4 iHiP=߀q>4H#X%'/M?z_oEӶ$"@:[
y^ `De9'7Pg(tdcQk#r^cB{qN4Xt'"PW9?69<o8| R?l-C\>NQPh/(%V M,)\GLԶp.אnaʈhE; N:A| 4ԤNFӢM /.։rD>K:uz(>N !Q] 煗>rK= xRxFvm
pY\P Sn\G 9{ｷ9@Ȣ9yQ!/@WyË[T;~m mu0F d ϏxL/=o2
v4L)r
Yՠ|PiPRсF7YSXg#!$o lcfe]xao̠:m߰-i |skP&}W@u J~O~/8oA%h5 4u,h8F]̓x1W<XN hD ۉ} ĉO |&@YW bs [Qh9g`
Q;?lڿ|kutla_MduiӱK n6(gj''xyC Pw~ f@ $~q];B\8$\s=@cX}%҅.q~p暐'/*r`Jsc!15t{%V߆ .{ʌ tDq[dg`7ƄnƛL'Lv yPx3uXMv\}aT3s +b 2!< X`vMBg9~뭷z \Amփi
CMKsJ.`
toל~QUD@D@D@D@@')A /s Aԋw,>Dq${&4$2+4]aԔ>95*Ic^]A0CeGc!Ld1Eb0xǤaN9XLkys
&GG 2¦
i a3C w>l ~wJ}>>ye.+,!99nS@xEgya^ov']-" " " " " " "PPՐ1 0, b"&J x|2Q Ѹ7 dw}[!8"z5-o30 L , F B?"("!1ycv\f8 r 1VTGD@D@D@D@D@D@D@ZU
h"FaE8|55\n"# 8q< `櫨!Vϵ,]]zRG oFǥq5%M! RF bK ?|Ƈm9x ?\81AFLz,qdqPn,`qu֎~@3'9X3ư|w_w[f@LBhBL?7`ew`Q=#ޱ"+ܰ6k
+: _4[,z1C~f5 ǰ I'0o8 auG?ظq\Le
'`H k[D@D@D@D@D@D@D@Zyxah"_q9.7PX::_ޖ-[ 1
+?Va=RqM3]k*; UBvnð7q29*q.p\%NDE@D@D@D@D@D@D@D%d5tJ A7ٳgJkrUk*8F`=,!`Uѣ?a׆3/hCca\P4JX
@ X0B\_Zč>Yf7[DLDϷ~ۗUwb۷ ,X)⮫ " " " " " " " -ļ..Z5uX!z;sL3Dc1뮻O!.`?"Bb"xaֽzr9pݿ/*K,q1, X b
rk9J,H'nX1 im
f X' ~aWq <Xb}G*b 8q% lGAD@D@D@D@D@D@D@Z:-
!7p1#,^~e8'X \J(ZA->bǼp"ȅ+ܹsEE &M!
JL?~|jcGk}YDL`/c ؒ/, 9kK1+? E7lW\q[5Vu_h(K@ɓ'ӦMs! :nC|=h{ؿ~znPoSN'x£m,kX!_~~͘1Å,İ!n=)S@}|o q яM>-"k1X%suG d K/ݜBޕIgԖڑڒu" " E `_an5CyEܮ>Y
.i`t!3"]pXmq
؎
\K 2 +"b/>0X8m۶5߄ \1c #O! ;^)Gª.ٗƲ"A2ӧ1pM#"pA U8 U7H^Cxt=n_%y("`geQ;<rb#N Wꇂ LV@ x1fddZNǴCjKV@-k|qNL$ j1du4uPD@D@D@D@D@D@ x{Am<֖1xV5X'֘ "ļ҉IF xdJ@VP^T-4{ʖԚ uļ&Er6oD@N&E wD t6 ʄ Map#~l- P pewꇂXԳ>ļE PGV͎Hɔ
Տ[4; 'S@.@mDIh:q M'" " " " " " " " K@b^ʹ@3# 1`J@r." " " " " " " "Hkf?+" " " " " " " "$%o43䊀$/RRR,y)-@EEUT)C"
K@ϑ孻 IDAT@2H?L#udddZA>kժďs,[yy54G222˫OMM4 "8k8J c_l:='t+))7 #~DĦ'z]|mPP ÇWաOtx(ס}{'KE@D@ q,Gg}%\ ΥO{n8yXsW . /_
WuqXkr [VBxch H'*˜K}Ļ}{=6/ẐgA8 W Ρ/H⍑B u{}=¹{V{811/%2rcvбP *!PQa },;MUg6Q5khxϞ= h!g [dڀlРAUY+..cwݻ'lYYY-[֯_om۶#GZ q~6m˗;aÆY =zs{my6n8رcqɏ>iضmܹa!
K~8?'33Fa={*SjP'V^mϷZju,z)er~yѣE96[v}ve
My> @S&s_~@NNy}W>0/_B>oٲYs/x?vꩧV Q6Kj*ES~l~L ?Eߋ~ },ڲxsܹsOծ]|ΥKz\'t-PP (k
6x:tQ^(' g rJCv֭<R(srLy%P_ 7C ģO\i(ԭN:UE| .qH}l qi
Ϯ3? K/^lrnq;q^Ϛ5k<mp/Q :tJΉ(i_nwYgy7wٟeDO8a%պu{+*<h۷)bhXe紵̬ N
qƸ`:]|ށc?
?n ? .."o}Y6xh#Hp=[oe3gt!{tѢE /
,a֬YvM7ygkHӛoi4ơa
|hP>c6m]~6do<A7ްO>:7p5O tg߾}B\ AuOhɤNf#z.O#|/Ի۷SO=ewk^Bhrx3إK^g;ܔ)SynV )t}2ν[| oD/K9ξ0fc'Fyr* W^K/E(\Ƌ-{%t%П$_qxqEvr>}I3cV'Nꫯr o>bŊ6uT#?}> 8
egl(3
7;s\81 '/X}W <~@/{ >-;;~4q &uo߾nNx.#rF%s{=1L|]r%^Gyc<3aWDߗ3?~w 8~7(
<~ ih4pu;xx§:vU
m2ȁƄ nرqF_wuP!q7g4 X" ,LX+P"G >#]@Ш{p ˨3fx'1g]nw{N ;!qXO xj饽Y@3XRN ?n BS n <;w|! @6 Q/m:tDz҂kHG?" " M m(x9 KN1)8G w}
K8 +
V=^!bC<EX0G$! s!vD;sN~$4䍶 ;<7
A/9Py91+J O a@ 䈗q B2c {;(S3 (q@X=35 O>7,o7z^gF.z.Z,7'ܛq嘆cƌqy131 ;<x^<=)aYA/+c7J# '= G t &MX20
LCY:fh .8Fxi1 M>Ɓ9 RL)xF'Fz(s߅Z9#M4b OcK\BcEyt &#tN蘼K^(!@ U e:5;:o v tH!bpza K:>߇!Qd!bPFMF&@߂~}!2a %W_}u <xӮ>yW BqoE9@MhopcN_q}@
SBK /\҆mXŭC2G?q*JB<RWП
ea:B R |+^k߾Quk('l- !@Sٗ(\q !
UKxg)L@ܸ"x^{</x c"od|ܗVx @c !ǃP}I;?<ߎ~-*4ZyG6|UDBA&
Mhx A$pG( mth$F444\4 Cq!gFh444 !p. V|\[mK'qMqg4q6Ҩ (osgu\4=seX29 kP:edRNG
u/6 |1i~Gbsg?A"g 8?LxӇ|-/F0 X wԥGt/ԣ_G?~ۤI\@H>VA\}yy I>@rݻwo~erH:EmΥP?/@A
ぇ zj-{1AߌI,S_B}D<h^+ %qel+^>33A8\9P40 <*%Gu</ 4ɓ<;KDz ! Z/̋H/S IHBxI֝E@jK1/ q+lscmRXZ E#:W泣f rFۻrGD<hス kݵx i m#@ a (3Z Û_:O9)xf̪~{fI&qTD8s@c4shN;}ss|9QĘ8+GT!(C7=ҷYٻv
zkUjjUտު3 MݕHO7=GrO %sGyhp?,C, ݲ۬ ⡍bRec!h4b葰 "',yh`GN e#+Va.6M>=)_|яs-}!!>aƸ VLxG e4)ϜM|c!`G<#<#- #WҐ=.qOgi#aͽ!!cыe/H\,IHyz,f@>*+H¤ɳs
uѼ~/KO,yZ @zAM#ƇF|hhLxwol823CG 4pQ7I!s"`1[D!54̞XI$mD;#tx ]k
fe4, D1С,i|2̌+!0:ZN %#. ]" " K#GE'FM_bV\K >c-khc&3VbSs OSTiث XO]M;(,#x}(,3IAc 9PW_qf
K\OW\K=j爗{H^ԨXa?Fg c }TY<"=< `u u7 < 9 (+}3#Ｄk < Gz E۞ļgD gƊ*̫y08灍U]t2i(ob3 j4Z)b A AĪ|hi8'f{iCHAb 3zRQrᑆq4%ʉ@<
%ez@QcBChfst)k>0QnY~@:Fϔ 8USep\''" "бlwD5o" Xp8a61(>Cwb" vY&aP8q5e, r oeq֩Ì er@K) :) XHuPƌQDX Q:#qqDp>8A p֬Y
+9 VI':!M8e`ሇ{BCp?փXn;'~?2(/s1 }<ȏ\j HK-.)!n8 l.˲WbD0D
,e<ؙBDúF}^bA`6*qy4gA
0w yl '$=fc6q-^3с{ |KLyeě\"RS(}hb Jc38Q. !#>^ ~#e&kSRNIGH_q;D
1 &D@o- G@B
VG\CۂG/bX5ݱr<xI" GX ai{!=DLUPTk ʬ/eE,'+ xV jE ʡW=Xa GYdI*Ka)x.,Gx_X+&sǐO5a-a.a
הu`4?3kp#Mހ`y`F P#xF &Ha=G< =y2$ \ORO@b^ʁ+ <#hDB`_3ا<ԩSCFsb|G
eG4NDf<]n4Vthxi G:_ GCC'0+' 3K3|b609%@b)̂zBBIC\E9FpG狺olDg,(2@ zR<N AoNE@D }Ж0<i?h[8xY6G;3^wE p_р@? M qі11E "
x"'m#"l`}>IB(NQ(y$ec>%ʟOlQ"8 7r! qDiu߱s_týP7 ;}@?6>?Ot9O{zʑ|[Q$~=~1X5<3!8Gy'¾z,u? SC (U8 ,ڵy{吆x hPx wP"(pMSVb6nj,i4 :1;x@lE>VN|"x4Ɯ",i FC qS:=ISV̅:[TA{_ʧ/Iy҉Nru4p G2M_~",4N=VND`?LtR? n<]|l_z[Lf _C[Cxίs S4'<W%Jۯӱ @~4(7^/Q~{P?(GrexoSD1{m4]~ qs{K (.5.65p /^E76S6OP.o k=zm Ny-%DM(<ypky6*M%Gs7O{iN
shL6W);|peswlB?<N4T kbOhqyR Z"%}-뼿EpRJKE~f\199.\ۜ)$K2 b&Qx8 4ilʏ[("j/6l2)dPÏ eO"T=^.x9 E@D@: >#JK|+oE໔rmzQPnD 9ZO /2JXD@D@D@D@D@D@D@D@# 1/9^
-" " " " " " " " )# 1/e蕰$G@b^rZD@D@D@D@D@D@D@D@RF@b^+aHļx)ļW" " " " " " " " " 7][[kOtfYyȔ nJND !Ցh!B P7T?Ó@>D 4t"И@{Չyxee%V_W8% @eXAAgdf [ M *mN::RWW)H~nPUU%1o?}P WцP?D@@̣~KZ̫=EVXɺvfIGEYh|**m"S۽{w2l+ f#r" =,..>CgD@$
H@OÜ c6a{-??zզS"P;ula;vܼ-
0rssGƍ: Sۘ MG ѡ6ƤSXVlٲ
$˼ô ;v8|D$PQQBwR/*ܹ ]
:Xff uS" " " " " " " F )1\! 98t|ʶ3Tzt7(o" " " " " " " " "ppIyN!D@D@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D HkeND@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D HkeND@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D dr|]U[}uedfZF^Ԋ+*h]UUUm+k]MD@D@D@D@D Ws\U_j}cY][v-oԙ; ᎫV
;vlCk7 ˶ml͚5vi ,hZI!yz߷:맭Ȗ-[f6bĈľ}mzY%>W_}e]v
{
nذ>Sʲ;Ύ8?{n{lP IDATO =zpsڑG iF
6ol[nmG l3ڵkC}:_C`}fXz}vUWYN'(sX¾ 'R7OnVRRuGND@D l'N q1}>,L s1 %'_mvڠA<xџ:-77?6/J>|xŶ' . ЇJ?_f{>}'ũI0 =CQ+0ֈ: ,7xQ_P/Q 4x%.qϞ=]hQ(nj9{! u'k֯_ s u9d0au93裏3 /
<edd7n 㢲28ptI 7c+Wɓ3<N7tli+yXZ]V,,cjz
jU,yrΓﴼg6
-Py饗`A JE]dz
i\)т /iQb q!4ƻv
q
СCeA`éQWޱ} ?ܜ& 뮻Ạ Ç 7o ù/FG]z=Dw}7Ezm˗/ ܺuPg̘j'E]|BXX1v饗64Nx{!ۇ ~:1Ci(! )s1 t5uM<P. V?vm5A9 domG }tE'0s /?4{l[t!XЧ">Ҿ0QI~>B 1믿>! ?D
፰&W\qE>l_%o{3i$+$? ox
7%Ç jE PQn{0V ,ol7e1yԗz* (DKSwĵnݺDb ^DCiӂAE駟P_9s 9z} 1z7&FSL . L <c!}t `3ō2bńy'38#x9`x 'ro wH 1v+߬j廖٥u8rGO~c,sOj-`UYgXڏzOyNo08r&fh Qx>9
&H(T*6;A*
*%7
/3rrb M6F7eY̮SI 3>F#0E {gwAuG<tܳf\.: 8+36?ر#yʽ;>
b8G2ό
(3/'|2Aq_~A a,ЏP`eGrQ:B9u<,0 SO
:CD q!}ӻ;898f@yNc]`'PGGtpxf|1#L 6lXCG S8:CX '喸(uڣ-[i+tP_?&5 }!o9^{ 1ps 1bԩʛs8
2 쭷W_}հC<tG
&^iKY@z 4nj!0gI'&RW/ʉ SVa$@ <]{Aú
1>e-ZV`@͘ 4yPuG}Q_u2?HX>;PGoheb*D.ȟ![q/`cp-B)b$qb a@}<k~
y3?z(ue; ,gu!чV[Π§[Xٻ=o|t̃A **Sq "" b .RƒF6R0!XG ̚?,bPiF8:7tS C=ގp|뭺>Ob^+(4y4:h+X)CL9 ,%etѨ XH}@Ts+Uf8O$
-9ꭋ䗎 B"0-ȉ`=3A粗 NK`;Ｐ,g.zAYZfB)|',V?{,% hfHկ~Ր Z:r" " Im}6A@pa@{A;
J8 } 8 9cb6Re{nbb`"h<鳑W_D~O MN WKIcf"\3a~hQG],SXʤ>,.LE q
>";C}n E" ƏBf1zM>^" 0uGcEx<C M g([ΗSqCg?Y
w%La[ؾR+~kUk&ZͲz_.Z_Yjjwe;2;sB7k9߈ 𡊻#
5B9;K(X ј20XJǫ\GE
+3r
~_裏6X) G4օ_Gʞ|ue,{%b:;zHAe=BҀr { I4
wPGXck/.FG8#]::X "D Y<fݑ \:¤M ;KiIB@>̙3'3g ',)_l@FXhvC,匙 |0t. +cs:EQg&NA.Kwco'D& (Ѷ/|GuaG сQD,|N!YE||߈X?aa}D|xW_0 !!>;A~ xQNR}|
O2dH#`P?d;>UqP>` ה _| DΟ-ߢg f|G_4</0'u% o y< W[c zJln?)-^C۴i$䁠تVͳV 9Nnݛlޟ{ەwe#$w
cguV|UTؙ.*
J4Յ#R!yPѢ^&t 6,~<#,;.DI [bUx0-SfOusG;>(7Q!9֏0y?t4 ~>Z=^2f y
6x'3h YKg?QǨ4"X bI9HpLÙ#
X:ܑ'9G2D!2<K=`A(f&)[ݔwѴ-?> n2̑mΉ@3ȝ?9&aDcMLN/mo xE+2?6m e{ [?c e_-9p(IXa$*cz~ĖUX2Rj čX@E pԡx.6
PB
Aĉ~!/a{z d.ޘ=~l~ ߬n{.c'?x3p #~SMxxwFwfXqY?)!:1}:+ˬYвjKYވo6_O)
&^o>ͪ,4ނ{06F!e G<|TXG)%2*6aݱ k&H}q?p< LTx(FœWخY۶(sZ]]eG-\j=5F d{v=YaNVK(sEw<qď 4$7吰#
01D]:XZh3{"Ѿ;= FƇYYf5 Cㄙ:fNlC"7
<k)<)6Pa r`z xc zQD@Dc Gas_y5\0x m {cYoOg\ϱ5RX6wxc2xȊ> ؟K=E9%LVaBYF0E9
;} B 8YĤ>}&i Osi# ?}(٬ZU X%zFl H>$=0C%m,cr1L84 &]lGd+31Tgc'&
Ѽ ygORO eb^]yUm2 Yޘ'iyc.Gc 9*̶
KZ, 1ʩt P Ұ@lH䨸4j
Qg;4v0G:ҘG q",1Dx`v^w{ްܹ233,[+,q2}OXnNu\` [.v Oor"w{O<RG]S(
4>h(h8i8(Czb6f)Qls=
! S~ χ6,/^?8":OywRtD ʥ?C)38/ g/ߠ W 3
e/_e8ΐHTnSe3MDD@D@Қ }#/Wǒ-ih?j闿e#8(EX1Va@xho?[;6lScaĞZcaU od)#͟
|Sި .v1V@ cN`yX!q1~5$ wٸ~l5yO{|ochG<||D 7u _zZBq?'%o~(}b7>sѸ NۻJXfȸw^_]a{mu_ 22,gVSVsM89I`R1r4 ^c"1cMV01f눗y( M 4 !ʭ]JJ0 /,2+Ǿb' cDuPFP6Ť"{g
95챂Y9( p ÊU 63Xw7a I?7 dg6Y7o /!=
~с}hl-`rJ @YNyKD
3{`)iCc)}&n(הGBfFڝu= ,ʉ7ځh A2Vݴ Lbb݂
b&pXж0d548c} ! b=Dn+!]I!wIH ! Yfoc!/Lnqq m{m3 ?^zTP/!~P0KX
Ny(>=VL X
nS.^\ c; 1v {x2y`); #,V%rPwCD4ҤRCcq?Hgc<K[*ȧ;Bqg^RLZ>}Yf7odQ[*>zJYӬ r YؗV_^짚<҈p@ i\Qxd 1".O0.NDEERH Ao u~} ϚtJJ&Soavӵg7|7NpmX1[iHxg+$ 42.8 !}(w4ec/fiq9:f)X∃xiD} P
)#fN2"'P/eeI CRf=);l@) 6v90BF-a~vA8g)4lQtlzH 1%Z?" ">9B/8LhW`>о BC !q #4+q|{`|
K^CGD WPpC<XEM}^I36+}dsBe"bG Q%۔sD::eՅ%(
p' wk:vrM9[!kKyzn}(>Át ϑ/D< uaU\ި0pAkװ9Eݎn1&K%8b6s@S_/gXMOZF~/=|Օup{5 +>yJ
_nݮ|/Tv
!٫ ~89>[wuWKgO=f xxeMʄp764 { qG <Xv-4DEUg
WӀ2&nV" v: _{{ =eմ2kkle/~r|[cF#/s\D@VC5 Ci,
H2Gb> ?hQ'
GQf)ԫh0+(Z:A~hpF :u; O?:Dse hѯ
R暊8x3 C2p߱IO# pVl_P<"Q g]<lBh#x ,lGe|w|~|WDEE]ڜx_Q_d*4Z"@F]-I'''z{@;tQMKRm5~yueز
ٟ(u_Xf/M4"6 4-\a1% "̎
455ۄAM9 Z:cs2q` IdzfX 9'P6TM< K_w=d{=+ ?*B^S ~MF5H"J$}V|ɔz[w<~> 9
!@Yvx5+0G*u"?^Z%fL9%s%[p.
;- +45 8T>D yY]YV!VSe<w`kzR p&+XN̙3>H Z_wu֨~4X55ao`2!6bG"$ļ
K?ő_{oѲ#ϙd.Xjsx/HLY3.V\Gp)2XӬj" 9&hpIJ[8Vn՛[պ%}>ѕ? Ot~aL6dW֬ן [8
ye4^CcIfmM98 eñ-y
GژczI YN2[, c"NSVpbiYy=^C@< ?ʗ<ibFOc/m :37,s+yXݞy- { ^
E {0m.aǫ}?:X49"<G`{b 6)?ǒqBLM-ZC$n;Cg(<¶leTOcXF0ؔU E6tЀTfWi@Hgu?_[Fn'unìpϭvFyvR+}[劷,gIX5N8xWRI7 aq
{ kupb3f0^x[ {!ZX{)%i,.)ݥykjKIJYZ\jK` IDATҶmߕ @kHtٱJf'+<,Y7s]U}}>ײzv}c9 BY~s8 3& ~We#EƦ ,= ŶgoZ~^zX O s~hŻl;n]"" " " " " " " "r1ϲr9ٶeKaXΠ-k}VK^U_jueE3duXΐ ͺQJҽ6avK쌉^r_eӧm?B[aKߐr(" " " " " " " L b ds;[ṿ#Y[|f1%fٖ{NaNe&VZ1?`Vع3~_oϞdbB BsycZ3z˧VoVuՕc-gx>/"0f0ӔcygOl*D@D@D@D@D@D@D@D%Vb 3r:YsR@ d]""xn:#/~<|IE@^/x`×ם @{ԏ;8%P__oVWW" fnPG؇UND ~x OOWGjkkڏ_Qړ@uuG{WZ @UUUWb^#V"rss4k{Jc@+**ꘙWE P?vƩ(z ;v蘙WE GCV mwymW@Oovn JED@D@D@D@D@D@RK@{楖RflT
(" " " " " " " " % 1/4ļfR@H- jS{.D@%@*6%1/UX}F]98#Nˉ@hWos 7oM()h~`Оy)dE@D@D@D@D@D@D@D@D Y%" " " " " " " " ""R^Ɋ@$%KLE@D@D@D@D@D@D@D@D E$d HK@HKx%+" " " " " " " " ,1"JVD@D@D@D@D@D@D@D@% 1/Yb
/" " " " " " " " )" 1/E$K@b^^D@D@D@D@D@D@D@D@RD@b^+YHļd)ļW" " " " " " " " ",ySxHy)dE@D@D@D@D@D@D@D@D Y%" " " " " " " " ""R^Ɋ@$%KLE@D@D@D@D@D@D@D@D E:WWWg8)6D@D@D@D@D@D@D@D@D D r~ɒ% ZFF]tE6tVZuu=sc6m
<x_x۸qcB.h扝;wڲe3ΰ֭[g˗/ kFj۵k-^cÇ?rrrEEiֿ;0UUU֯_o=zN:) "'|b6m}{ݸXlݺ>2eu=> yr7|SN-Zd[l.] Bbo4VmCc5zbVkyĽaÆ !>sy+W T<+))7x>s;<ıAhC㾧On&M
gCݻw֬YcW^y#<!H"!Κ5+k>lF0 o۶͞yڵM<WYYiıvڐļ23gWPP=ļ#<Ҳ} qG }d7t
2ēQD@D@D@D@D@D@D@DZ .-"(ݻ/kV
q D%X +4( q#<!1"#m:A
A +Y FӳgφxΝk}[n%|>;6~`$bz+**
yWmŊƵziXvy{
aB7
cݛoiX bA JKKm߾}vq+#?qkAQb^,]"G,po}W.\h_~yXڙ+" f=P/z*3gδO>O7x1DŽlXcmԩֹsp小=Xøgܺ#q\p=z/p
,L)O;6<묳E B0, 6lX8i`CnVC ²rXaR'O 7o^U] a8 9rd Qkҥ!
,.믃~p,ES.uco:wU r܇nݺ%Xa
B5sKAG?q5#, ݻÞ'NcH~:,:DxEPdi.KzGint( /P@b(BBBK]ݱ
KW%`~QrÏ0řkrJҍQ :,~Gƨ# ~ a#h ?/ qt!. QK. HqG2d. KYBu B q+XX'˚`ݒ1~(8 jDb {!l p<A@B* 2_9D' "V`n$P K7:"!a
V<`='\ K ˽?WX t8"{yoa
k@~ ޓO>izj'DhfsN؛ᓼ C#_ӟu^K=CHySND@D@D@D@D@D@D%5G!-<!;,">q#X!x|sE ʗЅ ĉ;eK'X }.<q=om%r88Ch"#B vX,7rXx 3fLco=%l[n
tÔ)SBZHI^`@;D<@ٳ.
c|r
^aYr[ U223s=1: NaE
]wZyWpr#엇 {!!፫p,
\?o/>sE|B@9 o R^; ,Jή`h3N/D8e-
x%~ ^x!r/rxÞu=[ 2aKm,5捲}W]uUX/ \CO a玥k4jz|"* Zo|e lc(1O%BD@D@D@D@D@D@D #2b H y=
K0"! zX^xa̓ 80\ o?~9ŋ/pC8ê.WYD< z vriӂK3x+["
᮹CC~:Ox :0Kw?DI8"$?pd'x"<!d=I J>" " " " " " " 4D.ٛt[I۷OòDyb[fq a"/$}; /1 -NjC YJrC|:+CDh|6ؚ*˘ -/odoiXݻwxtC wX },3FKK˼Gb,aXE-݈9NsŻ5<^8s~l*jǟ:$GCy&M
o^M$ ?9T
-" " " " " " " " %С<^Д;SOD@D@D@D@D@D@D@D@ҍ@feHO@b^|.:+" " " " " " " " iG@b^K!O@b^|.:+" " " " " " " " iG@b^+KlbuV p28r" " " " " " " "p( ݻ?Lp=%%%FzұND@D@D@D@D@D@D@Ҋ@FIiE}ssTW_o%;o>VPPNҞƍ-/5uuu{8`kJLD@D@D@D@D@D@D = TTT;[>(kC?D@D@D@D@D@D@D@D@D } HKr&" " " " " " " " HkC?D@D@D@D@D@D@D@D@D } w^۴iԴ)E>[TTԦi(r.mq-UWW322l/%\b'x_GΝ-++˖,Yb˖- >!< n'Oߣ/_n? 9.R {⊆whm^Z;^'" " " " " " "4kg}(q,87yk#FVu_| qA+// ;vX~,??>v{ Z6 b7l={xuCطo_( *ʬ@LV gϞ j`6D9~c^aaaCo?σի믿8!,lٲy`7` >}zX" =77:} mv2Ưn@@ɉIGf{ Ղv۶m[oE]dݺu3=z|O$srX!Ꮵ n
sΝv * XaAN:R>}X^^[Ύ;pY~p ->@֝;wkd'I@N:#" " " " " " `cxAZy jƌcK.
I'ī~ o7n ocI.!aߐ!Clyf͚xJ?~G 3gδ'6k ~AD<ꨣZ$aPzǷC5-$AZND@D@D@D@D@D@D@ kY~cډyX!nي+RYD4s+;nn j_~elРAAiܸqVz.]+ݻ!p_-fYo =²pq>G<#C>"qÆ
q/D۷ }с
~?|;Y!nHHX,b &q7,av_<`ԨQADò8X0b}'СC}p͛CIXQ5@ټJD@D@D@D@D@D@Dp"vb KG.\"!x!D}WAb);ݻϟ (&aѷvڰ [?A xܑ{gnػ3 XW bb} |Lj`]a,YHΙ3>c9&X roQ}6w\6lX{! yg 1 YP[A/Q ɕ+W,U&. bx }vf
ix:|wi%a`XƛiڌoJucǎ
>"b ײe,w 7x#Y%gc ɴHICTE X! _ߤI /{Fk?#! _^ y巼?;tM*˖3qgyװѓW~'3ح,!߅&D<d]we ,iӦy6uhi% KZY:
1,ڋ:(h OW_ DA;C,ı KWCꪫQ|` ,%#F5 ?XvܓO>B8xqⰬ,嚑#GQVTTD7,p /MXܱ =%ň}n H#<qâeϰdA;s9'{`@H+1"!\!a% RX#,,
`vj|!L;by;<(%,?=Ӣ^駟l\veAPE31y e|< APu#<# Xq,9ƺC|&Ly oi?s CG9%p2Ժ'^X}AB8BBÚ
Q!n>(,uGX) N
.!Fb~ q1Yu yg-!V~.Zoe{e և ~K>籊#<H %aLr%X^e, "(xe ^>B:|p/VX9)'" " " " " " " "кJ"7 YԱ|%ޚoErU a%HtO?+3<,ypNjU]K {!5kBKzO?tXV 7xK y,?f?A+ 3ɲᨐGO1KC}pX@" ra k/b={v7xN:5,!n)+]'" " " " " " " "@FIiE}|[I۷Oq dbe\aW9_9"("`ݨ_K 7MXr !
^aH|# )c.b _z ,y/x
Z^ށL)ʋM ".-Κvnu/ /hm(ю .qoX5Wszzl A9#PM`3k&/ǡ IDAT;'Xӵ'ݯ,T
D@D@D@D@D@D@D@D@DAQʦHSB@b^G)" " " " " " " " "_ͬr_urrr{anƍk۶mKc^^^tn;]JKK-;;ZzaUu" " " " " " " )# ˼VFxb+))K6dk#$T m#!]FdeYnv~222:$ZeZD@D@D@D@D@D@5%5[I۷4@ ʼBoTۚmŶ2,=EGloӢ1*A8,lMaF7)C`b%<cں:CW zz))jk,';p/w^g#ںx:'" " " " " " "N$h%# |-\<W][kuwf6wwɶM;w[Vff[yeuK9jvd7l}UAKxAV OHy)dE .5E0<ĸ~ݻуZqY>f{X,8:n]/1/3" b,5!#۷/u-![TTĔ^z5'@J`UsNIcky9Oe+(w!vd^ڎks!U6nw7_h-sTTگ v
~)Q%*" " " " " " "pP ^C+//kO<aW]u uQъ+lٲeA
Mf}*{m,eg7F88eʔlnb{7]vYϞ==4B<$dfdof5g{]V
r'6ۆŖ]{l[ WUc }d.[ ܷ/"[V?$&D@D@D@D@D@D@D#X7駟ڜ9s #ϝ;vСCXpW]] 1DI&c=fZ \#-[Xiiiyͳh_|t555vG9csΝ#،3^+++m^ct={[/.>_< 'K=x z{ri6wwףuoOE;KlD^6Yپ*딗2 x ZEUM:jM ;ʶڲK,\joѪ
qni$)vbސ!ClwgҥKmȑAӧ͚5 z!ܹ϶n~_|vg[ncc=CALkM:Qc/SO={n={vwq+>Xbv{!*7x}o3v6? ^}֩Sp0"=6ϟ HDC'PU]^pѳS0+)g;Jڈu>|e کVk{&d}8H嵳w.)Eduf218,Kf
DSN9%r[X!aynݺ a]ʌezlDoo۶m! ,u3kM6ً/h! Fr <xp<N.]Ӄpxrb_q!߈8XbuףG` nX1"X4X8nذ!p 5jTːڗ s7!/'+3Xc`qW^Yev7~UUXM]u\` mpVUSc/-~[}u[g{+w})5y|ر#}@w+W˗/tƏ x 6ĸUV̙3
0hZ| !!~AÚ<.\D<
˰G iso999wK.$"=! "~:իW;-˥^ϒdN>xm aYgYׂ|+k;~ x&[i^hO<^ZVhvevԠvϜvi'(+m^a~~۶ɽbhM ^c<^t{!Tڒ%KyBH8Rr\^\t\8 B "#" ?vy煥 l/+6n^1vpXaA z 8p`x< g|-" DF?,C,;fٲ; C(DГk XͱgޭffʆiO}&bzuJ+*3]Vmi`3>ɞxw-]ɲ2R܂lOWL>yT*" " " " " " "*:žo.P97yÒQ
2D*<ls,gE k xi|xg}^WTTd&L\|I;S5=ѣGe쫷y}b} ݱL駟pcƌ /0bosυ:ujH˯G,{%9?ې~l'l]vK -se -^{m}=۠ڔqByf֥ /,m;Q
" " " " " " " APUpe IENDB` | PNG
IHDR ,IQ IDATx|]ř+]bE.r
l abc1wB R|awMvSIfCؐ[ `z3`L16ݖd+}gĈ{eI\^3gsΙޙjhhh0NO ӗPp$B.B@b^9Q*H5 " " " " " " " " ]ļ.rTLk@D@D@D@D@D@D@D@D@p))" " " " ]@$[Ziiu" " Z^^[(UD B
MQ~N nŊV__o999 1%ꋀ$ Ν;-;; (A/|\& 1s ND@D@D@D XzXaa%''ϡ,"й 0XR[[kkٳg.J' $i D@D@D@D@DeeeNKKKs^yBD@KI)))ֽ{w+..XJOоX<ۧzʭ ӫW/;S- N쥸i&{#t( U'I o>yx)$ $۷oO|JQ:1*(h;v {***
#
2d͚5k#ضm q >}gj!.\7<x3vdӦ=3ע"Flڔ6:ymD@Dֶ3*! B1 |rssD)<ǪvnݺQd*ud=HfN#$">ⲟxvpsxI7 ț|~l@x6s'o7B4|gNsi8N ab B w$H!ۮ
'u6oMޕW^5?@[YYY>^wS*䁋0bo! . ژwuunbKJJq2#w'4`W_/Mʁ lĉ\O?mܸq]- ^ka-2rH'=裎u0`7i(tF -[f֭EY|{̰a:]l+--m fxy/9<ԂFE$ꪫ\tӟl6i$![߾}kqfD\!nv'E&.! <,>AÄ}l>3'@Ɗ@H=͔["0zO`lϨQw H!0+@W%1?v D wF1Obp_>^"C@Dc2
!߰d7ˋ: l+"] |EE" 5`@\/ǹ$PG؋fϞf@~-b"kW@YG G1 (#:kNrb2*- 瑷$ }UV95Z_<8gt HHj2aom8YDLWUO)VXMuV_ℸ3fb r<QGs-Tr*++hMv!Ec.VDE ٢/n(yfѣ]|L 7N7mڴ`-" " " pMvCl#:a=1 =Eo`js%YsǷd_;:.v% x n/^l x`]ϼ/OZBwuzf~0m&b &2C/ ޑ'<ӳg&M%s8cƌ f)/K`}Ο|]tEq E 1SVp
jʕ[}6 Zg XANzAA ;1P%Kr1txh
4(m݁Eyu<1Z`?0!Ȥ;n
CҌlC'$Vx}vG}ɱ4Hx|͙3y!!Nr| o;^$l5q G m=+ ڣ\ zh,]D@D@D@ڝ ~ٲBo,
/D>ľ5k8p.bۏF 3Q Vb q+t 6'y/6?9/5k t|@q<˟DK KR.>'bg*iN- >|:,qu?c]] HݻwwevlkxyS.W?DWMsΛ p8 !rB#` sLD@ZO6
y湃Y{m8N&{nS'4& ś6 q{ϖ-[.sx]ڬs9i <X_?%4W^y
6<.O?5<:܃b]P<xiN8[h F(<O4 Skv'Up[3m sF_w7Ygx& u&ED$ݰaq+Asei Pcy8pg?y6(GԤgO^s?8xQX)#xFh# !"$\1~%aڲt4ؼGMtc\9|F68ҠoNl(e@͋u@xq/yr "6:0"(/1bKA^ex@+~Yԑ{ 25F < zʥ#GY<`-MK ԏ|8QM69ΗMZ/V@0%o@$
@\W,sg3V~&3yWj z0{>8 YҊ_":N2WWs?AW} |viɃ8c|E_/3< \<QG ypP^>IEÆa=Z2E
X. qMi4Z̓s )2uu0 a tc27upe7ҥK&< mo߰0m>Nt#C 4x 3V9 01J/"F uQ~E@D@D@Dx/</D&^F ۜ<t氕 }Nm+F¶ƞBNN" "aOm[f( oA>ʋ]z駻+YsKPNy#I0o0G|@a=L< /
09`۳!"
~?KPorK>p} (b-61bbOR"2)22K=_].Ov7 m iwih;>&->, m"?"!` 2myrjY?S~|FQ<vbB&xNF;E 7&Z;< @*3"x(NR\\^8<#}N / ͱ0 DC.` b~ 醙^z l^<cd
xR=iki ύL_\H<6 #48 ,7Bp$ǣ\ sLSZ~{{~sMQ>ʏq¹|T:)SrOh$@aaaӔ,U+Pc
Rؠ؇ar;K:ؕ|:yt"
C<L*~~9Sсѡ%7 1!@C87p <!@@ p>q h[|1 qE <d ÎpjK~w_?fa>gϓ9b[=Xr>{!& g`N`h9ҷ }.D@ZF/j[)+5vtuD$_f< ༂NB #{4x? 2{2tv2=x0ųv tx.0m'<;8̠
m*:_n݇t ˠ}Qb~s^
M;K`
aַ1jǍ_I"vʏ(|@¥<Pͫ؈ys{p*,
xy!wW4ǁŀGpW`ybFN>ON"oGy"0"#7;VmE ,7u |>Ң| /xWz_ٟOFtF}X߱ F!:Do-'gtGoFk:RO\ EHU' #FaaGc~co`+bቁX` - ]mtGtY.>AۑN$ sC o7|6A=g7 FʎH2AE>)}<p:n ~h osn}7 G% p@ E={sj@,|~ړ[LO?
cEhihˉ1O>) e<xMYG3w {߭@s- gTg]P
8z]}hZ3<?L\ icY)VZK1) :<C|x ;͜9WCwWQZQ zd..*my0ƅ~9.XqB qH) 'O>my< c4< Q碣tтԕ2p3rr)pcË2LN3lr0'#M1$/A /#Wt909/0\=pe?:i.?&)79e旘$" " " I ۆu١-`8xYLVbp {{{ /mOb
[V<zjLT,pS$P*ۨot7&44
#lMʰ a!śFA4 [ [͎@.c)nǠN(q۾ (D?:f#A
Q x;?/\%Ԏ}Hp` +A1XxQwpB# 1Qֱ'.<D! It)Pp<ϯX PGN 9W|s<皺$2|%1:
F!(Cay 6FY3#G8>:p"`>.\сI#o.QDK |lс#ɻ3yć e$ &FHс m #0^ ou{w3LuAƌC o6߸&S&Cݛ+{o ?]aSx7g8A {NvKQ>dЗU:o)4،t$fz%_:!VewaoÎB8&Vzc\G8Ҏ [O-vf|| 7qH/ <"8@ _':\<KǪL /5 $f
:!8mSLe m&|` c¸1ϋ`Б |"} <pbF%3,r -. H 9 vT< \,OAxHXv-c+5uD_! |SZ۲b !* ΅11uԦc s с< o$+ڠoo ^,c}IGc䌋7/<tw,&~_Kq%O>ͅ=u?o}4?:D(
;ҲqMr,7"4|0vboXۖi
3 ;O5%>ky $: Wb
:~L
Τ텍o*Ɔ%hם8|` nOA)s}
=4VXS^Bj%~}XyP?3wb.-6L"|<aFߋy>}) *xS_p!@]r%Nc*Ҟ"JѾe=ꫯ: m7}{ux 7- mk[ ]\b{?so-C>{ <X& ͈9<y9Lyfn BGO3s_{a=Ro|M9/_~KM}jY`O5%Ҋ g-< ٟ
o@R&dEg1(V8N|t X~s ے#<6qb&M"X6 0ݒR/3+({
uMG F}֢ŌI'\iq- (=k\qeJFy`(yc%i)$ ;:oLeB ev k !a ^؍H>:xea```cAa} 2þcߤm7yx≻rr2(hQ6R<XX ؟l{ s0i G a>
V.9穥GH5ӭImsÞ~t0< ^>xb8t-" $܋Sh# 秱s "}P^@ ,@>.b|ȓuF>Fy oH]rKF ¨~ 6Ӧ\Biz! و: <giR>
o-Rx,)8wԃ<n^v.LM95?4'
i\>| 68r ~sp ތ<(E˅Jɋ~x ~>9x} }Qg~b]!=fH>:cPoZB`ov(5 JR``$ѣp<pLkF\g$:xp SGho6؍hT;%t^DK G
A;[|Б lk!D!Ňbk2a!Dq<v/[0NVp]E>hO CIׯG
OLG IXa8!(RX b(#u$`/g3u/D}fþD<PV#c v~Afԏz~ϗcX۹. ,CMD`W}y, מ䞧-?f< 5C[ /dytD?& G 2Ez-':k, O;y3Wm 4ӟdhD 4߰e
@L. 1xIoW]u`7x\kIx@<R
H
|0 5 7?HH i?9b(<H8?<I%m^\X~!CN07'A K+x EG IDAT#B|o[P s~<a-6bxq qn>ŵ_+~i,\LCP`1OlS/" " " m!`Յ}`- yabװA|yia2LGo :LHN*SLZ܇(IG<"` ~ uǛ Sk&67!e~e# _
ND G?}~ G~t]H=b Ok?.c1/z Xj"*cmS,'d@?vY>lCB=m&m6m? n` ea}7<vGh(oo㕅v
Th } ̨7uxޱZ +L;/fz,6\y03 x/2%!a$~[|Diy H"ި|@8<yad
yQrRnPaq( w@Ȩq~A`\6g('8wKpb:'n0.A@= )z('% ?*? qԝtb j>
r /P GZf 5D9 DJh5Mȋ茈&V&" " " - b:طx`w!VƾK[N
^آ >3] S̮A#=-J't [2bRXvuVDcMuB|bv
" AŔ 3J+P`ʔa` 6z=
Ɏ^o. ؚ!VFǹc3u# GcX9@> ֛5 "6C״]w;v! I.ۥ r0 ihi|} ݆ۿiWY/^+D gGqtڂoU8O9'yk ̘o|~x
2hӒl{~ZBC! X6 baDZ\(>}C |sSq{%W fmDd`$D:8Y,7D<6\G>ԉ8с 8U ^Xx3B Oώ
Ty!x.4tp a &Xj>B-tllg3<D&S'(a2pMg;aN F:l#:}=Cl= :vNx)!] ._}J0 Jx1$X'>{ԙ2@ ;i6;#1ͬ ``?Q\=^zG`;l:Y!V߉<
U2|sn "d<gotMD`h[z/ۧxBV .dtT4BA'3?/ KG|c+p K< * @ G $C e4,xG\/ax
DB Θ!
>Ƀ!0x؏(K/uyR'!M<عX4r2yf>]8 VxA` AIaяZ& w|cܜAF0$?7#ÖPW&MmW#
ؤAQ*zfDӉcZm 'Vz
Q6:^ޅ=ۂZ+3~(KsX`b&X5ʹ-" ] Zxx zy]+ֱb }@@ qx3Cq`<B<D%D2Glぎ˨ 5ioj`\ucJpSer
C. /KW^鼼x!QV%FɓQY (M 跄G$&o p5 |y7i2E_쬛h =&0H]5ΌuM_` ػ_Lf&B @ftR$ I ?Vy4,ښ[wcb !0ڑ.t>-
^F`c(mAs鏎1h`k,b kG\ {'GH GXb?{
" &eӜ+]Omن'$eBϧ6oL TAD@D@D@Dc`Q S;GT
Zk.1k;<d駟˂w p]}NT8Q5 O^R Eb՚d/7GGT3Q! /1B(N"FOAD@D@D@D@D@D@D@"ybf\p.EӒoݔ 8WTm55ĺDT:" " " " " " " @yxOi|i
ʓX|Rj" " " " " " " "@y8vS ҈UVh,G^9rJ_U@yuIQE@D@D@D@.fRF\DرceeeuҪ"&MLZJED@D@D@D@{x1Ȋ塷_ "7D"۴i{cAABi@%j=9*@% " "w ݿ;(U$ubt}xTUU;J@D@KOOwkv8" H눕$K G"" " " " " " " " {ļX@bHK G"" " " " " " " " {ļX@bHK G"" " " " " " " " {@RC^C$@BPR" " " " " " " " " {@ <MJ[D@D@D@D@D@D@D@D@A@k%v 1 + Hy4D@D@D@D@D@D@D@D@D HkBD@D@D@D@D@D@D@D@A@b^"(*
hDJCD@D@D@D@D@D@D@D@ځļv,D@D@D@D@D@D@D@D@D $%v 1 + Hy4D@D@D@D@D@D@D@D@D HkBD@D@D@D@D@D@D@D@A@b^"(*
hDJCD@D@D@D@D@D@D@D@ځļv,D@D@D@D@D@D@D@D@D $%v nk PzNA\IYS Yz1h36y
VYYnUUVPEVv"hgTȶp8atb߶
e9ezֿGEu'S*" " " " " " "6mJw0 E,?-g % Lʭt6ɷpe["hRbxb^Y}CE'_R(ɒB\m]d
npw]RR] k#@hǔD<"ַO_K'<tl@zz()e;-7qgSRyw=sW^ee-99~+#'fM8^d\t_E H}"vqvڤݿö(k~jK{%" " " " " " ]@<JER5VaE @Nn,-Ni7/8Ύ;̲S-lK+W9ϼCwN=)E,))X{Ncz3&ZFZ yPk.k콥ki{&)" " " " " " " Z̫:AUH<L<kQ6e}lv k6YZJئ |mؾܴ Sm/1 9LK1J+ Ss*?h붖X8}r'Z%'LT@:Gr(dv[YU,,p 2ϵeel[i4w7>ftD*kGV\ZY<,>_D@D@D@D@D@D@: Vy, "~n8s
/y`svحϽcrlV[qR eO.:u"O/Gڼ fMO^[$" " " " " " m!*1-@\-|Sn\yfOaϼ.80iقݛq yhgO
۟gk[oY2=5l=meg^J )" " " " " " "^$i#_Mlanj-umڧ6ZIyYs xr2ݚyןv\æKlRSc(t
Z k'r?&PGo|ZbJlVnEK2&lyٙ-+.>^dW
O;nWnn+6m5[2Mݏ//U]D@D@D@D@D@DNkw~l{NJ<2떙n~ʭ7ֿG7;o۰m{;yvWZRRȽն6q/@ H}Iۿ)VD@D@D@D@D@Dk4ۮ}T}@R(J+lѺv+ ءC --lk6[NFmؾÖl^QTRjz:j}tVbhuyY鼷 }ixeXZJf}*RD@D@D@D@D@D@%sXޮ.bq vnz+ߎ:h{9/izY,KINXzjgfɡ--5lu'? z>wըB" " " " " " 2N#5ԔYwfkVi5Xr^:xf<YFF%'#|jkkmʕ6` =mUYT$KKKk6-[XNNmo xj[bm,ju:Th}͊ǩ+UT)$7ev#7J+gN-۰^(Fk drx/=%2R,%l;ͲںHYD@D@D@D@D@D@Db^͚V>f͇P]U-my,c5Jh3hF"gL;D"V__oݺu6ۑG iÇwۘH ܦMf'OvSNZR[x 3~ȑ#]\C=dcƌ &M1 }Q;lذ7c(+*s/mnJg5ii)ַM ]rL6x@sI!%'lzz6wm;˝[noo뱼 |c-^ْy.rk=gU*Xwn*:\̫Yx{).2 -{%bt,)hesn-3
7[oܹs-%% xZffa
ak5j.b y555g59///ٳg{:>&Md 7o<']y y:tkfgyۿsΦ_իWqF{-;;ID$>9SgϞ]j^v w?\(B5-aܜl+-kۆM[g_ؾSd}Rh^|λ/3-%pM}rn;*kOn$ =GzS4D@D@D@D@D@D@D@:?"W'"%EcG^ecɹ}BP]f5Y+7YV,9e q]d<@ѣ!-_N>d7-;Cĸ;_~v'muh pveٓO>Һ袋1nLEHr#~po8qӦ\s{ 8)l2oىDz}> |ZѾͶh*9c]v6x`_KKMZ[nWޱۊ翻ͪk쌓u~r:A.HJ]KNJr/fN4`Hux 2o
vknr7u6,s%hJ e[, +y:]Uνi݇-mݍOIIF [\DM6I'UTT8
6X^UUUN$\bK)x! 2/>55vam6'& k'z-`!)3c@|QrȐ!Mb esLZϗTSۿ*HoD--5F h?j7>`q:m3ձ%e OK+IļmV
c1,se Ԯgoˋ-ut˚|%J r[-lFҋj릷7Lū17tqȇ`pvBAA)yyy֧O 7}}rLiW^ye ^Vryz1̙ʎC`kR3/ۻ>uRSNvB^Uu6%6m8;,==.<D{Ϭ.b%;KOw?b7/a^y5c'=U=ћP} e۷[vnnKcuٱ";6%-m PEJ7ڎǿouEK͒z{k/+,u8 bk?͞ ֬CHx!!n o;;߽bMi s q*Xoa
OX!Oe?oaSL: G 47V:mgqq w^_ XCeܜ-j6Z_ ¾lȠBWEKW ><\k =
z[aiۊwZJJ>YxM|XWCT!}[RrݎM'Hqfti:L=`=<76%͒{r!EPjkꫭz+g K<*JxнK%y 1bRwO<\˔q?'6YbMǺu~-:^TWz862}֯Gw͚5y 82wy-ZS :zǏ:kl
5VVXrR/X/;:jוżHj Nͪ" " " " " " "~b01B)P]n
5CRN XCU̳:K8u։fûw IDAT! e5mРAv>ck49<x믿n r& {M~|ehvĤK:7C^i9 -7 "ڋ! >,X`57Ncي5VQQʣhld"]**i3K/, -]1/,dUUqD@D@D@D@D@D@D@D !:L vVf>Rz dV_QbO#uȖ
ZjSz/6D06ֻC|{>ڭCg"شiӜ ㏻7z,03b֭['n: + ~auSaxgmʕxb'@ yr>`q?c
6olP`}{6 J_kw?%'}y^*,/M7
Je :L e[n
O1Zʀ9KuKo4kX[Yt Z#ZD
1yL=
A
@ ĠN;.'1۷owb ;֭~]pAf6yd} {f{wE]M6͋5 DdM3fv/ڼy7N8 <s7 NC梽<MwXEE;/X0lpڱߧoؗtČεYdz[)?!GZrN FVꓧK2=˒s Ա S]W^m\r tA1-ַǫv^{L˭t" " v_}U[^NA ^O88
9 z>c<81u&Nu 7tGFմ߭1s=w1\f;w^Aiӎ" " " " " " " "P1/9eNJmYe:RNPJEYݦ%)ޞ#1:B Zuu\@#k[o7r̤IldI{ac
.kt~i[d[Ï>0>6O?4ݠBnV oa auikqL ؿ`Wd2@KVRZrdd vU/m5+?PMU}nPoY(l m| X<Vs
A5` uQn]:\ /`+b ^x wuK5xk.bߥ^ )>m:|L=c\wƍw W^y{y普: >{ƢKqB!#OlY`r 'N^02bCc{\tu .%Z1[IuPSeS% x,c왖~I-=nܸ=C87͕Ke?C?ӘF@czJKK]z=zM6mn6?#F_MMK8/Ð5A< ˛zyq7l s"?3ӎx=,99u"nVb=Ӗ,_c_,KH]H<9²^-o⽦"oe fx%(deeYXI#*9
{7E3f!9[nG } ?Mm: 9sfuHO< &UW]ex%v@Y/>k9#۸ire[
Xhy˭W_KMc!Ȇ.9gOC" " " " "U +7ֽi_jm┻mЙ6pnX^hn CE6v
pa=x~+ 10 +/ā{mǎ b](-g#Z -cgeCKcَ-VPk7QiċP[i; ު?{{G,iο8:ޡ <+- nJ d@jF~jeNDȫO;~}eoD^:miiU()bu_5= /" " " " `>o K
$Mׯ5sK0{6p; YL80 c ~/fo U AFWӯ_=8n=3ڗ9{ MpXf[l_жGT7^߫c[[~/c)`H[06dX ?ȶUV[Ba`ӿ%!
<!L o??k[K'<=>pv^iY.b2;ߧڮt UVYSjsVd99NĔ.%Y3˟ECb #F2'wxq#OĠf`}]gƈU0CbpCp eAso_kg V1rv1B&w lhn/)_oڷyЯr#6ϭʶ_ted9<thχ guy4 yW5D@D@D@D@$P rHr>,b۫[}C}"b$`ezbL ~r퉃\y8'"N%Q,%s,6ۇ]q4F j>]l/[cۊK'ވl>6~6yK}"" " " " #SoD@D@ZDӉy:c> wSJ -% 7}XxEzZռx \322ܶlZ ĸ&hB{ L." " " " " " )<D۵`Ƶ#vM#i w uQxb^`rI'oxNt`M˗5 x|Ϛ5˕'y4]ѶTZrԢ-Mc_ۗ!n/Wz@tR1/QS:" AkPj(jZ= nKtYmf<[vve,|ވyζm1>vE
Y/U5%" " "pauɡ
]<~ E@D`?$ 1o?<M[p &.{
csqنp7 !Cs [Ҿ NjMGXaZ yO~GC|$0%8>c6D<i6~ O~vU]NI pi6:}ksLfJfmNtXj&==EvxW`=^$|oA?~PtG}|?3V|X[{] \{s۞{{3w-"0V_ݽFƪwvۈ#\>|<y}Gn:oРAݻ7}w7m.] {MqcU5~K}u[o `<sԩ6jԨV\ú{>}1=l0[z͙3jjjf{GO;w6[# kpBw ۨ߁ hӦMsgҥK7p va`[v;k͘1b .}?s $iA}䴪" " "D&v=7yڹ#αHݽ +-wzHhWӆjM +)unjw_,LبؖDQVlZl^x6md^z8?|i5
#u0o<aʔ)vM7ȑ##'vuѣV8
o[eeeL X7|p;wKbǎ ߮,]5lܸnf7ZB8죢"={]-7J.n3sb~vGW\D /&KC-ZȞ~iwҷ6.wߞr)͢ 'tw^aޑAb^GW" 4rw}n Pqc)BƻlŊ.>#@` $˺t2 .>BÊx1 ta lfs9&N:\ķ ۾}#}C< b yosB^ 6lpe!@h9͛ zZAAAtzmxt+
5 ߦ͵[QOiUBD@D`"nMUqa{ksX}}Ċʋln{vYfʵǏn2g
6؉yLwg 8y95ٛߴ[͇p2f̘&6 ˟~WJg"t!`o"&ņ0 9c wڋo̵S?2V/O-Y36+D{ƀ6belܸq%wj6DW_}xE!1pCG:tM0?mرMe'BPo<}7
~|C=dYYY8 t@38íN_,??Z{0&<c9pGZwqGSn㥤-#y]"Yg?Νk{6 0Dt -pZ{\>m\Sq]"'%䟙g |+<ao~9z/~ gno$itQ4R424Tag4x0qCCbJ)ߌ83"
ht\ 輩p!g? F@#:w<>37! ԨϤI\}'!K6?xQ-,,t"zFMCicr}) <@iMpfnm3^'\(y~9%9/>⇓Bw0>VhYɋ폋O]v[~I+#l$w,e }I`n
<_> ӺӠD@D@D a5g cKW[EoZ8+btdڈV^Wauoڌ侇k^{!g zjZ8Չv_zly2TżfrfBms'v';t 6nV'L0O 7֊w%W[V iu{-[**-+#T` t# a#v0p:^r v5=6(v5" %uT!1?OM5|ǝ~ꩧ6m?_:a> 8v;}h1oɊ5Ui mY
}ӧq7x]tENꪫ7Q 為sϹ> 8/CXZ]:*vmY8lu
nu#["B {q>XIߕ~_Du|{Ʊ`5~y{+r=qmؿߴ\sv} o ZVt/쐘*IhoJrŃ5hhG`] |Ѝbxvа<bCcL|D@\y3G^x 2u0y 'xhs<cxhjCW^n.˶?Kx 2Eϥ'!}!HyG #clP~?*v?DcAƆYVJ>ZfϮ)٩v|+$MI,d{e,;5k
;쭢Rn ̳-ut[[VmO)
5+=N oCrҭ:Ro l)v4峽IVb/{nV"ZcuD^+H:~}2!;Mue5[S @Jfڔ)6`G[7\76?-np%YM}]?\:'ܝ9L[Z̞Y}ӸK_W߹.[R Le=g|.:kf6>FΜ 7~g={t$n7Qqnp6.'ܪ|[`P(XlnᔰfgY]] ~jٳf8% b}Dsf`Â/FYf9oFKK,q6wN ۚ@"<g A4$ώ ;ߞ 4rX~]-/7;fEԓ ʱ
}=)8pGO;Į bYYvi¥ֳ{uˉ̀r2c g?R/ظX \7 J\0EDkU~7e ix}/:' :f
q~?uۣoϿ%'m%{ӝgb
78|4< M
'F h >. |>ċ&-UC5B֯Û< x$ i2d\1 hQ 4F eJD=̲IL
Q/B/ΎkzK وn6bz}4gEvAmXnz\(d#*jwɇ aPmk4+icYV8ɭ7(;tϰ}Fei*Ro
68;FO>XguNkLY
Pg{ n
&ZFr&ZqvXSiun}HC o>tk]bKc<lHזbGoN_bNc}&Y6817ڪ 쪽Q4xw[6iܘxC33ҭ_^Ԍ3<!0Z?D<ְC~f @x |!zy 7ޝg=22mҕ6a~%eh 8l}d=vgR6lcI_
3M1vld}`_W6sL
gO{ ` iRxUac#f?яxY
7}
6o
U6kͲ7x w}j3X~,'~#G?" b)끳9
xN\3H
!}w̰6gyrlRRR^ Ŕlʲ믿ޝ`kqLGC!~ ' }4A` X ދx뜀 &O~iG X] 1π`4w)pkraD xxZ7l#
P c h+ mÚ? ;e|i]m<ZmSdsk
tm n+n3;pEa
KXM}]5eC{8!_/kϭ-v5Sjo))vΐ |g<=N넼5Uy6[ Wͺ5>V쨲E%6gi-缯rXO /;BAF kM5ze؆VY[a m}z++kgq*6;kxp
/pRrr }n~g 5쀼Cޙẁ閒6d^>7Ons/͈_)Qjr۲ؾXU֫G#rf W IDATs/M wkU#YG4%;gW]]k/l~)k@#hfgfظ1 -Epc $̄v<B i!H~6;"ɋ/<o X>w A цX
a A)L'e q-ُ4fxfzeGu^=PЫU4 f1EbSn}_ "kOx,aԑ፹ Y89ٺu!
ٯ) a={,/SAZb*_ uуd>c~//Tӑ}zcf%ޣ\[x1M)>'3ɟ y!A YEU5$7.VO UQDeh XsF"h=4R4Fc!KCJC nfo@ӥQqYկa2F#Mޔ7^}HËlaH`Tꊻ4C rC,~rt{ɦd[v8ҾXk6b-jvFCM\ļe$7\U3iRVx ˆt} /At#vҀƇn]CT7ۆ龄>)vad$5d |yI{:;V$@AF5&d2 ڢV)X%ҕn
m8G) c:Mt{o\JͲk^kZgSfd9!- [~z'hҿ]e - L~L455L;{
팓_mz ~>w5ڽ_#Ste_بؗ` -[a": ȂᐁV[[۬랗ڜwSO=S\6ěvkr:<.'v<NM0dCaEZLve( ?; /Haͽ{ϕmȵt
>G{o^x];íx-^>yFܬCc*2`LۤNpf@PF㭪L}2uo;Fq3;V+mW^puͲiSٻ . {}8So{\݀1̀ -Ԅ%|)$@!@
B
j
ݖu|%"g?vg<3\myKN !b+C?9G2 =҆-1)0fE\/)yK KHLvҟW-*DRBdV]`EUVݎ VKMJtrtfsŝ >t.<|31O vmd ˏyZH- ͏?<4i{BYƅ`bNo{ײ>>o.`~WZ.\1j37d )A k-0AXׅ7<,nS3b_E,uv~DV(NHpi%啀`rK &X$+k
p\cyRia s_%<D[ c~I-5ENީI+-7>/td$" " " I{9{؉Ob$YѧVX]h`I$mՕyM[C'1Oޙ#t Y,*YdM9sl|qVXk,{[^*;Q-5mkhZ V4Z[}8A|DKMMk
̓$Đ}0mf{HQ?F0긟u%E۸ 4 ܑbtVw-"؟27.VKH "P,(!Y 151`+oUƽWs/)||m`=i8t`d
%tc<YV.DHox`1b }+t ŌYj )+##1c@\}
XH[ ^W_o??w(;qn VŅ|Mp@EBgs{ |; < <pe J< {uYg9q @Dfz#E ҏ1,LbyfI(>ϷVZ] }Od;jd >ix+疖'o\x01,.txx+6=.PyyyG Bpz,_H&nl }Ǫ4XOaܔ2k.̥/qX~X /lOX6u2#xhL74włuM"?"{JN cGr_VQkeM7NRB݂,fQاUnĠt魬0gM|Hr6;kS؎%e&7`Q9] 6[&H0˫̳V`C2aWVVN 'Uԗڪ<BX1te26x
hW}+_?Qyu߆pƋL-%vt DuM}|,=%5{P> X1g 59q+5 3 ZGʈOʪ7/ gOsP8zӷ!N8Ə \+] Ao f̘)3t "m >lgu
784Dx=kεW_b,-Of̶3gۀ=9ֲ ":G͘7[V+B`Ed b(~ [_Va_M5w=lcFYLrBoIc* o S (k:>~7 Qb9wx!3 sVbǓ>p.03.dHyÓvcLՖy@-̯߿gK`2Fh: " ,Zoڄxٹ(a2̏ 7`U<o@xg
t.zZ\DVϗ & +=Q^.̼8`JΏ %A㝧ZɅx/Kl04t9'~?? '|rRchYG V{&w[QzG^g/= e
]Rl=Snz;hȁ +[vr&ɶ3wuDZ [kʜegCEMͯnps&ܢF^
Lqiv٨ MeVY~MK|[Rc j~E@D@D@ Ue6h.RB"t?Ȋ 4VͯʷqO3e6yd{sśVPmu
`+V[Zb>4>Z,_`\ψp =.s[! >/S6jܓJ2p[ > 'p 6`Nj|pܟcI} v;w 8TVmQ*c "!q(BPw`,Ը
n>
bXaExXbX F ]v.#g͛ .뮻ܜ̗K7nwGӿKVugi.˾rn0 ^͊><'"CbEV1 c
Fm1; CPX1 ^m&^~}͞|M[z/bWo z 6Yx8E@&1^o[9 Œ1y7"G_3a|1`L`8sk x!a<ygƞI{yfR7>
" Εm.9'mS-Ns'EIO 6#p " ?/.nr ?ИncB ||)Ol 0aPCŅ1'z}qqS ng C"OM̛t)'y7 O
ܜO^xE .[[fK-+)QTVt?fUa'U-g8FVXaH7i+b&أlZA[]Z\dWWO I+/?siz{gMU74{9V[QYk Kk\ ŗWQi8dD@D@D@ 6XU7TYJ0dwmkڈV^_j&72~k{ d ~/y^_mҀIvlHW},Hki2{\YevBj: +2Ĥᾙbm
IOၹofQ2n~ !pO_WĪkll}Xb lgtB=1밻@,AQr{p `x}=S !w sq Y0܇s8qx Q4D 3̅j Qݏ?' ȷڞz '/)oq&X K4D͛núg,!9gS̗Np ֓ۃ>ج]6ɼ7,ZgIYQzw(;h=?
|Z3z˲֭& [{ם7lgk+ d X ε_|эw菜 2 ew7mYƎGK9WC(dDRa 2@k/> 9uR`QU^lQ`ֹ9ZM"K k`O &n\#*Ŧ.(;:O~ qY[Sb~$AMa i+ qyb;퓛n*ubL0=Y%UqaWJj\%ua Üq O||\ưiHyb,.HӂE]`;p@tܦtnUvkW[jr
3lRcWTo9tYYVY_iI68Q0Êo?Vx{+ݲƕí3mmZy疄zN̶? sWAx0 o/f<{v)XVfpvl! OX q-8!бayc<m~_Uk g_o-Zjk,!5,1_/E+uF>! M'X.<o)v `#DC!x`(ƭEӇ{}*ڋ*6=6NںzGsXn9Oi3 o]s6zH!"~`>:k-
P!ikJ;jk{kimVHN0U˽>mƫ.` " S/':!mY 0`?}k8L CS~q>9Vzi&/֣-vW}/(( Ֆy ȧwe П7l5\ rqصvKr]4mqY[ o XϧhhX7]trFzk-ʇ6_ջܧhE_E@D@D@v/xsVPY86͝f
&-)dOrK tle/ba~ƫ ~N2i
c~_߶YUup>ǺdeAˋlB}:kIG 잒xAk"/wk;2Z->xʳ9+5v$c_ĐMdo\;x1ƫ z?Z=96i)oKĥ3_^oU,r|#&B #
ՙmmDZͅl--nkq;b6y Q0!""#V.>7Cn+o;t5{)q"["--f7& y[⋀+/8C8[GZgϊ
; mx Gc-inUaX:úkN|,d/% 1cy+7ةx*p|ǂ~埯S+gu[b+OZX47ۖdtn@ As#sV\ND@b^'jlUU0E%aknIz#" " " " " " "$m?C " %sqlNS6Ue" 1o`<ֈ~l ڬYe'mhGk3VԶ@L4#-Ef@ED@D@D`X%" 7y7-%l5LYЌL9.
@ Im$n-k}-푋FAQi@;Nζ=?,h*FC lݤ$KII{L;ᎋd,??ߺtҬ<pnݺ U;999̂Qλ9sP
-779 4m,:DZk;Vè< n2-50M 7 tOo[9.+> " " " " " F Ec/ElfLkkfo P'׆}ͦ ,Ĕ~ʕ+پ ʲ =z4 c<+**jO_ 7aL*v9 ,yj*'lܯ[N Lj;"ĥX
$)&-"VYh}ڊ*WvsP_+n|;s6[7}l# ;!k?8+*plOzx,㾔PuMir!C.1, Z{m c*mС}C
)8UU7"f);aL띝lu&<VLHz{[SZkȵt f,llgٗaby wےw˟:^D@D@D@D@D `=mSx([G bVg1=@8C%.<*sgOγ=틘̔Mkx6{\xIK1l?n 44~[TPe+ও^nH +" " " " " " " " ;@܊ypj>*y1lTtdb qneuWچ&sUVPVļ| z]@\yaD!vї(#Fy cgȲW(`3o:> " " " " " " " " "451hʎE|e'!rY-/vq ^U~AD@D@D@D@D@D@D@D`!b^(`'YEMӜyX2{ȰΥ=xcgY)r]nH@ <Dނ х1&nZkb{4, Ŗqb4." " " " " " " " :ݎpuK}fۢJ;˭!b= ۹ >"מQ`z" " " " " " " " "%~xYu%DpKI { Y]#,=)dKlA~nsSG =S]@BiY\bU lN~%wʰ̍-#ɱ-3Q.zmGW|9I:2Hq+ʾЋvtӂ[yEVZÐ# IDATRd]Z(DW >:ZD@D@D@D@D@D@vm VWSc奖y(nlֺ֖YvC:[W~n+l]Y XW$>E D,biɉGRQD@D@D@D@D@D@D@v@*[7[1X"^,<D9^
\4ͼD@D@D@D@D@D@D@D`sAΙfhN@b^s &" " " " " " " " qK@b^6
&" " " " " " " " HkCD@D@D@D@D@D@D@D@D n H̋ۦQD@D@D@D@D@D@D@D@D9yy-yq4*4' 19}% 1/nFBͿnR]ނ*t $,hzu TJ 1K]+zVZkh5,"ۼݪ3tjK! `g=YJjjWN-%WQOD@D@D@D@D@D@D@vmZ CsR" " " " " " " " 6y." " " " " " " " ;ļ^u[D@D@D@D@D@D@D@D@vy;
2# 1ox)4vze," " " " " " " " [G@bRlp-*" " " " "vTJWDsxlʔ)ֵk6A̚5˖/_n'|hN}y/^{ͮ*KLLM6ͱ;3]-"т YC/V@D"֯_?5>džO>իW۩}[CC&ZnɱԖ{ۀZݿn|7N;V?uĉaFF;nɒ%6sLFVPP``@mhOڟ/\CΝk |y?s9[F"oʢ " " " " ;ļI_y@
lAԩSmyB`ྤzl̴;RRR\BˋR@{`K.n>j('D#f F i=[vnq튋mٲe[ WSUUPϷݻ; zp'O6D9d!I&ZV\iwqˉG^A0yܸq.R'|z̙cYYY@OJJ&hhh`0K=?<n[W bu&K/1tP0}two~GqGG"pmxȊP8x`y};駟3pG̣8CY֮]k
\[8 _M+**\ooM;Rf4f֛
" " " " " H;%Wm˖\CTY' $
]0
{;Q?iTVVv~~ F ĘJpL[buT u&DPB6!7+3Î9@KNhq駟G V?! >
[nvG8 <B aVTTd |MMpDd ."[x!` {cᮯڹD #{x
.+Vc"$] 䅈%b`G։~B~ }CY'LЪ5jk.t;lq3Κ@d?.YMsޏ>^ wnb ,-Zd?O W_Fú#s /ؚ5kvp{<DvC jzĹF<,,
Xbey]0?aQ;bt$y I[y@ ? 7ߟn)IM"ӣZas=ƎݚA4, 3>ꨣ 1guw5E6l, 8p:Ͽi/edAH3 zf 8p;v 1b;= C ">"(VPp%Ξ{)X"*b^c8lf/J;p,%eS5>Cκ
kMSo};99k = ?ka}ωo<2tl(I cEA6?]veFߌ6E袌QXK/Xg>w,ou$i9;malj{\ߊ-?uFc<~!.bs> !bU|y8}/s@[j⋮
ps`9H9 6Fӧc)ӿ/gw/Vƈ I!
" " " " "QZ }٧n ot;XhxDz|0H~we0 @ޚmɉVU]kI! CMVf-TTTYye&b 9;hsݟ{lBk5\yͮ:'tMmM2?ԪkNWM.엷֕w/9oIY=ܛ[̃:x!r^=v3qk_Zt;s FƸaw%*6;}u~=[&~QYUm?cv߰Nt3qqAF3P<m7
D~Yna!"csD Bso;U<\l{vjaQ[oKV2u
VPΖvťKp[email protected]_~Yq #>,"5:8? >m{a20 E#ba[6!-/x!mZy晨.W}Ɠ|Yk11BK1X1z
lr%/s pđPO'&@^dC!r6n7 r M}C{"ߎA-h^8\ciޙG Zped0|Yg9 <fa98ۙp8h5l%+B!a3ߧq]s,9ySk3u7pV?lC/?i՜={+Cu"71;sbѯxr
g]]U:ϲ&"0
K<
waH?'|YKO,?}z!3f̈ZD"d}w}|Lq&0! hb܄#ۜK ~Ζ孱}ƎJ6s+n !%AnsuE\EȄR /Ël\34,氼t-[ X/ȋ@>mG^"""ZX~r B V~'0 V]3g"'SX1 tboca 3 nܝp1zݤXwp3Z:t%;BAHO39 ah˅:J~9H|Ww x; pu. ?~!PtB nB2@-ywlg+Q x6 l{E^Ć3< ԗ!XP +%,~_8с9-_̳3OdW^tfܓ_~#+)3Nfѹc#[ovF-HD@pAd}wWs<8nCw#>!#!P6 G> oy}RbȂ&1s?³3Vy yJ{vvv#`o1V\/8UaEG_l }{{<ڕ{_"چ4 qo >OB>) S OX2 D ż-3.LLFss37ͽD-%x ѿ>eeeeyg_yg"
f,
Vwa1hO<D'TA>YpRo;11Hs"{|wXr{=A^ziU bkx\XEzd}wZfCӜgnNs׃>b( Ě |X<: \@a}5ԗoĞ8 `cwghVNJ_}.Xf-lA؋o|`?F
V-Wخl PPPDQ8_z%'"bEo/X>Kk,Ic."Ӷ?O7&
mZk
7pUO<$@1yG DyxK@q({
E@D@D@D@D`G-<A.Oy϶Xk߿JSvIO>چ cx ?,엷=ƲX0}W W3Lw:a+2>.X!Da
VTݼy# akBoF'a+0QgY_ R yQU@A^SSG\`<\]{ F$)ZWb_]oiVdPBf #&UJK<B c>'xf
1a҉vY8b !nzoapYW\KL Y96oOg+: fA
aB#tqm ?kU}*i@
u_CNvfpłUL\hwW\Sbi)RvS<9{Qזei]D@D@D@D@ڛn!1
\nyʎdAD{Sz"
=r-))rr7[-<ᜋ_v%pu(, tb8 #],mwj, ~XwYDP q[F$enPaLY8wDi2[Vwefb{Sg؍,XG$Dan5^
,_jY9),oDl
ԇG y Q,]K1c~{98q w;O>g[=yy]a8b@[VpQܖh e ?##2`6~cG@ V^#wyn?~g|O?M8c^K Hj7b˥" " " " "ОZ>ɷ87<D Yn <yg_ܺ:|埏;eѲ<gdP9zmCMI#2NB Lx,{ (b!ڠW;)W0j knXu!0o N :n,y&7|sM%٬yj3q0%+*
Vʷ* CqBأk~µϟoXw}eoSO= 35\:i<ß'[D'|XXAN:$Ty~q;=9)ɉQrslnU[|E !!`d[+/LK
θ&s `ZV 8q& ,\+L Z }X" "K;a
q@z~˓ɼw{u<X@u! B <3KBA8l謋XT b z?Fc E:\ ?X@ gOAحyN>p;zX98MboX,8 3c(,pycUJ^zės!K | PtXAR_aX =p;v~b _~yTȋM }[nٟnWT:ᣰ+Lmლk9x`C`C_BpC,f4D!>V1 :thXETr wI"3"$r{2 Y`U !{?@e[,ڀ o kIX鳬f^h~ 1]G
d{:uEgdi)9 {1گ؋ŋEh9Y:.uq XP0ƽ[E aXF~1 y[h>ĜyX+V٠lXrbqygK-'B6@AD@D@D@D@:@BiYv<|/ =7{ncnұif Oع잠_y1OY]'JԩS koctnJirJ%'o vDU%%֧wMW:"& j uWwٹ g콧EbVfMly-qarNˀXg,ӊw:
фxcĩ[z֯/+.<7zti]:`]#ď,}=pY
Ȼ'}~bںz{퉓n]D('a27wx:> .<}˯6 9yq!"<s8pR,P W,p-m# >
C?~~z}I3p#vفbFdG{~UFhGآ^m!#ß?<u$Mڔ3-hlؼXiy\ohPr džiӦy)#}egD?^l:," " " " CႂBn\bB\ylㆆ{{t
Z&G>n=t >Xx\qӻ@3y̘mwYIye.xQ?H77k 7ډG fw&؋.Xjϼ[Y2aӑ}ƌGo3Q@Uuxo
atd~>nq[/
#[!6"BpĕGF)tF W ,#r[A`+ 7-؇U.7X!-|y tf1V/r.w`p_irֵm+fED` ^IYErJ+}9@'D嶳y&7֟G v
ܸNc " " " " ;./(JSb tv1/>l$0TBO1>@ `/&" " " [G N1Sl K cW" " " " " " " " " E@yER鈀@kh0]elv*LbB@<X_lUkexh( $%o};Rҡ" " " " ļڪ.OݹmN^%''|oL3mhfΓ;4 " " " D@#lD- `UE"f mrX IDATvLKCc8boZ`)Ikf3
` s7}V*@HH:kK =uE9"W%# uQUyY3+[_h鳻}{" " " "M=XccBeַn&ah_pxkbED`"У{ݪ>LpX(D@D@D@D@:98ZR֬YmHU=y; " "й:s[hN ]Xo]A,
}HAy;M }`sAbht NXLjD@D@D@D@D@D@D@:/,<mvu}zzAAKzkEv<ư鎧 E@D@D@D@D@D@D@6yKM YJj"˽5nG1ܼ^" " " " " " " " "I눂)dKI}[ D4ζq" qF@b^5#" " " " " A@U6Xc$b e#}rPPgˉ)?hu=;"+W{Fb^{T:" " " " " J ! ~{>3*k5}%9f=Y0 V-@$qS@]% Z]-;;`VUUl_*Wѷiļm¦D@D@D@D@D@v4}̶[b),nH1ltBިQvJNVZe#FR嫩<CVVVT övZKKK}ZG\䛙-W{מ4@*^R3- KJH0'a ;@(r_<{eG<vy}q7ׯNrY" AUil;o[EM\#ݗ BiyC㵳BkjϲHkOJKD@D@D@D@D] 켡XVC@n(Xv,_." " " " " " " " F@ `J%$" " " " "/c
?e M{.GmÑ54F,1'6%-5F"aA1>!"H8͵O2b +hp=[RkE` 0sE"*s)~7i8Z
k{R8$Կ[+F',f( }U月1mkY.Ϥ1l=Smd,liU68A -#% \
V=#D
+mw6Ғ#;VU|ȾVXZcUu&y*5ͲRB6M%l,QT$~JRr3mYaETP''["ڥG*g$ߺK,jVmV ȵ V䤽VhUUU CR&매[N555N0JJJJ=V>uֹ?*,Z( qGC}Ub@HKK ֶ'sckڌ3lɒ%VRR=֭ 6vvm{o[:FK
Ӡ0>DKMMIlN~p^P n[a͚5gҥK4ʶ{{ژ1c\_hxmH żӧ[QQ|322\w5iܒtp!:רQRBOm, E@D@D@D@D`'h<{ŘtG GkXSh]{8guaKUEMŶ8?6iְ/ 52l~vgG ^떙 3}2☑ֈϚ:H
9U|%ͮ?iOKM
:"aqG0C4C9VUh6ilovh J뗝fw_x {vJWnA+LN 41mh3hG.CҰ-(mҘ^)cO[aY/ m2xp']4'lC^eCK-1\m X-ܺ o` .544؏c;3vE}o~3ZtĦzʉg%^KƬ999}233G qiwy_N>d;C B m6p@?{
< 6zj3g}Gvǻ=Qq `H 'r ӧM2%Zٳg_{\|}φ !] ^xO7;䉀;/;.
&e}qZgm{믿neee8K|3p _wNT<[l͟?W^y pr~ /~ %ۧ~hFoɖw: v}u}g N;-@~z-ǒ6-> YfE 6ĵEjʕCp1Nj]v!u]\t.'q?O[~S{.jsiS]n6! 0JGS,ew5 ObmΜ|q'lRW1rl!$`6wXa뛙f\|TFǎ뫬kF$f,[g9!8OJ Z$,` vpMb1mYA3g'쐑=y6ouH7\k7c X]oa~eE"
}ZM}LwXFj!b1nN@3S 8" WSS;G xro?bz'%65m [و"'ddwc=u}]TXfXIB *+Y:! ͜9`U c^{e`ǘ: ^ ,1~=Ǹ6Ƶ.XX1%0E8#ݱl?|y7EC kuI'd .teEXl.-ʏ Vh eeeYqqk 3t?|W.:i$?b ;ԅ=Sԓ?u-L>CǒXkq\ u7ѣ 7x:r y(/e w1E(W_uu?vb{?b Ȉ :՛ Rb%ުUǶX< 2?oJ;\}ծO{QpᮊO; tA֣GЇh./K1oo~O@mϞ=w-JJ+,)1d]d9F[t`Fk1 _С>sׁipNR:ĉHt.<-/]z眩-wq# ^rfȐ!bܕ@;.g <*
qBSVjZWZFrj9k=sԂ5el
m:VjXZ!mպ*{䃥vёdto = k71l'5h|oɷA3-)`^+\k]v <;rVhrӝV\Qk
ᰥ%O D?ݯ̳qn9{
WOϲ9iCzf:;i6cI-/K a21bzfaz?\hsW~Omn^|8'V7IYp͊9<v!;S cC, ؒF`;nXK^ z65qOmG
np} q- k3tbB@LBAB 9cK/uXK1}|l^A ]Yâ !_|ͮ\Æ
s?0fX;֭ =
>{199rO~9!O?n6'"aIG 뮻 4C0~99=#,~9Kv" z# H_W\l9cx-Z=߱o ˌ+,Vx"f",Vvh(
|@,E$p>` [܈i#D mꋸ~v-8ŗ gѢENd?/;-la '/^tE X {5{孏h]%m!vΩـO)N Z-I|]$-Cޱ/\l经wD>.(\hG qDT#栨\d vanD@D@D@D@D@v=u ?饹VT^cX1`7`0^,ϊj-{)c;ǎԤ$sq" "⾋XH nA ıf@Bz7W_4g}dGtrӝݞ8ޤ`"9yɣWvjt. <Wټen?yt7y+su
^Y#zR(hN|i'_g/\eN {}X.3n ֔ZaY >O?{%6[=R{᳕\+(q 0ӗ^ }>-Y4Yk_x"f]V==\CBAT
TXHNC뮻xA
A _n~5D ;40B" 1.~ >/(aqݍݎh%C*
>Aʇ7o<) hXK9S>ޱbcM(u:ʥI ʉUG 6_[oչb Db n&- qW8+Ip b#Bc q9<N䢎Z >
'| bXaЉG hK[1" D 9I@B=C 3s"4? F4DWB[l飸.ӆ~ފKW?- yb-'3fۨaCʪj9{w[Vf[#UE:Y.9I .tNI0;3
u446ONkPHAD@D@D@D@D`#"ޕ6
X%n{no?'dlCP H -\S,uM3^J
6XwOwYfjȾ9a!J!|!1W z j\g 2֔T8avqהTلQ=uv>෮~VQ]o+-o]sEõe9InRgpTl'uLq
7`5ɢB4ju>^PdE.b7}I " OͲo 1&q#ҙ!Dlg xȈ yD$-cuB^3sC7cdelZq .&x~ؐψu&kaU#B Q&p#*
1eB a1&! l*jΝ@^s.P{cvvo2E,3b\1NT"Q^ʅ0x W DQ ,08 ъ4 <h y!P āu&DXA
/#p;.8I.b "ϟ|XhL; >pÚ7жY9mn|5oFzY[ov:!}6"395N:DD %` (7^ a8|GkC Lħ' /
%Q{ x¦͜c{}νw[|6][kGokL8i\BQdw
&bH 6sM:rh-N>m5:WU[e];]
P86N
kЧ7\canzo뙝b8&r/_o5N ta~sU%.|qN\;!ΰ5S?<?RvQ>ʚz 5 ʲS-=9h "yʪm"[VTn
a{EvI{}t)v a`M0&Isֆ 6؎f.r E5b]kpߏ6~,>̢ kK7̽W, g%
뛓jcXȵb%&+ڶFKx c@! `\ 86ըoBBkl6A`\Q v T09yG b6. Qက+~XQ?i?uDHB@\\o)b[bBD \-I +8D3< c vE`aMPO ыsdx!6@#vQCl[(#e-avV[ĉ
{Fz~b'tM79a ߮
/6N@"l-F "^ҿpn/pq>S z#Զ 0ĺXaҟ hJ6,Xh-|
8z?G?x#ٶ,oޚ/C/8ݒư}|7B LkVƖt X%NɃJN;q6:(.@ \-q 8}/t\m߹bƪN z'vb1:/`??s0eKN xnUY.iI^TRQg< m'ؿoc[b(D6Ի`0%Ғ m&nYN""vaVUDHԅ/ͷ. T0^($R:⚌\=I8~ /ɯY۔|3 ~ s.+u`fP8[ ;!l,b^q[^Ti ;m*=S7XX%, <!ɘ AqjCp"?` m D"/0fEhDDB<AB`q ƛ1xyAryX rԍUJc[|[Xtȟ0̸'qnh"x?d,< +,=WZ\a2`iEI#vLv2}@(ڊ2q mˢ P%$u1=FAbBÐvx҇qT^%grL[rOK?x{L^ k"/mU"U`=x w8+;e,[<ڛ>K{-m [ 1sy!aW]uU|yžd>bmhJ%>[4wܜ.vˏG<z9ma[(4KOKE4Ẓ6ȱ5f~O 0AF pNz>`FŊڲq." " " " " p)eQ :lf8W8n͏ϴ`ܜvL*ᕙֹJ5Ήp : Q Sd%Uum7U63.:jX+:߰[fj{Evbc )
܍y IDATð;j5
Q;BWư;tdO0FM}Eu:Mm<HوQ qB۳=ͷr,9`䁋.=؎ c>DGtwnǤ܆βA3 Wݑ}lO'$eYȘHwSSW8W۫ e˷Gr-huhV#<ags
"Jx!1k/*7awy 7XqL`e n OXQIX\ 7Y+zb]??
+?,
K9QIU13ҊcX|I9ͰBCc *,4I@ڔçGn-?|l>˸bQG@"Zw\C ?\`"đw]ƋI~C9jk4杲s<}#Vj Ju#簋͓}"gOX` i W]?<qzp
^aK G8E o@ [[N>dWS:@ H~;m,;:vʰJ[WRf=wbLj Wnr#CبlCiZ!![~%NxhtN4|QQQx'$/љD@D@D@D@D@vmv3[rb k,X8S`F0{z
|z:t G ;3ǻZ?ZPh36ivn1%Uҹq wjܣȓg8gUs#5agx|/v!7D?tF xX#oh]0zZbzv_?58ʪjpeCs톓r{ɢ"{f
c_%elQNpA
V:[,!".}D /!&!Xcn[V
Xs)v{#@ :Y]{JNy0i?
/pME,(1&Ep!0~$v\sQw/n!j <fʔ)EXxkF˰4b5xOے WK76x(vց;O:?!nLEv,~X "@fNB'n0ߴ /CGb1EYlbWm|G0E@[C# @?;\N acMD7%O8%鱢0}UoMq1e@X?֣:# hg>s^Ǻ(.~y?\ۦug;k֜E_َ9@Dq-ŞA/>:OPtbNfN
G osP}$VuaQs xnY 6y~6wUNKK
l2SJr"i)!ȡ=+Ū* "1c~`;kEsM0ڨ>Y{U\ګsrl
$$ALc;axcA$$ ! 圥V[Z[GZM}v]]U^v/r+k҆F#;#խ\C 8lxJq>w Xuj"B9Vi}8G;;X\v> [ 'qbA $t\yvi[#ۊm?5VŅKgw1-v9 |b ,*ǧT_7v װŖԞֵlYE[u1cF@, `1TJE 6+k̙7Bs!\@ 4c%M0*!'XPF'Q,tA a!
B'z ??Y@B`/s I 2XR! ! !!|6FC/sad po# D\@y [Bྫྷ" G{)irYgu 7*D@y@ \ )ևn,oO.. pW>&$_X Vv2{q-.~WO(짜!E(XXR)_z `G th|}`ؕG cGan~6G_]yv昺_F'Ѥż;óupqBޏ~#8P1y`"GQhTvYmi|q3X<?/s%ea_Or)jK[3 V\1&xc=7wv 1y=4cmutje, 臫l'alg6T|?
wuޯ݇w+{ì
nm{9D#GsΉq}o/~^d]uz $Or2w>[<z3nwa7w;uROåp]ocـnm퇏|Z{jNR^nWtFv? amYkb0O`S@[gvbK%BDq!H˰iز>0AƕXɢX E*K~J(bQ
!r-.! q?Q %
ᢌk*ia+- +Ik?}܍WW.na
ǣ7pEA((bpZ`[@AXDy3z k\U' XdK 3G .e~;0:y,6o\ю<b
$xQQ <#"N8_ݐa\x̋G
]0_ Ge
-E"{(/ K<R^~_Ǟ %!
:1a]:⥫o[;y ;p>Ymߕg~ =͢J)W}W!ܮRh@=@ncYYG桱'oUTÐ$0HvXz˿cY^F!7uЭoww0ְbõ;.'+vTv .> K<
%ei Ft4v< S xZN6k{6UPl#zzw9*u
lî3u1c>, UZϩt3d_p +9 WT
iij_qi paNE4p7o%ej>;X\jYXky2""<[gg|kd<lf_m.dژ\d=V㍕$G֯|X g䥶r!oWJ yؽmU}/b
ڊZ0FD6.
Vz#`q NbCp%~40R.p `ᄰU>}}*T:aNzM\ C~"I * o ùw.
' 0"9 &B$D$!paA
'snBJڂWv?jAH=p
sa\S(KZō5/P1s<{Q [>" ruXT&DEq#$,\ܖ,_c?՞}4gwRvUO+އ9aF^H ݻwYzzu!1/JCIK@b^ʸ@%P1/dY7N1b< c\sb*'^`UY,W}"Q># i"|8F()L{ /q, , .K!K˪WC{VXZQWL+v7ܢlOh[S{XH#o"Eӥ 5#VD#!D!T!4V_T( j_s=&QoX O{]yqXޞZ9qc@&1h cpn? ux}+#Fb1AGTh:97 $ێ'k<-1wMO87?9 / ;6}ͲFAZ{KRK2,,ݭӵ6C T|Ja +=,ٰ(S=4u;7>M9Hkʿ&" " " " " IH wZ_J04R(=L%}sAD@D@D@D@D@D ) !p
hb$5 D8B@6YGXhKD@D@ 1O@D@D@D@D@DI`VijL%" "ШX7va:b S+hμ"xE@D@D@D@D@jM:Ͳ{ؔyuVJ.l*** D WYwǎ ־grrr\HXNUT :;\'$ FE"" " " " "PHXZj\݊JJ-R6+ WXfyٲe˒ bS#W oyfQK<w݅;wMk[Hiy5FE@D@D@D@D@ "LۜL/=l|WHM1wٮumҤk npLݻa
{nSqllu왵#1t@=(gޣ
v9|'E xYjTD $
O}ݯVbz)V_! !&$-Zy)VXTbev)cRTƛ=l4P P 1r3,''#) )A`_&RN_ZMba}^D@D@D@D@D@D@D@D@TTD@D@D@D@D@D@D@D@ļ{fD@b^3T&P9r/Cˍ
" " " " " " " G5* HKr 7Q{5-,D %KD@D@D@D@D@D@@nhH֭[7hț^" " " " " " " M@qqmٲ%a$%D"аRSS---ao4)yѱoL9JJJBa,++s*Kiox_m>YYY8m@D@D@D@D@D@D@D@yk&=t}l2˳ :߷o_۾}۷j8>D?MĿ֭[ 88l0k۶
>z=U" " " " " " " "Т Hk?odnK/֭[]=zvm6|۽{]y駟ڼy|8D;ww%؈#ܚӢ"{w믷
69s.ٳg~;sϭ'Ǻ4 ywQd
7n'x
98,.BƎ +34D`k@wAտ݂3feffZNN }W_\pA2aV^E@D@D@D@D@D@D@@3%)D^x}ljWGd/KT]`ՙ3gn|Xͤ)҇(, s{vKb l۶ͭڴicݻwsq%]w /Ν;[kkmh6N 5k| ]yf6m MP
˗/wRg zȅWXpMOOwqO-E0E eddXǎ -77X̿oڪU<.\lU > [h$ w1u!`nD()D;ϺtoX!NZ}ǹXw^\McW{
q5={ N^6^vv!Zr lu 'رÿ " " " " " " " -e%粖y;w[U"TN<]vs=B
7`۷w+2?v=8nO}XSO=L<1c~<O<_|}G.l= '6
ڴiA.|IVl"\,X n[re A %vEmhQdd%7x
d?좋.r8NZ q}{ĺuf/ O9{=zp!gϞ
X sϩ+"*lsXj7;D9·B| ,Xame$؇ ~ {1/ " " " " " " " -,֭#\ru?_~e'BӨQ;nʭCX?W_"saчXX*;nm۶u?⌊X (YWh뮻_~ aKCBn`9o<;3| qo|XrX5r?!p" *@K& 1/@%\
QoʜnwWX`m*}QRB-ޭb!Tða\ #͟|ȱ>}G `\Xw!C1O>nv p X B_D@D@D@D@D@D@D@Zy ~M,pd ,Lùks mvLpם5kaXva UܘÍuС6` êQK:8 ?6TDD0a 9YO<a^xscml29s]|֫W/{} Xn+" " " " " " " "P$% ܿy +
iժU> b̅7g @7uT۽{M4Ž`Isƛ={]\X!D Ƽr2 kcyƳK
k y#xXM6ͭC̰lY#ꋈ7f̘*E7c6X>eUD h'y E<ļ.!8a>C8žoWf : ~x.[|rwӝ8qƢčeb q^ ݻww5^ LFJ̓Gl+"X:-yB2eR z| s{}6lpk ;v8%Kda*3 .!" " " " " " "8Ј<++w(]5i@<bUgp
Ep"`]ЄH"
a8x;.g='ްz+AZ+6gS EҥK] +"T/Ļ`i,B3869v`}I'ѣ.88IVvʪt8k瞼 VQ}VMSʜ@@"dddZNh@m)@CDW
(
]̣D_D@D@D@D@D@D@Df0b
k0#g O̫?#iV@| IAYK IDAT:!Z'(z' 1" " " " " " " " "P7$
G"" " " " " " " " N@b^#
D@D@D@D@D@D@D@D@DnH̫ED@D@D@D@D@D@D@D@ꝀļzG@W7 ;yX7A %,#-RAr3S-;9 k؟zb =i'vML*" " " " " " Mļ&s(1"8جJPC@XO46m@q\Ao<+8Tb)Q.UTrߋpGzf, n;T%\zW`L;D@D@D@D@D@D@DD~%C@jj 8lܼ̾B@Q9p ۞G>|/+d# *.|ֶt~,=-8`|ym;d9 7mL_aO6oMed٧k}/s2Ҏ
>HC\K?^ew 2Ǣɷ4'IlEEQhJmP66v`'hqRgL[a6L"e#Urɧڨ>
M я]d"YJ9 ^t?Oxm{ҲJ+<n@|嶱4;P\j#Yii]4_lWVTRf !:n/ý<l=:M{,摅%a ?Y(ʅ$Zy)VXTjeV"A/JH1X%Iv&ss7}Ea{/좑Cܭ˷dw--vk1nC!v+w[֫suɰ/6Y+w?<ʲ3Rm%1\jnB,5#v xFngXؽ:ZgYXώ.[~JJOuA.oakf
;wXU'Q@b^dgXNNfsȟ(5"/?-+FhpUv\>ڮ]dZ.2̬㭕ߧt c~j8?i?h}6}6a\ +.)s|{- .K[ҝ@b)n8G[;kpg;3g>>4cX~ka[Yn,w Q$" " " " " " Hb^媒a߈ѭE@N "=pii֥m;oPKF1~u(iˍcz~
m[d}P۔W[3s6'Z +-2ݕJlݖ6˭/pŊpQ |i*sg-eo|~vPҫm+n{oeS[+p4nm@S&P+1)gHi8qis ?\g7^ggb[+_D"E^.i)~A3[^]:ΰwL3mt]ʂ-vϤ-n܋ Kmv٘^Lwv)feޒf# -ߺ~2qzv/06>єVYֵm֑x%" " " " " " ̀ļf#)"PX5#,s7[mE֥m mmjَ=EVp
69d%e> }NNpkOV
x ,.uK? bVFٲŜ
{.-5N. ѭJcauzi 8gUZߕWC%Ӗ;//*3ualp)~:% 1Nq*2h~c߾ʘw ]hCz]6-Vm?`7U%1r_qmٖ}گkk{.'W]}bk_ku.kOu7mvԅ9\~VZ1'ޔO7yn%enzeںwȶ]q羴aʰ"Uz/$3y+"e]J#& b9irms^1gݰļBJ+l"`N[n
23/kmuKWe;XvYv]
Xb<[m3-b梭vɩ=|
ҁVɽ_3m
Xb!غ8`! " " " " " " ͑ļ)"PVlowpaA+Oc{ 2ܪ
W\l o3pi]:,(~+1ftva[q nX\\ *bﯱú/dt/7My,+Oi'l[eїft(*ZeWwK@<w^6=;*"" " " " " " ̀@j3H("PRW7stqre [O*^;9dT cV`w|> } +_ Uc||~<a1جk_qv&Q%~0x< E7*1QW}b/--խ%Uaц@3" 1XJT_ #ďE sս6+*-r_ MyV\Rf9nj+ [(+l<C(LOM4HOjF{a痝f.aO`$ץ s2|nk]eYqI["̅8Ĺ`Xܶ>^fiIc@hFfی~Բ2+..RKeS3c {4_XY=(/GHJk{SR;푏ڃE%y[l6zϴnmrWԅ[l`ٺ)9v Qv/_YjW"V{yfc_T+,.?_ϻ6hfn[9_t? lN[5`<m@S& 1):8mO>VXa]ڎ ;<G
M6ٞ={==D4DE=mZII#Ft5j
0SjzI/)t]sK18[n=c [|]{e lGAFXvz/|u+,m7wM{
ݥkr{fF4,~zP{q&.rf jtO&y\^]խn?=rZ
r7ZD(DĚcߙ4n;'!MMPD@D@D@D@D@D@D >}ǚB?,7,0nUVK/dvrmܸq6yd[`.r{FFx[l?v)pWTTdop
qF o]tEvVyfncYYٵVaq'oUTY>}-33VI@Z6'uY+vC
ݮ}v+
][[ώپ W]
#OY2Kؿd>ƒ;
|6Y6o ۲W: soFZ=T2 r<.*)lIúZV_wdaoL@<-egNc`TFFuI ̋H[(aX!0w-UXYcO= <xYaQĶSO=A~cǎu:k6{l˳ |}Ç0Pon]vY]f#)rmp]1 .h66[[7sK* 3d%}e6~`'} tp66g[ er;GKJ+h{Vetwa1ֺ.vTi|oWJ@3" 1 oΜ9nSÆ
s9Zje۶m3gڤI{U1!H͘1N?@²l6~ŋ>x}\J
6/҂28ֹspi mPx*!kt"[XXI]uXq o =z6ĻuֹG }d't
2ďO Zkj4&cf<#VP E q*=.9}ǞUqU@@V+6uTԩM89eۻws?۷Gwܹs|@h@{'
o̘1vg>Vk_x3
۾}ꫯ\lĂ"ϷnC8G̃!VxRwi?-];6}t9P[RL@y ~]\;Kws=㰆Cb3h{~իW[߾}ݕtnuUT ;C ݄ _Yf> :;<i֊GڂZ4-
rʪ9 }Qm]tʐݺukpe=ˀ pBuܠM6 wdGDqc U !" " " " " " " @h n\ʋ6?|[\P
8m)ª"F}Uh唅!A\y/b-Z_p.1W " zh@:1XG>։|DwY\ae cط-<xG1!p na@K# ˼(B ._E{s1 !y2;" bT\x,0rH
1]vnb ;vC!/D~ڞx wkeN`ep 7Z>X c@9$o}@TܑXC$GD@b^5%\ ~b Xx (1ߢ!Jmذسg/`w ^JÂ${D! =z\nB@S4u].bupG@|D# tvYg>x" A.q!f"'aɨ " " " " " " " -ļ.X0 бJ*t,T
i,܀ |K,S;/cbņ{*jM!/g8|pL 9n'CYlw[D{U dAPL@s%uq
}g\D#C<Ê,:?bR4\h|w}wE<,C
a!>peh@#~>M%@D#`i %aϞ=݊^c .aY {6nh4~nǜX!oV8{}M!" " " " " " " F@y вaaֿc%[: E\JY7[VƎ n}'Np喹ٳ}Eݨ q&є\s=#.̑F\dꫯ^~\D:u[M4We߲eˌdx'D A$~>W^y>M"" " " " " " " A@b^N<W^yŭnrQ,pExcŇes!
4(z_?` BC}^8\gY6W^zqGݤW{=o/=,v5ݳ>k;vwa;DR?VM] dÂGc^C)@2H)WX9[
r[^Qa,7Z5ٟoE {X!!ȅ~&9*
~9]98 y{44VŲ!ݰܔN Xb퇥"ݺuVߙ0+eee^Dړ**ʬOUeDwS<<|h)2Xk61>NֱS1&eC X hA؋ g誛.ױcGsmq'uD}45/Oll,a'˼F tshn"K \wR"D"r@P;PhyrTwBPߪ*C jS Ab^}PU"hDq=n'M sn⢯ "p,Տch \M @`Jz"1*bhX=z;cæBwG-[{q#jz)VD٤~K6 vݩ`۷{ f)
F ݻw{hF"LsvHk&AAQ_EP i꿐BuϦN@BJ_c֏L-M@ \q yuR1@Wx yuR1@Wx yuR1@HMV^QQKu@- BK¢R+CS@\e%ʃ@r@8xnRRR FQQZfffqԽJJJ̲گ/"P*UNe%MtԆʇ|m5" - rvZf+h Bd@^lȦR)" -mA\w>\C C|;γO>1<8nsݰalРA~C={gnz^yҥM8ѿgee7w\! ?:t7 m!ݜЪU+O_8tv%Xnnnm~ ꫯ\ܫ:Hh[ P h
w/7TK.UVW\av3gzMH` 6j(>|xH3fxֶm[;SsrJ[x]y啵~:$Б>}w(/2L>#ߜ4iRإ"0Yf::utܸ9>g- 駟ngygM@5'`AD)@m,Z֮]kW]u[oe!Dݻ{}UNmJ>g8qHǎ sގp`Y۷Yf3~a[nwyo?[aVPP`SLqQe˖y z"[l q^ƹ qws͛=nt %q.i& !SN9L
Q>y$p@ż1@' zFUa֭_
3o bmڴ 1.+>:O<w8 KgN ;lB: IDAT?m߾Z3\DzF HSb^ ߔ /F h;NuRw]nIQݹǶm4c az ^{ |I @~[::.q |v嗻(1o<ڵ#\s>sF"`
w7ٳ]ম`}'O=@WG 9~XfݻQx1ڮ];LԩS>R o njZ>W_}=v=9 [|!챍Ȇa/GXD>1p{^,
?2B8E1/?v'? {iC# 1:::&- M(xc<, hxh,yD5`*SϞ=z Y< zKׯ_F!Mٿ;m-@8
2֬XQP桞pu
E @1 O:|ݺu7% ;:s w>}JsGp?#H Y\QF i.ae,B8M 8H 4:Ƽ8 n:Ǥ7\G E ۪ ow}UQ7n2 sN X+Phk(gK:q~lVp.8餓,`:n8/לK9~Q>{:@ ~ ҉Gp":}8V<{#PVPFM胅r((G"p,^<ϡ^ Zѿ@.@}8s<wBq #
b\q x6c\di[CԻ $ Oøm M:LpBo38|оЎ>!G&/e b!Fbi^' y+IN NaX,x#` >T1`} DJ#`w攨I,]x~: 447ެbuD."A>xk~ yO^|EO 6_K}k;e VEX!Et `A/K/44tj"vСE6u"i".R8IG&u.ŊgcG`p'5 :!PP y(ϔ)'Vڔwڍ~eg凲Uz40.y ^Qx /n;q's3^ywu[K ~'
H9ǒBDwdz:y7V
" e4"DP8"R P)cƌ=B/+y ?"~Vq a, n;<^Vb ? f!{߫zC<&nHZ0f"$
C{K)҈/^np
D=>6A4g,a)y5%DA
ThhhtnV 0hAd[<x< oN +@c `M0,,#6u=tD? 7vw/@,6ms olq3`E7Cx'0]g}v*Q9N믻<'=ak) Br b/
A DoDhjܗpA` ];q,X2@ ;60
֭GL# (Vԡ{oć(`P3\k9 E &Nǂz A>&IE Px^2اej&(@S xw^ª>}S@!`ц+uF,M7<}&! #q
b! q/^Mzxs>H7kQC?sOߍ l`?a@;IzIK{@<Q>hhPp`DJJE#FƎHs|0 gַo_'Dc cm<=D)|W8 G<-msC' &:XQ7yLg#XQO x *$
tJ~>CxB9\#`'=&_k]:ӈrX1M0ӊ(
s`HǓk8'"HKe lRyއ}ړv%fqb
w<'/1B`%y ] NPW3lSS/Qy2sEXh#T(@I@'x2WAݠ9
>ݖ)<wp q")s/rB!/8fرnǵU^FMAE ئo\u@˼: !c*ڔDixIDC\䱺kťM q)Kn.ʽH h@ipB` EHBH" PE;4T8DcNY!DsE&(Bl@hx#W]g:B Y-0 XsX E*@ 8HG
Gڪ !.~5T8cpXQ$h!I?|xg,G:(G;x P =E@!pN?/̙mZl8eAXl]c>KQ)XcP> \ܘByeHB|XsH xu2ĩK?5@x 䥣'</xxFQ/ cµ<gthWp g.byMn=0C4/uk^ }=?X.8ƒUoGFq-Mh]"K@b^,}Lna wYΣA @FƏcAx 9^p.L &R&@7K,`rb CFG3mi ŋ{pR 0CC ,6Ǩ\gubyĜdYLV!,([ !v_%n\(SHOkX+0]V(͜? u e) J ] u#܃zz uQ$~,Z8/Vq܋zG]B`HC;4H C+, UO4Nm'7Rx'7 > Øg-0uHyJ{vnX(ӄ@
zSLb c -yU#79V"n^{qB!ܓ:}0)\s5"p<GHǿ ntσ oexPF;ћ>& #@@<4@[ qA'o`(Li-hdskă0_Q4Eb_F`IC=i8E 7\L1 y\3t_mSr-Aa E:,܈H !2%h˳{>= B Bxn,SKCT9!w ȬY5'"Ml8\- uvỳ i7(o짬*Nݧyc=
k:, W z0i$0 nbUx> MVy&u%;/IY]&.ҩM gkrQ SH~kXl}<siD8ю~ M|xd T+cW:&)^$Or B⥽3}tO}6D>B3~ N.|D @0 zF^]\"PE@b^
m%N 'Q gxx Ńx0? \\5S
5#x|01OGe@VzL`/6ߍkh g + 2wFhbwhhk,@
W=Gt6)XP3tS n iQ,g Hht""1>B C[C(H,zQ}Y9$.\E
X"#Ɠ "Pw}'O/</װ'QhK`9Iʙ*<Y oK'Ov%
z 83z4/X:F^R.?B Kb~$@]!M{hO0/y#NC@"/ hϨg
"%s8{xGW<m@2e%s+0&@HcN_^0vēo0y +p^RfL3+7T_kVL6x܃~}3e;gj ?F{*^X9P&^l69.ڣ@{¹3 K0X
"P)
&ǹ
wYnnףǹL tyHsN죓wN5H z0GxHPcЈk ӦM }S1SXVֱT}|<2ӧo'g3+4 iHiP=߀q>4H#X%'/M?z_oEӶ$"@:[
y^ `De9'7Pg(tdcQk#r^cB{qN4Xt'"PW9?69<o8| R?l-C\>NQPh/(%V M,)\GLԶp.אnaʈhE; N:A| 4ԤNFӢM /.։rD>K:uz(>N !Q] 煗>rK= xRxFvm
pY\P Sn\G 9{ｷ9@Ȣ9yQ!/@WyË[T;~m mu0F d ϏxL/=o2
v4L)r
Yՠ|PiPRсF7YSXg#!$o lcfe]xao̠:m߰-i |skP&}W@u J~O~/8oA%h5 4u,h8F]̓x1W<XN hD ۉ} ĉO |&@YW bs [Qh9g`
Q;?lڿ|kutla_MduiӱK n6(gj''xyC Pw~ f@ $~q];B\8$\s=@cX}%҅.q~p暐'/*r`Jsc!15t{%V߆ .{ʌ tDq[dg`7ƄnƛL'Lv yPx3uXMv\}aT3s +b 2!< X`vMBg9~뭷z \Amփi
CMKsJ.`
toל~QUD@D@D@D@@')A /s Aԋw,>Dq${&4$2+4]aԔ>95*Ic^]A0CeGc!Ld1Eb0xǤaN9XLkys
&GG 2¦
i a3C w>l ~wJ}>>ye.+,!99nS@xEgya^ov']-" " " " " " "PPՐ1 0, b"&J x|2Q Ѹ7 dw}[!8"z5-o30 L , F B?"("!1ycv\f8 r 1VTGD@D@D@D@D@D@D@ZU
h"FaE8|55\n"# 8q< `櫨!Vϵ,]]zRG oFǥq5%M! RF bK ?|Ƈm9x ?\81AFLz,qdqPn,`qu֎~@3'9X3ư|w_w[f@LBhBL?7`ew`Q=#ޱ"+ܰ6k
+: _4[,z1C~f5 ǰ I'0o8 auG?ظq\Le
'`H k[D@D@D@D@D@D@D@Zyxah"_q9.7PX::_ޖ-[ 1
+?Va=RqM3]k*; UBvnð7q29*q.p\%NDE@D@D@D@D@D@D@D%d5tJ A7ٳgJkrUk*8F`=,!`Uѣ?a׆3/hCca\P4JX
@ X0B\_Zč>Yf7[DLDϷ~ۗUwb۷ ,X)⮫ " " " " " " " -ļ..Z5uX!z;sL3Dc1뮻O!.`?"Bb"xaֽzr9pݿ/*K,q1, X b
rk9J,H'nX1 im
f X' ~aWq <Xb}G*b 8q% lGAD@D@D@D@D@D@D@Z:-
!7p1#,^~e8'X \J(ZA->bǼp"ȅ+ܹsEE &M!
JL?~|jcGk}YDL`/c ؒ/, 9kK1+? E7lW\q[5Vu_h(K@ɓ'ӦMs! :nC|=h{ؿ~znPoSN'x£m,kX!_~~͘1Å,İ!n=)S@}|o q яM>-"k1X%suG d K/ݜBޕIgԖڑڒu" " E `_an5CyEܮ>Y
.i`t!3"]pXmq
؎
\K 2 +"b/>0X8m۶5߄ \1c #O! ;^)Gª.ٗƲ"A2ӧ1pM#"pA U8 U7H^Cxt=n_%y("`geQ;<rb#N Wꇂ LV@ x1fddZNǴCjKV@-k|qNL$ j1du4uPD@D@D@D@D@D@ x{Am<֖1xV5X'֘ "ļ҉IF xdJ@VP^T-4{ʖԚ uļ&Er6oD@N&E wD t6 ʄ Map#~l- P pewꇂXԳ>ļE PGV͎Hɔ
Տ[4; 'S@.@mDIh:q M'" " " " " " " " K@b^ʹ@3# 1`J@r." " " " " " " "Hkf?+" " " " " " " "$%o43䊀$/RRR,y)-@EEUT)C"
K@ϑ孻 IDAT@2H?L#udddZA>kժďs,[yy54G222˫OMM4 "8k8J c_l:='t+))7 #~DĦ'z]|mPP ÇWաOtx(ס}{'KE@D@ q,Gg}%\ ΥO{n8yXsW . /_
WuqXkr [VBxch H'*˜K}Ļ}{=6/ẐgA8 W Ρ/H⍑B u{}=¹{V{811/%2rcvбP *!PQa },;MUg6Q5khxϞ= h!g [dڀlРAUY+..cwݻ'lYYY-[֯_om۶#GZ q~6m˗;aÆY =zs{my6n8رcqɏ>iضmܹa!
K~8?'33Fa={*SjP'V^mϷZju,z)er~yѣE96[v}ve
My> @S&s_~@NNy}W>0/_B>oٲYs/x?vꩧV Q6Kj*ES~l~L ?Eߋ~ },ڲxsܹsOծ]|ΥKz\'t-PP (k
6x:tQ^(' g rJCv֭<R(srLy%P_ 7C ģO\i(ԭN:UE| .qH}l qi
Ϯ3? K/^lrnq;q^Ϛ5k<mp/Q :tJΉ(i_nwYgy7wٟeDO8a%պu{+*<h۷)bhXe紵̬ N
qƸ`:]|ށc?
?n ? .."o}Y6xh#Hp=[oe3gt!{tѢE /
,a֬YvM7ygkHӛoi4ơa
|hP>c6m]~6do<A7ްO>:7p5O tg߾}B\ AuOhɤNf#z.O#|/Ի۷SO=ewk^Bhrx3إK^g;ܔ)SynV )t}2ν[| oD/K9ξ0fc'Fyr* W^K/E(\Ƌ-{%t%П$_qxqEvr>}I3cV'Nꫯr o>bŊ6uT#?}> 8
egl(3
7;s\81 '/X}W <~@/{ >-;;~4q &uo߾nNx.#rF%s{=1L|]r%^Gyc<3aWDߗ3?~w 8~7(
<~ ih4pu;xx§:vU
m2ȁƄ nرqF_wuP!q7g4 X" ,LX+P"G >#]@Ш{p ˨3fx'1g]nw{N ;!qXO xj饽Y@3XRN ?n BS n <;w|! @6 Q/m:tDz҂kHG?" " M m(x9 KN1)8G w}
K8 +
V=^!bC<EX0G$! s!vD;sN~$4䍶 ;<7
A/9Py91+J O a@ 䈗q B2c {;(S3 (q@X=35 O>7,o7z^gF.z.Z,7'ܛq嘆cƌqy131 ;<x^<=)aYA/+c7J# '= G t &MX20
LCY:fh .8Fxi1 M>Ɓ9 RL)xF'Fz(s߅Z9#M4b OcK\BcEyt &#tN蘼K^(!@ U e:5;:o v tH!bpza K:>߇!Qd!bPFMF&@߂~}!2a %W_}u <xӮ>yW BqoE9@MhopcN_q}@
SBK /\҆mXŭC2G?q*JB<RWП
ea:B R |+^k߾Quk('l- !@Sٗ(\q !
UKxg)L@ܸ"x^{</x c"od|ܗVx @c !ǃP}I;?<ߎ~-*4ZyG6|UDBA&
Mhx A$pG( mth$F444\4 Cq!gFh444 !p. V|\[mK'qMqg4q6Ҩ (osgu\4=seX29 kP:edRNG
u/6 |1i~Gbsg?A"g 8?LxӇ|-/F0 X wԥGt/ԣ_G?~ۤI\@H>VA\}yy I>@rݻwo~erH:EmΥP?/@A
ぇ zj-{1AߌI,S_B}D<h^+ %qel+^>33A8\9P40 <*%Gu</ 4ɓ<;KDz ! Z/̋H/S IHBxI֝E@jK1/ q+lscmRXZ E#:W泣f rFۻrGD<hス kݵx i m#@ a (3Z Û_:O9)xf̪~{fI&qTD8s@c4shN;}ss|9QĘ8+GT!(C7=ҷYٻv
zkUjjUտު3 MݕHO7=GrO %sGyhp?,C, ݲ۬ ⡍bRec!h4b葰 "',yh`GN e#+Va.6M>=)_|яs-}!!>aƸ VLxG e4)ϜM|c!`G<#<#- #WҐ=.qOgi#aͽ!!cыe/H\,IHyz,f@>*+H¤ɳs
uѼ~/KO,yZ @zAM#ƇF|hhLxwol823CG 4pQ7I!s"`1[D!54̞XI$mD;#tx ]k
fe4, D1С,i|2̌+!0:ZN %#. ]" " K#GE'FM_bV\K >c-khc&3VbSs OSTiث XO]M;(,#x}(,3IAc 9PW_qf
K\OW\K=j爗{H^ԨXa?Fg c }TY<"=< `u u7 < 9 (+}3#Ｄk < Gz E۞ļgD gƊ*̫y08灍U]t2i(ob3 j4Z)b A AĪ|hi8'f{iCHAb 3zRQrᑆq4%ʉ@<
%ez@QcBChfst)k>0QnY~@:Fϔ 8USep\''" "бlwD5o" Xp8a61(>Cwb" vY&aP8q5e, r oeq֩Ì er@K) :) XHuPƌQDX Q:#qqDp>8A p֬Y
+9 VI':!M8e`ሇ{BCp?փXn;'~?2(/s1 }<ȏ\j HK-.)!n8 l.˲WbD0D
,e<ؙBDúF}^bA`6*qy4gA
0w yl '$=fc6q-^3с{ |KLyeě\"RS(}hb Jc38Q. !#>^ ~#e&kSRNIGH_q;D
1 &D@o- G@B
VG\CۂG/bX5ݱr<xI" GX ai{!=DLUPTk ʬ/eE,'+ xV jE ʡW=Xa GYdI*Ka)x.,Gx_X+&sǐO5a-a.a
הu`4?3kp#Mހ`y`F P#xF &Ha=G< =y2$ \ORO@b^ʁ+ <#hDB`_3ا<ԩSCFsb|G
eG4NDf<]n4Vthxi G:_ GCC'0+' 3K3|b609%@b)̂zBBIC\E9FpG狺olDg,(2@ zR<N AoNE@D }Ж0<i?h[8xY6G;3^wE p_р@? M qі11E "
x"'m#"l`}>IB(NQ(y$ec>%ʟOlQ"8 7r! qDiu߱s_týP7 ;}@?6>?Ot9O{zʑ|[Q$~=~1X5<3!8Gy'¾z,u? SC (U8 ,ڵy{吆x hPx wP"(pMSVb6nj,i4 :1;x@lE>VN|"x4Ɯ",i FC qS:=ISV̅:[TA{_ʧ/Iy҉Nru4p G2M_~",4N=VND`?LtR? n<]|l_z[Lf _C[Cxίs S4'<W%Jۯӱ @~4(7^/Q~{P?(GrexoSD1{m4]~ qs{K (.5.65p /^E76S6OP.o k=zm Ny-%DM(<ypky6*M%Gs7O{iN
shL6W);|peswlB?<N4T kbOhqyR Z"%}-뼿EpRJKE~f\199.\ۜ)$K2 b&Qx8 4ilʏ[("j/6l2)dPÏ eO"T=^.x9 E@D@: >#JK|+oE໔rmzQPnD 9ZO /2JXD@D@D@D@D@D@D@D@# 1/9^
-" " " " " " " " )# 1/e蕰$G@b^rZD@D@D@D@D@D@D@D@RF@b^+aHļx)ļW" " " " " " " " " 7][[kOtfYyȔ nJND !Ցh!B P7T?Ó@>D 4t"И@{Չyxee%V_W8% @eXAAgdf [ M *mN::RWW)H~nPUU%1o?}P WцP?D@@̣~KZ̫=EVXɺvfIGEYh|**m"S۽{w2l+ f#r" =,..>CgD@$
H@OÜ c6a{-??zզS"P;ula;vܼ-
0rssGƍ: Sۘ MG ѡ6ƤSXVlٲ
$˼ô ;v8|D$PQQBwR/*ܹ ]
:Xff uS" " " " " " " F )1\! 98t|ʶ3Tzt7(o" " " " " " " " "ppIyN!D@D@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D HkeND@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D HkeND@D@D@D@D@D@D@D@ڊļ"xE@D@D@D@D@D@D@D@D dr|]U[}uedfZF^Ԋ+*h]UUUm+k]MD@D@D@D@D Ws\U_j}cY][v-oԙ; ᎫV
;vlCk7 ˶ml͚5vi ,hZI!yz߷:맭Ȗ-[f6bĈľ}mzY%>W_}e]v
{
nذ>Sʲ;Ύ8?{n{lP IDATO =zpsڑG iF
6ol[nmG l3ڵkC}:_C`}fXz}vUWYN'(sX¾ 'R7OnVRRuGND@D l'N q1}>,L s1 %'_mvڠA<xџ:-77?6/J>|xŶ' . ЇJ?_f{>}'ũI0 =CQ+0ֈ: ,7xQ_P/Q 4x%.qϞ=]hQ(nj9{! u'k֯_ s u9d0au93裏3 /
<edd7n 㢲28ptI 7c+Wɓ3<N7tli+yXZ]V,,cjz
jU,yrΓﴼg6
-Py饗`A JE]dz
i\)т /iQb q!4ƻv
q
СCeA`éQWޱ} ?ܜ& 뮻Ạ Ç 7o ù/FG]z=Dw}7Ezm˗/ ܺuPg̘j'E]|BXX1v饗64Nx{!ۇ ~:1Ci(! )s1 t5uM<P. V?vm5A9 domG }tE'0s /?4{l[t!XЧ">Ҿ0QI~>B 1믿>! ?D
፰&W\qE>l_%o{3i$+$? ox
7%Ç jE PQn{0V ,ol7e1yԗz* (DKSwĵnݺDb ^DCiӂAE駟P_9s 9z} 1z7&FSL . L <c!}t `3ō2bńy'38#x9`x 'ro wH 1v+߬j廖٥u8rGO~c,sOj-`UYgXڏzOyNo08r&fh Qx>9
&H(T*6;A*
*%7
/3rrb M6F7eY̮SI 3>F#0E {gwAuG<tܳf\.: 8+36?ر#yʽ;>
b8G2ό
(3/'|2Aq_~A a,ЏP`eGrQ:B9u<,0 SO
:CD q!}ӻ;898f@yNc]`'PGGtpxf|1#L 6lXCG S8:CX '喸(uڣ-[i+tP_?&5 }!o9^{ 1ps 1bԩʛs8
2 쭷W_}հC<tG
&^iKY@z 4nj!0gI'&RW/ʉ SVa$@ <]{Aú
1>e-ZV`@͘ 4yPuG}Q_u2?HX>;PGoheb*D.ȟ![q/`cp-B)b$qb a@}<k~
y3?z(ue; ,gu!чV[Π§[Xٻ=o|t̃A **Sq "" b .RƒF6R0!XG ̚?,bPiF8:7tS C=ގp|뭺>Ob^+(4y4:h+X)CL9 ,%etѨ XH}@Ts+Uf8O$
-9ꭋ䗎 B"0-ȉ`=3A粗 NK`;Ｐ,g.zAYZfB)|',V?{,% hfHկ~Ր Z:r" " Im}6A@pa@{A;
J8 } 8 9cb6Re{nbb`"h<鳑W_D~O MN WKIcf"\3a~hQG],SXʤ>,.LE q
>";C}n E" ƏBf1zM>^" 0uGcEx<C M g([ΗSqCg?Y
w%La[ؾR+~kUk&ZͲz_.Z_Yjjwe;2;sB7k9߈ 𡊻#
5B9;K(X ј20XJǫ\GE
+3r
~_裏6X) G4օ_Gʞ|ue,{%b:;zHAe=BҀr { I4
wPGXck/.FG8#]::X "D Y<fݑ \:¤M ;KiIB@>̙3'3g ',)_l@FXhvC,匙 |0t. +cs:EQg&NA.Kwco'D& (Ѷ/|GuaG сQD,|N!YE||߈X?aa}D|xW_0 !!>;A~ xQNR}|
O2dH#`P?d;>UqP>` ה _| DΟ-ߢg f|G_4</0'u% o y< W[c zJln?)-^C۴i$䁠تVͳV 9Nnݛlޟ{ەwe#$w
cguV|UTؙ.*
J4Յ#R!yPѢ^&t 6,~<#,;.DI [bUx0-SfOusG;>(7Q!9֏0y?t4 ~>Z=^2f y
6x'3h YKg?QǨ4"X bI9HpLÙ#
X:ܑ'9G2D!2<K=`A(f&)[ݔwѴ-?> n2̑mΉ@3ȝ?9&aDcMLN/mo xE+2?6m e{ [?c e_-9p(IXa$*cz~ĖUX2Rj čX@E pԡx.6
PB
Aĉ~!/a{z d.ޘ=~l~ ߬n{.c'?x3p #~SMxxwFwfXqY?)!:1}:+ˬYвjKYވo6_O)
&^o>ͪ,4ނ{06F!e G<|TXG)%2*6aݱ k&H}q?p< LTx(FœWخY۶(sZ]]eG-\j=5F d{v=YaNVK(sEw<qď 4$7吰#
01D]:XZh3{"Ѿ;= FƇYYf5 Cㄙ:fNlC"7
<k)<)6Pa r`z xc zQD@Dc Gas_y5\0x m {cYoOg\ϱ5RX6wxc2xȊ> ؟K=E9%LVaBYF0E9
;} B 8YĤ>}&i Osi# ?}(٬ZU X%zFl H>$=0C%m,cr1L84 &]lGd+31Tgc'&
Ѽ ygORO eb^]yUm2 Yޘ'iyc.Gc 9*̶
KZ, 1ʩt P Ұ@lH䨸4j
Qg;4v0G:ҘG q",1Dx`v^w{ްܹ233,[+,q2}OXnNu\` [.v Oor"w{O<RG]S(
4>h(h8i8(Czb6f)Qls=
! S~ χ6,/^?8":OywRtD ʥ?C)38/ g/ߠ W 3
e/_e8ΐHTnSe3MDD@D@Қ }#/Wǒ-ih?j闿e#8(EX1Va@xho?[;6lScaĞZcaU od)#͟
|Sި .v1V@ cN`yX!q1~5$ wٸ~l5yO{|ochG<||D 7u _zZBq?'%o~(}b7>sѸ NۻJXfȸw^_]a{mu_ 22,gVSVsM89I`R1r4 ^c"1cMV01f눗y( M 4 !ʭ]JJ0 /,2+Ǿb' cDuPFP6Ť"{g
95챂Y9( p ÊU 63Xw7a I?7 dg6Y7o /!=
~с}hl-`rJ @YNyKD
3{`)iCc)}&n(הGBfFڝu= ,ʉ7ځh A2Vݴ Lbb݂
b&pXж0d548c} ! b=Dn+!]I!wIH ! Yfoc!/Lnqq m{m3 ?^zTP/!~P0KX
Ny(>=VL X
nS.^\ c; 1v {x2y`); #,V%rPwCD4ҤRCcq?Hgc<K[*ȧ;Bqg^RLZ>}Yf7odQ[*>zJYӬ r YؗV_^짚<҈p@ i\Qxd 1".O0.NDEERH Ao u~} ϚtJJ&Soavӵg7|7NpmX1[iHxg+$ 42.8 !}(w4ec/fiq9:f)X∃xiD} P
)#fN2"'P/eeI CRf=);l@) 6v90BF-a~vA8g)4lQtlzH 1%Z?" ">9B/8LhW`>о BC !q #4+q|{`|
K^CGD WPpC<XEM}^I36+}dsBe"bG Q%۔sD::eՅ%(
p' wk:vrM9[!kKyzn}(>Át ϑ/D< uaU\ި0pAkװ9Eݎn1&K%8b6s@S_/gXMOZF~/=|Օup{5 +>yJ
_nݮ|/Tv
!٫ ~89>[wuWKgO=f xxeMʄp764 { qG <Xv-4DEUg
WӀ2&nV" v: _{{ =eմ2kkle/~r|[cF#/s\D@VC5 Ci,
H2Gb> ?hQ'
GQf)ԫh0+(Z:A~hpF :u; O?:Dse hѯ
R暊8x3 C2p߱IO# pVl_P<"Q g]<lBh#x ,lGe|w|~|WDEE]ڜx_Q_d*4Z"@F]-I'''z{@;tQMKRm5~yueز
ٟ(u_Xf/M4"6 4-\a1% "̎
455ۄAM9 Z:cs2q` IdzfX 9'P6TM< K_w=d{=+ ?*B^S ~MF5H"J$}V|ɔz[w<~> 9
!@Yvx5+0G*u"?^Z%fL9%s%[p.
;- +45 8T>D yY]YV!VSe<w`kzR p&+XN̙3>H Z_wu֨~4X55ao`2!6bG"$ļ
K?ő_{oѲ#ϙd.Xjsx/HLY3.V\Gp)2XӬj" 9&hpIJ[8Vn՛[պ%}>ѕ? Ot~aL6dW֬ן [8
ye4^CcIfmM98 eñ-y
GژczI YN2[, c"NSVpbiYy=^C@< ?ʗ<ibFOc/m :37,s+yXݞy- { ^
E {0m.aǫ}?:X49"<G`{b 6)?ǒqBLM-ZC$n;Cg(<¶leTOcXF0ؔU E6tЀTfWi@Hgu?_[Fn'unìpϭvFyvR+}[劷,gIX5N8xWRI7 aq
{ kupb3f0^x[ {!ZX{)%i,.)ݥykjKIJYZ\jK` IDATҶmߕ @kHtٱJf'+<,Y7s]U}}>ײzv}c9 BY~s8 3& ~We#EƦ ,= ŶgoZ~^zX O s~hŻl;n]"" " " " " " " "r1ϲr9ٶeKaXΠ-k}VK^U_jueE3duXΐ ͺQJҽ6avK쌉^r_eӧm?B[aKߐr(" " " " " " " L b ds;[ṿ#Y[|f1%fٖ{NaNe&VZ1?`Vع3~_oϞdbB BsycZ3z˧VoVuՕc-gx>/"0f0ӔcygOl*D@D@D@D@D@D@D@D%Vb 3r:YsR@ d]""xn:#/~<|IE@^/x`×ם @{ԏ;8%P__oVWW" fnPG؇UND ~x OOWGjkkڏ_Qړ@uuG{WZ @UUUWb^#V"rss4k{Jc@+**ꘙWE P?vƩ(z ;v蘙WE GCV mwymW@Oovn JED@D@D@D@D@D@RK@{楖RflT
(" " " " " " " " % 1/4ļfR@H- jS{.D@%@*6%1/UX}F]98#Nˉ@hWos 7oM()h~`Оy)dE@D@D@D@D@D@D@D@D Y%" " " " " " " " ""R^Ɋ@$%KLE@D@D@D@D@D@D@D@D E$d HK@HKx%+" " " " " " " " ,1"JVD@D@D@D@D@D@D@D@% 1/Yb
/" " " " " " " " )" 1/E$K@b^^D@D@D@D@D@D@D@D@RD@b^+YHļd)ļW" " " " " " " " ",ySxHy)dE@D@D@D@D@D@D@D@D Y%" " " " " " " " ""R^Ɋ@$%KLE@D@D@D@D@D@D@D@D E:WWWg8)6D@D@D@D@D@D@D@D@D D r~ɒ% ZFF]tE6tVZuu=sc6m
<x_x۸qcB.h扝;wڲe3ΰ֭[g˗/ kFj۵k-^cÇ?rrrEEiֿ;0UUU֯_o=zN:) "'|b6m}{ݸXlݺ>2eu=> yr7|SN-Zd[l.] Bbo4VmCc5zbVkyĽaÆ !>sy+W T<+))7x>s;<ıAhC㾧On&M
gCݻw֬YcW^y#<!H"!Κ5+k>lF0 o۶͞yڵM<WYYiıvڐļ23gWPP=ļ#<Ҳ} qG }d7t
2ēQD@D@D@D@D@D@D@DZ .-"(ݻ/kV
q D%X +4( q#<!1"#m:A
A +Y FӳgφxΝk}[n%|>;6~`$bz+**
yWmŊƵziXvy{
aB7
cݛoiX bA JKKm߾}vq+#?qkAQb^,]"G,po}W.\h_~yXڙ+" f=P/z*3gδO>O7x1DŽlXcmԩֹsp小=Xøgܺ#q\p=z/p
,L)O;6<묳E B0, 6lX8i`CnVC ²rXaR'O 7o^U] a8 9rd Qkҥ!
,.믃~p,ES.uco:wU r܇nݺ%Xa
B5sKAG?q5#, ݻÞ'NcH~:,:DxEPdi.KzGint( /P@b(BBBK]ݱ
KW%`~QrÏ0řkrJҍQ :,~Gƨ# ~ a#h ?/ qt!. QK. HqG2d. KYBu B q+XX'˚`ݒ1~(8 jDb {!l p<A@B* 2_9D' "V`n$P K7:"!a
V<`='\ K ˽?WX t8"{yoa
k@~ ޓO>izj'DhfsN؛ᓼ C#_ӟu^K=CHySND@D@D@D@D@D@D%5G!-<!;,">q#X!x|sE ʗЅ ĉ;eK'X }.<q=om%r88Ch"#B vX,7rXx 3fLco=%l[n
tÔ)SBZHI^`@;D<@ٳ.
c|r
^aYr[ U223s=1: NaE
]wZyWpr#엇 {!!፫p,
\?o/>sE|B@9 o R^; ,Jή`h3N/D8e-
x%~ ^x!r/rxÞu=[ 2aKm,5捲}W]uUX/ \CO a玥k4jz|"* Zo|e lc(1O%BD@D@D@D@D@D@D #2b H y=
K0"! zX^xa̓ 80\ o?~9ŋ/pC8ê.WYD< z vriӂK3x+["
᮹CC~:Ox :0Kw?DI8"$?pd'x"<!d=I J>" " " " " " " 4D.ٛt[I۷OòDyb[fq a"/$}; /1 -NjC YJrC|:+CDh|6ؚ*˘ -/odoiXݻwxtC wX },3FKK˼Gb,aXE-݈9NsŻ5<^8s~l*jǟ:$GCy&M
o^M$ ?9T
-" " " " " " " " %С<^Д;SOD@D@D@D@D@D@D@D@ҍ@feHO@b^|.:+" " " " " " " " iG@b^K!O@b^|.:+" " " " " " " " iG@b^+KlbuV p28r" " " " " " " "p( ݻ?Lp=%%%FzұND@D@D@D@D@D@D@Ҋ@FIiE}ssTW_o%;o>VPPNҞƍ-/5uuu{8`kJLD@D@D@D@D@D@D = TTT;[>(kC?D@D@D@D@D@D@D@D@D } HKr&" " " " " " " " HkC?D@D@D@D@D@D@D@D@D } w^۴iԴ)E>[TTԦi(r.mq-UWW322l/%\b'x_GΝ-++˖,Yb˖- >!< n'Oߣ/_n? 9.R {⊆whm^Z;^'" " " " " " "4kg}(q,87yk#FVu_| qA+// ;vX~,??>v{ Z6 b7l={xuCطo_( *ʬ@LV gϞ j`6D9~c^aaaCo?σի믿8!,lٲy`7` >}zX" =77:} mv2Ưn@@ɉIGf{ Ղv۶m[oE]dݺu3=z|O$srX!Ꮵ n
sΝv * XaAN:R>}X^^[Ύ;pY~p ->@֝;wkd'I@N:#" " " " " " `cxAZy jƌcK.
I'ī~ o7n ocI.!aߐ!Clyf͚xJ?~G 3gδ'6k ~AD<ꨣZ$aPzǷC5-$AZND@D@D@D@D@D@D@ kY~cډyX!nي+RYD4s+;nn j_~elРAAiܸqVz.]+ݻ!p_-fYo =²pq>G<#C>"qÆ
q/D۷ }с
~?|;Y!nHHX,b &q7,av_<`ԨQADò8X0b}'СC}p͛CIXQ5@ټJD@D@D@D@D@D@Dp"vb KG.\"!x!D}WAb);ݻϟ (&aѷvڰ [?A xܑ{gnػ3 XW bb} |Lj`]a,YHΙ3>c9&X roQ}6w\6lX{! yg 1 YP[A/Q ɕ+W,U&. bx }vf
ix:|wi%a`XƛiڌoJucǎ
>"b ײe,w 7x#Y%gc ɴHICTE X! _ߤI /{Fk?#! _^ y巼?;tM*˖3qgyװѓW~'3ح,!߅&D<d]we ,iӦy6uhi% KZY:
1,ڋ:(h OW_ DA;C,ı KWCꪫQ|` ,%#F5 ?XvܓO>B8xqⰬ,嚑#GQVTTD7,p /MXܱ =%ň}n H#<qâeϰdA;s9'{`@H+1"!\!a% RX#,,
`vj|!L;by;<(%,?=Ӣ^駟l\veAPE31y e|< APu#<# Xq,9ƺC|&Ly oi?s CG9%p2Ժ'^X}AB8BBÚ
Q!n>(,uGX) N
.!Fb~ q1Yu yg-!V~.Zoe{e և ~K>籊#<H %aLr%X^e, "(xe ^>B:|p/VX9)'" " " " " " " "кJ"7 YԱ|%ޚoErU a%HtO?+3<,ypNjU]K {!5kBKzO?tXV 7xK y,?f?A+ 3ɲᨐGO1KC}pX@" ra k/b={v7xN:5,!n)+]'" " " " " " " "@FIiE}|[I۷Oq dbe\aW9_9"("`ݨ_K 7MXr !
^aH|# )c.b _z ,y/x
Z^ށL)ʋM ".-Κvnu/ /hm(ю .qoX5Wszzl A9#PM`3k&/ǡ IDAT;'Xӵ'ݯ,T
D@D@D@D@D@D@D@D@DAQʦHSB@b^G)" " " " " " " " "_ͬr_urrr{anƍk۶mKc^^^tn;]JKK-;;ZzaUu" " " " " " " )# ˼VFxb+))K6dk#$T m#!]FdeYnv~222:$ZeZD@D@D@D@D@D@5%5[I۷4@ ʼBoTۚmŶ2,=EGloӢ1*A8,lMaF7)C`b%<cں:CW zz))jk,';p/w^g#ںx:'" " " " " " "N$h%# |-\<W][kuwf6wwɶM;w[Vff[yeuK9jvd7l}UAKxAV OHy)dE .5E0<ĸ~ݻуZqY>f{X,8:n]/1/3" b,5!#۷/u-![TTĔ^z5'@J`UsNIcky9Oe+(w!vd^ڎks!U6nw7_h-sTTگ v
~)Q%*" " " " " " "pP ^C+//kO<aW]u uQъ+lٲeA
Mf}*{m,eg7F88eʔlnb{7]vYϞ==4B<$dfdof5g{]V
r'6ۆŖ]{l[ WUc }d.[ ܷ/"[V?$&D@D@D@D@D@D@D#X7駟ڜ9s #ϝ;vСCXpW]] 1DI&c=fZ \#-[Xiiiyͳh_|t555vG9csΝ#،3^+++m^ct={[/.>_< 'K=x z{ri6wwףuoOE;KlD^6Yپ*딗2 x ZEUM:jM ;ʶڲK,\joѪ
qni$)vbސ!ClwgҥKmȑAӧ͚5 z!ܹ϶n~_|vg[ncc=CALkM:Qc/SO={n={vwq+>Xbv{!*7x}o3v6? ^}֩Sp0"=6ϟ HDC'PU]^pѳS0+)g;Jڈu>|e کVk{&d}8H嵳w.)Eduf218,Kf
DSN9%r[X!aynݺ a]ʌezlDoo۶m! ,u3kM6ً/h! Fr <xp<N.]Ӄpxrb_q!߈8XbuףG` nX1"X4X8nذ!p 5jTːڗ s7!/'+3Xc`qW^Yev7~UUXM]u\` mpVUSc/-~[}u[g{+w})5y|ر#}@w+W˗/tƏ x 6ĸUV̙3
0hZ| !!~AÚ<.\D<
˰G iso999wK.$"=! "~:իW;-˥^ϒdN>xm aYgYׂ|+k;~ x&[i^hO<^ZVhvevԠvϜvi'(+m^a~~۶ɽbhM ^c<^t{!Tڒ%KyBH8Rr\^\t\8 B "#" ?vy煥 l/+6n^1vpXaA z 8p`x< g|-" DF?,C,;fٲ; C(DГk XͱgޭffʆiO}&bzuJ+*3]Vmi`3>ɞxw-]ɲ2R܂lOWL>yT*" " " " " " "*:žo.P97yÒQ
2D*<ls,gE k xi|xg}^WTTd&L\|I;S5=ѣGe쫷y}b} ݱL駟pcƌ /0bosυ:ujH˯G,{%9?ې~l'l]vK -se -^{m}=۠ڔqByf֥ /,m;Q
" " " " " " " APUpe IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/AutoUpdateConfigChangeListener.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.TypeConverter;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.env.Environment;
import org.springframework.util.CollectionUtils;
/**
* Create by zhangzheng on 2018/3/6
*/
public class AutoUpdateConfigChangeListener implements ConfigChangeListener{
private static final Logger logger = LoggerFactory.getLogger(AutoUpdateConfigChangeListener.class);
private final boolean typeConverterHasConvertIfNecessaryWithFieldParameter;
private final Environment environment;
private final ConfigurableBeanFactory beanFactory;
private final TypeConverter typeConverter;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private final Gson gson;
public AutoUpdateConfigChangeListener(Environment environment, ConfigurableListableBeanFactory beanFactory){
this.typeConverterHasConvertIfNecessaryWithFieldParameter = testTypeConverterHasConvertIfNecessaryWithFieldParameter();
this.beanFactory = beanFactory;
this.typeConverter = this.beanFactory.getTypeConverter();
this.environment = environment;
this.placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
this.springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
this.gson = new Gson();
}
@Override
public void onChange(ConfigChangeEvent changeEvent) {
Set<String> keys = changeEvent.changedKeys();
if (CollectionUtils.isEmpty(keys)) {
return;
}
for (String key : keys) {
// 1. check whether the changed key is relevant
Collection<SpringValue> targetValues = springValueRegistry.get(beanFactory, key);
if (targetValues == null || targetValues.isEmpty()) {
continue;
}
// 2. update the value
for (SpringValue val : targetValues) {
updateSpringValue(val);
}
}
}
private void updateSpringValue(SpringValue springValue) {
try {
Object value = resolvePropertyValue(springValue);
springValue.update(value);
logger.info("Auto update apollo changed value successfully, new value: {}, {}", value,
springValue);
} catch (Throwable ex) {
logger.error("Auto update apollo changed value failed, {}", springValue.toString(), ex);
}
}
/**
* Logic transplanted from DefaultListableBeanFactory
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#doResolveDependency(org.springframework.beans.factory.config.DependencyDescriptor, java.lang.String, java.util.Set, org.springframework.beans.TypeConverter)
*/
private Object resolvePropertyValue(SpringValue springValue) {
// value will never be null, as @Value and @ApolloJsonValue will not allow that
Object value = placeholderHelper
.resolvePropertyValue(beanFactory, springValue.getBeanName(), springValue.getPlaceholder());
if (springValue.isJson()) {
value = parseJsonValue((String)value, springValue.getGenericType());
} else {
if (springValue.isField()) {
// org.springframework.beans.TypeConverter#convertIfNecessary(java.lang.Object, java.lang.Class, java.lang.reflect.Field) is available from Spring 3.2.0+
if (typeConverterHasConvertIfNecessaryWithFieldParameter) {
value = this.typeConverter
.convertIfNecessary(value, springValue.getTargetType(), springValue.getField());
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType());
}
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType(),
springValue.getMethodParameter());
}
}
return value;
}
private Object parseJsonValue(String json, Type targetType) {
try {
return gson.fromJson(json, targetType);
} catch (Throwable ex) {
logger.error("Parsing json '{}' to type {} failed!", json, targetType, ex);
throw ex;
}
}
private boolean testTypeConverterHasConvertIfNecessaryWithFieldParameter() {
try {
TypeConverter.class.getMethod("convertIfNecessary", Object.class, Class.class, Field.class);
} catch (Throwable ex) {
return false;
}
return true;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.TypeConverter;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.env.Environment;
import org.springframework.util.CollectionUtils;
/**
* Create by zhangzheng on 2018/3/6
*/
public class AutoUpdateConfigChangeListener implements ConfigChangeListener{
private static final Logger logger = LoggerFactory.getLogger(AutoUpdateConfigChangeListener.class);
private final boolean typeConverterHasConvertIfNecessaryWithFieldParameter;
private final Environment environment;
private final ConfigurableBeanFactory beanFactory;
private final TypeConverter typeConverter;
private final PlaceholderHelper placeholderHelper;
private final SpringValueRegistry springValueRegistry;
private final Gson gson;
public AutoUpdateConfigChangeListener(Environment environment, ConfigurableListableBeanFactory beanFactory){
this.typeConverterHasConvertIfNecessaryWithFieldParameter = testTypeConverterHasConvertIfNecessaryWithFieldParameter();
this.beanFactory = beanFactory;
this.typeConverter = this.beanFactory.getTypeConverter();
this.environment = environment;
this.placeholderHelper = SpringInjector.getInstance(PlaceholderHelper.class);
this.springValueRegistry = SpringInjector.getInstance(SpringValueRegistry.class);
this.gson = new Gson();
}
@Override
public void onChange(ConfigChangeEvent changeEvent) {
Set<String> keys = changeEvent.changedKeys();
if (CollectionUtils.isEmpty(keys)) {
return;
}
for (String key : keys) {
// 1. check whether the changed key is relevant
Collection<SpringValue> targetValues = springValueRegistry.get(beanFactory, key);
if (targetValues == null || targetValues.isEmpty()) {
continue;
}
// 2. update the value
for (SpringValue val : targetValues) {
updateSpringValue(val);
}
}
}
private void updateSpringValue(SpringValue springValue) {
try {
Object value = resolvePropertyValue(springValue);
springValue.update(value);
logger.info("Auto update apollo changed value successfully, new value: {}, {}", value,
springValue);
} catch (Throwable ex) {
logger.error("Auto update apollo changed value failed, {}", springValue.toString(), ex);
}
}
/**
* Logic transplanted from DefaultListableBeanFactory
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#doResolveDependency(org.springframework.beans.factory.config.DependencyDescriptor, java.lang.String, java.util.Set, org.springframework.beans.TypeConverter)
*/
private Object resolvePropertyValue(SpringValue springValue) {
// value will never be null, as @Value and @ApolloJsonValue will not allow that
Object value = placeholderHelper
.resolvePropertyValue(beanFactory, springValue.getBeanName(), springValue.getPlaceholder());
if (springValue.isJson()) {
value = parseJsonValue((String)value, springValue.getGenericType());
} else {
if (springValue.isField()) {
// org.springframework.beans.TypeConverter#convertIfNecessary(java.lang.Object, java.lang.Class, java.lang.reflect.Field) is available from Spring 3.2.0+
if (typeConverterHasConvertIfNecessaryWithFieldParameter) {
value = this.typeConverter
.convertIfNecessary(value, springValue.getTargetType(), springValue.getField());
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType());
}
} else {
value = this.typeConverter.convertIfNecessary(value, springValue.getTargetType(),
springValue.getMethodParameter());
}
}
return value;
}
private Object parseJsonValue(String json, Type targetType) {
try {
return gson.fromJson(json, targetType);
} catch (Throwable ex) {
logger.error("Parsing json '{}' to type {} failed!", json, targetType, ex);
throw ex;
}
}
private boolean testTypeConverterHasConvertIfNecessaryWithFieldParameter() {
try {
TypeConverter.class.getMethod("convertIfNecessary", Object.class, Class.class, Field.class);
} catch (Throwable ex) {
return false;
}
return true;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/bean/XmlBean.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song([email protected])
*/
public class XmlBean {
private static final Logger logger = LoggerFactory.getLogger(XmlBean.class);
private int timeout;
private int batch;
public void setTimeout(int timeout) {
logger.info("updating timeout, old value: {}, new value: {}", this.timeout, timeout);
this.timeout = timeout;
}
public void setBatch(int batch) {
logger.info("updating batch, old value: {}, new value: {}", this.batch, batch);
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
@Override
public String toString() {
return String.format("[XmlBean] timeout: %d, batch: %d", timeout, batch);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song([email protected])
*/
public class XmlBean {
private static final Logger logger = LoggerFactory.getLogger(XmlBean.class);
private int timeout;
private int batch;
public void setTimeout(int timeout) {
logger.info("updating timeout, old value: {}, new value: {}", this.timeout, timeout);
this.timeout = timeout;
}
public void setBatch(int batch) {
logger.info("updating batch, old value: {}, new value: {}", this.batch, batch);
this.batch = batch;
}
public int getTimeout() {
return timeout;
}
public int getBatch() {
return batch;
}
@Override
public String toString() {
return String.format("[XmlBean] timeout: %d, batch: %d", timeout, batch);
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceBranchServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.test.context.jdbc.Sql;
public class NamespaceBranchServiceTest extends AbstractIntegrationTest {
@Autowired
private NamespaceBranchService namespaceBranchService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
private String testApp = "test";
private String testCluster = "default";
private String testNamespace = "application";
private String testBranchName = "child-cluster";
private String operator = "apollo";
private Pageable pageable = PageRequest.of(0, 10);
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindBranch() {
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNotNull(branch);
Assert.assertEquals(testBranchName, branch.getClusterName());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateOnce() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(rule.getAppId(), activeRule.getAppId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory releaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(1, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, releaseHistory.getOperation());
Assert.assertEquals(0, releaseHistory.getReleaseId());
Assert.assertEquals(0, releaseHistory.getPreviousReleaseId());
Assert.assertTrue(releaseHistory.getOperationContext().contains(rule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateTwice() {
GrayReleaseRule firstRule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, firstRule);
GrayReleaseRule secondRule = instanceGrayReleaseRule();
secondRule.setRules("[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"]}]");
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, secondRule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(secondRule);
Assert.assertEquals(secondRule.getAppId(), activeRule.getAppId());
Assert.assertEquals(secondRule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, secondReleaseHistory.getOperation());
Assert.assertTrue(firstReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertFalse(firstReleaseHistory.getOperationContext().contains(secondRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(secondRule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleNotExist() {
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNull(activeRule);
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleExist() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(Long.valueOf(latestReleaseId), activeRule.getReleaseId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(NamespaceBranchStatus.ACTIVE, activeRule.getBranchStatus());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteBranch() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName, NamespaceBranchStatus.DELETED, operator);
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNull(branch);
GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(latestRule);
Assert.assertEquals(NamespaceBranchStatus.DELETED, latestRule.getBranchStatus());
Assert.assertEquals("[]", latestRule.getRules());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.ABANDON_GRAY_RELEASE, secondReleaseHistory.getOperation());
}
private GrayReleaseRule instanceGrayReleaseRule() {
GrayReleaseRule rule = new GrayReleaseRule();
rule.setAppId(testApp);
rule.setClusterName(testCluster);
rule.setNamespaceName(testNamespace);
rule.setBranchName(testBranchName);
rule.setBranchStatus(NamespaceBranchStatus.ACTIVE);
rule.setRules("[{\"clientAppId\":\"test\",\"clientIpList\":[\"1.0.0.4\"]}]");
return rule;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.test.context.jdbc.Sql;
public class NamespaceBranchServiceTest extends AbstractIntegrationTest {
@Autowired
private NamespaceBranchService namespaceBranchService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
private String testApp = "test";
private String testCluster = "default";
private String testNamespace = "application";
private String testBranchName = "child-cluster";
private String operator = "apollo";
private Pageable pageable = PageRequest.of(0, 10);
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindBranch() {
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNotNull(branch);
Assert.assertEquals(testBranchName, branch.getClusterName());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateOnce() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(rule.getAppId(), activeRule.getAppId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory releaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(1, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, releaseHistory.getOperation());
Assert.assertEquals(0, releaseHistory.getReleaseId());
Assert.assertEquals(0, releaseHistory.getPreviousReleaseId());
Assert.assertTrue(releaseHistory.getOperationContext().contains(rule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateTwice() {
GrayReleaseRule firstRule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, firstRule);
GrayReleaseRule secondRule = instanceGrayReleaseRule();
secondRule.setRules("[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"]}]");
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, secondRule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(secondRule);
Assert.assertEquals(secondRule.getAppId(), activeRule.getAppId());
Assert.assertEquals(secondRule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, secondReleaseHistory.getOperation());
Assert.assertTrue(firstReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertFalse(firstReleaseHistory.getOperationContext().contains(secondRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(secondRule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleNotExist() {
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNull(activeRule);
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleExist() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(Long.valueOf(latestReleaseId), activeRule.getReleaseId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(NamespaceBranchStatus.ACTIVE, activeRule.getBranchStatus());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteBranch() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName, NamespaceBranchStatus.DELETED, operator);
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNull(branch);
GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(latestRule);
Assert.assertEquals(NamespaceBranchStatus.DELETED, latestRule.getBranchStatus());
Assert.assertEquals("[]", latestRule.getRules());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.ABANDON_GRAY_RELEASE, secondReleaseHistory.getOperation());
}
private GrayReleaseRule instanceGrayReleaseRule() {
GrayReleaseRule rule = new GrayReleaseRule();
rule.setAppId(testApp);
rule.setClusterName(testCluster);
rule.setNamespaceName(testNamespace);
rule.setBranchName(testBranchName);
rule.setBranchStatus(NamespaceBranchStatus.ACTIVE);
rule.setRules("[{\"clientAppId\":\"test\",\"clientIpList\":[\"1.0.0.4\"]}]");
return rule;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.controller;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.ctrip.framework.apollo.configservice.service.config.ConfigService;
import com.ctrip.framework.apollo.configservice.util.InstanceConfigAuditUtil;
import com.ctrip.framework.apollo.configservice.util.NamespaceUtil;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @author Jason Song([email protected])
*/
@RestController
@RequestMapping("/configs")
public class ConfigController {
private static final Splitter X_FORWARDED_FOR_SPLITTER = Splitter.on(",").omitEmptyStrings()
.trimResults();
private final ConfigService configService;
private final AppNamespaceServiceWithCache appNamespaceService;
private final NamespaceUtil namespaceUtil;
private final InstanceConfigAuditUtil instanceConfigAuditUtil;
private final Gson gson;
private static final Type configurationTypeReference = new TypeToken<Map<String, String>>() {
}.getType();
public ConfigController(
final ConfigService configService,
final AppNamespaceServiceWithCache appNamespaceService,
final NamespaceUtil namespaceUtil,
final InstanceConfigAuditUtil instanceConfigAuditUtil,
final Gson gson) {
this.configService = configService;
this.appNamespaceService = appNamespaceService;
this.namespaceUtil = namespaceUtil;
this.instanceConfigAuditUtil = instanceConfigAuditUtil;
this.gson = gson;
}
@GetMapping(value = "/{appId}/{clusterName}/{namespace:.+}")
public ApolloConfig queryConfig(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespace,
@RequestParam(value = "dataCenter", required = false) String dataCenter,
@RequestParam(value = "releaseKey", defaultValue = "-1") String clientSideReleaseKey,
@RequestParam(value = "ip", required = false) String clientIp,
@RequestParam(value = "messages", required = false) String messagesAsString,
HttpServletRequest request, HttpServletResponse response) throws IOException {
String originalNamespace = namespace;
//strip out .properties suffix
namespace = namespaceUtil.filterNamespaceName(namespace);
//fix the character case issue, such as FX.apollo <-> fx.apollo
namespace = namespaceUtil.normalizeNamespace(appId, namespace);
if (Strings.isNullOrEmpty(clientIp)) {
clientIp = tryToGetClientIp(request);
}
ApolloNotificationMessages clientMessages = transformMessages(messagesAsString);
List<Release> releases = Lists.newLinkedList();
String appClusterNameLoaded = clusterName;
if (!ConfigConsts.NO_APPID_PLACEHOLDER.equalsIgnoreCase(appId)) {
Release currentAppRelease = configService.loadConfig(appId, clientIp, appId, clusterName, namespace,
dataCenter, clientMessages);
if (currentAppRelease != null) {
releases.add(currentAppRelease);
//we have cluster search process, so the cluster name might be overridden
appClusterNameLoaded = currentAppRelease.getClusterName();
}
}
//if namespace does not belong to this appId, should check if there is a public configuration
if (!namespaceBelongsToAppId(appId, namespace)) {
Release publicRelease = this.findPublicConfig(appId, clientIp, clusterName, namespace,
dataCenter, clientMessages);
if (Objects.nonNull(publicRelease)) {
releases.add(publicRelease);
}
}
if (releases.isEmpty()) {
response.sendError(HttpServletResponse.SC_NOT_FOUND,
String.format(
"Could not load configurations with appId: %s, clusterName: %s, namespace: %s",
appId, clusterName, originalNamespace));
Tracer.logEvent("Apollo.Config.NotFound",
assembleKey(appId, clusterName, originalNamespace, dataCenter));
return null;
}
auditReleases(appId, clusterName, dataCenter, clientIp, releases);
String mergedReleaseKey = releases.stream().map(Release::getReleaseKey)
.collect(Collectors.joining(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR));
if (mergedReleaseKey.equals(clientSideReleaseKey)) {
// Client side configuration is the same with server side, return 304
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
Tracer.logEvent("Apollo.Config.NotModified",
assembleKey(appId, appClusterNameLoaded, originalNamespace, dataCenter));
return null;
}
ApolloConfig apolloConfig = new ApolloConfig(appId, appClusterNameLoaded, originalNamespace,
mergedReleaseKey);
apolloConfig.setConfigurations(mergeReleaseConfigurations(releases));
Tracer.logEvent("Apollo.Config.Found", assembleKey(appId, appClusterNameLoaded,
originalNamespace, dataCenter));
return apolloConfig;
}
private boolean namespaceBelongsToAppId(String appId, String namespaceName) {
//Every app has an 'application' namespace
if (Objects.equals(ConfigConsts.NAMESPACE_APPLICATION, namespaceName)) {
return true;
}
//if no appId is present, then no other namespace belongs to it
if (ConfigConsts.NO_APPID_PLACEHOLDER.equalsIgnoreCase(appId)) {
return false;
}
AppNamespace appNamespace = appNamespaceService.findByAppIdAndNamespace(appId, namespaceName);
return appNamespace != null;
}
/**
* @param clientAppId the application which uses public config
* @param namespace the namespace
* @param dataCenter the datacenter
*/
private Release findPublicConfig(String clientAppId, String clientIp, String clusterName,
String namespace, String dataCenter, ApolloNotificationMessages clientMessages) {
AppNamespace appNamespace = appNamespaceService.findPublicNamespaceByName(namespace);
//check whether the namespace's appId equals to current one
if (Objects.isNull(appNamespace) || Objects.equals(clientAppId, appNamespace.getAppId())) {
return null;
}
String publicConfigAppId = appNamespace.getAppId();
return configService.loadConfig(clientAppId, clientIp, publicConfigAppId, clusterName, namespace, dataCenter,
clientMessages);
}
/**
* Merge configurations of releases.
* Release in lower index override those in higher index
*/
Map<String, String> mergeReleaseConfigurations(List<Release> releases) {
Map<String, String> result = Maps.newLinkedHashMap();
for (Release release : Lists.reverse(releases)) {
result.putAll(gson.fromJson(release.getConfigurations(), configurationTypeReference));
}
return result;
}
private String assembleKey(String appId, String cluster, String namespace, String dataCenter) {
List<String> keyParts = Lists.newArrayList(appId, cluster, namespace);
if (!Strings.isNullOrEmpty(dataCenter)) {
keyParts.add(dataCenter);
}
return String.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keyParts);
}
private void auditReleases(String appId, String cluster, String dataCenter, String clientIp,
List<Release> releases) {
if (Strings.isNullOrEmpty(clientIp)) {
//no need to audit instance config when there is no ip
return;
}
for (Release release : releases) {
instanceConfigAuditUtil.audit(appId, cluster, dataCenter, clientIp, release.getAppId(),
release.getClusterName(),
release.getNamespaceName(), release.getReleaseKey());
}
}
private String tryToGetClientIp(HttpServletRequest request) {
String forwardedFor = request.getHeader("X-FORWARDED-FOR");
if (!Strings.isNullOrEmpty(forwardedFor)) {
return X_FORWARDED_FOR_SPLITTER.splitToList(forwardedFor).get(0);
}
return request.getRemoteAddr();
}
ApolloNotificationMessages transformMessages(String messagesAsString) {
ApolloNotificationMessages notificationMessages = null;
if (!Strings.isNullOrEmpty(messagesAsString)) {
try {
notificationMessages = gson.fromJson(messagesAsString, ApolloNotificationMessages.class);
} catch (Throwable ex) {
Tracer.logError(ex);
}
}
return notificationMessages;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.controller;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.ctrip.framework.apollo.configservice.service.config.ConfigService;
import com.ctrip.framework.apollo.configservice.util.InstanceConfigAuditUtil;
import com.ctrip.framework.apollo.configservice.util.NamespaceUtil;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @author Jason Song([email protected])
*/
@RestController
@RequestMapping("/configs")
public class ConfigController {
private static final Splitter X_FORWARDED_FOR_SPLITTER = Splitter.on(",").omitEmptyStrings()
.trimResults();
private final ConfigService configService;
private final AppNamespaceServiceWithCache appNamespaceService;
private final NamespaceUtil namespaceUtil;
private final InstanceConfigAuditUtil instanceConfigAuditUtil;
private final Gson gson;
private static final Type configurationTypeReference = new TypeToken<Map<String, String>>() {
}.getType();
public ConfigController(
final ConfigService configService,
final AppNamespaceServiceWithCache appNamespaceService,
final NamespaceUtil namespaceUtil,
final InstanceConfigAuditUtil instanceConfigAuditUtil,
final Gson gson) {
this.configService = configService;
this.appNamespaceService = appNamespaceService;
this.namespaceUtil = namespaceUtil;
this.instanceConfigAuditUtil = instanceConfigAuditUtil;
this.gson = gson;
}
@GetMapping(value = "/{appId}/{clusterName}/{namespace:.+}")
public ApolloConfig queryConfig(@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespace,
@RequestParam(value = "dataCenter", required = false) String dataCenter,
@RequestParam(value = "releaseKey", defaultValue = "-1") String clientSideReleaseKey,
@RequestParam(value = "ip", required = false) String clientIp,
@RequestParam(value = "messages", required = false) String messagesAsString,
HttpServletRequest request, HttpServletResponse response) throws IOException {
String originalNamespace = namespace;
//strip out .properties suffix
namespace = namespaceUtil.filterNamespaceName(namespace);
//fix the character case issue, such as FX.apollo <-> fx.apollo
namespace = namespaceUtil.normalizeNamespace(appId, namespace);
if (Strings.isNullOrEmpty(clientIp)) {
clientIp = tryToGetClientIp(request);
}
ApolloNotificationMessages clientMessages = transformMessages(messagesAsString);
List<Release> releases = Lists.newLinkedList();
String appClusterNameLoaded = clusterName;
if (!ConfigConsts.NO_APPID_PLACEHOLDER.equalsIgnoreCase(appId)) {
Release currentAppRelease = configService.loadConfig(appId, clientIp, appId, clusterName, namespace,
dataCenter, clientMessages);
if (currentAppRelease != null) {
releases.add(currentAppRelease);
//we have cluster search process, so the cluster name might be overridden
appClusterNameLoaded = currentAppRelease.getClusterName();
}
}
//if namespace does not belong to this appId, should check if there is a public configuration
if (!namespaceBelongsToAppId(appId, namespace)) {
Release publicRelease = this.findPublicConfig(appId, clientIp, clusterName, namespace,
dataCenter, clientMessages);
if (Objects.nonNull(publicRelease)) {
releases.add(publicRelease);
}
}
if (releases.isEmpty()) {
response.sendError(HttpServletResponse.SC_NOT_FOUND,
String.format(
"Could not load configurations with appId: %s, clusterName: %s, namespace: %s",
appId, clusterName, originalNamespace));
Tracer.logEvent("Apollo.Config.NotFound",
assembleKey(appId, clusterName, originalNamespace, dataCenter));
return null;
}
auditReleases(appId, clusterName, dataCenter, clientIp, releases);
String mergedReleaseKey = releases.stream().map(Release::getReleaseKey)
.collect(Collectors.joining(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR));
if (mergedReleaseKey.equals(clientSideReleaseKey)) {
// Client side configuration is the same with server side, return 304
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
Tracer.logEvent("Apollo.Config.NotModified",
assembleKey(appId, appClusterNameLoaded, originalNamespace, dataCenter));
return null;
}
ApolloConfig apolloConfig = new ApolloConfig(appId, appClusterNameLoaded, originalNamespace,
mergedReleaseKey);
apolloConfig.setConfigurations(mergeReleaseConfigurations(releases));
Tracer.logEvent("Apollo.Config.Found", assembleKey(appId, appClusterNameLoaded,
originalNamespace, dataCenter));
return apolloConfig;
}
private boolean namespaceBelongsToAppId(String appId, String namespaceName) {
//Every app has an 'application' namespace
if (Objects.equals(ConfigConsts.NAMESPACE_APPLICATION, namespaceName)) {
return true;
}
//if no appId is present, then no other namespace belongs to it
if (ConfigConsts.NO_APPID_PLACEHOLDER.equalsIgnoreCase(appId)) {
return false;
}
AppNamespace appNamespace = appNamespaceService.findByAppIdAndNamespace(appId, namespaceName);
return appNamespace != null;
}
/**
* @param clientAppId the application which uses public config
* @param namespace the namespace
* @param dataCenter the datacenter
*/
private Release findPublicConfig(String clientAppId, String clientIp, String clusterName,
String namespace, String dataCenter, ApolloNotificationMessages clientMessages) {
AppNamespace appNamespace = appNamespaceService.findPublicNamespaceByName(namespace);
//check whether the namespace's appId equals to current one
if (Objects.isNull(appNamespace) || Objects.equals(clientAppId, appNamespace.getAppId())) {
return null;
}
String publicConfigAppId = appNamespace.getAppId();
return configService.loadConfig(clientAppId, clientIp, publicConfigAppId, clusterName, namespace, dataCenter,
clientMessages);
}
/**
* Merge configurations of releases.
* Release in lower index override those in higher index
*/
Map<String, String> mergeReleaseConfigurations(List<Release> releases) {
Map<String, String> result = Maps.newLinkedHashMap();
for (Release release : Lists.reverse(releases)) {
result.putAll(gson.fromJson(release.getConfigurations(), configurationTypeReference));
}
return result;
}
private String assembleKey(String appId, String cluster, String namespace, String dataCenter) {
List<String> keyParts = Lists.newArrayList(appId, cluster, namespace);
if (!Strings.isNullOrEmpty(dataCenter)) {
keyParts.add(dataCenter);
}
return String.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keyParts);
}
private void auditReleases(String appId, String cluster, String dataCenter, String clientIp,
List<Release> releases) {
if (Strings.isNullOrEmpty(clientIp)) {
//no need to audit instance config when there is no ip
return;
}
for (Release release : releases) {
instanceConfigAuditUtil.audit(appId, cluster, dataCenter, clientIp, release.getAppId(),
release.getClusterName(),
release.getNamespaceName(), release.getReleaseKey());
}
}
private String tryToGetClientIp(HttpServletRequest request) {
String forwardedFor = request.getHeader("X-FORWARDED-FOR");
if (!Strings.isNullOrEmpty(forwardedFor)) {
return X_FORWARDED_FOR_SPLITTER.splitToList(forwardedFor).get(0);
}
return request.getRemoteAddr();
}
ApolloNotificationMessages transformMessages(String messagesAsString) {
ApolloNotificationMessages notificationMessages = null;
if (!Strings.isNullOrEmpty(messagesAsString)) {
try {
notificationMessages = gson.fromJson(messagesAsString, ApolloNotificationMessages.class);
} catch (Throwable ex) {
Tracer.logError(ex);
}
}
return notificationMessages;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.PropertyResolver;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class NamespaceServiceTest extends AbstractUnitTest {
@Mock
private AdminServiceAPI.NamespaceAPI namespaceAPI;
@Mock
private ReleaseService releaseService;
@Mock
private ItemService itemService;
@Mock
private PropertyResolver resolver;
@Mock
private AppNamespaceService appNamespaceService;
@Mock
private InstanceService instanceService;
@Mock
private NamespaceBranchService branchService;
@Mock
private UserInfoHolder userInfoHolder;
@InjectMocks
private NamespaceService namespaceService;
private String testAppId = "6666";
private String testClusterName = "default";
private String testNamespaceName = "application";
private Env testEnv = Env.DEV;
@Before
public void setup() {
}
@Test
public void testFindNamespace() {
AppNamespace applicationAppNamespace = mock(AppNamespace.class);
AppNamespace hermesAppNamespace = mock(AppNamespace.class);
NamespaceDTO application = new NamespaceDTO();
application.setId(1);
application.setClusterName(testClusterName);
application.setAppId(testAppId);
application.setNamespaceName(testNamespaceName);
NamespaceDTO hermes = new NamespaceDTO();
hermes.setId(2);
hermes.setClusterName("default");
hermes.setAppId(testAppId);
hermes.setNamespaceName("hermes");
List<NamespaceDTO> namespaces = Arrays.asList(application, hermes);
ReleaseDTO someRelease = new ReleaseDTO();
someRelease.setConfigurations("{\"a\":\"123\",\"b\":\"123\"}");
ItemDTO i1 = new ItemDTO("a", "123", "", 1);
ItemDTO i2 = new ItemDTO("b", "1", "", 2);
ItemDTO i3 = new ItemDTO("", "", "#dddd", 3);
ItemDTO i4 = new ItemDTO("c", "1", "", 4);
List<ItemDTO> someItems = Arrays.asList(i1, i2, i3, i4);
when(applicationAppNamespace.getFormat()).thenReturn(ConfigFileFormat.Properties.getValue());
when(hermesAppNamespace.getFormat()).thenReturn(ConfigFileFormat.XML.getValue());
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName))
.thenReturn(applicationAppNamespace);
when(appNamespaceService.findPublicAppNamespace("hermes")).thenReturn(hermesAppNamespace);
when(namespaceAPI.findNamespaceByCluster(testAppId, Env.DEV, testClusterName)).thenReturn(namespaces);
when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName,
testNamespaceName)).thenReturn(someRelease);
when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName, "hermes")).thenReturn(someRelease);
when(itemService.findItems(testAppId, Env.DEV, testClusterName, testNamespaceName)).thenReturn(someItems);
List<NamespaceBO> namespaceVOs = namespaceService.findNamespaceBOs(testAppId, Env.DEV, testClusterName);
assertEquals(2, namespaceVOs.size());
NamespaceBO namespaceVO = namespaceVOs.get(0);
assertEquals(4, namespaceVO.getItems().size());
assertEquals("a", namespaceVO.getItems().get(0).getItem().getKey());
assertEquals(2, namespaceVO.getItemModifiedCnt());
assertEquals(testAppId, namespaceVO.getBaseInfo().getAppId());
assertEquals(testClusterName, namespaceVO.getBaseInfo().getClusterName());
assertEquals(testNamespaceName, namespaceVO.getBaseInfo().getNamespaceName());
}
@Test
public void testDeletePrivateNamespace() {
String operator = "user";
AppNamespace privateNamespace = createAppNamespace(testAppId, testNamespaceName, false);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(privateNamespace);
when(userInfoHolder.getUser()).thenReturn(createUser(operator));
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
verify(namespaceAPI, times(1)).deleteNamespace(testEnv, testAppId, testClusterName, testNamespaceName, operator);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceHasInstance() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceBranchHasInstance() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
String branchName = "branch";
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceWithAssociatedNamespace() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
String branchName = "branch";
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(0);
when(appNamespaceService.findPublicAppNamespace(testNamespaceName)).thenReturn(publicNamespace);
when(namespaceAPI.countPublicAppNamespaceAssociatedNamespaces(testEnv, testNamespaceName)).thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test
public void testDeleteEmptyNamespace() {
String branchName = "branch";
String operator = "user";
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(0);
when(appNamespaceService.findPublicAppNamespace(testNamespaceName)).thenReturn(publicNamespace);
NamespaceDTO namespace = createNamespace(testAppId, testClusterName, testNamespaceName);
when(namespaceAPI.getPublicAppNamespaceAllNamespaces(testEnv, testNamespaceName, 0, 10)).thenReturn(
Collections.singletonList(namespace));
when(userInfoHolder.getUser()).thenReturn(createUser(operator));
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
verify(namespaceAPI, times(1)).deleteNamespace(testEnv, testAppId, testClusterName, testNamespaceName, operator);
}
private AppNamespace createAppNamespace(String appId, String name, boolean isPublic) {
AppNamespace instance = new AppNamespace();
instance.setAppId(appId);
instance.setName(name);
instance.setPublic(isPublic);
return instance;
}
private NamespaceDTO createNamespace(String appId, String clusterName, String namespaceName) {
NamespaceDTO instance = new NamespaceDTO();
instance.setAppId(appId);
instance.setClusterName(clusterName);
instance.setNamespaceName(namespaceName);
return instance;
}
private UserInfo createUser(String userId) {
UserInfo instance = new UserInfo();
instance.setUserId(userId);
return instance;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.PropertyResolver;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class NamespaceServiceTest extends AbstractUnitTest {
@Mock
private AdminServiceAPI.NamespaceAPI namespaceAPI;
@Mock
private ReleaseService releaseService;
@Mock
private ItemService itemService;
@Mock
private PropertyResolver resolver;
@Mock
private AppNamespaceService appNamespaceService;
@Mock
private InstanceService instanceService;
@Mock
private NamespaceBranchService branchService;
@Mock
private UserInfoHolder userInfoHolder;
@InjectMocks
private NamespaceService namespaceService;
private String testAppId = "6666";
private String testClusterName = "default";
private String testNamespaceName = "application";
private Env testEnv = Env.DEV;
@Before
public void setup() {
}
@Test
public void testFindNamespace() {
AppNamespace applicationAppNamespace = mock(AppNamespace.class);
AppNamespace hermesAppNamespace = mock(AppNamespace.class);
NamespaceDTO application = new NamespaceDTO();
application.setId(1);
application.setClusterName(testClusterName);
application.setAppId(testAppId);
application.setNamespaceName(testNamespaceName);
NamespaceDTO hermes = new NamespaceDTO();
hermes.setId(2);
hermes.setClusterName("default");
hermes.setAppId(testAppId);
hermes.setNamespaceName("hermes");
List<NamespaceDTO> namespaces = Arrays.asList(application, hermes);
ReleaseDTO someRelease = new ReleaseDTO();
someRelease.setConfigurations("{\"a\":\"123\",\"b\":\"123\"}");
ItemDTO i1 = new ItemDTO("a", "123", "", 1);
ItemDTO i2 = new ItemDTO("b", "1", "", 2);
ItemDTO i3 = new ItemDTO("", "", "#dddd", 3);
ItemDTO i4 = new ItemDTO("c", "1", "", 4);
List<ItemDTO> someItems = Arrays.asList(i1, i2, i3, i4);
when(applicationAppNamespace.getFormat()).thenReturn(ConfigFileFormat.Properties.getValue());
when(hermesAppNamespace.getFormat()).thenReturn(ConfigFileFormat.XML.getValue());
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName))
.thenReturn(applicationAppNamespace);
when(appNamespaceService.findPublicAppNamespace("hermes")).thenReturn(hermesAppNamespace);
when(namespaceAPI.findNamespaceByCluster(testAppId, Env.DEV, testClusterName)).thenReturn(namespaces);
when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName,
testNamespaceName)).thenReturn(someRelease);
when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName, "hermes")).thenReturn(someRelease);
when(itemService.findItems(testAppId, Env.DEV, testClusterName, testNamespaceName)).thenReturn(someItems);
List<NamespaceBO> namespaceVOs = namespaceService.findNamespaceBOs(testAppId, Env.DEV, testClusterName);
assertEquals(2, namespaceVOs.size());
NamespaceBO namespaceVO = namespaceVOs.get(0);
assertEquals(4, namespaceVO.getItems().size());
assertEquals("a", namespaceVO.getItems().get(0).getItem().getKey());
assertEquals(2, namespaceVO.getItemModifiedCnt());
assertEquals(testAppId, namespaceVO.getBaseInfo().getAppId());
assertEquals(testClusterName, namespaceVO.getBaseInfo().getClusterName());
assertEquals(testNamespaceName, namespaceVO.getBaseInfo().getNamespaceName());
}
@Test
public void testDeletePrivateNamespace() {
String operator = "user";
AppNamespace privateNamespace = createAppNamespace(testAppId, testNamespaceName, false);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(privateNamespace);
when(userInfoHolder.getUser()).thenReturn(createUser(operator));
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
verify(namespaceAPI, times(1)).deleteNamespace(testEnv, testAppId, testClusterName, testNamespaceName, operator);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceHasInstance() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceBranchHasInstance() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
String branchName = "branch";
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test(expected = BadRequestException.class)
public void testDeleteNamespaceWithAssociatedNamespace() {
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
String branchName = "branch";
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(0);
when(appNamespaceService.findPublicAppNamespace(testNamespaceName)).thenReturn(publicNamespace);
when(namespaceAPI.countPublicAppNamespaceAssociatedNamespaces(testEnv, testNamespaceName)).thenReturn(10);
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
}
@Test
public void testDeleteEmptyNamespace() {
String branchName = "branch";
String operator = "user";
AppNamespace publicNamespace = createAppNamespace(testAppId, testNamespaceName, true);
NamespaceDTO branch = createNamespace(testAppId, branchName, testNamespaceName);
when(appNamespaceService.findByAppIdAndName(testAppId, testNamespaceName)).thenReturn(publicNamespace);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, testClusterName, testNamespaceName))
.thenReturn(0);
when(branchService.findBranchBaseInfo(testAppId, testEnv, testClusterName, testNamespaceName)).thenReturn(branch);
when(instanceService.getInstanceCountByNamepsace(testAppId, testEnv, branchName, testNamespaceName)).thenReturn(0);
when(appNamespaceService.findPublicAppNamespace(testNamespaceName)).thenReturn(publicNamespace);
NamespaceDTO namespace = createNamespace(testAppId, testClusterName, testNamespaceName);
when(namespaceAPI.getPublicAppNamespaceAllNamespaces(testEnv, testNamespaceName, 0, 10)).thenReturn(
Collections.singletonList(namespace));
when(userInfoHolder.getUser()).thenReturn(createUser(operator));
namespaceService.deleteNamespace(testAppId, testEnv, testClusterName, testNamespaceName);
verify(namespaceAPI, times(1)).deleteNamespace(testEnv, testAppId, testClusterName, testNamespaceName, operator);
}
private AppNamespace createAppNamespace(String appId, String name, boolean isPublic) {
AppNamespace instance = new AppNamespace();
instance.setAppId(appId);
instance.setName(name);
instance.setPublic(isPublic);
return instance;
}
private NamespaceDTO createNamespace(String appId, String clusterName, String namespaceName) {
NamespaceDTO instance = new NamespaceDTO();
instance.setAppId(appId);
instance.setClusterName(clusterName);
instance.setNamespaceName(namespaceName);
return instance;
}
private UserInfo createUser(String userId) {
UserInfo instance = new UserInfo();
instance.setUserId(userId);
return instance;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/logo/logo-simple.png | PNG
IHDR . sRGB pHYs YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y @ IDATxrF?HwLfʜ1O`eLVdfNPY$ZGUbo,?Aמ]'N-4DŒ,Q ~Ek4I >(6@`bo:3jAiwu%J G+qx-u fGo ;K@ @ 3r/"U[V[媭'A$QqqLn mr505 @ @ V,!u"Pd TZZu$g.tIr@ @ a Xf`GEPHp(YQ3U<z!P#g @ @ղ[qj5jvI)RK1ḏ"Huu!F@ @ %@}( Ip(N?a֑ [@ @ (,B5T l|N.GZU֩st %C @ hEFx+8J+QiTa@V|dL@ @ @|gX|ïJV^< KZmmTM @ Ԑ vj\*媗$jiW> vs%S\B6 @ C`Q8}%c(
VϮȊf)A1Mt8EJj4@ @ XQgaRGA"Y~Es0K_h @ PEUPGDz&Bg$kc5h@ @r* 5."Tq(ju?۫B @ \PEo:*Q5t&X=MjGI=3% @ oyC$H Kgrq.=vЉz
E , @ 0
)pDIKL(>)kI՝VKmz9 @ Y^4ҢJL6эFӲjچʋi[5s
w @ Ԟ E ,t0Ң @ YV4Eѕݝfx @ &@fQGkiKdEۅ
/gJEC@ @ 7XL;ˤ7q2` r.L9l8 @ @ BLCb5MϒMkZii@" @ # EI>vF6I.M}V|Me @ B%4P{Fv '"PTNҕ$Q&xҔ8 @ , Xd(N
N2!J `"L @ @ LC /jgIQZ9C HA㻩u @ ,'!@ % '@8
^C @ Rpųuk N9%
ueoawǩ"C @ rQ\C^HC! @ %@/j#PTۮ1F`G) @ ". (! @ ( @ "묂@Q{zUX @ [email protected](
a ^f @ Xo e|Ĺ $Z1Zv @ @S0
)=mahٲXA\2%A
8 @ @ VYdczE{krC0 @ @ YTힹYiAؖ<%sAi@ @ X4 F?ҭLk4|hI~f @ @M ,iv?E6YMB@^awg9 @ '@͢p8Y2u$}C*5 @ jJ`QM;֦[VsB) H;b8 @ N`) =ID%OyQJ(6U"͖AZRI{xSj!IY6俥~\@ @`R&%׀߮-Zj:Egwpِ#퀅)(tP%U6նצ~)0 @ 0!KiM R7 Kp(mhyjcS -HyQca o_-5C @ E"[$k&p'ǽ5;:QOuuyo=By6%Gߕw?ɜ @ @ ',:7^ItMQLkRzU]} :O˫LY[ij#0s~rw<N @ 0
bFk[Y.2S*AlZbԚijd-4S&eL#s! @ 4 EMNgdx +ꖑb
F˧oV9@ @E Ǣ9{A\A)Fn~eo!) @ &4{ $SxBȉ-$f
(L0c3*h 9?kV# @ @CYԐTVv1 /2N}J^TC/]O]! @ 8'r0+i2ݤ͓bjK>[5, vqUk}s @ @,\Ժ&R:~zò륖Jfi&8u @ 6Eas\Z G_FaPZFEbף/ B @ 8Eק4mKw?[Klװ vj/l˯R^1?"6 @ b"@fQLe:f$L;J1M:MK+\Ap" @ uSz,?[*;kw@wO4yrahXN.%3WM3"5 @ @]=![ HVQ'i^H}hWm[|@Ԧ]d@
@ PodջnF:.Go[־j$]T
wB @ (.:*"P40JBqڟ %ÈQ1@ @ ,jP E/bZ_2Z*uO
@ &@fQ7u*"P4vOuBarv3IT*>Y>v+{ Զ#P@ MRa}5ȬZmaNtAՂt Z3mr|ӼzG^^,`6\Kn
~cEJՋr @ @S )[|pm'}`wE :NCd.s̿ygc!~ C U$`OV%P~B @ {Ȣ}Gki7Ez%? Sx,@"o ; MF.]H ^_@ @ hE
õtb.k}V!3lF[UMݙdJhK^Wɵɵ\r Jut?k
@ N Xt
H]^غʛ?iGdh{ A^UA# :K2MROR۲. @ "' VA Q+Yd!M3 } `XLU357 LS[
! @ ,
RKK6QO1^8غ%A#}lr]G @ @ bLCʚ֕<.>vU\˦?i;@/UOdjZ*Sv|1R8/}6$m(+ Y @ !@f497qb K1^ϖ|*s$P4vwLѰΒy~)us:ZJB @ ,&V:9`&kL2{}#& IsΒJ,G^t9'α "! @ `u
LahHǜM4},KG5uLVGʢ-y0i@ @ (85 Pde0_'ʞ^٦Ac*ZP݁1 @ @Un-ЪV}2Yi˾7(* &{uHl +EU
@ @t }N5_4]ueouKԤ@1$7r2"3F߮-8H@ @ Q Xe4:O:%[LV#[u]z4kQ}y `c&#,좙2+· @ p E瑩$zE>&ea4sKE]$pvt @ h<E5b[J]f}+5}!#gZ*ٴ @ 0.E`Db3 f)M<QWnZpF!W3Թ99 H@ @ JFTD`$k) 0 peaZ
E3@ @յՎʵ]0iMSt Լ3O3QS) ld.@ @Qմcb
[w?
3J"\ȮLas6 zTb Fc! @ ,Jܿ&+of
[2T+W6{;7##:Mr'.d)Er @ @ 6b25Mi'"~֑eS fpҷYR\q(& @ @(~kEDŭ)h *г $Ļئd B @ :k Sh[iSWS*[MET4Yn<klYT%~tC @ A XD7X7bDW5p!Z +.YEJf/ E, @ h,U^Ӕ2wfFKt'ph$C @ 8f%ҍ+n(?/4%f
hmM' K}~miL6! @ DB`Q$ U̸VBsD TZ
O;,>nQyK.# @ @Eu>QfzE%?(hZ9 g&1e '@ @ (A`Q HQ5jMn=pT'
XPXnV+`+;zW! @ ]Z]%l:bjNֱ$ꍘ
@ @ dBIlKT{|#5l^)r]m̎m ؖL^A̙ @ ` "LXNf[1M;[ryu$ciwNA @ @ ̈fCA#ʶ.]rRgӅeF4Ӻ @ 2hߒPҝN+ TJ @ 5EސֳL$XE{6tſ@ @ ,rȓ Z}Qcl;pBoLå @ @)41ɉ hm=@&Ot @ @|gX $K>l:7 @ 05ES#DDf(L& '
@ q ,X߮u6iݏ>'@ @ @(~
@ @ EAtC,y @ ,
jB] /@ @ @{o۾.@`"/&: @ @ z7t?]#_RWQ C @ 8$@!\D%$ׅ`i"M(@ @ #,C TǶt plږTyxsr!n vb# @ W"\$X]iMnX.ĀK|w(ul @ P XT Ak K 픋|KPg EK! @ Xn%hklK
ll?g[۵m@ @ X]]`p` TNrX.$]tdl\Ԇ\b-5T{MZ)N4 @ jK`Qݺ6]/4ܿfԛY-io}N EpGH @ pH`Qݮx)7k= vuR8 %n2ɜzlj\B @ H:,R:*pXk'"%Ee[5j`]+:t% @ b @(^'wc4iDž2jՅ&v ?
rȜ,r @ @,Sc)7/h^YS.;F e
̅YZ/]u!d L@ @ 骱 fWZsG_Y
Q=
n {=uW'*~ ]'# @ @D.Ed+%J+m[KzpKnW%uR"S.2W&w? ֬EWzǕ+U֯qm= @ ,\7z<mIٶ/Y6cnH(@m mʓe0)sam_<F @ f`Z
9"!Gs$b+eew{VCSH}/[~
@ @x,
OXdnM Ɗ0Bm%EqUtU)kSkjjG#sfښdA @ h8E Mjܒ$q6E zT:G{&kg
d#,)-D25<[># @ i}$I?tՒR'VbaQJ ;TLcQyto\#/d\۱ @ <2
lLۙ
Nӭњ,E]dd[@qag2Uiä%hK͆Jk jV@ @"&4pM%Bͯ- Y7Z:{#pWb.
G_UtT+$HKlݏfg c @ &`5o^q?k[l;^s}ZWNza7v٪53Qkݕ|:|W @ K@Jp' |/̍wid
$0RG̲%z?gY&EtY1_@ 4 Eu<,&h-u%RhIol"H&9s @ ԑ Euc>TȘr].2:\3kט6
>k7C @ h,2j)Ųkf\ yy^96$и"z @ XE]_
bsL.ʕ5v0Iw4]ق @ P[j۵Cǒ<DvڟuB_4u;_;G @ @JA)[˦
V,]ؔyc7x܌?C @ h,EM$U~DevjKjáE!E 1 @ 09?f;ï<Ovݞ/=yϗ<і"! }R埽uM{@ > ͛|F;+?M@f XԌ~Vֶ"W'wLSsUd53d=!_Y` .۷nm)YlDMyffO>l *۷nĶEW=}|mrq`Z74LGs:qʹ4ɦi@W ?a~3 ۷
E jQ' oT~ Pɏ[⡅ @b.fT:"#l#eRhA MT>@ e $ykl[ ҲVaVn_i @?EWQqmIF%-(;k= eَLꙠ0h{,5i,UqT
ԉU$;dGޕ˒mtW=X @ &'@hrviu1W`$`qv%\42F2=d} m ȿ&e]R'zc@ y942Fi`a @ (E`Q)Lhn& -dG_U{Q*/6qdVHv-8@
:@@ @ @,$YIdU l܋g X̵tk vwcJȎ?iG/HvAu~y67TOHk .@ 5 pTܐLp7nˊ9iVb @ 8I@lM"`VKg/v% B]0*1S{e |h|0 h 6A
"za(O=ٕ4@ E<~:DF1Xs 0
a}o+x|CϚ krT,[l߈s읳 ZpjER0jjI @ ,rM8Dy1(DƲ)ƀquӸ$ظ4]h @2_-D,@ @ N`u ~rwEt#0 #V# ! tmUczN|@ @`Q:Lk]d|%`T*igr>gaWbsc7 ^^ [ p[9@ *'@.ƀ:e&`TIdQgHvڊ)]V@n^a:Z= XT dI"Ib.ѭ 'Fj`Qf"xzi` 0u#ph. ! @ E.kxhMLvNҲd-DC Hسak " 4 t9^[SvёI?\p/Ŀص mem
sf 8WKA`
@ Eawk vw\~) hfδ;6E)v @ C 8Sxr͛uf]; f X~?u8&o/c$ e,Hh#f9~l b!c6$齽= @Z <9#YJNeסhF:OxQfb! +a\o'|: @ V)v=Љza
*?eԱ(zjQ&H<ZP$;jUE*4@ $qO 5dA@ Xy/r R؊7>iJJ9n9)v jV )l-/lm: Ԕ v$nŮMrn瘩i4Y2z3bda- dݏ͒uOAϊ9s*d@ ;lUn7D@4Z[!Zr f}h%Cv 8m>{ѿ.^Ǘ2@ Qcjt[32=\۔U:Ǐ|-E;bKϧN1M;"h ˗Mya$ѽϞwE ~
b\ @ @씪Mb[y -YF eUMM[vE͘ HOݫ/_g ln<}<SqLU \L`Ō٢юwi}r|UdG-~*ŋC XӲ &8tOnIQGK?98, @ >3_[{TLMK~Se~6{/y@Ӵ.ŝKZZ/-u,JE @ x5u:Zh\%QԴ^`.6nR<!- 3 c-q?y6Y8>7dA" @ dMƭ1gIdq <S NM{a_l z J\;+d\Ԝ@^<*+gvUںϸS۴ @5uݞo{^ 9 ݓ|whs3j DI `nQĺúF 9a&j@ !@ 0>E@Ij0VkY1·UYmIp]u,)M#7oJ(l=~[vQj֭@ @DEYUj$O%p>JG/]uwA3_ fD] [Ŏ0@JRًV+Wpմqϛnr
@ 5Go
/x'jyy.ڑ`KϣJ?u jG` YtX'O>ݚHOk7y㞔 3] @վ:XNJC<6 ͪoYf2smQ'Ea"
%/@Mpdژ1[hOS@ ` "+%L$prY^IR¼W~ ?MJZCȒCCϞOG2V9s/^JK @ F`54\!AS.Z4*,|U:*9Kbݜk $:slJ]۪ukŵC &$`JKFUZވc1 ?C*8 $~V uf=+rF
ߺehl @EPTѕ w[ҩK
ؓG .ZV̄ <}RzރͦV5պqZV좩{ C`8h"reS׀3s3vT7
] P 'CZ :%Ze ^7 q!LM(`TLךZZ`rfE[bӗ5=w1ϡ9 PSo^ז=ϟoԣgf$6# &`'yN#*V(E= _/7X.}@6 `@$c1HӧOde4 Ӄ / @ pF`3ܕ0϶͊odH`.`ˍOxQ J m =5jeڻreL;@ i \V C֎CR7gy#Ů{8 ̟>{ xąuf }f꣰BOcp֭m~"n'
ak $;מ# c| ,*ϊęUʙ+46:QOd T%Szp^ˇyRދn̅ lHҺןz\eHR@ {*ouo_$俼:3So<:fJl IJ-5L@!Pg)+ /lCZ'iHF <WPkEE
E$hGY+5a[uUEagBfj
*~^%]?0yJk#pOj[tˬ$,XϻjSi5P33So#5~!E< ~:D\q-10En6Kze`Lsy2-J &qn0(E@yc\+lnf&|X
BOcʈE%:숸%ISŇo7D
eY&L Gp460&6Y~~Mj ECp'ӽh >P~!E|Z+ť;g.)u?gf4c( 08g2ɾ2Ĝ4;-i ukITZH~%2
nL[QY<!y1562+'ԡL?[ ier L㊞V0@`<mw?eK% 2sey\<(B PR' ='PdEVL 6ÅM+"rE\gEԡ<Y`Hvїr['EaYnE B $~W_|- Nl<OůOB|h Ԟّ%ԦDwFsvy /=05SLZ·Eh_,_ GSG$K>ڂ{LWV1^zR's*[izM>C. W~`/H/f3ϼy}&7N R`G6SN- P,[K 79dm/\Wd* 7q5cG2Wmw#/\6uhv%4KcVrՁU
JGrZϴUFF3eva߭m%ɥ9S~c̏6Zde@V[boYfFcoGA!֖7oA--hE-[$4=T$ԇfͲsZ*n) ƹZe#g߇#G3պ8vX' ʮ%Wbq9jh_p M}7VBMZoHQN:Qrm?+YR 2n" mi1!iۑA-vnhWHbҖ
"0,l tyA1a3=_cp}8A0zg,"9 ~ܠW 7kןS`ξnG judՀF~ ߸$7_ڤOz&bK9d/ 9֑9y &}(ƚ_H;1 eyػrEƷכh~*~s릞7Sbise .9*I=2LéҲUe7UlJ"Z匩]옊>Qo<InR Rhm=Vܪܗ^(Lm!ߢMeP$$;uv1o['먮_rkwvB71ô],ظu@>P^ݖLY-V
%Vrm v9Af4cjsT9Ͷ uK} Zmuu . |k'҇Mp[̒Ү}_k=ɗL,_n㭙l⍾%2fܐ)ӆv3s^^E ܳls9A,gcL嬽)voygIe_?$H4@9m}M%*D5Pdf8Il72]$jSl x_(33Aj̇ >|AGuL|5 PT4e6MMi@:=1EH|~_~;[$+ #o?gRdgą˵ {BA8юLaxLR (e JpjMt )7iN7II,&9~Ƀo>"pzݔ"F;1`)T]d%JE(JShsbmoZKýX7v*Wi>]jlIe.
4KEQ}C_jPڞ{yR;YÕbw&*7i]q9ɍj5W\7(qL31`o_O%h{= :x[O?'w1
fl5# ]dmI'ԮEܩdw)mIϟga[+y=@{|bǒդ@ыdLYTE іE$g`wm[ Y J3Ey@͊Zoa=e?XOJ`^KߌR[8Z¤8]$}L\0\ NzNΆ<6 l7(ل'sZS:jDThzyǺ̀E >j;aE)q07_HgSQ\W{k?5f Z>U@܇/@S!\07B>ٮYrQ&d *ƔUg :j ,250~Mu~ 5 ]2Eyһ!
D`V.ח۷>?lnHjXp=BE# T4knj]P=Sכ3-`)/ocbuaM"KLx4<+?-/<NgW][*42a|EȰܣi&hT{gq0\yz12˾7RO(e nn혋q 0%6u{/cVДիf~Էnn?ʵu?y 7n*AF̦942Rn`yEq=bLU#h\bē gY&FŲͅ8nj]P-%3kw
nĘL]/_nIWUSúEGk+-(}}
,Hnؐ( ̋Տ%h@=(/J\<}Noܧ' 8QRFQ&rlF^)RhĘEGSΆuT~X4nyQkE%ybhnK uQQ 5^{3ϟg"dwjA H/nB X!Mʪn2--nNt2'E1Fw Spq2+}U
%cSrSY9ipj~42v.2S _u
# LM['音q2 >Z `qչK4zv̬.}^=onƆ)[B,_m?k;MEƾE&lJ$ߑA-ouig5yhB
}p 01@' hLE,2DR(6!}ΙO>o۵|,j[Wz1]$%K"?`+>
{#W25LS5wuO uB4fz^XR2*? D& " @ IDATI_[?<{\
$"mlK yd]Zrp![t# 7_ =.+ jƘ{6SH}% mʅÓ / sx%ģJTOYFwR,˷?{w z}f&
=KXKP'q n/:*!+% :|( ʓ9\d;z]~og>x
3=Y;}12;|}? MtcJhj~;Y Kܟ<#^?P6d檴 ݊
#`J$+ľ-RǙ9&`oCc3ţM g\ؒ1Os|C2>|ϟgLƗ5R ޗKȶK1uȳ)c*`ѻ~7EOnEwکE}tf4Xjxԉ(%J}#2c?
ryHOp&َ&q B,xn 똸QZ+W25_w
7L* TLJiF8p 6 0NҬ
fQ1,WU7RnѫLQp>}Ky$b$A?)o<E3R(SFK(Ej *7>Kq<OS/jV_d^d T11^*"pȝ8} z!A`d]"] ZG[\NGmG`LT1tＳ*7_Z h ڊZU:3)\TBv\1}rnHhS[-IASh!(vZ2G[z 6 %Y ۺ;8ȘAd7Se$ QS}S\K29ei. f ) 0ۘ
rO$tI\"s
ZHJM@FFe L0:FqtVVxĎ lyPt2^ T'3LԢ1ӊoUosUNGꞫ )%"${|`SN] 0J*eL,j_` "] onY$jmW#A<cNñKB$ ŢQaSX3p_#)38얀e&KZ hfDy\HGJmj]"cXma^cj.}L,*
Y'ɦ'Tr^LS& g rqkUqM)Ú4J5Q ,S&E]ZyAO1آ[ }|ި= GGE+7xO@xWVS { 蒀ׂ8V?\?R c$< KA\Uٽ;$YJiZZ(j=sp0)ts_BE˫R/g=S|/7IZj"`F8=
n92U vLT'.䏖W F7);c SÅg^"@"[d,Hԣj\
E$hG8Vq5 g^K0bwիu/yR2Za= ?<&LO:獊O]NJcr|n=[u> {UiZ0]1ʃE&Pk Fgt`y6 e>{4g;}.2y30:Jwt=Ĵn~lՎDrpR;v8T@}k-'(}2ԊBux]Zh:;`$n
0@iLU,ehxM |qsyY?}QkY֖c$SgO"jNQ;xL1Oּ5ӛİ:JHe1 a_ 3+Egõ}d'qܩ^{*nn n ѯ/cXTe:U%7 gWהMQD{StW]UjD
M"F'5 5<5Sm`ѵ'.8I._,0&0yrqn4zn<t@jե~ zHplϸiǘrT% ERk<sn"cB ",z{i Fedﯖi7uO6 oT6\?-W~_})r5=ì4_#]t5w9N1uס)FhݢT.y%kk̽fjK
㱙k5uiy'n[a-*} f0r$_tQf(oۍϞ
0SR;ջ]l 0}Ly
NYB[dZZw%9O8R`< `FggW zXɴ 2<dĸ㴩@l͘.d 9Ӥ}N$]UŘK=1-X%f/jILZ Ni9<?[~7-De'g(gWY`dJgLּ&;15|dv:6 0]˿xɶ|OٍJIAamg2=yp n[f| Ɣ uLy __H| أT}T諶~>tֲՀL)+yyXksn4@h ۠<7b
F>P= N(M ٺ=?{X4ŃeVq7 gLc9ǔ`QݾZu|>q-@[%%떟 %͙Y)j=NI#ӊ&KR){Ѐ/u+k P]
nqʤM]=u"Y-N3/wc$h/G*=Ƙs i!)W/_f8V3:Uy[ڎiǟh6$kn|<5m?0Ȱ^oħI%@JC/4 Nrfy*ڒkI{L?;ap(g{^!2mL9
wV%HqBիNNFE#_&W]{
UeĦ[v$P\,MkAXV z)* a&hn3#PV%C$0*v9Uц \H&lhyll-Y9 c|6^4~;K `T&7ڝJڟ] Pn8WrD䘏)x ҲxhZ9àEqf1VnoLAC,|eδLr &} dZU?plu hxT@HcIȬ|&, ܕ[1_Uݢk YݏuZf45zz}]{nS?Z3~M织k9*"6'6 :65+Q 2!TԄVn0@Ɣ`)h d:lJeuZ5(NkZT_l #O&5' Q(Nü$U$T;l Whsu~>> ' -!}ʣ:4̄xh !1H?2^|krA3
Z8ӞHvD=gH̭,1m܀=> Ou\A4h/CM qǃ'|ӃUJC> _a\{AiV2%l~ǁ9n2S %:E 2#-<V/i $~nr3/:PCe qm9"SMo )lk |EfGt:|:;Y{<f*lVE}ֶRΧ-ˍJyQrx4E}^2ߛI$Z.avK =ޕ߸tdA
aƔH
aLY gUM&/Lӈߛj6/Pg_>|ʥ`](O@Tz}! 6O*Ŭ'
9fpHpwD eG;b lV: ޕ+o{N#4Vzٙ5hȗ1ў.ꨡ 6٧l}H'`LciKRcZHE %H[}v )|"7PVNeXP,,_t٪QL@#[RxUeӈ &j]~@ }q9ߪ<2A# ^-ǥ
6CpiW}jY L̊p':f_ 6 0$q,J6)νԙōhq6)wdN[#-cjzLY ;+D"?In HO?mJR4 :,>#^KD̘w|2Qh];#[Vxph[&& aWhVժ'#:U1 Z5:!':<Y}\>q9d'`hnrɕuIm]w`
d=~ڌLfg *wǔܻL53mKWdzIMGoNwUrK& )vmjug4!ڔmlW } ؔ ,E3 -&np,?$ RT 7ig\m{Jj}6
8 -YD4-2h6a3Sі,8hp15ua*3 $ \ٔ}^P&3WF4 UWzjör]lM[D.uzJ&e_K].ӎZVvL-/M y rˊ8 A5$%hoIC h8ٖAqok&hZǘ
FP٘*X;r#wgo9!ER& 3ԑ:hgnF(j}W~#c?uiߐ H`#um_[РќLg\=z>q\*Ƥ-mӤg<<I,o:a|#>ObSL$v/k&Vtԫ SSTdӹ ٻrdu*[L5)jn z3&;t X}$y42~;b:MNX OP3!W/rfկ MliOcT۷o/xЃ$qiD
93٧C+&fsg3*_W=: 43u^B7P:wr!CLD@+xI {3ݬ)Ac81u"NkJ:4kݲ9iV: Ȃ>P$^܇/蘒@+ L)!ӽd#c2{7;& S־~}.XPVZA U<h'7:0KbV)Sza3ZnjBi2M+>ƧibQբjDQ&R#b<-}5#hם$OdtSTz5 kC<B"B&F[+8h:6;!kcj`Ai)ӂ| իiHū̎{ a~-EIαy$$L%Z1As7v0p4\5,o,IpL\&XZ%ykGpB^Ty}hf0n]l>3
a aك5g0c.<CۻL
> 0&gJLVTah7ǥEV
~%q'_V{*ѶrEht3->j]ƛ5{f[
{ΒK- CLke9\ P}2(ߖ#p -1em%cj`zޖ:Ot.%y\tȡIsu*`Q;rޗG+@n2nL`Ͱs!?_HvB `!) L@ ! @
&0VׯwUZRĺ Jgo+;הNV:>UV#z-4 8\'$O zL r p *;CDл.
{j]04aړe´
@ pJ``YJ, Hv4Ύ.ٕ${%\2Q(j}ԡk2'/慌$hIlq]c0僻#1`LvæoLEzFuf:u @ xEu*24 :e`WmީQ̈ݏ2cKkxvѮɂ Q[2bШSLgJE%Q5W @?"$o[jQ)d c@[QT#*?P:!`B0_J0camDWӅ,-au ]T7o@bf> KvZ8`O>I TYM
bE"PQ!&: i@
zQ^ vdVGqbp- ϲavQ:YE ObY9s/^Jŗ VդC|7{vM; Wv((lDl& Y 5sS[P,T1Je ԤVQԁk= }cJLd+{+bԐ 0È좊aREQ([|w7M4KDcȩZ+r?A[˘ ԉjԅEmI=~=
`FQl[%Z%_AG^,^?awBϴLm'fcO&0CGVJ*_;vSk#AM)? A 3)ƽ87˗Ϲ&ϳqm
$ J~6g٦"` :M%aɺфB;,fQlT9. z2;BuKJ' $2ua'7ݏf[q ޒ~:r v$=/js|lGA#QNWw$&
d`Aի* mKϬ =@I|j\ԏp =5˜HS Ze>PwO'2'\O]IMfLM{T9.&7B{ЅPײ/ mcB֦ȅH} ]
B"`DΊ),owYlfa0 }뿹~=5S ɇzGN }*B46ݾ^Gn
퍑j_%HK[`s8| Xg43v[uiˢ0D*̢Βql/ϮH}TCGٸM7~?G
% LKYsT?R狦;#Ws}FO?m:b?g ,-D0]Y%ʛ4O& sGVoC$nkŧOnMjUC15%
EEKSVT15$ڟݒ{rsm>@ѶכJ'C&H$S ^4w}x:I~6F6
Okg#|Oiڸ* S xg:f._Lfv@|3I ϑ:S~
8<<R:7XdRp5q7NL2xHl;M%֍pζ__8
E/&?8 deϰ/Y$V#IFhn<sú|Rw\Y\T6L"]Nt^Y]noZga0aQoI&lSOc`QQ6\nY \o:֊L"DdFmrF ~3;6 ^`26ͧ|Z% {%#dB οV. Ty֗d0|Cn -0Wtnt& Թ"Y Wv/iihVN]p 'ﶥ.ЦFvozi^%MmͦI}rcNj0-9xfIt
[72?f8n?{TY"[N tʯp͚ -F0&[:3XTL8lDUt|x+*+D 2lӬlV#Onk EIp?( 0Fg00+/=O|rOv!pI8l0$>P _V 0Mq$mЀűRsh}8'L` GS2ԙW33RAp^CREݏ @tig~M\Ӿ1>0(h ](é#d{g>|ܒT|\3Oc0U.K1Uv!3ErCsYG fڙd1 `(z7\7?OfZѥof:Zqñl \Fn IZs챍i { P.
ϙfLEÛ q4I\O, ,EZ}cAT-E
~6s8QLܗB\&#ǹ/$霳N3Є>sUd^Xa֘]K d0}!>?Ř
3CSob]mCVѣGnDwՕF;Q(:")`$c4IPzwL%CE=GXb߆]8wJߛ#z0OzV%>S6iN%+1VHwrO?mTMb vw.nI &Ш@
?g٦{p2Jvd6mn}njd^L00lef] L2.>k"F ŋMy|4)tT=ҘtL#Z:/^toBP}rltj6>̴ZO=;LKs^iKLvesZTC$Y$*y[9
A!?9H`g knj1ܙV)}Mx ɣ<q/% 1T И:,zw*]~ZYEG_[:<|qZgU`xՇ0+xQ[/vl0 L/n:~ )]45E]y (KO}L3WLR`)2ԲSy!Dֹυ,ѽnLxʞ>}eZz[Uf^j%6`L٠8ihyޙЯNsUֺܸܿU`GoF`*&N7ׯr=98100,\Yj\v,X~#f"0_(zv)9 V6trZH2Na^aCpw~3Ͼz壟c\A* qL 9P=qZl$jޅu)Oj]FOe4;\k]$-=DgVs-yM}%dtCWV|A;{W.o9SS "3D0S\o承k%Q? xƴŨVh,cBaS-gQuWNѝg4eW(jоvrP<òͽN̕tw&ەFnKMzpr' (_bfS JfM- ܾy3~z z惚ɢ7>t[=qч2]|Ɣ
uL,>Fm[jz ַk -Vdvmt?I \"_ȂI_l D^x-$h}xS>{I սqps~3A @He"뙙UODeŔ=O
CT[KvϏm0ŏ:S~//$nQf%gPtqBvZ(Ҿ~t\`P%83\&s.:wc cO|n{9&5y&%=xh0" ~ DN
mXs/\?\#暑LBo' iVqE1Q}Lh+)@˦[nIVQg宂'wʵp, U8w ꤶ
ɕZQr ˻X~mӄEnجI&{ {yR*:b B;FxKu(R-Yn2UI j oLu3{칹 ^3^W_80GS;$1Kf:XӰ{Ӛ$[^C Z.]K Ai Kn=(O`vKhMR]K$[
Z<>rtϟo p #ӗMM75- M1ګ1,cM(:.h-ed
i LC@
9ĹN>OGdD0G2!^ZQ zB86ofKMX!Mk'/J1`iLa= oiSSMzS$&WCUv_86QjaS|%{>k<@ter=!`
{QtLM荫 s€֯s|$K3rU1e }lckGL~i`[zQ(QYܰ-nu I&IH~^d|u;~'յs~_ӝN(M))@Oh5 ζH<.IQG>4τ0k9%d`S(}W__0Bcŭap+HhCډU
m]T%~t7@cg.b#ѵ{{ qǏ}'+ ղSrJ{˘ r' i{WGUta&=Ry&0w#溩( M%é1#);]*EI6eo 㼒 h B gsYCհ ʓԇ]9:<N)XMsׂ L |칐Id|f2tg쁓zw֭ue)6gzvjz 1Ux<9zӺWS2"PϩWK
q7!P9<I7YmK ۮܹ1 SF5[֛o}dpґu0p_nW|AI <^,<]UugL}$ۯGd3fhq(}[y]'
/$љ
0`QԵ3= pzEW\dեȆ@pQnlR{%d{aj"[8 u0<&@͛r34HtH<ٮPnU?,|=~W:OTG!2KC_Qk_\LAۯɋm|c
ok:=lrlt)K-_#٩_v5
<BŴL- *<9}7oqm4b}M $ yIQQDRe I JHugn T(@ޗFJ gZ';vyvaZՀc`L_1u,+~Ҧu vlï @q $IGf6KnD [&@n]k ȷKԗ2EbsR,ٵޛE (Ar%ˊPP3
vj?<{'0:5 }!ϧRdd4T ^
(ckch:$8"_E*N- MBǶ.>_mHSZ=3:a4ԆC "/~vaJ}z'A- `eU6~?VG}`L?;_>jkt9wN[ t,1z ";& ԥzHf|wrraEbӧO: _adU:4ez
ߛ ˦m6M]ׁaLH7w|_iZ1ƔRMSG*ʩcʵ,JyC,ox`-X`N 8J۔Jz͕:MVdꃏ- ZBf9_˪/KGP~ 'QWE46%!aa
aj2I7椙6
^/yO ִm|o$MkóI,'#x gLg ,fRQx )+e-{(-EV[)"Yu[E:\7S/\ הZs
J,oo9/w<ݖ\ŧ;u!PF~zzW__ƞfChZNj8?;Cq<Pa.NLawC) YWt|"VW4-a} ZrE ^W"RgnYSa֓@F<֦Nt{\S)#-}4:wejsc\@[email protected] n&48 QGϗa,뇭CH%o0-M@'櫢\YQh5T׃k5My+>gsQZqy1B
7MjС1<aᚎ7~!gE@ox͐< =mVjRV-*%0qw `
52Ģ\g &_| V*]Ҭ5: S`dDR{kts"cjY-B!5UL9->8 @>K 9F7'{03wEEN(C[Fc(<[R1]K}/THb>sn95 ??G
[ks]ݠք ٌ/ 4V%=H`#c0Tw~S{_IkJDy7(
G,pc &;wϢ4LBx=ɪvڟE'K{e;%R&1vrS Ȯ{@aT8buQr LEESqQRo&-r ]]||\Yêw9,Z4S7vsvS}JkjVb3/B,y~8 @5 iW͑UT?yeZ@jb1J՟1F8Zy
-R&GG&[Vt47دQt~ 5hJ %fs"esT@7uI4.QzO1FZu(C؈sK/ s~Z]0(#4(q6W\S,
G,ʲv1
V('
&ϻ[Q&Հy'+E1)8.BSNGig\vs]2+;Zp"砃k*i*
G,ʃyw~o@ vnp4B 5U&k ֮ D`$
lw9{p:'za4QUή"7t$vG^wkZ8p?g\SZ5Ȳls N8F,:pI jG0.ϵnP3 $"
:vOwM$M4 p@Im@yUV;=*^GkjV~\S8BQ"/>]Նg"3S;O
ZA/Y QH, wS0N9ČgYy t Q[3OF)tEW87͓uM>6L#.Mm## pMMu"xuMd,h3#FvB C Aρm61@ 4?CR O\S7$
s3OBLQ `F>vv o!55THbQZXhNB{
;}mv̢h\^.--9lETz; wHeЅ'RRDrպɰk?I7H4ݴ[ 2]9VN
_^̦T##+ ޙu QE[qU'{}M|b;A8A1QE8 =$``Ei;sg~BQ1&tP2f;%6u}|q= ! ECG|:5pqTodE̗WF; ߰jPn0|q hQB0lnn ǒY7úSffEMQ7?
ˁ튄 -naHM+g*T9栙?MݾK@hda/owT|ya ܈ܺޞ~8s+je,L$;|GwR*}W}kuG}>"1NTZV0(|7{ (,Eg7 N`Q(O 7=ax?$~YXA g9,Jywѝ (EOvF椾
D {p'RZ$n{v=LH;G܍vv\S3suX,re?o-erZ{tx8W@d٦a P*a !ٲ|laFݚƺ{
DմJVϊ*Yy,+!&Q>\XhjA7ڬ1vtp@TQL1W
ݖ:Iۑ]'fb xGғS~Jj#"~F .$5UδEq/r<Qތ]R҆|5.R"+n 9v@! k[diM@ @N
Q3:>nGqV -=PٍJ<G
c" pMGD, znߓnhGk0ȁm M3yqs
+r!z_KZ'.캰).b ('U nÔ㸩{dHE#;ׂ1;Jr;CH?v fvUOA( S?-o?W7QU_(d9$FvB_! @ k&}<o+LD:!<ם T~gP,bң[[ܻiD(nU
/QEb2x^;Eۑ]'f '1
@ A N
.Mkjkjq/|-}oU$^.| ML :wߞCۘ @ @ \:wJApwc(Z&we.X
>pa
'I!a%f _! @ B$0LC3UB=Wh]VD B>S7?uׅӡꫭ5,`sii
gvF^Q\wwsC @ #Cd`n XͥˤܠCYopx<ۖ% $ qՕqsQ "i @ @-
B"Z M
_ ۡT$b |¶+R\ݹyhw}4lqh컰 @ ^A,]~h$xll5hscgv\
(M0iY}{Q%>Xoܜk&m(w @ yg"};x~ŃDLD[!VZ'.ǐp7Z IDAT8nQZJ13C8:<?7I4e+bOS: @ ΊEFoB;_w{rnb߁"Wgf,螽f zr%y :sSZ q6 w{Lc @ 8#Vȝ`\<hu_GV_9*r%}!{{~>QJZ}S@5Q
'7eUQE%ʅ\ 0 @ 8#Y_93o\F?tE\v<{&`N\Na~ѭw2ZP E6a
\5"4=;A @ .!5,?]GxvN&xM(sqmUxlbIhk"Pt.ig6@ @17ĢwSQNP(@fvUd<XYqbbk#YD|uD
5Hd' @ #X4Y ^
vF+j9`NJ6e٪ӵj|溟oono0H"'խadBQgWQEM ΅7&2 e` @ uS [{G"ұ*"c} Oc CaL 0(ӂ:p(ȆZu W
Ӵ @ kE[4ۇ m̾} ăn*Bֻ6 ŬshqqY!=|}&jGqB~Z Fs0_%I[<-+]t]& @ p1 ŢaMi E7AV o{M<?h
S˖.(yuHsVc/Rq Q]p,:5'FE @ P{EFEQ ao)jfW?\ݳòAEo h(PD6<lNcT Lַ6?#/{V Z(~a${\d9E
Z01@ iL]d*\T:/>Yt{0>[4AsgcgƉ"ϖ}VFQF[zɆVv{[t+EGIg=0qh @ )"~mX/UNCF`͙/EAآ&2NOO3 5cc,HЛ8>4 me2}E_Ɯ' @ nJ`X42\hMstsݿUю-=onVn6= EO!4 Q/S 2Mfφ>m ɧ[[}~$kbjMz{ '.@ @VtoupqqG- \OPхdxճ|/MѦOEEGgT<=?#o](8^e=U_[YC"Wz?i/8 {SO u7߶ , @{WEK+j\⠥X%M
h GA A[Vy! liL)O
W\}'4+|R+ EuXkF6]ݲ.jug.<}Lf & PĢ% Ԇb9:<WqjLb78:ҺmiC7V<P{z ډA}~XAk}ϊ"eu.>4>;85װ:GVC)-=h}__;vWf-IsU Lu47 I' "& @tsV"e Q47Q 6(`Vo<rd$Lɥڔ`Q0:癷?I{]i|c]ʽ}EݿC &XTg ieYG? NsOm)'ûIFid;>y"ntE的"X"a>Eo$Anb&/5t, @ @ (o
FV{OvJBaլ|=
>(2aⱊ,j~X.۴kD @ L%oQ?)JoFI+mń";;k NCMqS)(ݰIa$_h7> @ wF\7 !]߅GUM( w}YEB%4QB)B_5ьfi^%H&hɧ- @ Z,_(`pam>ZXH&=MIl*z=MV8YD_{dQ켶ʫPDTMO @ @Nf*]dEq&tijfWETF(X*͟$IKvD֗>
^[aK[r죄D .! @ p"3p+˒ τGic(w[fܸ)-Y쓨VhEջ@&@* w=W(ZVWS3 @ 5&0Xd+I X3ݨ<UJZҦYOttp3n T+4]kK3w( Q+lWڤdYzd"gOR@ x@`f|;]Ǐm4.jigDuy0?@Rk'q~&ky ^=ל{ @ omzeg;1|-JbZޞc)ljҳZ"WrA(C
3$5gsRIqVz4]fBp{３dӉCYߦNlc kEV1ySY4}FW[[kEw[h"_j8:k4~ꕝ۬>\/k89FݚקiN:%kgܼל4;nc @ kE֙/KL: uLmߕjpA~SgUǩ-k]U~@aVÎP:D`ȻaE&]|)&E_D k|Ud @ E6Ete<e+VY'x.s+uK;zA%:xr
yqԴEcEOȗM-G1 @ ܀ŢQ |w?:T֭wE#8fiPrCg,vzC3A ^R}YRvf=0 L+4 l @ gn,xFly66HPy.a
inűGEعvE&Z#Fs9yYٷ\ml @ rl\{zzbkJ8ZiiHiLVNԡ&фrV%6a-9lD)
ϙ gy @ r&XTtB7Y֝{pd廉DO/Cj]V3BKŵ1XT 6J3Ȯ{8ڤK @ pA 7Ȝ{(KhSBsSQn+:DA&-xz)TH
@o_ R_tMg^"_SYV? ! @ P
\"AVGqvh ]9ZZZj5[J-k-? k fĢXR=.j==oSў^8' Dg?gv.A @ ],:8G}ϲM :{zMgLLbhSem=ô?tbk;mP^F52Г`ڗpwY [[곭>QuaNCi f @ 9YdK<5X@.x%OT>Q7H{g{}U
%|1QE"֩eMU6 @ (ܧ~QqHO3|"B]QAĘԠ ԨS,6! @ f{JZwc S|#9ҡ$.BQ sVq7)h]fx @ $L,2Zs+YIr *4Y{9> 714 *h0M@ @-bݘߺ{!l(V[yETz;nB o(>B @ op*Yw&YD^" [ sK,»զtQ`V8}: 9f3@ KYH -..W . Xݬ[[>|Ij_}
M@H^G @ Pm[? q7cz`s'<Ս;כSUt}:EݪqA @.
>Q]Nǩ]~P'uW"v P
C @
P0я~
dH>PdkٕDD H(ZP?s0 @ @E6f FB0`+B`vK`]B$ @ 2 "ـʜP4qb&მXWf&8 @ @ib@0t +'JD4l @ @b2?G $ELjF%- @ hem?G I_
^B@'$}$Y/ | ? ga^B @&lF7 Pt9$IZ(
P} E+*fe @ u%Xdpa qW/Y9Ÿ,v:ES\B IrQz{|I3>~#ڿO>( @ ~m/{YіW~y7؏}|fCA";dy>RA:GZEY@ ,j ZÓ>kN@+essɫWnpp*њցiLKไD^Cs@ @`VފE<\\v Ϫ|gnO
_uri g| @ !Xd 6ш:F{PV$ڲg+ucT o/e E=}%@ @ AEaii *~
l'']~2igiip/WB8PDY@ @ (@0biic~։>7?BYLZZ] igE/@ xL 8X>\Xh+¨y|r]5KI^lmy@ IsQʕ<p'e1V; ,! @ * "m}xj z"x(#&$wI4Q 1@ V,O((}<Gh@ledƟ2n^@@_zMt vA @ Qb͡E v-(_ܚP(9~$mE6u.ּ- @
%P hLlb``7AOx@mʳ=O=ĭ)2IV%QSM&ǺXY{@ @RbјeD# PyޏlvKxr݄c%Oʙ{ @ JX4oՉ$L=Qc(=k[wrV$YQSHKym"v) @ !JE6a=[A4*I>7?HT ٳ3R EZ$}Ygi}W @ 'PyhhLHeNqғ/ ]oHb @ *I6bxL40-=Fc0=mw(?[u4W[#/@ Gvb)zdqh 2\j$ : eѭ(J:b7} ju5ns3S
@ @,ZEcKKK`e&v f
nthuBR'Bl'ŦޓH7ۡ @ 0 ĢS,E`hSP.~9jek#{#0JQPj LwTZj]j7 @ @,>5(fu=Ew_lmu4pZ ~&vR^ @ ^j, A[>ذz UoN6J SѮ&.Q)NB @1u#ێ],یR^_@ WFj˰=u\%Q
@ @n8:Gm+xjzJ
p8$IZcQ~mu#ZGZ3qHW!` @ $X`ZF5O HMuS
ݨZP߄\!` ":,u/<M#_/q%C @ S@, 7)D/a[S)R^(e{Hkn|~wM3;aЎ,ZHƄy @ B% 6 <\Xh/#"4^C @ ':x o IENDB` | PNG
IHDR . sRGB pHYs YiTXtXML:com.adobe.xmp <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:Orientation>1</tiff:Orientation>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
L'Y @ IDATxrF?HwLfʜ1O`eLVdfNPY$ZGUbo,?Aמ]'N-4DŒ,Q ~Ek4I >(6@`bo:3jAiwu%J G+qx-u fGo ;K@ @ 3r/"U[V[媭'A$QqqLn mr505 @ @ V,!u"Pd TZZu$g.tIr@ @ a Xf`GEPHp(YQ3U<z!P#g @ @ղ[qj5jvI)RK1ḏ"Huu!F@ @ %@}( Ip(N?a֑ [@ @ (,B5T l|N.GZU֩st %C @ hEFx+8J+QiTa@V|dL@ @ @|gX|ïJV^< KZmmTM @ Ԑ vj\*媗$jiW> vs%S\B6 @ C`Q8}%c(
VϮȊf)A1Mt8EJj4@ @ XQgaRGA"Y~Es0K_h @ PEUPGDz&Bg$kc5h@ @r* 5."Tq(ju?۫B @ \PEo:*Q5t&X=MjGI=3% @ oyC$H Kgrq.=vЉz
E , @ 0
)pDIKL(>)kI՝VKmz9 @ Y^4ҢJL6эFӲjچʋi[5s
w @ Ԟ E ,t0Ң @ YV4Eѕݝfx @ &@fQGkiKdEۅ
/gJEC@ @ 7XL;ˤ7q2` r.L9l8 @ @ BLCb5MϒMkZii@" @ # EI>vF6I.M}V|Me @ B%4P{Fv '"PTNҕ$Q&xҔ8 @ , Xd(N
N2!J `"L @ @ LC /jgIQZ9C HA㻩u @ ,'!@ % '@8
^C @ Rpųuk N9%
ueoawǩ"C @ rQ\C^HC! @ %@/j#PTۮ1F`G) @ ". (! @ ( @ "묂@Q{zUX @ [email protected](
a ^f @ Xo e|Ĺ $Z1Zv @ @S0
)=mahٲXA\2%A
8 @ @ VYdczE{krC0 @ @ YTힹYiAؖ<%sAi@ @ X4 F?ҭLk4|hI~f @ @M ,iv?E6YMB@^awg9 @ '@͢p8Y2u$}C*5 @ jJ`QM;֦[VsB) H;b8 @ N`) =ID%OyQJ(6U"͖AZRI{xSj!IY6俥~\@ @`R&%׀߮-Zj:Egwpِ#퀅)(tP%U6նצ~)0 @ 0!KiM R7 Kp(mhyjcS -HyQca o_-5C @ E"[$k&p'ǽ5;:QOuuyo=By6%Gߕw?ɜ @ @ ',:7^ItMQLkRzU]} :O˫LY[ij#0s~rw<N @ 0
bFk[Y.2S*AlZbԚijd-4S&eL#s! @ 4 EMNgdx +ꖑb
F˧oV9@ @E Ǣ9{A\A)Fn~eo!) @ &4{ $SxBȉ-$f
(L0c3*h 9?kV# @ @CYԐTVv1 /2N}J^TC/]O]! @ 8'r0+i2ݤ͓bjK>[5, vqUk}s @ @,\Ժ&R:~zò륖Jfi&8u @ 6Eas\Z G_FaPZFEbף/ B @ 8Eק4mKw?[Klװ vj/l˯R^1?"6 @ b"@fQLe:f$L;J1M:MK+\Ap" @ uSz,?[*;kw@wO4yrahXN.%3WM3"5 @ @]=![ HVQ'i^H}hWm[|@Ԧ]d@
@ PodջnF:.Go[־j$]T
wB @ (.:*"P40JBqڟ %ÈQ1@ @ ,jP E/bZ_2Z*uO
@ &@fQ7u*"P4vOuBarv3IT*>Y>v+{ Զ#P@ MRa}5ȬZmaNtAՂt Z3mr|ӼzG^^,`6\Kn
~cEJՋr @ @S )[|pm'}`wE :NCd.s̿ygc!~ C U$`OV%P~B @ {Ȣ}Gki7Ez%? Sx,@"o ; MF.]H ^_@ @ hE
õtb.k}V!3lF[UMݙdJhK^Wɵɵ\r Jut?k
@ N Xt
H]^غʛ?iGdh{ A^UA# :K2MROR۲. @ "' VA Q+Yd!M3 } `XLU357 LS[
! @ ,
RKK6QO1^8غ%A#}lr]G @ @ bLCʚ֕<.>vU\˦?i;@/UOdjZ*Sv|1R8/}6$m(+ Y @ !@f497qb K1^ϖ|*s$P4vwLѰΒy~)us:ZJB @ ,&V:9`&kL2{}#& IsΒJ,G^t9'α "! @ `u
LahHǜM4},KG5uLVGʢ-y0i@ @ (85 Pde0_'ʞ^٦Ac*ZP݁1 @ @Un-ЪV}2Yi˾7(* &{uHl +EU
@ @t }N5_4]ueouKԤ@1$7r2"3F߮-8H@ @ Q Xe4:O:%[LV#[u]z4kQ}y `c&#,좙2+· @ p E瑩$zE>&ea4sKE]$pvt @ h<E5b[J]f}+5}!#gZ*ٴ @ 0.E`Db3 f)M<QWnZpF!W3Թ99 H@ @ JFTD`$k) 0 peaZ
E3@ @յՎʵ]0iMSt Լ3O3QS) ld.@ @Qմcb
[w?
3J"\ȮLas6 zTb Fc! @ ,Jܿ&+of
[2T+W6{;7##:Mr'.d)Er @ @ 6b25Mi'"~֑eS fpҷYR\q(& @ @(~kEDŭ)h *г $Ļئd B @ :k Sh[iSWS*[MET4Yn<klYT%~tC @ A XD7X7bDW5p!Z +.YEJf/ E, @ h,U^Ӕ2wfFKt'ph$C @ 8f%ҍ+n(?/4%f
hmM' K}~miL6! @ DB`Q$ U̸VBsD TZ
O;,>nQyK.# @ @Eu>QfzE%?(hZ9 g&1e '@ @ (A`Q HQ5jMn=pT'
XPXnV+`+;zW! @ ]Z]%l:bjNֱ$ꍘ
@ @ dBIlKT{|#5l^)r]m̎m ؖL^A̙ @ ` "LXNf[1M;[ryu$ciwNA @ @ ̈fCA#ʶ.]rRgӅeF4Ӻ @ 2hߒPҝN+ TJ @ 5EސֳL$XE{6tſ@ @ ,rȓ Z}Qcl;pBoLå @ @)41ɉ hm=@&Ot @ @|gX $K>l:7 @ 05ES#DDf(L& '
@ q ,X߮u6iݏ>'@ @ @(~
@ @ EAtC,y @ ,
jB] /@ @ @{o۾.@`"/&: @ @ z7t?]#_RWQ C @ 8$@!\D%$ׅ`i"M(@ @ #,C TǶt plږTyxsr!n vb# @ W"\$X]iMnX.ĀK|w(ul @ P XT Ak K 픋|KPg EK! @ Xn%hklK
ll?g[۵m@ @ X]]`p` TNrX.$]tdl\Ԇ\b-5T{MZ)N4 @ jK`Qݺ6]/4ܿfԛY-io}N EpGH @ pH`Qݮx)7k= vuR8 %n2ɜzlj\B @ H:,R:*pXk'"%Ee[5j`]+:t% @ b @(^'wc4iDž2jՅ&v ?
rȜ,r @ @,Sc)7/h^YS.;F e
̅YZ/]u!d L@ @ 骱 fWZsG_Y
Q=
n {=uW'*~ ]'# @ @D.Ed+%J+m[KzpKnW%uR"S.2W&w? ֬EWzǕ+U֯qm= @ ,\7z<mIٶ/Y6cnH(@m mʓe0)sam_<F @ f`Z
9"!Gs$b+eew{VCSH}/[~
@ @x,
OXdnM Ɗ0Bm%EqUtU)kSkjjG#sfښdA @ h8E Mjܒ$q6E zT:G{&kg
d#,)-D25<[># @ i}$I?tՒR'VbaQJ ;TLcQyto\#/d\۱ @ <2
lLۙ
Nӭњ,E]dd[@qag2Uiä%hK͆Jk jV@ @"&4pM%Bͯ- Y7Z:{#pWb.
G_UtT+$HKlݏfg c @ &`5o^q?k[l;^s}ZWNza7v٪53Qkݕ|:|W @ K@Jp' |/̍wid
$0RG̲%z?gY&EtY1_@ 4 Eu<,&h-u%RhIol"H&9s @ ԑ Euc>TȘr].2:\3kט6
>k7C @ h,2j)Ųkf\ yy^96$и"z @ XE]_
bsL.ʕ5v0Iw4]ق @ P[j۵Cǒ<DvڟuB_4u;_;G @ @JA)[˦
V,]ؔyc7x܌?C @ h,EM$U~DevjKjáE!E 1 @ 09?f;ï<Ovݞ/=yϗ<і"! }R埽uM{@ > ͛|F;+?M@f XԌ~Vֶ"W'wLSsUd53d=!_Y` .۷nm)YlDMyffO>l *۷nĶEW=}|mrq`Z74LGs:qʹ4ɦi@W ?a~3 ۷
E jQ' oT~ Pɏ[⡅ @b.fT:"#l#eRhA MT>@ e $ykl[ ҲVaVn_i @?EWQqmIF%-(;k= eَLꙠ0h{,5i,UqT
ԉU$;dGޕ˒mtW=X @ &'@hrviu1W`$`qv%\42F2=d} m ȿ&e]R'zc@ y942Fi`a @ (E`Q)Lhn& -dG_U{Q*/6qdVHv-8@
:@@ @ @,$YIdU l܋g X̵tk vwcJȎ?iG/HvAu~y67TOHk .@ 5 pTܐLp7nˊ9iVb @ 8I@lM"`VKg/v% B]0*1S{e |h|0 h 6A
"za(O=ٕ4@ E<~:DF1Xs 0
a}o+x|CϚ krT,[l߈s읳 ZpjER0jjI @ ,rM8Dy1(DƲ)ƀquӸ$ظ4]h @2_-D,@ @ N`u ~rwEt#0 #V# ! tmUczN|@ @`Q:Lk]d|%`T*igr>gaWbsc7 ^^ [ p[9@ *'@.ƀ:e&`TIdQgHvڊ)]V@n^a:Z= XT dI"Ib.ѭ 'Fj`Qf"xzi` 0u#ph. ! @ E.kxhMLvNҲd-DC Hسak " 4 t9^[SvёI?\p/Ŀص mem
sf 8WKA`
@ Eawk vw\~) hfδ;6E)v @ C 8Sxr͛uf]; f X~?u8&o/c$ e,Hh#f9~l b!c6$齽= @Z <9#YJNeסhF:OxQfb! +a\o'|: @ V)v=Љza
*?eԱ(zjQ&H<ZP$;jUE*4@ $qO 5dA@ Xy/r R؊7>iJJ9n9)v jV )l-/lm: Ԕ v$nŮMrn瘩i4Y2z3bda- dݏ͒uOAϊ9s*d@ ;lUn7D@4Z[!Zr f}h%Cv 8m>{ѿ.^Ǘ2@ Qcjt[32=\۔U:Ǐ|-E;bKϧN1M;"h ˗Mya$ѽϞwE ~
b\ @ @씪Mb[y -YF eUMM[vE͘ HOݫ/_g ln<}<SqLU \L`Ō٢юwi}r|UdG-~*ŋC XӲ &8tOnIQGK?98, @ >3_[{TLMK~Se~6{/y@Ӵ.ŝKZZ/-u,JE @ x5u:Zh\%QԴ^`.6nR<!- 3 c-q?y6Y8>7dA" @ dMƭ1gIdq <S NM{a_l z J\;+d\Ԝ@^<*+gvUںϸS۴ @5uݞo{^ 9 ݓ|whs3j DI `nQĺúF 9a&j@ !@ 0>E@Ij0VkY1·UYmIp]u,)M#7oJ(l=~[vQj֭@ @DEYUj$O%p>JG/]uwA3_ fD] [Ŏ0@JRًV+Wpմqϛnr
@ 5Go
/x'jyy.ڑ`KϣJ?u jG` YtX'O>ݚHOk7y㞔 3] @վ:XNJC<6 ͪoYf2smQ'Ea"
%/@Mpdژ1[hOS@ ` "+%L$prY^IR¼W~ ?MJZCȒCCϞOG2V9s/^JK @ F`54\!AS.Z4*,|U:*9Kbݜk $:slJ]۪ukŵC &$`JKFUZވc1 ?C*8 $~V uf=+rF
ߺehl @EPTѕ w[ҩK
ؓG .ZV̄ <}RzރͦV5պqZV좩{ C`8h"reS׀3s3vT7
] P 'CZ :%Ze ^7 q!LM(`TLךZZ`rfE[bӗ5=w1ϡ9 PSo^ז=ϟoԣgf$6# &`'yN#*V(E= _/7X.}@6 `@$c1HӧOde4 Ӄ / @ pF`3ܕ0϶͊odH`.`ˍOxQ J m =5jeڻreL;@ i \V C֎CR7gy#Ů{8 ̟>{ xąuf }f꣰BOcp֭m~"n'
ak $;מ# c| ,*ϊęUʙ+46:QOd T%Szp^ˇyRދn̅ lHҺןz\eHR@ {*ouo_$俼:3So<:fJl IJ-5L@!Pg)+ /lCZ'iHF <WPkEE
E$hGY+5a[uUEagBfj
*~^%]?0yJk#pOj[tˬ$,XϻjSi5P33So#5~!E< ~:D\q-10En6Kze`Lsy2-J &qn0(E@yc\+lnf&|X
BOcʈE%:숸%ISŇo7D
eY&L Gp460&6Y~~Mj ECp'ӽh >P~!E|Z+ť;g.)u?gf4c( 08g2ɾ2Ĝ4;-i ukITZH~%2
nL[QY<!y1562+'ԡL?[ ier L㊞V0@`<mw?eK% 2sey\<(B PR' ='PdEVL 6ÅM+"rE\gEԡ<Y`Hvїr['EaYnE B $~W_|- Nl<OůOB|h Ԟّ%ԦDwFsvy /=05SLZ·Eh_,_ GSG$K>ڂ{LWV1^zR's*[izM>C. W~`/H/f3ϼy}&7N R`G6SN- P,[K 79dm/\Wd* 7q5cG2Wmw#/\6uhv%4KcVrՁU
JGrZϴUFF3eva߭m%ɥ9S~c̏6Zde@V[boYfFcoGA!֖7oA--hE-[$4=T$ԇfͲsZ*n) ƹZe#g߇#G3պ8vX' ʮ%Wbq9jh_p M}7VBMZoHQN:Qrm?+YR 2n" mi1!iۑA-vnhWHbҖ
"0,l tyA1a3=_cp}8A0zg,"9 ~ܠW 7kןS`ξnG judՀF~ ߸$7_ڤOz&bK9d/ 9֑9y &}(ƚ_H;1 eyػrEƷכh~*~s릞7Sbise .9*I=2LéҲUe7UlJ"Z匩]옊>Qo<InR Rhm=Vܪܗ^(Lm!ߢMeP$$;uv1o['먮_rkwvB71ô],ظu@>P^ݖLY-V
%Vrm v9Af4cjsT9Ͷ uK} Zmuu . |k'҇Mp[̒Ү}_k=ɗL,_n㭙l⍾%2fܐ)ӆv3s^^E ܳls9A,gcL嬽)voygIe_?$H4@9m}M%*D5Pdf8Il72]$jSl x_(33Aj̇ >|AGuL|5 PT4e6MMi@:=1EH|~_~;[$+ #o?gRdgą˵ {BA8юLaxLR (e JpjMt )7iN7II,&9~Ƀo>"pzݔ"F;1`)T]d%JE(JShsbmoZKýX7v*Wi>]jlIe.
4KEQ}C_jPڞ{yR;YÕbw&*7i]q9ɍj5W\7(qL31`o_O%h{= :x[O?'w1
fl5# ]dmI'ԮEܩdw)mIϟga[+y=@{|bǒդ@ыdLYTE іE$g`wm[ Y J3Ey@͊Zoa=e?XOJ`^KߌR[8Z¤8]$}L\0\ NzNΆ<6 l7(ل'sZS:jDThzyǺ̀E >j;aE)q07_HgSQ\W{k?5f Z>U@܇/@S!\07B>ٮYrQ&d *ƔUg :j ,250~Mu~ 5 ]2Eyһ!
D`V.ח۷>?lnHjXp=BE# T4knj]P=Sכ3-`)/ocbuaM"KLx4<+?-/<NgW][*42a|EȰܣi&hT{gq0\yz12˾7RO(e nn혋q 0%6u{/cVДիf~Էnn?ʵu?y 7n*AF̦942Rn`yEq=bLU#h\bē gY&FŲͅ8nj]P-%3kw
nĘL]/_nIWUSúEGk+-(}}
,Hnؐ( ̋Տ%h@=(/J\<}Noܧ' 8QRFQ&rlF^)RhĘEGSΆuT~X4nyQkE%ybhnK uQQ 5^{3ϟg"dwjA H/nB X!Mʪn2--nNt2'E1Fw Spq2+}U
%cSrSY9ipj~42v.2S _u
# LM['音q2 >Z `qչK4zv̬.}^=onƆ)[B,_m?k;MEƾE&lJ$ߑA-ouig5yhB
}p 01@' hLE,2DR(6!}ΙO>o۵|,j[Wz1]$%K"?`+>
{#W25LS5wuO uB4fz^XR2*? D& " @ IDATI_[?<{\
$"mlK yd]Zrp![t# 7_ =.+ jƘ{6SH}% mʅÓ / sx%ģJTOYFwR,˷?{w z}f&
=KXKP'q n/:*!+% :|( ʓ9\d;z]~og>x
3=Y;}12;|}? MtcJhj~;Y Kܟ<#^?P6d檴 ݊
#`J$+ľ-RǙ9&`oCc3ţM g\ؒ1Os|C2>|ϟgLƗ5R ޗKȶK1uȳ)c*`ѻ~7EOnEwکE}tf4Xjxԉ(%J}#2c?
ryHOp&َ&q B,xn 똸QZ+W25_w
7L* TLJiF8p 6 0NҬ
fQ1,WU7RnѫLQp>}Ky$b$A?)o<E3R(SFK(Ej *7>Kq<OS/jV_d^d T11^*"pȝ8} z!A`d]"] ZG[\NGmG`LT1tＳ*7_Z h ڊZU:3)\TBv\1}rnHhS[-IASh!(vZ2G[z 6 %Y ۺ;8ȘAd7Se$ QS}S\K29ei. f ) 0ۘ
rO$tI\"s
ZHJM@FFe L0:FqtVVxĎ lyPt2^ T'3LԢ1ӊoUosUNGꞫ )%"${|`SN] 0J*eL,j_` "] onY$jmW#A<cNñKB$ ŢQaSX3p_#)38얀e&KZ hfDy\HGJmj]"cXma^cj.}L,*
Y'ɦ'Tr^LS& g rqkUqM)Ú4J5Q ,S&E]ZyAO1آ[ }|ި= GGE+7xO@xWVS { 蒀ׂ8V?\?R c$< KA\Uٽ;$YJiZZ(j=sp0)ts_BE˫R/g=S|/7IZj"`F8=
n92U vLT'.䏖W F7);c SÅg^"@"[d,Hԣj\
E$hG8Vq5 g^K0bwիu/yR2Za= ?<&LO:獊O]NJcr|n=[u> {UiZ0]1ʃE&Pk Fgt`y6 e>{4g;}.2y30:Jwt=Ĵn~lՎDrpR;v8T@}k-'(}2ԊBux]Zh:;`$n
0@iLU,ehxM |qsyY?}QkY֖c$SgO"jNQ;xL1Oּ5ӛİ:JHe1 a_ 3+Egõ}d'qܩ^{*nn n ѯ/cXTe:U%7 gWהMQD{StW]UjD
M"F'5 5<5Sm`ѵ'.8I._,0&0yrqn4zn<t@jե~ zHplϸiǘrT% ERk<sn"cB ",z{i Fedﯖi7uO6 oT6\?-W~_})r5=ì4_#]t5w9N1uס)FhݢT.y%kk̽fjK
㱙k5uiy'n[a-*} f0r$_tQf(oۍϞ
0SR;ջ]l 0}Ly
NYB[dZZw%9O8R`< `FggW zXɴ 2<dĸ㴩@l͘.d 9Ӥ}N$]UŘK=1-X%f/jILZ Ni9<?[~7-De'g(gWY`dJgLּ&;15|dv:6 0]˿xɶ|OٍJIAamg2=yp n[f| Ɣ uLy __H| أT}T諶~>tֲՀL)+yyXksn4@h ۠<7b
F>P= N(M ٺ=?{X4ŃeVq7 gLc9ǔ`QݾZu|>q-@[%%떟 %͙Y)j=NI#ӊ&KR){Ѐ/u+k P]
nqʤM]=u"Y-N3/wc$h/G*=Ƙs i!)W/_f8V3:Uy[ڎiǟh6$kn|<5m?0Ȱ^oħI%@JC/4 Nrfy*ڒkI{L?;ap(g{^!2mL9
wV%HqBիNNFE#_&W]{
UeĦ[v$P\,MkAXV z)* a&hn3#PV%C$0*v9Uц \H&lhyll-Y9 c|6^4~;K `T&7ڝJڟ] Pn8WrD䘏)x ҲxhZ9àEqf1VnoLAC,|eδLr &} dZU?plu hxT@HcIȬ|&, ܕ[1_Uݢk YݏuZf45zz}]{nS?Z3~M织k9*"6'6 :65+Q 2!TԄVn0@Ɣ`)h d:lJeuZ5(NkZT_l #O&5' Q(Nü$U$T;l Whsu~>> ' -!}ʣ:4̄xh !1H?2^|krA3
Z8ӞHvD=gH̭,1m܀=> Ou\A4h/CM qǃ'|ӃUJC> _a\{AiV2%l~ǁ9n2S %:E 2#-<V/i $~nr3/:PCe qm9"SMo )lk |EfGt:|:;Y{<f*lVE}ֶRΧ-ˍJyQrx4E}^2ߛI$Z.avK =ޕ߸tdA
aƔH
aLY gUM&/Lӈߛj6/Pg_>|ʥ`](O@Tz}! 6O*Ŭ'
9fpHpwD eG;b lV: ޕ+o{N#4Vzٙ5hȗ1ў.ꨡ 6٧l}H'`LciKRcZHE %H[}v )|"7PVNeXP,,_t٪QL@#[RxUeӈ &j]~@ }q9ߪ<2A# ^-ǥ
6CpiW}jY L̊p':f_ 6 0$q,J6)νԙōhq6)wdN[#-cjzLY ;+D"?In HO?mJR4 :,>#^KD̘w|2Qh];#[Vxph[&& aWhVժ'#:U1 Z5:!':<Y}\>q9d'`hnrɕuIm]w`
d=~ڌLfg *wǔܻL53mKWdzIMGoNwUrK& )vmjug4!ڔmlW } ؔ ,E3 -&np,?$ RT 7ig\m{Jj}6
8 -YD4-2h6a3Sі,8hp15ua*3 $ \ٔ}^P&3WF4 UWzjör]lM[D.uzJ&e_K].ӎZVvL-/M y rˊ8 A5$%hoIC h8ٖAqok&hZǘ
FP٘*X;r#wgo9!ER& 3ԑ:hgnF(j}W~#c?uiߐ H`#um_[РќLg\=z>q\*Ƥ-mӤg<<I,o:a|#>ObSL$v/k&Vtԫ SSTdӹ ٻrdu*[L5)jn z3&;t X}$y42~;b:MNX OP3!W/rfկ MliOcT۷o/xЃ$qiD
93٧C+&fsg3*_W=: 43u^B7P:wr!CLD@+xI {3ݬ)Ac81u"NkJ:4kݲ9iV: Ȃ>P$^܇/蘒@+ L)!ӽd#c2{7;& S־~}.XPVZA U<h'7:0KbV)Sza3ZnjBi2M+>ƧibQբjDQ&R#b<-}5#hם$OdtSTz5 kC<B"B&F[+8h:6;!kcj`Ai)ӂ| իiHū̎{ a~-EIαy$$L%Z1As7v0p4\5,o,IpL\&XZ%ykGpB^Ty}hf0n]l>3
a aك5g0c.<CۻL
> 0&gJLVTah7ǥEV
~%q'_V{*ѶrEht3->j]ƛ5{f[
{ΒK- CLke9\ P}2(ߖ#p -1em%cj`zޖ:Ot.%y\tȡIsu*`Q;rޗG+@n2nL`Ͱs!?_HvB `!) L@ ! @
&0VׯwUZRĺ Jgo+;הNV:>UV#z-4 8\'$O zL r p *;CDл.
{j]04aړe´
@ pJ``YJ, Hv4Ύ.ٕ${%\2Q(j}ԡk2'/慌$hIlq]c0僻#1`LvæoLEzFuf:u @ xEu*24 :e`WmީQ̈ݏ2cKkxvѮɂ Q[2bШSLgJE%Q5W @?"$o[jQ)d c@[QT#*?P:!`B0_J0camDWӅ,-au ]T7o@bf> KvZ8`O>I TYM
bE"PQ!&: i@
zQ^ vdVGqbp- ϲavQ:YE ObY9s/^Jŗ VդC|7{vM; Wv((lDl& Y 5sS[P,T1Je ԤVQԁk= }cJLd+{+bԐ 0È좊aREQ([|w7M4KDcȩZ+r?A[˘ ԉjԅEmI=~=
`FQl[%Z%_AG^,^?awBϴLm'fcO&0CGVJ*_;vSk#AM)? A 3)ƽ87˗Ϲ&ϳqm
$ J~6g٦"` :M%aɺфB;,fQlT9. z2;BuKJ' $2ua'7ݏf[q ޒ~:r v$=/js|lGA#QNWw$&
d`Aի* mKϬ =@I|j\ԏp =5˜HS Ze>PwO'2'\O]IMfLM{T9.&7B{ЅPײ/ mcB֦ȅH} ]
B"`DΊ),owYlfa0 }뿹~=5S ɇzGN }*B46ݾ^Gn
퍑j_%HK[`s8| Xg43v[uiˢ0D*̢Βql/ϮH}TCGٸM7~?G
% LKYsT?R狦;#Ws}FO?m:b?g ,-D0]Y%ʛ4O& sGVoC$nkŧOnMjUC15%
EEKSVT15$ڟݒ{rsm>@ѶכJ'C&H$S ^4w}x:I~6F6
Okg#|Oiڸ* S xg:f._Lfv@|3I ϑ:S~
8<<R:7XdRp5q7NL2xHl;M%֍pζ__8
E/&?8 deϰ/Y$V#IFhn<sú|Rw\Y\T6L"]Nt^Y]noZga0aQoI&lSOc`QQ6\nY \o:֊L"DdFmrF ~3;6 ^`26ͧ|Z% {%#dB οV. Ty֗d0|Cn -0Wtnt& Թ"Y Wv/iihVN]p 'ﶥ.ЦFvozi^%MmͦI}rcNj0-9xfIt
[72?f8n?{TY"[N tʯp͚ -F0&[:3XTL8lDUt|x+*+D 2lӬlV#Onk EIp?( 0Fg00+/=O|rOv!pI8l0$>P _V 0Mq$mЀűRsh}8'L` GS2ԙW33RAp^CREݏ @tig~M\Ӿ1>0(h ](é#d{g>|ܒT|\3Oc0U.K1Uv!3ErCsYG fڙd1 `(z7\7?OfZѥof:Zqñl \Fn IZs챍i { P.
ϙfLEÛ q4I\O, ,EZ}cAT-E
~6s8QLܗB\&#ǹ/$霳N3Є>sUd^Xa֘]K d0}!>?Ř
3CSob]mCVѣGnDwՕF;Q(:")`$c4IPzwL%CE=GXb߆]8wJߛ#z0OzV%>S6iN%+1VHwrO?mTMb vw.nI &Ш@
?g٦{p2Jvd6mn}njd^L00lef] L2.>k"F ŋMy|4)tT=ҘtL#Z:/^toBP}rltj6>̴ZO=;LKs^iKLvesZTC$Y$*y[9
A!?9H`g knj1ܙV)}Mx ɣ<q/% 1T И:,zw*]~ZYEG_[:<|qZgU`xՇ0+xQ[/vl0 L/n:~ )]45E]y (KO}L3WLR`)2ԲSy!Dֹυ,ѽnLxʞ>}eZz[Uf^j%6`L٠8ihyޙЯNsUֺܸܿU`GoF`*&N7ׯr=98100,\Yj\v,X~#f"0_(zv)9 V6trZH2Na^aCpw~3Ͼz壟c\A* qL 9P=qZl$jޅu)Oj]FOe4;\k]$-=DgVs-yM}%dtCWV|A;{W.o9SS "3D0S\o承k%Q? xƴŨVh,cBaS-gQuWNѝg4eW(jоvrP<òͽN̕tw&ەFnKMzpr' (_bfS JfM- ܾy3~z z惚ɢ7>t[=qч2]|Ɣ
uL,>Fm[jz ַk -Vdvmt?I \"_ȂI_l D^x-$h}xS>{I սqps~3A @He"뙙UODeŔ=O
CT[KvϏm0ŏ:S~//$nQf%gPtqBvZ(Ҿ~t\`P%83\&s.:wc cO|n{9&5y&%=xh0" ~ DN
mXs/\?\#暑LBo' iVqE1Q}Lh+)@˦[nIVQg宂'wʵp, U8w ꤶ
ɕZQr ˻X~mӄEnجI&{ {yR*:b B;FxKu(R-Yn2UI j oLu3{칹 ^3^W_80GS;$1Kf:XӰ{Ӛ$[^C Z.]K Ai Kn=(O`vKhMR]K$[
Z<>rtϟo p #ӗMM75- M1ګ1,cM(:.h-ed
i LC@
9ĹN>OGdD0G2!^ZQ zB86ofKMX!Mk'/J1`iLa= oiSSMzS$&WCUv_86QjaS|%{>k<@ter=!`
{QtLM荫 s€֯s|$K3rU1e }lckGL~i`[zQ(QYܰ-nu I&IH~^d|u;~'յs~_ӝN(M))@Oh5 ζH<.IQG>4τ0k9%d`S(}W__0Bcŭap+HhCډU
m]T%~t7@cg.b#ѵ{{ qǏ}'+ ղSrJ{˘ r' i{WGUta&=Ry&0w#溩( M%é1#);]*EI6eo 㼒 h B gsYCհ ʓԇ]9:<N)XMsׂ L |칐Id|f2tg쁓zw֭ue)6gzvjz 1Ux<9zӺWS2"PϩWK
q7!P9<I7YmK ۮܹ1 SF5[֛o}dpґu0p_nW|AI <^,<]UugL}$ۯGd3fhq(}[y]'
/$љ
0`QԵ3= pzEW\dեȆ@pQnlR{%d{aj"[8 u0<&@͛r34HtH<ٮPnU?,|=~W:OTG!2KC_Qk_\LAۯɋm|c
ok:=lrlt)K-_#٩_v5
<BŴL- *<9}7oqm4b}M $ yIQQDRe I JHugn T(@ޗFJ gZ';vyvaZՀc`L_1u,+~Ҧu vlï @q $IGf6KnD [&@n]k ȷKԗ2EbsR,ٵޛE (Ar%ˊPP3
vj?<{'0:5 }!ϧRdd4T ^
(ckch:$8"_E*N- MBǶ.>_mHSZ=3:a4ԆC "/~vaJ}z'A- `eU6~?VG}`L?;_>jkt9wN[ t,1z ";& ԥzHf|wrraEbӧO: _adU:4ez
ߛ ˦m6M]ׁaLH7w|_iZ1ƔRMSG*ʩcʵ,JyC,ox`-X`N 8J۔Jz͕:MVdꃏ- ZBf9_˪/KGP~ 'QWE46%!aa
aj2I7椙6
^/yO ִm|o$MkóI,'#x gLg ,fRQx )+e-{(-EV[)"Yu[E:\7S/\ הZs
J,oo9/w<ݖ\ŧ;u!PF~zzW__ƞfChZNj8?;Cq<Pa.NLawC) YWt|"VW4-a} ZrE ^W"RgnYSa֓@F<֦Nt{\S)#-}4:wejsc\@[email protected] n&48 QGϗa,뇭CH%o0-M@'櫢\YQh5T׃k5My+>gsQZqy1B
7MjС1<aᚎ7~!gE@ox͐< =mVjRV-*%0qw `
52Ģ\g &_| V*]Ҭ5: S`dDR{kts"cjY-B!5UL9->8 @>K 9F7'{03wEEN(C[Fc(<[R1]K}/THb>sn95 ??G
[ks]ݠք ٌ/ 4V%=H`#c0Tw~S{_IkJDy7(
G,pc &;wϢ4LBx=ɪvڟE'K{e;%R&1vrS Ȯ{@aT8buQr LEESqQRo&-r ]]||\Yêw9,Z4S7vsvS}JkjVb3/B,y~8 @5 iW͑UT?yeZ@jb1J՟1F8Zy
-R&GG&[Vt47دQt~ 5hJ %fs"esT@7uI4.QzO1FZu(C؈sK/ s~Z]0(#4(q6W\S,
G,ʲv1
V('
&ϻ[Q&Հy'+E1)8.BSNGig\vs]2+;Zp"砃k*i*
G,ʃyw~o@ vnp4B 5U&k ֮ D`$
lw9{p:'za4QUή"7t$vG^wkZ8p?g\SZ5Ȳls N8F,:pI jG0.ϵnP3 $"
:vOwM$M4 p@Im@yUV;=*^GkjV~\S8BQ"/>]Նg"3S;O
ZA/Y QH, wS0N9ČgYy t Q[3OF)tEW87͓uM>6L#.Mm## pMMu"xuMd,h3#FvB C Aρm61@ 4?CR O\S7$
s3OBLQ `F>vv o!55THbQZXhNB{
;}mv̢h\^.--9lETz; wHeЅ'RRDrպɰk?I7H4ݴ[ 2]9VN
_^̦T##+ ޙu QE[qU'{}M|b;A8A1QE8 =$``Ei;sg~BQ1&tP2f;%6u}|q= ! ECG|:5pqTodE̗WF; ߰jPn0|q hQB0lnn ǒY7úSffEMQ7?
ˁ튄 -naHM+g*T9栙?MݾK@hda/owT|ya ܈ܺޞ~8s+je,L$;|GwR*}W}kuG}>"1NTZV0(|7{ (,Eg7 N`Q(O 7=ax?$~YXA g9,Jywѝ (EOvF椾
D {p'RZ$n{v=LH;G܍vv\S3suX,re?o-erZ{tx8W@d٦a P*a !ٲ|laFݚƺ{
DմJVϊ*Yy,+!&Q>\XhjA7ڬ1vtp@TQL1W
ݖ:Iۑ]'fb xGғS~Jj#"~F .$5UδEq/r<Qތ]R҆|5.R"+n 9v@! k[diM@ @N
Q3:>nGqV -=PٍJ<G
c" pMGD, znߓnhGk0ȁm M3yqs
+r!z_KZ'.캰).b ('U nÔ㸩{dHE#;ׂ1;Jr;CH?v fvUOA( S?-o?W7QU_(d9$FvB_! @ k&}<o+LD:!<ם T~gP,bң[[ܻiD(nU
/QEb2x^;Eۑ]'f '1
@ A N
.Mkjkjq/|-}oU$^.| ML :wߞCۘ @ @ \:wJApwc(Z&we.X
>pa
'I!a%f _! @ B$0LC3UB=Wh]VD B>S7?uׅӡꫭ5,`sii
gvF^Q\wwsC @ #Cd`n XͥˤܠCYopx<ۖ% $ qՕqsQ "i @ @-
B"Z M
_ ۡT$b |¶+R\ݹyhw}4lqh컰 @ ^A,]~h$xll5hscgv\
(M0iY}{Q%>Xoܜk&m(w @ yg"};x~ŃDLD[!VZ'.ǐp7Z IDAT8nQZJ13C8:<?7I4e+bOS: @ ΊEFoB;_w{rnb߁"Wgf,螽f zr%y :sSZ q6 w{Lc @ 8#Vȝ`\<hu_GV_9*r%}!{{~>QJZ}S@5Q
'7eUQE%ʅ\ 0 @ 8#Y_93o\F?tE\v<{&`N\Na~ѭw2ZP E6a
\5"4=;A @ .!5,?]GxvN&xM(sqmUxlbIhk"Pt.ig6@ @17ĢwSQNP(@fvUd<XYqbbk#YD|uD
5Hd' @ #X4Y ^
vF+j9`NJ6e٪ӵj|溟oono0H"'խadBQgWQEM ΅7&2 e` @ uS [{G"ұ*"c} Oc CaL 0(ӂ:p(ȆZu W
Ӵ @ kE[4ۇ m̾} ăn*Bֻ6 ŬshqqY!=|}&jGqB~Z Fs0_%I[<-+]t]& @ p1 ŢaMi E7AV o{M<?h
S˖.(yuHsVc/Rq Q]p,:5'FE @ P{EFEQ ao)jfW?\ݳòAEo h(PD6<lNcT Lַ6?#/{V Z(~a${\d9E
Z01@ iL]d*\T:/>Yt{0>[4AsgcgƉ"ϖ}VFQF[zɆVv{[t+EGIg=0qh @ )"~mX/UNCF`͙/EAآ&2NOO3 5cc,HЛ8>4 me2}E_Ɯ' @ nJ`X42\hMstsݿUю-=onVn6= EO!4 Q/S 2Mfφ>m ɧ[[}~$kbjMz{ '.@ @VtoupqqG- \OPхdxճ|/MѦOEEGgT<=?#o](8^e=U_[YC"Wz?i/8 {SO u7߶ , @{WEK+j\⠥X%M
h GA A[Vy! liL)O
W\}'4+|R+ EuXkF6]ݲ.jug.<}Lf & PĢ% Ԇb9:<WqjLb78:ҺmiC7V<P{z ډA}~XAk}ϊ"eu.>4>;85װ:GVC)-=h}__;vWf-IsU Lu47 I' "& @tsV"e Q47Q 6(`Vo<rd$Lɥڔ`Q0:癷?I{]i|c]ʽ}EݿC &XTg ieYG? NsOm)'ûIFid;>y"ntE的"X"a>Eo$Anb&/5t, @ @ (o
FV{OvJBaլ|=
>(2aⱊ,j~X.۴kD @ L%oQ?)JoFI+mń";;k NCMqS)(ݰIa$_h7> @ wF\7 !]߅GUM( w}YEB%4QB)B_5ьfi^%H&hɧ- @ Z,_(`pam>ZXH&=MIl*z=MV8YD_{dQ켶ʫPDTMO @ @Nf*]dEq&tijfWETF(X*͟$IKvD֗>
^[aK[r죄D .! @ p"3p+˒ τGic(w[fܸ)-Y쓨VhEջ@&@* w=W(ZVWS3 @ 5&0Xd+I X3ݨ<UJZҦYOttp3n T+4]kK3w( Q+lWڤdYzd"gOR@ x@`f|;]Ǐm4.jigDuy0?@Rk'q~&ky ^=ל{ @ omzeg;1|-JbZޞc)ljҳZ"WrA(C
3$5gsRIqVz4]fBp{３dӉCYߦNlc kEV1ySY4}FW[[kEw[h"_j8:k4~ꕝ۬>\/k89FݚקiN:%kgܼל4;nc @ kE֙/KL: uLmߕjpA~SgUǩ-k]U~@aVÎP:D`ȻaE&]|)&E_D k|Ud @ E6Ete<e+VY'x.s+uK;zA%:xr
yqԴEcEOȗM-G1 @ ܀ŢQ |w?:T֭wE#8fiPrCg,vzC3A ^R}YRvf=0 L+4 l @ gn,xFly66HPy.a
inűGEعvE&Z#Fs9yYٷ\ml @ rl\{zzbkJ8ZiiHiLVNԡ&фrV%6a-9lD)
ϙ gy @ r&XTtB7Y֝{pd廉DO/Cj]V3BKŵ1XT 6J3Ȯ{8ڤK @ pA 7Ȝ{(KhSBsSQn+:DA&-xz)TH
@o_ R_tMg^"_SYV? ! @ P
\"AVGqvh ]9ZZZj5[J-k-? k fĢXR=.j==oSў^8' Dg?gv.A @ ],:8G}ϲM :{zMgLLbhSem=ô?tbk;mP^F52Г`ڗpwY [[곭>QuaNCi f @ 9YdK<5X@.x%OT>Q7H{g{}U
%|1QE"֩eMU6 @ (ܧ~QqHO3|"B]QAĘԠ ԨS,6! @ f{JZwc S|#9ҡ$.BQ sVq7)h]fx @ $L,2Zs+YIr *4Y{9> 714 *h0M@ @-bݘߺ{!l(V[yETz;nB o(>B @ op*Yw&YD^" [ sK,»զtQ`V8}: 9f3@ KYH -..W . Xݬ[[>|Ij_}
M@H^G @ Pm[? q7cz`s'<Ս;כSUt}:EݪqA @.
>Q]Nǩ]~P'uW"v P
C @
P0я~
dH>PdkٕDD H(ZP?s0 @ @E6f FB0`+B`vK`]B$ @ 2 "ـʜP4qb&მXWf&8 @ @ib@0t +'JD4l @ @b2?G $ELjF%- @ hem?G I_
^B@'$}$Y/ | ? ga^B @&lF7 Pt9$IZ(
P} E+*fe @ u%Xdpa qW/Y9Ÿ,v:ES\B IrQz{|I3>~#ڿO>( @ ~m/{YіW~y7؏}|fCA";dy>RA:GZEY@ ,j ZÓ>kN@+essɫWnpp*њցiLKไD^Cs@ @`VފE<\\v Ϫ|gnO
_uri g| @ !Xd 6ш:F{PV$ڲg+ucT o/e E=}%@ @ AEaii *~
l'']~2igiip/WB8PDY@ @ (@0biic~։>7?BYLZZ] igE/@ xL 8X>\Xh+¨y|r]5KI^lmy@ IsQʕ<p'e1V; ,! @ * "m}xj z"x(#&$wI4Q 1@ V,O((}<Gh@ledƟ2n^@@_zMt vA @ Qb͡E v-(_ܚP(9~$mE6u.ּ- @
%P hLlb``7AOx@mʳ=O=ĭ)2IV%QSM&ǺXY{@ @RbјeD# PyޏlvKxr݄c%Oʙ{ @ JX4oՉ$L=Qc(=k[wrV$YQSHKym"v) @ !JE6a=[A4*I>7?HT ٳ3R EZ$}Ygi}W @ 'PyhhLHeNqғ/ ]oHb @ *I6bxL40-=Fc0=mw(?[u4W[#/@ Gvb)zdqh 2\j$ : eѭ(J:b7} ju5ns3S
@ @,ZEcKKK`e&v f
nthuBR'Bl'ŦޓH7ۡ @ 0 ĢS,E`hSP.~9jek#{#0JQPj LwTZj]j7 @ @,>5(fu=Ew_lmu4pZ ~&vR^ @ ^j, A[>ذz UoN6J SѮ&.Q)NB @1u#ێ],یR^_@ WFj˰=u\%Q
@ @n8:Gm+xjzJ
p8$IZcQ~mu#ZGZ3qHW!` @ $X`ZF5O HMuS
ݨZP߄\!` ":,u/<M#_/q%C @ S@, 7)D/a[S)R^(e{Hkn|~wM3;aЎ,ZHƄy @ B% 6 <\Xh/#"4^C @ ':x o IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.foundation.internals;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.List;
public enum NetworkInterfaceManager {
INSTANCE;
private InetAddress m_local;
private InetAddress m_localHost;
NetworkInterfaceManager() {
load();
}
public InetAddress findValidateIp(List<InetAddress> addresses) {
InetAddress local = null;
int maxWeight = -1;
for (InetAddress address : addresses) {
if (address instanceof Inet4Address) {
int weight = 0;
if (address.isSiteLocalAddress()) {
weight += 8;
}
if (address.isLinkLocalAddress()) {
weight += 4;
}
if (address.isLoopbackAddress()) {
weight += 2;
}
/**
* The following logic is removed as we will sort the network interfaces according to the index asc to determine
* the priorities between network interfaces, see https://github.com/ctripcorp/apollo/pull/1986
*/
// has host name
/*
if (!Objects.equals(address.getHostName(), address.getHostAddress())) {
weight += 1;
}
*/
if (weight > maxWeight) {
maxWeight = weight;
local = address;
}
}
}
return local;
}
public String getLocalHostAddress() {
return m_local.getHostAddress();
}
public String getLocalHostName() {
try {
if (null == m_localHost) {
m_localHost = InetAddress.getLocalHost();
}
return m_localHost.getHostName();
} catch (UnknownHostException e) {
return m_local.getHostName();
}
}
private String getProperty(String name) {
String value = null;
value = System.getProperty(name);
if (value == null) {
value = System.getenv(name);
}
return value;
}
private void load() {
String ip = getProperty("host.ip");
if (ip != null) {
try {
m_local = InetAddress.getByName(ip);
return;
} catch (Exception e) {
System.err.println(e);
// ignore
}
}
try {
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
List<NetworkInterface> nis = interfaces == null ? Collections.<NetworkInterface>emptyList()
: Collections.list(interfaces);
//sort the network interfaces according to the index asc
Collections.sort(nis, new Comparator<NetworkInterface>() {
@Override
public int compare(NetworkInterface nis1, NetworkInterface nis2) {
return Integer.compare(nis1.getIndex(), nis2.getIndex());
}
});
List<InetAddress> addresses = new ArrayList<>();
InetAddress local = null;
try {
for (NetworkInterface ni : nis) {
if (ni.isUp() && !ni.isLoopback()) {
addresses.addAll(Collections.list(ni.getInetAddresses()));
}
}
local = findValidateIp(addresses);
} catch (Exception e) {
// ignore
}
if (local != null) {
m_local = local;
return;
}
} catch (SocketException e) {
// ignore it
}
m_local = InetAddress.getLoopbackAddress();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.foundation.internals;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.List;
public enum NetworkInterfaceManager {
INSTANCE;
private InetAddress m_local;
private InetAddress m_localHost;
NetworkInterfaceManager() {
load();
}
public InetAddress findValidateIp(List<InetAddress> addresses) {
InetAddress local = null;
int maxWeight = -1;
for (InetAddress address : addresses) {
if (address instanceof Inet4Address) {
int weight = 0;
if (address.isSiteLocalAddress()) {
weight += 8;
}
if (address.isLinkLocalAddress()) {
weight += 4;
}
if (address.isLoopbackAddress()) {
weight += 2;
}
/**
* The following logic is removed as we will sort the network interfaces according to the index asc to determine
* the priorities between network interfaces, see https://github.com/ctripcorp/apollo/pull/1986
*/
// has host name
/*
if (!Objects.equals(address.getHostName(), address.getHostAddress())) {
weight += 1;
}
*/
if (weight > maxWeight) {
maxWeight = weight;
local = address;
}
}
}
return local;
}
public String getLocalHostAddress() {
return m_local.getHostAddress();
}
public String getLocalHostName() {
try {
if (null == m_localHost) {
m_localHost = InetAddress.getLocalHost();
}
return m_localHost.getHostName();
} catch (UnknownHostException e) {
return m_local.getHostName();
}
}
private String getProperty(String name) {
String value = null;
value = System.getProperty(name);
if (value == null) {
value = System.getenv(name);
}
return value;
}
private void load() {
String ip = getProperty("host.ip");
if (ip != null) {
try {
m_local = InetAddress.getByName(ip);
return;
} catch (Exception e) {
System.err.println(e);
// ignore
}
}
try {
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
List<NetworkInterface> nis = interfaces == null ? Collections.<NetworkInterface>emptyList()
: Collections.list(interfaces);
//sort the network interfaces according to the index asc
Collections.sort(nis, new Comparator<NetworkInterface>() {
@Override
public int compare(NetworkInterface nis1, NetworkInterface nis2) {
return Integer.compare(nis1.getIndex(), nis2.getIndex());
}
});
List<InetAddress> addresses = new ArrayList<>();
InetAddress local = null;
try {
for (NetworkInterface ni : nis) {
if (ni.isUp() && !ni.isLoopback()) {
addresses.addAll(Collections.list(ni.getInetAddresses()));
}
}
local = findValidateIp(addresses);
} catch (Exception e) {
// ignore
}
if (local != null) {
m_local = local;
return;
}
} catch (SocketException e) {
// ignore it
}
m_local = InetAddress.getLoopbackAddress();
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/service/NamespaceOpenApiService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.List;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
public class NamespaceOpenApiService extends AbstractOpenApiService {
private static final Type OPEN_NAMESPACE_DTO_LIST_TYPE = new TypeToken<List<OpenNamespaceDTO>>() {
}.getType();
public NamespaceOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
super(client, baseUrl, gson);
}
public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s", escapePath(env), escapePath(appId),
escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenNamespaceDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespace for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId, clusterName,
namespaceName, env), ex);
}
}
public List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces", escapePath(env), escapePath(appId),
escapePath(clusterName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OPEN_NAMESPACE_DTO_LIST_TYPE);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespaces for appId: %s, cluster: %s in env: %s failed", appId, clusterName, env), ex);
}
}
public OpenAppNamespaceDTO createAppNamespace(OpenAppNamespaceDTO appNamespaceDTO) {
checkNotEmpty(appNamespaceDTO.getAppId(), "App id");
checkNotEmpty(appNamespaceDTO.getName(), "Name");
checkNotEmpty(appNamespaceDTO.getDataChangeCreatedBy(), "Created by");
if (Strings.isNullOrEmpty(appNamespaceDTO.getFormat())) {
appNamespaceDTO.setFormat(ConfigFileFormat.Properties.getValue());
}
String path = String.format("apps/%s/appnamespaces", escapePath(appNamespaceDTO.getAppId()));
try (CloseableHttpResponse response = post(path, appNamespaceDTO)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenAppNamespaceDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Create app namespace: %s for appId: %s, format: %s failed", appNamespaceDTO.getName(),
appNamespaceDTO.getAppId(), appNamespaceDTO.getFormat()), ex);
}
}
public OpenNamespaceLockDTO getNamespaceLock(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/lock", escapePath(env), escapePath(appId),
escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenNamespaceLockDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespace lock for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId, clusterName,
namespaceName, env), ex);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceLockDTO;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.List;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
public class NamespaceOpenApiService extends AbstractOpenApiService {
private static final Type OPEN_NAMESPACE_DTO_LIST_TYPE = new TypeToken<List<OpenNamespaceDTO>>() {
}.getType();
public NamespaceOpenApiService(CloseableHttpClient client, String baseUrl, Gson gson) {
super(client, baseUrl, gson);
}
public OpenNamespaceDTO getNamespace(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s", escapePath(env), escapePath(appId),
escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenNamespaceDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespace for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId, clusterName,
namespaceName, env), ex);
}
}
public List<OpenNamespaceDTO> getNamespaces(String appId, String env, String clusterName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces", escapePath(env), escapePath(appId),
escapePath(clusterName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OPEN_NAMESPACE_DTO_LIST_TYPE);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespaces for appId: %s, cluster: %s in env: %s failed", appId, clusterName, env), ex);
}
}
public OpenAppNamespaceDTO createAppNamespace(OpenAppNamespaceDTO appNamespaceDTO) {
checkNotEmpty(appNamespaceDTO.getAppId(), "App id");
checkNotEmpty(appNamespaceDTO.getName(), "Name");
checkNotEmpty(appNamespaceDTO.getDataChangeCreatedBy(), "Created by");
if (Strings.isNullOrEmpty(appNamespaceDTO.getFormat())) {
appNamespaceDTO.setFormat(ConfigFileFormat.Properties.getValue());
}
String path = String.format("apps/%s/appnamespaces", escapePath(appNamespaceDTO.getAppId()));
try (CloseableHttpResponse response = post(path, appNamespaceDTO)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenAppNamespaceDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Create app namespace: %s for appId: %s, format: %s failed", appNamespaceDTO.getName(),
appNamespaceDTO.getAppId(), appNamespaceDTO.getFormat()), ex);
}
}
public OpenNamespaceLockDTO getNamespaceLock(String appId, String env, String clusterName, String namespaceName) {
if (Strings.isNullOrEmpty(clusterName)) {
clusterName = ConfigConsts.CLUSTER_NAME_DEFAULT;
}
if (Strings.isNullOrEmpty(namespaceName)) {
namespaceName = ConfigConsts.NAMESPACE_APPLICATION;
}
checkNotEmpty(appId, "App id");
checkNotEmpty(env, "Env");
String path = String.format("envs/%s/apps/%s/clusters/%s/namespaces/%s/lock", escapePath(env), escapePath(appId),
escapePath(clusterName), escapePath(namespaceName));
try (CloseableHttpResponse response = get(path)) {
return gson.fromJson(EntityUtils.toString(response.getEntity()), OpenNamespaceLockDTO.class);
} catch (Throwable ex) {
throw new RuntimeException(String
.format("Get namespace lock for appId: %s, cluster: %s, namespace: %s in env: %s failed", appId, clusterName,
namespaceName, env), ex);
}
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/tech-support-qq-1.png | PNG
IHDR . . "h "IDATx
pTqNQ5TڋBt[࠴"Ej͵#ނ2 kQ1IbDjA
y )MLSHTr' OMȞsv{?g=rvfB8E/B!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQœim>a{5ڶ c((((((((('C1C>V |J#QwQEQEQEQEQEQ$((9gĎF 1 EQEQEQ1&((cLEQE1</{N鄰 ֢(((((((((^/S +\cʋ(((((((((v4ac3
۔Cb|0{(((((((((sC6 c(FEQۈ(EQ6(mD1"v~Nh IQEQEQEQEQEQEQEQEQo>>|U@ EQEQEQEQEQEQEQEQEQ uN8ݣ5l}EQEQEQEQEQEQEQEQEQ /ط$Q'!i$((((((((bɌz |q+((((((((' C?l& D92tpQEQEQEQEQEQEQEQEQLɌMT9 Ɍzx4EQEQEQEQE[_+++;rsQEQlgڵkכo[jU<DQ C(}ZZy (i -!ŐP7 c<ׁEQ{x
(vt3g q@5DQ;({]6<J( o~Pġ+,X9"vNئ j2C+((@}V~T!'J5"7((wߧlYUյ n<ؘpG.(mHn&=?px/ZU w4 bGɻNoddd᱐Cs5ַV+vn,0E)Qv{N CvyO EQ 5 =z466!wԶ/Boa<Ժrc#OGE1.)G%;Z';_Wd4<ǃF_C(bQ|[(/ZQT'(U'A[XI(nݺa5CYY>GGq {v'
5S֯܌[&qC1v\?Qӽ>%5A-:!Jzwt?9 g٥]_esM!s8m<,ɮ{Xnyh*ܣ'vׇ?\E)F?jZdB@5744a^?x,YJne [k,<pʼ?#1nɝ5pr^F*@5(bBQiJv[Y ʯ\0KXܻϱ
,)\D㏻
`ҩeByq? }6KʤNw]^ɖF*#8(}V~ )XcѮLJo cN2#y]粒qucoa/䴡=0 HI UEQLgώ6oA4&-YrqL \E|Fsv Slua=}24\
$LT=NN("Qoܲ
L}A RH}x @!t6~CS rN@1
=rBV$%ZzɍUDD1)*v$,vWl,6*oC.l g$.4L!+ rl
i_|ϒ?Rɒ@֡Kn;JŨ^4bN03Q )Ŝ;PssfWh
<kr]|Yd§oen@6#7F^?B>deh8qE,,X j5,I-A l|N<w+3eڥXM v5IԱNl+\ l3ZdfFG%OD'Wo*y梔>Ӫt I$Aڢ6|8jêlL$FHFңAFPLKz$ ҥdɖYsӽ D(bP?ذv:z54HÞWD ijs,UpTTk4#lc&sH&"h)PhRd43EQ]VT(:5E 6 79-$V(sWpht.ZV$"
{áuAHb! Vl+m ,* cFF(b<m+mrũ=莝(lfjr \EĽ]t{dE"w!̡[،M9
W,NF^` OfWơ`zp76KAF!1diRhp=6jLH&Z8$YÀrƅ͞.F|努RaQ6vHslhm":*cKMmr'
?gÖi;"ט:kNCo+(ϞIb}E4#
QnGѥh-R-䌻L8[_=)ʬ'=ml,iC{
#;)ʜ~8H[ID>4hLpx((GhLj7R%1Y; #YAԫ/UeSF=9706|hgߝd=;8-;hh@#n=
'(E+,$YġMl$$Κ;c,KLlXfh6qk/R
N#! + tc]uK"{!HׯA;oRlȍ(E?q9<>Dm퉻U zOsM/(ZJ$g~Mk_| <V@XWŶE?{g2ۗY #=:gM,0LxxJ7/mK@>NN?39kvUx)RU*|'u|!'3b4x;cP̚ 9 zɛU:ą9tR ڵolٸzN[dEڢF +7SX9c
& =@lOӔ\jw|gJEPquH ֡C
3qnY~.5K$%s؞ cv"f
`;7|^Wj-P$+⦌gȢv SDy^(b|S_SD{DY|ڑHwFH likdŤoze{)/1.Ez6i
ԈDQ :ckj_H}/sǸHt)*r41nXlGHΜGʳgZ[(zKduSa*g@XVVv?* AX=w&Ȅox43ũ#n1}?$jeY{,Z>fT;c,Mb+yցTIE*|'yEĸ٬ۮ3h:c6'jQiЊlL7%RlYK!P V%Ra ^M,)_K*g۸mMh..?lL [:ퟆmle;lÖ5yp}3#Aԙ8ҊsX.mX~u5$챩Eb7Rō(b|Թf-;#cյ?ٳqxTc˔ɛgѾټkٗ[&%eN r z_fPh/ufWkR\Q̗Yr L[fNɽAѡBJK"%s .Ļ#ޟ^0sǎ/g Q 1r6Si
Ν6T$Ɔ?Lq5zQEs$<㮧YNb5jwws>@˕8zvsRRqG")F2]Qو(k.ZbD#\FA+(Y
i7sڕˡ̈dEӝsJ,!)acR?b>q(fM2TbSs
$<' =q_g SFR'٦rcEᐒ;iԛ.?%őܸ#ލ--d˪u\CGF)zw7,%ZH% O9qx9%bE .&1λ7iM( y Plݜ%$ƻ;?Ph>s{_4igh@"vZ-8)%IFE (b(;]]1R<t $Fѵʬ' TOE 6 iWNEAگ\4z% `xs {*g *ի>q?wPEQB>llj[mM${KHo*{-xci玡CDq囩}_}(峺:5ɧH]dQ<_;6fIkğ]z}{uH OVE1hi_6!]5i D#$ג8arٸӆع)-'u~#-n[;ڏ;oizeTE,x(!xgDds 5x^) ~44ȄnVʚaK}'L9ۤG~n?ztoi?Az?32רR xm=FVYf;'gk*#`y)u0Uy I;gg'w0E)}. J` z]2k_9w2$ҥdS(ϰY`A ? ]㕢1lMڜegHs\Tgd
Xp?wqꞁ+l4P_p{zUߵ Z;{=IrMsȖ8s }K 0`(bPllj5HJ3#N7ʝ5w)]L|7Y1>b'5伜]K^{^8+s9a$iLu~7XL45Ǿ% [<U@y%:8/EAR2 8;npΌ_Z@ZcsJoWՕ.EcQt4ҙ ұ<3, yՈDQua`mTj ĦE8 ozv+Kd-eNHK%ir kܯ ۏ7\۽۽=L2 }DQCA$ڨd9ˊ4;RWcws` G6`Kkr/y)␂O~J%
;+Hza4)Q;dF ?O8&vWXKuwM-frPB]
!j=F6M:Zq)d"{buEZM? 7 ;95<t[iWQ ? RSB^;^FVn/AlhRbEʰ7<+}#wZ5]tEQLp6"Z`c#/ӣH;m
Hٹ fG=y9l?s֩S>ܣ)"j7ݦ(bS<|мᡅ;6ɜn!p}jfظަ%ݔAiCdZ2Զk(%EumH[L#-iolEDԛ|hɰ(b\R 4hPCCC^
4#C$F8u)͊CEP
*SGT 툜Chlj^nIܵF5V)(ғ 3i";r(O ߢCd}hXV8?Q{&?F,+c6c6EEQbhJZ{}k(p@(b((dK5QCE1!4aLUEQlK.B(PE{=ӎC(lGB_OQEQEQEQEQEQEQEQ ,gEQ ajE}}}nn f}/6!nQVV5z^zpEQţ1xh VH;bqX(bɢ(((( 6~ X~'vbwM]Q燗(((((((((ɼC6l >`k(((((((((ؾom kSV{}B4'((((((((v;v 1N'a,((((((((dF'b7+ [gQEQEQEQEQEQEQEQEQ`'P><3EQEQEQEQEQEQEQEQEQlC?؉`ݣO(((((((((<s:=}YEQEQEQEQEQEQEQEQE1>Vy9 (((((((((bPl`?>? p(((((((((B1 OEQEQEQEQEQEQEQEQE1CN]m >CϏ0EQEQEQEQEQEQEQEQŎL)My{l(((((((((*
QT(DQPB!
B
QKPBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(bZq IENDB` | PNG
IHDR . . "h "IDATx
pTqNQ5TڋBt[࠴"Ej͵#ނ2 kQ1IbDjA
y )MLSHTr' OMȞsv{?g=rvfB8E/B!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQœim>a{5ڶ c((((((((('C1C>V |J#QwQEQEQEQEQEQ$((9gĎF 1 EQEQEQ1&((cLEQE1</{N鄰 ֢(((((((((^/S +\cʋ(((((((((v4ac3
۔Cb|0{(((((((((sC6 c(FEQۈ(EQ6(mD1"v~Nh IQEQEQEQEQEQEQEQEQo>>|U@ EQEQEQEQEQEQEQEQEQ uN8ݣ5l}EQEQEQEQEQEQEQEQEQ /ط$Q'!i$((((((((bɌz |q+((((((((' C?l& D92tpQEQEQEQEQEQEQEQEQLɌMT9 Ɍzx4EQEQEQEQE[_+++;rsQEQlgڵkכo[jU<DQ C(}ZZy (i -!ŐP7 c<ׁEQ{x
(vt3g q@5DQ;({]6<J( o~Pġ+,X9"vNئ j2C+((@}V~T!'J5"7((wߧlYUյ n<ؘpG.(mHn&=?px/ZU w4 bGɻNoddd᱐Cs5ַV+vn,0E)Qv{N CvyO EQ 5 =z466!wԶ/Boa<Ժrc#OGE1.)G%;Z';_Wd4<ǃF_C(bQ|[(/ZQT'(U'A[XI(nݺa5CYY>GGq {v'
5S֯܌[&qC1v\?Qӽ>%5A-:!Jzwt?9 g٥]_esM!s8m<,ɮ{Xnyh*ܣ'vׇ?\E)F?jZdB@5744a^?x,YJne [k,<pʼ?#1nɝ5pr^F*@5(bBQiJv[Y ʯ\0KXܻϱ
,)\D㏻
`ҩeByq? }6KʤNw]^ɖF*#8(}V~ )XcѮLJo cN2#y]粒qucoa/䴡=0 HI UEQLgώ6oA4&-YrqL \E|Fsv Slua=}24\
$LT=NN("Qoܲ
L}A RH}x @!t6~CS rN@1
=rBV$%ZzɍUDD1)*v$,vWl,6*oC.l g$.4L!+ rl
i_|ϒ?Rɒ@֡Kn;JŨ^4bN03Q )Ŝ;PssfWh
<kr]|Yd§oen@6#7F^?B>deh8qE,,X j5,I-A l|N<w+3eڥXM v5IԱNl+\ l3ZdfFG%OD'Wo*y梔>Ӫt I$Aڢ6|8jêlL$FHFңAFPLKz$ ҥdɖYsӽ D(bP?ذv:z54HÞWD ijs,UpTTk4#lc&sH&"h)PhRd43EQ]VT(:5E 6 79-$V(sWpht.ZV$"
{áuAHb! Vl+m ,* cFF(b<m+mrũ=莝(lfjr \EĽ]t{dE"w!̡[،M9
W,NF^` OfWơ`zp76KAF!1diRhp=6jLH&Z8$YÀrƅ͞.F|努RaQ6vHslhm":*cKMmr'
?gÖi;"ט:kNCo+(ϞIb}E4#
QnGѥh-R-䌻L8[_=)ʬ'=ml,iC{
#;)ʜ~8H[ID>4hLpx((GhLj7R%1Y; #YAԫ/UeSF=9706|hgߝd=;8-;hh@#n=
'(E+,$YġMl$$Κ;c,KLlXfh6qk/R
N#! + tc]uK"{!HׯA;oRlȍ(E?q9<>Dm퉻U zOsM/(ZJ$g~Mk_| <V@XWŶE?{g2ۗY #=:gM,0LxxJ7/mK@>NN?39kvUx)RU*|'u|!'3b4x;cP̚ 9 zɛU:ą9tR ڵolٸzN[dEڢF +7SX9c
& =@lOӔ\jw|gJEPquH ֡C
3qnY~.5K$%s؞ cv"f
`;7|^Wj-P$+⦌gȢv SDy^(b|S_SD{DY|ڑHwFH likdŤoze{)/1.Ez6i
ԈDQ :ckj_H}/sǸHt)*r41nXlGHΜGʳgZ[(zKduSa*g@XVVv?* AX=w&Ȅox43ũ#n1}?$jeY{,Z>fT;c,Mb+yցTIE*|'yEĸ٬ۮ3h:c6'jQiЊlL7%RlYK!P V%Ra ^M,)_K*g۸mMh..?lL [:ퟆmle;lÖ5yp}3#Aԙ8ҊsX.mX~u5$챩Eb7Rō(b|Թf-;#cյ?ٳqxTc˔ɛgѾټkٗ[&%eN r z_fPh/ufWkR\Q̗Yr L[fNɽAѡBJK"%s .Ļ#ޟ^0sǎ/g Q 1r6Si
Ν6T$Ɔ?Lq5zQEs$<㮧YNb5jwws>@˕8zvsRRqG")F2]Qو(k.ZbD#\FA+(Y
i7sڕˡ̈dEӝsJ,!)acR?b>q(fM2TbSs
$<' =q_g SFR'٦rcEᐒ;iԛ.?%őܸ#ލ--d˪u\CGF)zw7,%ZH% O9qx9%bE .&1λ7iM( y Plݜ%$ƻ;?Ph>s{_4igh@"vZ-8)%IFE (b(;]]1R<t $Fѵʬ' TOE 6 iWNEAگ\4z% `xs {*g *ի>q?wPEQB>llj[mM${KHo*{-xci玡CDq囩}_}(峺:5ɧH]dQ<_;6fIkğ]z}{uH OVE1hi_6!]5i D#$ג8arٸӆع)-'u~#-n[;ڏ;oizeTE,x(!xgDds 5x^) ~44ȄnVʚaK}'L9ۤG~n?ztoi?Az?32רR xm=FVYf;'gk*#`y)u0Uy I;gg'w0E)}. J` z]2k_9w2$ҥdS(ϰY`A ? ]㕢1lMڜegHs\Tgd
Xp?wqꞁ+l4P_p{zUߵ Z;{=IrMsȖ8s }K 0`(bPllj5HJ3#N7ʝ5w)]L|7Y1>b'5伜]K^{^8+s9a$iLu~7XL45Ǿ% [<U@y%:8/EAR2 8;npΌ_Z@ZcsJoWՕ.EcQt4ҙ ұ<3, yՈDQua`mTj ĦE8 ozv+Kd-eNHK%ir kܯ ۏ7\۽۽=L2 }DQCA$ڨd9ˊ4;RWcws` G6`Kkr/y)␂O~J%
;+Hza4)Q;dF ?O8&vWXKuwM-frPB]
!j=F6M:Zq)d"{buEZM? 7 ;95<t[iWQ ? RSB^;^FVn/AlhRbEʰ7<+}#wZ5]tEQLp6"Z`c#/ӣH;m
Hٹ fG=y9l?s֩S>ܣ)"j7ݦ(bS<|мᡅ;6ɜn!p}jfظަ%ݔAiCdZ2Զk(%EumH[L#-iolEDԛ|hɰ(b\R 4hPCCC^
4#C$F8u)͊CEP
*SGT 툜Chlj^nIܵF5V)(ғ 3i";r(O ߢCd}hXV8?Q{&?F,+c6c6EEQbhJZ{}k(p@(b((dK5QCE1!4aLUEQlK.B(PE{=ӎC(lGB_OQEQEQEQEQEQEQEQ ,gEQ ajE}}}nn f}/6!nQVV5z^zpEQţ1xh VH;bqX(bɢ(((( 6~ X~'vbwM]Q燗(((((((((ɼC6l >`k(((((((((ؾom kSV{}B4'((((((((v;v 1N'a,((((((((dF'b7+ [gQEQEQEQEQEQEQEQEQ`'P><3EQEQEQEQEQEQEQEQEQlC?؉`ݣO(((((((((<s:=}YEQEQEQEQEQEQEQEQE1>Vy9 (((((((((bPl`?>? p(((((((((B1 OEQEQEQEQEQEQEQEQE1CN]m >CϏ0EQEQEQEQEQEQEQEQŎL)My{l(((((((((*
QT(DQPB!
B
QKPBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(PBEB
(*P(bZq IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/auth/WebSecurityConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.auth;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@ConditionalOnMissingProfile("auth")
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.httpBasic();
http.csrf().disable();
http.headers().frameOptions().sameOrigin();
}
/**
* Although the authentication below is useless, we may not remove them for backward compatibility.
* Because if we remove them and the old clients(before 0.9.0) still send the authentication
* information, the server will return 401, which should cause big problems.
*
* We may remove the following once we remove spring security from Apollo.
*/
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication().withUser("user").password("").roles("USER").and()
.withUser("apollo").password("").roles("USER", "ADMIN");
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.auth;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@ConditionalOnMissingProfile("auth")
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.httpBasic();
http.csrf().disable();
http.headers().frameOptions().sameOrigin();
}
/**
* Although the authentication below is useless, we may not remove them for backward compatibility.
* Because if we remove them and the old clients(before 0.9.0) still send the authentication
* information, the server will return 401, which should cause big problems.
*
* We may remove the following once we remove spring security from Apollo.
*/
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication().withUser("user").password("").roles("USER").and()
.withUser("apollo").password("").roles("USER", "ADMIN");
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/tech-support-qq-2.png | PNG
IHDR . . "h -IDATx
pTqNcZk :Ai}E Ԩq+(X+FJM""y5!4@=ytQX {lΞ={><nfBh@EB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(Pn4h9 ͽ1&((((((((x*c cB: {@EQEQEQEQEQEQEQEQEQ<]v(G`v};KcLEQEQEQǘ(((1QEQxH `QEQEQEQEQEQEQEQEQEQl)10֖rEQEQEQEQEQEQEQEQEQ`_
YcLEQEQEQEQEQEQEQEQE1 Z' EQ:(ZGEQ(EQE#.݄ma tǤ(((((((((a8|``_`yQEQEQEQEQEQEQEQEQX `OJ^Nos((((((((6 bٰ=q((((((((v(% dF} ۽CEQEQEQEQEQEQEQEQE1~yuTA&i|3/((((((((v(n@?/@; #lop -{EQEQEQEQo|;7pO? oEQlC;ut7O8qٲe'ع!7g#lJEQO,:w<f̘} 6M o4 0mQxPb|SF=V @(Qi箻u&(iӦ(b(bʕ=zEQPC=$C||; :v;4$*oo߾9!BE1^)9BE1.)u_⍟/t((F:lhh8s=k7lYUյ{ l<27\EQuС$Ʀ& ,|= 5n
$b);-'ȡ\ak͞xtc#l
ٰ~a~E1t/_w._WRXyW]é#66f8wq{uEQ /_uz.v*l-'kY`ӗ_5[㿧;4=EQLpT9+0ڽdm `T@rw ?(bRCCYX>'@
} Ƨ4 +CzS7}q'sX"ڽ ~tm%g[,.w=_^iE Ȝ iD9d]u
\nkv nj0L]-XmbgU֬t =(ï.e,/@z
ˁ\ p6{xiGN [dDW#;n3'4*8K[Yo^Q ld>rݥ\ܻϱ,ik:`ҩeB|Q}< q6q}.tӥS dNo5#L]TT$87oQXٲْ|2!"4+VM JW-=>vk-[ b. q. ]=._<+&i=IW#;.EݻwEQL>^-(MSz^Aha2K ѻ+C k/ yn?!=3ri2# I{d]8c QDvfzh62ɇH#6`=C6~C)k!c8g{OYhѮ'7zW%v,oll8@C]gȐ!lyGuMbsHUyO/xf r ğ8$
"k
Idy~IG%~ߥ$KY",M%aUvQ`yŢ7eI=E63bFkYwuჽ.A
Td *s5lְ B ~ d|z[wR% q8ͣ(ݻ٪h
$~KJ
u6fc>O է ɕxc{u郯0:.gQl+قFJfjd> (b)v-._WR]#~_cE)=t#]$Ch
)\mX7ZJb@E4 -
"6nj/#.%5+Kc'y,G(bon~Ou֛ޓi=@ Rjs,Up TTWm]6@
BԱ@_LȟA1FEQCG1###čU.E:TFcنa:"MNb?wFeEr,Ұ9 ZG$Fa& & ɱ b'ctO8cUOCqғcd<Z0NIJF@get{dE"7!̡[pIErd;F(.YFeWpo ϷQ'(,
Z4Xr9Y>ؘu2"F4HqHy/YDž͖.F|]e.Q8]6vH9jc6T9
d: Z3taK@kLP!ے˳QҬrR9 qv5O(ōݎK*R-ԻL8[=hʬg=~tl\oul(sʁCE<0=М1!.N8QE1(~V;:ȴ&Z~#eY6+g?9f zEk?hp8;f; Q}pGgZa}FKvjY4F:n< .++KE1(zll^lfi6AI2 H*˝>6wH.1Iٰjn7иiS$GJe;?}R
0n=kso++]hwAbt>~ yceeb#7ŢOcG(ؓO(>.(~"gM` PHfϜV8-x}WA&xh,(wϚyS`<ۇi #=:-$LxpZ%{/M @N?39ĠʶUx)pXnQ ;Ŝog YC3.9s5yg0=.<܊raY=4B5 7 }jH-ar=}[V`ҡReV/E3S(mԻ"E#0X7 aV,_'1.}=53/[غૺR˄n"Y-e@Sx 8"-EQ"⼜ʬg
'߃%G3dE~Pdpf[3MM$+&~Z굗ml*RV_$#]m2
ԈDQ :c;jjK.3gp):)t!o+v81oGHΜ˳Y-j-@\s Eg69?b?-\ AXOs ȄǦx83ICo1}?$SS ɥ(N IIls9ڏS';,M1XaQXQEbܻhm?{EΘ
T2*)Yed)fjo
;o]~?*;|p,Q,-m֨Q.=xDﮘ[ퟆmle;lÚ5yqm3#Aԙ8Қ\ڰjn,k`3cSdňodWO'nDQbUFǪks٣t!#ѹƖ)
7%Λl [&%eNx/zof|_E1(F|2ëq)=prj31G,m&53 VĠHs%[%9)G )sx WܲeQ~2CE1( =r㖩T&O ϯ\^T9tgüivVE#9 J f89)Bk!YHFɍو(
ţHb4Wt`Fi:*o:뜴X9s_rfD_[)[9-o:אEO߰2)qp>)(fJ2$*qO? {G yKԣ)R:߯j ÝhQ82KOIq$7ntf͆UsYK#JQ^
K6|(q 9q^0OobQg$">$w!> $o
Baw1g.=<nF: 9 ȼdQj`: AI?Lb4^4hn QQlGu) 8w}Aی!=s[e3\gn"5IТ!.)>A&? '`@s u}*go *WQU} ( +ucSSOK l"8ӭ\BJ|{X쑷KCU<k "+Mƣ)_q >Gb bک2T\í,%N8 ~Տo,SktR"N `EQCJRMԄtոIH\KEL u֧Q[: OjoF(Z4)q
7/g~aGb굗/^4+R ;v)/j 2?ߙl) ~44ȄnVJS&[e{#c)>S;HgVϛb#767HcԨ\f&1x~N;q
jv.l=aYĈ(0+^M @
<C7_E1i lYk4/T6 3}h\D"]A66C=~uRMモ1hEEgHs\vVfXowq~~K
䬹==[=$@;T}w9ld/ ۹8{cӇ%WE1A(665Q
xE,@~*+r]Jr}#nOI,=;;gۂױ pffXT[cQxf(++ C!ؚkOKtIq^3@R4/ M_;g U.
VtNI=骺҅h,ʜF:Z:'nDDZZ(bBQN# Ff I[_CpJKȬ\o5YlT\mY~ؾr߇.k/4CEEEafEQl$jTeEN9mٲ9 ʶU E#+U
~^85+}ּiAê̝Qh$=0 (A1vO::vTXty9!.pE #QӢ\Pd P(FѬ9qxӌSS]G_q ۛi^SQK-?nC ,SNx9gv!/ /E#+7 @Sy6TA6)Z)w{q]4?PFyyy DQl-/X[k(fMFҶ- '=;;[z)9 LWщ~2-MEQg敜5OOOit S36-L @7 "Ӓa}[i*&(ZzXG^mxًԛ|hɰDѥ(b[hQ2?dHaCkߖݬH>t+R6xп`Q;y7vr'9Ojlj^j IܕVBkޔhI<hHEQ<G1hРSZj p
=ڟLKcXX$jQQ*js=U sEQ ST5DQh%PE1`D 222PCJ^ءj`Z^~QEQE_EQEQ(EQl$vM؆ݻ3&77>7A?g(6%( -(b A((((
X9~v2LEQEQEQEQEQEQEQEQE8vy0TAk
DEQEQEQEQEQEQEQEQE1"ωX ~n9EQEQEQEQEQEQEQEQEQ<ñɃx|kP1QEQEQEQEQEQEQEQEQ0 5
Co{EQEQEQEQEQEQEQEQEQLhh:v$VPo((((((((v(&ơ /vϏEiWEQEQEQEQEQEQEQEQPRs"v̂5Uv2#YEQEQEQEQEQEQEQEQE1cwb<u6%((((((((<=D<| QEQEQEQEQEQEQEQEQEQ #saOG(((((((((O16 i?'3&((((((((('7v h!l~b -((((((((6)*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
(*P(DQEB!
(*c7 IENDB` | PNG
IHDR . . "h -IDATx
pTqNcZk :Ai}E Ԩq+(X+FJM""y5!4@=ytQX {lΞ={><nfBh@EB!
(*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
QT(Pn4h9 ͽ1&((((((((x*c cB: {@EQEQEQEQEQEQEQEQEQ<]v(G`v};KcLEQEQEQǘ(((1QEQxH `QEQEQEQEQEQEQEQEQEQl)10֖rEQEQEQEQEQEQEQEQEQ`_
YcLEQEQEQEQEQEQEQEQE1 Z' EQ:(ZGEQ(EQE#.݄ma tǤ(((((((((a8|``_`yQEQEQEQEQEQEQEQEQX `OJ^Nos((((((((6 bٰ=q((((((((v(% dF} ۽CEQEQEQEQEQEQEQEQE1~yuTA&i|3/((((((((v(n@?/@; #lop -{EQEQEQEQo|;7pO? oEQlC;ut7O8qٲe'ع!7g#lJEQO,:w<f̘} 6M o4 0mQxPb|SF=V @(Qi箻u&(iӦ(b(bʕ=zEQPC=$C||; :v;4$*oo߾9!BE1^)9BE1.)u_⍟/t((F:lhh8s=k7lYUյ{ l<27\EQuС$Ʀ& ,|= 5n
$b);-'ȡ\ak͞xtc#l
ٰ~a~E1t/_w._WRXyW]é#66f8wq{uEQ /_uz.v*l-'kY`ӗ_5[㿧;4=EQLpT9+0ڽdm `T@rw ?(bRCCYX>'@
} Ƨ4 +CzS7}q'sX"ڽ ~tm%g[,.w=_^iE Ȝ iD9d]u
\nkv nj0L]-XmbgU֬t =(ï.e,/@z
ˁ\ p6{xiGN [dDW#;n3'4*8K[Yo^Q ld>rݥ\ܻϱ,ik:`ҩeB|Q}< q6q}.tӥS dNo5#L]TT$87oQXٲْ|2!"4+VM JW-=>vk-[ b. q. ]=._<+&i=IW#;.EݻwEQL>^-(MSz^Aha2K ѻ+C k/ yn?!=3ri2# I{d]8c QDvfzh62ɇH#6`=C6~C)k!c8g{OYhѮ'7zW%v,oll8@C]gȐ!lyGuMbsHUyO/xf r ğ8$
"k
Idy~IG%~ߥ$KY",M%aUvQ`yŢ7eI=E63bFkYwuჽ.A
Td *s5lְ B ~ d|z[wR% q8ͣ(ݻ٪h
$~KJ
u6fc>O է ɕxc{u郯0:.gQl+قFJfjd> (b)v-._WR]#~_cE)=t#]$Ch
)\mX7ZJb@E4 -
"6nj/#.%5+Kc'y,G(bon~Ou֛ޓi=@ Rjs,Up TTWm]6@
BԱ@_LȟA1FEQCG1###čU.E:TFcنa:"MNb?wFeEr,Ұ9 ZG$Fa& & ɱ b'ctO8cUOCqғcd<Z0NIJF@get{dE"7!̡[pIErd;F(.YFeWpo ϷQ'(,
Z4Xr9Y>ؘu2"F4HqHy/YDž͖.F|]e.Q8]6vH9jc6T9
d: Z3taK@kLP!ے˳QҬrR9 qv5O(ōݎK*R-ԻL8[=hʬg=~tl\oul(sʁCE<0=М1!.N8QE1(~V;:ȴ&Z~#eY6+g?9f zEk?hp8;f; Q}pGgZa}FKvjY4F:n< .++KE1(zll^lfi6AI2 H*˝>6wH.1Iٰjn7иiS$GJe;?}R
0n=kso++]hwAbt>~ yceeb#7ŢOcG(ؓO(>.(~"gM` PHfϜV8-x}WA&xh,(wϚyS`<ۇi #=:-$LxpZ%{/M @N?39ĠʶUx)pXnQ ;Ŝog YC3.9s5yg0=.<܊raY=4B5 7 }jH-ar=}[V`ҡReV/E3S(mԻ"E#0X7 aV,_'1.}=53/[غૺR˄n"Y-e@Sx 8"-EQ"⼜ʬg
'߃%G3dE~Pdpf[3MM$+&~Z굗ml*RV_$#]m2
ԈDQ :c;jjK.3gp):)t!o+v81oGHΜ˳Y-j-@\s Eg69?b?-\ AXOs ȄǦx83ICo1}?$SS ɥ(N IIls9ڏS';,M1XaQXQEbܻhm?{EΘ
T2*)Yed)fjo
;o]~?*;|p,Q,-m֨Q.=xDﮘ[ퟆmle;lÚ5yqm3#Aԙ8Қ\ڰjn,k`3cSdňodWO'nDQbUFǪks٣t!#ѹƖ)
7%Λl [&%eNx/zof|_E1(F|2ëq)=prj31G,m&53 VĠHs%[%9)G )sx WܲeQ~2CE1( =r㖩T&O ϯ\^T9tgüivVE#9 J f89)Bk!YHFɍو(
ţHb4Wt`Fi:*o:뜴X9s_rfD_[)[9-o:אEO߰2)qp>)(fJ2$*qO? {G yKԣ)R:߯j ÝhQ82KOIq$7ntf͆UsYK#JQ^
K6|(q 9q^0OobQg$">$w!> $o
Baw1g.=<nF: 9 ȼdQj`: AI?Lb4^4hn QQlGu) 8w}Aی!=s[e3\gn"5IТ!.)>A&? '`@s u}*go *WQU} ( +ucSSOK l"8ӭ\BJ|{X쑷KCU<k "+Mƣ)_q >Gb bک2T\í,%N8 ~Տo,SktR"N `EQCJRMԄtոIH\KEL u֧Q[: OjoF(Z4)q
7/g~aGb굗/^4+R ;v)/j 2?ߙl) ~44ȄnVJS&[e{#c)>S;HgVϛb#767HcԨ\f&1x~N;q
jv.l=aYĈ(0+^M @
<C7_E1i lYk4/T6 3}h\D"]A66C=~uRMモ1hEEgHs\vVfXowq~~K
䬹==[=$@;T}w9ld/ ۹8{cӇ%WE1A(665Q
xE,@~*+r]Jr}#nOI,=;;gۂױ pffXT[cQxf(++ C!ؚkOKtIq^3@R4/ M_;g U.
VtNI=骺҅h,ʜF:Z:'nDDZZ(bBQN# Ff I[_CpJKȬ\o5YlT\mY~ؾr߇.k/4CEEEafEQl$jTeEN9mٲ9 ʶU E#+U
~^85+}ּiAê̝Qh$=0 (A1vO::vTXty9!.pE #QӢ\Pd P(FѬ9qxӌSS]G_q ۛi^SQK-?nC ,SNx9gv!/ /E#+7 @Sy6TA6)Z)w{q]4?PFyyy DQl-/X[k(fMFҶ- '=;;[z)9 LWщ~2-MEQg敜5OOOit S36-L @7 "Ӓa}[i*&(ZzXG^mxًԛ|hɰDѥ(b[hQ2?dHaCkߖݬH>t+R6xп`Q;y7vr'9Ojlj^j IܕVBkޔhI<hHEQ<G1hРSZj p
=ڟLKcXX$jQQ*js=U sEQ ST5DQh%PE1`D 222PCJ^ءj`Z^~QEQE_EQEQ(EQl$vM؆ݻ3&77>7A?g(6%( -(b A((((
X9~v2LEQEQEQEQEQEQEQEQE8vy0TAk
DEQEQEQEQEQEQEQEQE1"ωX ~n9EQEQEQEQEQEQEQEQEQ<ñɃx|kP1QEQEQEQEQEQEQEQEQ0 5
Co{EQEQEQEQEQEQEQEQEQLhh:v$VPo((((((((v(&ơ /vϏEiWEQEQEQEQEQEQEQEQPRs"v̂5Uv2#YEQEQEQEQEQEQEQEQE1cwb<u6%((((((((<=D<| QEQEQEQEQEQEQEQEQEQ #saOG(((((((((O16 i?'3&((((((((('7v h!l~b -((((((((6)*
QT(DQPB!
B
QT(PBEB
(*P(DQEB!
(*
QT(DQPB!
B
(*P(DQEB!
(*c7 IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/ConfigServiceTestConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo;
import com.ctrip.framework.apollo.biz.auth.WebSecurityConfig;
import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
@Configuration
@ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
LocalConfigServiceApplication.class, ConfigServiceApplication.class, WebSecurityConfig.class})})
@EnableAutoConfiguration
public class ConfigServiceTestConfiguration {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo;
import com.ctrip.framework.apollo.biz.auth.WebSecurityConfig;
import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
@Configuration
@ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
LocalConfigServiceApplication.class, ConfigServiceApplication.class, WebSecurityConfig.class})})
@EnableAutoConfiguration
public class ConfigServiceTestConfiguration {
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/scripts/services/ConfigService.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
appService.service("ConfigService", ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var config_source = $resource("", {}, {
load_namespace: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName'
},
load_public_namespace_for_associated_namespace: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/envs/:env/apps/:appId/clusters/:clusterName/namespaces/:namespaceName/associated-public-namespace'
},
load_all_namespaces: {
method: 'GET',
isArray: true,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces'
},
find_items: {
method: 'GET',
isArray: true,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items'
},
modify_items: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items'
},
diff: {
method: 'POST',
url: AppUtil.prefixPath() + '/namespaces/:namespaceName/diff',
isArray: true
},
sync_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/items',
isArray: false
},
create_item: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/item'
},
update_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/item'
},
delete_item: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items/:itemId'
},
syntax_check_text: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/syntax-check'
},
revoke_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/revoke-items'
},
});
return {
load_namespace: function (appId, env, clusterName, namespaceName) {
var d = $q.defer();
config_source.load_namespace({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
load_public_namespace_for_associated_namespace: function (env, appId, clusterName, namespaceName) {
var d = $q.defer();
config_source.load_public_namespace_for_associated_namespace({
env: env,
appId: appId,
clusterName: clusterName,
namespaceName: namespaceName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
load_all_namespaces: function (appId, env, clusterName) {
var d = $q.defer();
config_source.load_all_namespaces({
appId: appId,
env: env,
clusterName: clusterName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
find_items: function (appId, env, clusterName, namespaceName, orderBy) {
var d = $q.defer();
config_source.find_items({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
orderBy: orderBy
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
modify_items: function (appId, env, clusterName, namespaceName, model) {
var d = $q.defer();
config_source.modify_items({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},
model, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
diff: function (namespaceName, sourceData) {
var d = $q.defer();
config_source.diff({
namespaceName: namespaceName
}, sourceData, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
sync_items: function (appId, namespaceName, sourceData) {
var d = $q.defer();
config_source.sync_item({
appId: appId,
namespaceName: namespaceName
}, sourceData, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
create_item: function (appId, env, clusterName, namespaceName, item) {
var d = $q.defer();
config_source.create_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, item, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
update_item: function (appId, env, clusterName, namespaceName, item) {
var d = $q.defer();
config_source.update_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, item, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
delete_item: function (appId, env, clusterName, namespaceName, itemId) {
var d = $q.defer();
config_source.delete_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
itemId: itemId
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
syntax_check_text: function (appId, env, clusterName, namespaceName, model) {
var d = $q.defer();
config_source.syntax_check_text({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},
model, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
revoke_item: function (appId, env, clusterName, namespaceName) {
var d = $q.defer();
config_source.revoke_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},{}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
appService.service("ConfigService", ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var config_source = $resource("", {}, {
load_namespace: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName'
},
load_public_namespace_for_associated_namespace: {
method: 'GET',
isArray: false,
url: AppUtil.prefixPath() + '/envs/:env/apps/:appId/clusters/:clusterName/namespaces/:namespaceName/associated-public-namespace'
},
load_all_namespaces: {
method: 'GET',
isArray: true,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces'
},
find_items: {
method: 'GET',
isArray: true,
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items'
},
modify_items: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items'
},
diff: {
method: 'POST',
url: AppUtil.prefixPath() + '/namespaces/:namespaceName/diff',
isArray: true
},
sync_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName/items',
isArray: false
},
create_item: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/item'
},
update_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/item'
},
delete_item: {
method: 'DELETE',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/items/:itemId'
},
syntax_check_text: {
method: 'POST',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/syntax-check'
},
revoke_item: {
method: 'PUT',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/revoke-items'
},
});
return {
load_namespace: function (appId, env, clusterName, namespaceName) {
var d = $q.defer();
config_source.load_namespace({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
load_public_namespace_for_associated_namespace: function (env, appId, clusterName, namespaceName) {
var d = $q.defer();
config_source.load_public_namespace_for_associated_namespace({
env: env,
appId: appId,
clusterName: clusterName,
namespaceName: namespaceName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
load_all_namespaces: function (appId, env, clusterName) {
var d = $q.defer();
config_source.load_all_namespaces({
appId: appId,
env: env,
clusterName: clusterName
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
find_items: function (appId, env, clusterName, namespaceName, orderBy) {
var d = $q.defer();
config_source.find_items({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
orderBy: orderBy
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
modify_items: function (appId, env, clusterName, namespaceName, model) {
var d = $q.defer();
config_source.modify_items({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},
model, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
diff: function (namespaceName, sourceData) {
var d = $q.defer();
config_source.diff({
namespaceName: namespaceName
}, sourceData, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
sync_items: function (appId, namespaceName, sourceData) {
var d = $q.defer();
config_source.sync_item({
appId: appId,
namespaceName: namespaceName
}, sourceData, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
create_item: function (appId, env, clusterName, namespaceName, item) {
var d = $q.defer();
config_source.create_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, item, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
update_item: function (appId, env, clusterName, namespaceName, item) {
var d = $q.defer();
config_source.update_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
}, item, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
delete_item: function (appId, env, clusterName, namespaceName, itemId) {
var d = $q.defer();
config_source.delete_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
itemId: itemId
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
syntax_check_text: function (appId, env, clusterName, namespaceName, model) {
var d = $q.defer();
config_source.syntax_check_text({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},
model, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
},
revoke_item: function (appId, env, clusterName, namespaceName) {
var d = $q.defer();
config_source.revoke_item({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName
},{}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
}
}]);
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/aop/RepositoryAspect.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.aop;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;
@Aspect
@Component
public class RepositoryAspect {
@Pointcut("execution(public * org.springframework.data.repository.Repository+.*(..))")
public void anyRepositoryMethod() {
}
@Around("anyRepositoryMethod()")
public Object invokeWithCatTransaction(ProceedingJoinPoint joinPoint) throws Throwable {
String name =
joinPoint.getSignature().getDeclaringType().getSimpleName() + "." + joinPoint.getSignature()
.getName();
Transaction catTransaction = Tracer.newTransaction("SQL", name);
try {
Object result = joinPoint.proceed();
catTransaction.setStatus(Transaction.SUCCESS);
return result;
} catch (Throwable ex) {
catTransaction.setStatus(ex);
throw ex;
} finally {
catTransaction.complete();
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.aop;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;
@Aspect
@Component
public class RepositoryAspect {
@Pointcut("execution(public * org.springframework.data.repository.Repository+.*(..))")
public void anyRepositoryMethod() {
}
@Around("anyRepositoryMethod()")
public Object invokeWithCatTransaction(ProceedingJoinPoint joinPoint) throws Throwable {
String name =
joinPoint.getSignature().getDeclaringType().getSimpleName() + "." + joinPoint.getSignature()
.getName();
Transaction catTransaction = Tracer.newTransaction("SQL", name);
try {
Object result = joinPoint.proceed();
catTransaction.setStatus(Transaction.SUCCESS);
return result;
} catch (Throwable ex) {
catTransaction.setStatus(ex);
throw ex;
} finally {
catTransaction.complete();
}
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/API.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.api;
import com.ctrip.framework.apollo.portal.component.RetryableRestTemplate;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class API {
@Autowired
protected RetryableRestTemplate restTemplate;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.api;
import com.ctrip.framework.apollo.portal.component.RetryableRestTemplate;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class API {
@Autowired
protected RetryableRestTemplate restTemplate;
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/WebContextConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.ctrip.filters.UserAccessFilter;
import com.google.common.base.Strings;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
@Profile("ctrip")
public class WebContextConfiguration {
private final PortalConfig portalConfig;
private final UserInfoHolder userInfoHolder;
public WebContextConfiguration(final PortalConfig portalConfig, final UserInfoHolder userInfoHolder) {
this.portalConfig = portalConfig;
this.userInfoHolder = userInfoHolder;
}
@Bean
public ServletContextInitializer servletContextInitializer() {
return servletContext -> {
String loggingServerIP = portalConfig.cloggingUrl();
String loggingServerPort = portalConfig.cloggingPort();
String credisServiceUrl = portalConfig.credisServiceUrl();
servletContext.setInitParameter("loggingServerIP",
Strings.isNullOrEmpty(loggingServerIP) ? "" : loggingServerIP);
servletContext.setInitParameter("loggingServerPort",
Strings.isNullOrEmpty(loggingServerPort) ? "" : loggingServerPort);
servletContext.setInitParameter("credisServiceUrl",
Strings.isNullOrEmpty(credisServiceUrl) ? "" : credisServiceUrl);
};
}
@Bean
public FilterRegistrationBean userAccessFilter() {
FilterRegistrationBean filter = new FilterRegistrationBean();
filter.setFilter(new UserAccessFilter(userInfoHolder));
filter.addUrlPatterns("/*");
return filter;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.ctrip.filters.UserAccessFilter;
import com.google.common.base.Strings;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
@Profile("ctrip")
public class WebContextConfiguration {
private final PortalConfig portalConfig;
private final UserInfoHolder userInfoHolder;
public WebContextConfiguration(final PortalConfig portalConfig, final UserInfoHolder userInfoHolder) {
this.portalConfig = portalConfig;
this.userInfoHolder = userInfoHolder;
}
@Bean
public ServletContextInitializer servletContextInitializer() {
return servletContext -> {
String loggingServerIP = portalConfig.cloggingUrl();
String loggingServerPort = portalConfig.cloggingPort();
String credisServiceUrl = portalConfig.credisServiceUrl();
servletContext.setInitParameter("loggingServerIP",
Strings.isNullOrEmpty(loggingServerIP) ? "" : loggingServerIP);
servletContext.setInitParameter("loggingServerPort",
Strings.isNullOrEmpty(loggingServerPort) ? "" : loggingServerPort);
servletContext.setInitParameter("credisServiceUrl",
Strings.isNullOrEmpty(credisServiceUrl) ? "" : credisServiceUrl);
};
}
@Bean
public FilterRegistrationBean userAccessFilter() {
FilterRegistrationBean filter = new FilterRegistrationBean();
filter.setFilter(new UserAccessFilter(userInfoHolder));
filter.addUrlPatterns("/*");
return filter;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/config/diff.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="diff_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Diff.Title' | translate }}</title>
<style>
.comment-toggle {
margin-left: 8px !important;
}
.diff-content {
margin-top: 12px;
}
</style>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="DiffItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Diff.NextStep' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Diff.TipsTitle' | translate }}:</strong>
<ul>
<li>{{'Config.Diff.Tips' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="false" apollo-select="collectSelectedClusters"
apollo-default-checked-env="pageContext.env"
apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2">
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-12">
<label class="control-label">
<input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff"
ng-click="showCommentDiff=!showCommentDiff">
{{'Config.Diff.HasDiffComment' | translate }}
</label>
</div>
<div class="col-sm-12 diff-content">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>Key</td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'">
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey">
<td width="15%" ng-bind="key"></td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment">
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="diff_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Diff.Title' | translate }}</title>
<style>
.comment-toggle {
margin-left: 8px !important;
}
.diff-content {
margin-top: 12px;
}
</style>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="DiffItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Diff.NextStep' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Diff.TipsTitle' | translate }}:</strong>
<ul>
<li>{{'Config.Diff.Tips' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="false" apollo-select="collectSelectedClusters"
apollo-default-checked-env="pageContext.env"
apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2">
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-12">
<label class="control-label">
<input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff"
ng-click="showCommentDiff=!showCommentDiff">
{{'Config.Diff.HasDiffComment' | translate }}
</label>
</div>
<div class="col-sm-12 diff-content">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>Key</td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'">
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey">
<td width="15%" ng-bind="key"></td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment">
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./scripts/helm/apollo-portal/templates/deployment-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/test/resources/application.properties | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring.datasource.url = jdbc:h2:mem:~/apolloportaldb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring.datasource.url = jdbc:h2:mem:~/apolloportaldb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.hibernate.show_sql=false
spring.h2.console.enabled = true
spring.h2.console.settings.web-allow-others=true
spring.main.allow-bean-definition-overriding=true
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/img/delete.png | PNG
IHDR X IDATx^]Mr&e'YE7|Ћ#WN`d֑O`*dey"_UX^LXY0s'xz2~ j̈%z?0 ~lV~3mPs `o=Ş[D*X1O[g;z ^isKϰEEN&%I.,feMm@EN>L?>' <-G ͷD\ ^I @MQ?!VV,ң
ܷ'X}Q~xIݦ#$G^gB/<Ajf4/4}ƳCyf RifBQVQ(MF
oBV/{^ʤK%H&SM&(}Kz 3mlY]^희J)$AjJXLX qpAYWGŢ} GjuL?̤RB
AP(Ao%B ֮WmfǸMtzH
Eje]!tr$U^{߇h! <UsChENdZ~\}Z!H5=귃"} AjD?{͜DI
rOYݭYsQ WnruQʾ'He]ӤTKܝ/!cC r36GLD+>$ݺ"?L?VB+>&8>[ 7v\$VB"Ak1}O;Z
w^XQ\$Rfv&U JQ A>coN? Aj Ĵn&Ҏ9m8DssETf!B7*^zu)%ާ#K~ H{ͨRb>ADDAm攏o_s&jxyo]~W_Sr;{x`x HˤݹGĬ|^~^#YP-{bNVTC78߽}
@0[hgDKMq")''<
rȉ,x f*<HQyC@MOqR_Vykб80($ [M?@z@AM8+ftz{~Hǭݼ
Ҏ[{ *^{&4 ܼ7|Xv*N=Xɧ5*D.xh
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*((@ TQ(QP\1HwGh6d}`k 3 Oˇ}/oJș,+TTQ$A
JBk"' /tG_*4ii>Rm~f]Z@Uln^ ,AIZob.\ ֿL2kO9h+Y{7=xcy
Fwk(L ѨRtIĚ `v$6ozQzK8ϧƾў%3y6b
#,[}rU9?' A\O zK_-a]N纉m[T( ;vn( ZerzΈw
>_L
;$~FȀ
|hⵋnuny9SM 7Jo @@% 8Q]V`|UyD ^z}k"+A@[*&
Q[1\ 71muib,aP9<<9 4Dϖ"p Ag}9rxCQd T܀CbbYCu!;f"0+\W8<5T P]J͖Hґ[ x+1* !!IJ
!;T/DeiޅkqQu e^yfU*<XF XY
<L۠YGe^k"IJ
e^wPEjb5o !٤v*ALH CZ4D1#%&i G*TܡB U,7A
/T7˰U,TPŊ= . U,w̰Y1UQB˚ PXbYͪzU$Hґ#IwLkX!Iw I:t+AeF~4 A qw_A1Cr VV
& q0!Ar l[M'lV9H/?rw̐ V0! 9Ha'AuQqE
9+b8'UQB˚bYCu 3TPŲUHґ#IGn5]k 3X!Bee5`Ba LX(Bج1̋2o}X(k9+bX(B j3Xl&ͼ X:Al桛4 !qE 9rKAb rJ3Fe^kb5T
bc&j8bMqxkAܡ-ŨhVqG!;fbYYDX(B!
Ph5]k 3X!Bee5`ol1A 9rw 3 !Abe5A`Br I+zz
S.1? ;*!h7+1ɤh4X#'Skn{^Si-BF Q b)gj_e
5qOsCs<=8/ǍHk1}zɳ:a.է .+!tr1 tO\䮶 i.sgDGQU+yҤTI+Z9 'cIbBAlѾ׃?h3];>3a;.[P,| 9,<_۶ڃK$
m%E'iIRFy&iUQcȜCl7+^ {6w(HG )T{KQ$A.KJM*LX`>k n
ӼBӳ ~.ʿ!Z Ӭ|tA݀H
n@$@ @E@@h
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*()A$a@iDRB Q +Bǣ~B"!P7Kn=4/(2#{qO "G^g+y@|ě Z !؟| '[]Ug-s
} ypN=w5'Z\`.g$0AP9L.IBxJRu~a:Xv9 $@w7\浽,!v'Ux ^<mcM;@!<NT=X<&
= :]DDa:A<]B" rx܅] ^HcjݧR'A -j$!KNA˄ #f: 2E@>m=̠2!܋lAk1BLm)w/3MJ(_f1#1e߲H^sC)feݛeJ lAAK3NgP&d'Krdb]mtO+ cS ӳ,r{ W;`^vl@@eR*߈?+sRz%u{"^zىhp:8qSi%- IENDB` | PNG
IHDR X IDATx^]Mr&e'YE7|Ћ#WN`d֑O`*dey"_UX^LXY0s'xz2~ j̈%z?0 ~lV~3mPs `o=Ş[D*X1O[g;z ^isKϰEEN&%I.,feMm@EN>L?>' <-G ͷD\ ^I @MQ?!VV,ң
ܷ'X}Q~xIݦ#$G^gB/<Ajf4/4}ƳCyf RifBQVQ(MF
oBV/{^ʤK%H&SM&(}Kz 3mlY]^희J)$AjJXLX qpAYWGŢ} GjuL?̤RB
AP(Ao%B ֮WmfǸMtzH
Eje]!tr$U^{߇h! <UsChENdZ~\}Z!H5=귃"} AjD?{͜DI
rOYݭYsQ WnruQʾ'He]ӤTKܝ/!cC r36GLD+>$ݺ"?L?VB+>&8>[ 7v\$VB"Ak1}O;Z
w^XQ\$Rfv&U JQ A>coN? Aj Ĵn&Ҏ9m8DssETf!B7*^zu)%ާ#K~ H{ͨRb>ADDAm攏o_s&jxyo]~W_Sr;{x`x HˤݹGĬ|^~^#YP-{bNVTC78߽}
@0[hgDKMq")''<
rȉ,x f*<HQyC@MOqR_Vykб80($ [M?@z@AM8+ftz{~Hǭݼ
Ҏ[{ *^{&4 ܼ7|Xv*N=Xɧ5*D.xh
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*((@ TQ(QP\1HwGh6d}`k 3 Oˇ}/oJș,+TTQ$A
JBk"' /tG_*4ii>Rm~f]Z@Uln^ ,AIZob.\ ֿL2kO9h+Y{7=xcy
Fwk(L ѨRtIĚ `v$6ozQzK8ϧƾў%3y6b
#,[}rU9?' A\O zK_-a]N纉m[T( ;vn( ZerzΈw
>_L
;$~FȀ
|hⵋnuny9SM 7Jo @@% 8Q]V`|UyD ^z}k"+A@[*&
Q[1\ 71muib,aP9<<9 4Dϖ"p Ag}9rxCQd T܀CbbYCu!;f"0+\W8<5T P]J͖Hґ[ x+1* !!IJ
!;T/DeiޅkqQu e^yfU*<XF XY
<L۠YGe^k"IJ
e^wPEjb5o !٤v*ALH CZ4D1#%&i G*TܡB U,7A
/T7˰U,TPŊ= . U,w̰Y1UQB˚ PXbYͪzU$Hґ#IwLkX!Iw I:t+AeF~4 A qw_A1Cr VV
& q0!Ar l[M'lV9H/?rw̐ V0! 9Ha'AuQqE
9+b8'UQB˚bYCu 3TPŲUHґ#IGn5]k 3X!Bee5`Ba LX(Bج1̋2o}X(k9+bX(B j3Xl&ͼ X:Al桛4 !qE 9rKAb rJ3Fe^kb5T
bc&j8bMqxkAܡ-ŨhVqG!;fbYYDX(B!
Ph5]k 3X!Bee5`ol1A 9rw 3 !Abe5A`Br I+zz
S.1? ;*!h7+1ɤh4X#'Skn{^Si-BF Q b)gj_e
5qOsCs<=8/ǍHk1}zɳ:a.է .+!tr1 tO\䮶 i.sgDGQU+yҤTI+Z9 'cIbBAlѾ׃?h3];>3a;.[P,| 9,<_۶ڃK$
m%E'iIRFy&iUQcȜCl7+^ {6w(HG )T{KQ$A.KJM*LX`>k n
ӼBӳ ~.ʿ!Z Ӭ|tA݀H
n@$@ @E@@h
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*((@ TQ(QP -PD8DZ" Bq @E@@h
Ł
AA*()A$a@iDRB Q +Bǣ~B"!P7Kn=4/(2#{qO "G^g+y@|ě Z !؟| '[]Ug-s
} ypN=w5'Z\`.g$0AP9L.IBxJRu~a:Xv9 $@w7\浽,!v'Ux ^<mcM;@!<NT=X<&
= :]DDa:A<]B" rx܅] ^HcjݧR'A -j$!KNA˄ #f: 2E@>m=̠2!܋lAk1BLm)w/3MJ(_f1#1e߲H^sC)feݛeJ lAAK3NgP&d'Krdb]mtO+ cS ӳ,r{ W;`^vl@@eR*߈?+sRz%u{"^zىhp:8qSi%- IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-core/src/test/resources/META-INF/services/com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface4 | com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface1Impl
| com.ctrip.framework.foundation.internals.ServiceBootstrapTest$Interface1Impl
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-adminservice/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-adminservice</artifactId>
<name>Apollo AdminService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-adminservice</artifactId>
<name>Apollo AdminService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = AdminServiceTestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractControllerTest {
@Autowired
private HttpMessageConverters httpMessageConverters;
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
restTemplate.setMessageConverters(httpMessageConverters.getConverters());
}
@Value("${local.server.port}")
protected int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = AdminServiceTestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractControllerTest {
@Autowired
private HttpMessageConverters httpMessageConverters;
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
restTemplate.setMessageConverters(httpMessageConverters.getConverters());
}
@Value("${local.server.port}")
protected int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/scripts/controller/open/OpenManageController.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
open_manage_module.controller('OpenManageController',
['$scope', '$translate', 'toastr', 'AppUtil', 'OrganizationService', 'ConsumerService', 'PermissionService', 'EnvService',
OpenManageController]);
function OpenManageController($scope, $translate, toastr, AppUtil, OrganizationService, ConsumerService, PermissionService, EnvService) {
var $orgWidget = $('#organization');
$scope.consumer = {};
$scope.consumerRole = {
type: 'NamespaceRole'
};
$scope.submitBtnDisabled = false;
$scope.userSelectWidgetId = 'toAssignMasterRoleUser';
$scope.getTokenByAppId = getTokenByAppId;
$scope.createConsumer = createConsumer;
$scope.assignRoleToConsumer = assignRoleToConsumer;
function init() {
initOrganization();
initPermission();
initEnv();
}
function initOrganization() {
OrganizationService.find_organizations().then(function (result) {
var organizations = [];
result.forEach(function (item) {
var org = {};
org.id = item.orgId;
org.text = item.orgName + '(' + item.orgId + ')';
org.name = item.orgName;
organizations.push(org);
});
$orgWidget.select2({
placeholder: $translate.instant('Common.PleaseChooseDepartment'),
width: '100%',
data: organizations
});
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "load organizations error");
});
}
function initPermission() {
PermissionService.has_root_permission()
.then(function (result) {
$scope.isRootUser = result.hasPermission;
});
}
function initEnv() {
EnvService.find_all_envs()
.then(function (result) {
$scope.envs = new Array();
for (var iLoop = 0; iLoop < result.length; iLoop++) {
$scope.envs.push({ checked: false, env: result[iLoop] });
$scope.envsChecked = new Array();
}
$scope.switchSelect = function (item) {
item.checked = !item.checked;
$scope.envsChecked = new Array();
for (var iLoop = 0; iLoop < $scope.envs.length; iLoop++) {
var env = $scope.envs[iLoop];
if (env.checked) {
$scope.envsChecked.push(env.env);
}
}
};
});
}
function getTokenByAppId() {
if (!$scope.consumer.appId) {
toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId'));
return;
}
ConsumerService.getConsumerTokenByAppId($scope.consumer.appId)
.then(function (consumerToken) {
if (consumerToken.token) {
$scope.consumerToken = consumerToken;
$scope.consumerRole.token = consumerToken.token;
} else {
$scope.consumerToken = {
token: $translate.instant('Open.Manage.AppNotCreated', { appId: $scope.consumer.appId })
};
}
});
}
function createConsumer() {
$scope.submitBtnDisabled = true;
if (!$scope.consumer.appId) {
toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId'));
return;
}
var selectedOrg = $orgWidget.select2('data')[0];
if (!selectedOrg.id) {
toastr.warning($translate.instant('Common.PleaseChooseDepartment'));
return;
}
$scope.consumer.orgId = selectedOrg.id;
$scope.consumer.orgName = selectedOrg.name;
// owner
var owner = $('.ownerSelector').select2('data')[0];
if (!owner) {
toastr.warning($translate.instant('Common.PleaseChooseOwner'));
return;
}
$scope.consumer.ownerName = owner.id;
ConsumerService.createConsumer($scope.consumer)
.then(function (consumerToken) {
toastr.success($translate.instant('Common.Created'));
$scope.consumerToken = consumerToken;
$scope.consumerRole.token = consumerToken.token;
$scope.submitBtnDisabled = false;
$scope.consumer = {};
}, function (response) {
AppUtil.showErrorMsg(response, $translate.instant('Common.CreateFailed'));
$scope.submitBtnDisabled = false;
})
}
function assignRoleToConsumer() {
ConsumerService.assignRoleToConsumer($scope.consumerRole.token,
$scope.consumerRole.type,
$scope.consumerRole.appId,
$scope.consumerRole.namespaceName,
$scope.envsChecked)
.then(function (consumerRoles) {
toastr.success($translate.instant('Open.Manage.GrantSuccessfully'));
}, function (response) {
AppUtil.showErrorMsg(response, $translate.instant('Open.Manage.GrantFailed'));
})
}
init();
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
open_manage_module.controller('OpenManageController',
['$scope', '$translate', 'toastr', 'AppUtil', 'OrganizationService', 'ConsumerService', 'PermissionService', 'EnvService',
OpenManageController]);
function OpenManageController($scope, $translate, toastr, AppUtil, OrganizationService, ConsumerService, PermissionService, EnvService) {
var $orgWidget = $('#organization');
$scope.consumer = {};
$scope.consumerRole = {
type: 'NamespaceRole'
};
$scope.submitBtnDisabled = false;
$scope.userSelectWidgetId = 'toAssignMasterRoleUser';
$scope.getTokenByAppId = getTokenByAppId;
$scope.createConsumer = createConsumer;
$scope.assignRoleToConsumer = assignRoleToConsumer;
function init() {
initOrganization();
initPermission();
initEnv();
}
function initOrganization() {
OrganizationService.find_organizations().then(function (result) {
var organizations = [];
result.forEach(function (item) {
var org = {};
org.id = item.orgId;
org.text = item.orgName + '(' + item.orgId + ')';
org.name = item.orgName;
organizations.push(org);
});
$orgWidget.select2({
placeholder: $translate.instant('Common.PleaseChooseDepartment'),
width: '100%',
data: organizations
});
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "load organizations error");
});
}
function initPermission() {
PermissionService.has_root_permission()
.then(function (result) {
$scope.isRootUser = result.hasPermission;
});
}
function initEnv() {
EnvService.find_all_envs()
.then(function (result) {
$scope.envs = new Array();
for (var iLoop = 0; iLoop < result.length; iLoop++) {
$scope.envs.push({ checked: false, env: result[iLoop] });
$scope.envsChecked = new Array();
}
$scope.switchSelect = function (item) {
item.checked = !item.checked;
$scope.envsChecked = new Array();
for (var iLoop = 0; iLoop < $scope.envs.length; iLoop++) {
var env = $scope.envs[iLoop];
if (env.checked) {
$scope.envsChecked.push(env.env);
}
}
};
});
}
function getTokenByAppId() {
if (!$scope.consumer.appId) {
toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId'));
return;
}
ConsumerService.getConsumerTokenByAppId($scope.consumer.appId)
.then(function (consumerToken) {
if (consumerToken.token) {
$scope.consumerToken = consumerToken;
$scope.consumerRole.token = consumerToken.token;
} else {
$scope.consumerToken = {
token: $translate.instant('Open.Manage.AppNotCreated', { appId: $scope.consumer.appId })
};
}
});
}
function createConsumer() {
$scope.submitBtnDisabled = true;
if (!$scope.consumer.appId) {
toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId'));
return;
}
var selectedOrg = $orgWidget.select2('data')[0];
if (!selectedOrg.id) {
toastr.warning($translate.instant('Common.PleaseChooseDepartment'));
return;
}
$scope.consumer.orgId = selectedOrg.id;
$scope.consumer.orgName = selectedOrg.name;
// owner
var owner = $('.ownerSelector').select2('data')[0];
if (!owner) {
toastr.warning($translate.instant('Common.PleaseChooseOwner'));
return;
}
$scope.consumer.ownerName = owner.id;
ConsumerService.createConsumer($scope.consumer)
.then(function (consumerToken) {
toastr.success($translate.instant('Common.Created'));
$scope.consumerToken = consumerToken;
$scope.consumerRole.token = consumerToken.token;
$scope.submitBtnDisabled = false;
$scope.consumer = {};
}, function (response) {
AppUtil.showErrorMsg(response, $translate.instant('Common.CreateFailed'));
$scope.submitBtnDisabled = false;
})
}
function assignRoleToConsumer() {
ConsumerService.assignRoleToConsumer($scope.consumerRole.token,
$scope.consumerRole.type,
$scope.consumerRole.appId,
$scope.consumerRole.namespaceName,
$scope.envsChecked)
.then(function (consumerRoles) {
toastr.success($translate.instant('Open.Manage.GrantSuccessfully'));
}, function (response) {
AppUtil.showErrorMsg(response, $translate.instant('Open.Manage.GrantFailed'));
})
}
init();
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./scripts/sql/delta/v060-v062/apolloportaldb-v060-v062.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo portal db from v0.6.0 to v0.6.2
Use ApolloPortalDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo portal db from v0.6.0 to v0.6.2
Use ApolloPortalDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-beta
labels:
app: service-apollo-admin-server-test-beta
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-beta
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-beta
labels:
app: deployment-apollo-admin-server-test-beta
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-beta
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-beta
configMap:
name: configmap-apollo-admin-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-beta.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-beta
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-beta
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-beta
labels:
app: service-apollo-admin-server-test-beta
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-beta
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-beta
labels:
app: deployment-apollo-admin-server-test-beta
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-beta
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-beta
configMap:
name: configmap-apollo-admin-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-beta.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-beta
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-beta
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-alpha
labels:
app: service-apollo-admin-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-alpha
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-alpha
labels:
app: deployment-apollo-admin-server-test-alpha
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-alpha
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-alpha
configMap:
name: configmap-apollo-admin-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-alpha.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-alpha
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-alpha
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-alpha
labels:
app: service-apollo-admin-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-alpha
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-alpha
labels:
app: deployment-apollo-admin-server-test-alpha
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-alpha
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-alpha
configMap:
name: configmap-apollo-admin-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-alpha.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-alpha
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-alpha
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./doc/images/gray-release/prepare-to-full-release.png | PNG
IHDR { IDATx řNؼ9H"H9cr t>پw'DEI"g*9RCk4
߂tWWW=]ַߪ
)dpFBp$B " /*SE ~D@D@D@D@D@D@D@D@D D3,*
X,f۶mM|)#" " gϞ֫W/ BP$AZ@H*O%&" " " " N[jYn, ]" "Кx{n+,,aÆIkMJ+#/#QH'6lpO:HD t ED #Buۭo߾Q.BZ"tD@D@D@D@D[ZZjC ݧf4D@Du qʲ>}Ν;%.^$e@%v"` ϙ3gӯ_?;s-mKq˖-{ԩS[H:>'X ;v trtr ]v?neeeMciӦȑvYgQ{G]?s`0?usѢEn#F8xL~w57? [E'RdvW%Ъ f"(9LR ݻwOWxUUUlxѣAa5V]]m+WtoqQ&! xLLJ a"h 烸'^>}ڵN# i m|M5ogKǟOi4krr}g6w\Wر'" " " " " " " @ ~}wy4p@뜋mz7?/8͚5ͳB>}Y'!X껭СC\/wd+V" @27y+`%HG< ~a;q<]o}駮 E e gy 'NI&|=waCN+B 'yǍgwd|QG 2?(" " " " " " " D+Vۘ1cҎi^l
zUTT$t kAx
7n6cec9y=s6h 曝HF(C0Չ뮄bp;q
v.^8ĭtB$9m
"R6I/V2w ג ;G/"R"߿%(t:"!>}N z! = ?'̯T}D ChCcX4eayf'P}x%?L9yM]"*>nz>O%R
n4I)ȹRz!4)f\=zyNpFt- \{ 7MD@D@D@D@D@D@ }\b ^w 4;qqa*<7zpԨQXiV*NxvPD$*4L_W^y5_y,>wn۶'tI{-SnH8~NRx!qCۄ R
%5` ܞ '57֭[ݲַg sOr3f4@//fyik:D7ntS`5x|ƌܐ~ ,_7lTv쾜i|nݲeuVYt$~i}ߜ6*qHaa` #^|E;S] tp6Tf l8Cwﻶ2'vW8`gi%_tC⳨V^+))q O渱c:a P
xo dIQ7~xбasɒ%9(ǐ!C?nj ϩy뭷<arqH>2e^^ {)8 9#4D:.Lǡ
yX&4 s
mħA>}#\KAD@D@D@҅
+31 H^
n:g+2G1vq9?쩅 :)R{ BL~G|q<cѰ؟:Df 8o9&Olc7 QM8(v6&O;/ a5 s'tC߁sە)1i06e@P>|Y[* }"&`STn [
~_߾}a "rM8&sLÂ8\r%vG8@6(mm,K/ik4[ODo/"A|rG>rm
%>/`6[!Aa`<#ocwߝ0$N;4[x3 4~!p|1 b=Ug㸈=X;ܿ1n {1ghhq2| .h a7 ~3 0 p҈; =>xKX ?%m_|ħ# A4_8!U`82|8G `n081ޒs㊁{5CD@D@D@D `ab !FQFBA$W_M&eFޮwlW@6/A<@e: V^Z2ԋxt^q,y/PSmt΅/yܹs
ǹyW>1ɨlJL ;(# K8~ ؘl\N7y
Ɓ6&y
tα{}'V_>O8(>% [ |Iz%N5+y"/B" N
" -#@:-bʽF ?3}/sp|9]_ihO:DwW:>p x;9і~2Fq@D~`${*߂ XbԩSݜo\xT$F
^C?| <lNvn ]` n>xᩈK\88 \X<dVO_q=)fFl@ qKcEݲe E?iX
d Ϲx3@ĸL}:|z|
ΒCp<48k(axH`hT7)>`,"BR~E6m߭O0xta;#!D1ۜ<hJޞ%)/m"^QDJPaKa#abS":N(bwb/{2hҡă/U / O
M/v)SOK<ȓr<e"?8${ BT?p]ßapP =-}/ aR-XMغ} 챋4?Lˈ>^m3]lb]N& p/Is=o@8ټh
9v]Kh)$Ŵ /ZH /Lx^M{j tQ/ hϋ(D@G[罙~q Ϭ'?G[NGoy00Hk8bpfl*\\^8_aNTCP J4i.rI:q?7p^`"<DaC@9]s@| P^ظ1^6$1q1xxcY(?O|p "/oP|6 0q;n/
" " " "V`飳oldl7:u^@>DÖ^a ?~cWvF@`bW1DBH:Tt۰HN%#r52 >?|r i{ےm ;^r ^{ͥMy iC6#$. s 8/qr N(&8$缔^)/=O>Y* z,As0OCuw9ҷ!>!D@G 1,ܯS8ns?"ip8m4: /dhG_ f|?s쩧r<8>̽yҏs=^(Q
k^Z/VrSf{p mpM]»;9|]>{`!OAO0
Xoho5/Fo}{رo?@#rPP8VVe_
ryϜ93?9T#։}<G^7~p 1.E|R<9k&a pc!B '$"ô7n|>|OYc{C}_Q>}!C?gr&eH8MF%m*~r4 n~ Ɩt$ lb:س*98;Atr6 6 v30l:%:t hYBC v4v`=9ϟG> ;y~zN RT6n; D^WϧLߗza^u/" }`|`sm`# # ͛7uHw? =qS&K iǙ av4q9{?"/63mЦ##o~ӝowi ܻ|OVR] g7b /D|@(e~Bqp vGkADx $fxv23p
@c&̘xYȓ҇^st҂#pAraqػ 7ypt*.7$r{V\ }1P8 a"r^ޖSVMͅT7<-+y&`lr$CC
lHMm|"bl@\ G<5oE @јI` '~ u
x
o(Ƭhi@{3 ⓟ{ĖSI& 6ÂAyOgo9f~mJ蒇rN9l*< RlA ttZ:ܜg<cSTCzSK
FؚA[&>P\0Dkh2} ^CP@\OKo<@ kG%oh U/BvG3fpm;_ x>/=mo9n yvv᠑2#F ϳQ8o!WИdz^P.<'c` `}?9wDu o^x4 p<:d{xhP0
pY
C ՚m(R6$QTm,/C!p#&rr>ͅ.U@\>$d;,q 7#?'r,q>ACB} 0EO<.5|C&.(
';teo,߹13TO}"=CG #Hx]DGt<f/ñB2-d
.T9}QDdɁ'U0`aJi68vp[0=cbS&ۃ7cݟ39 ϧ?ٿoL넾楺w> } ؗ kuC lO.~@W'_k8 ʼnoG)3 #&"`1,}~0D/mzιن_
YG'NA/jp9]ڋ(|:| 0`g70'߾
?* Gw.
':秾)F YB$.bUT[qq?@8eʔ1Rr yGH }܀FG0~K^
췵CB
?7?}ݜO!]_s FZ9Iw ?Fi,yÂA͊K4oN0K% wh+dQmmːZ:sx
`_G?),d 9Kw#,NO?}ۙtI
~ɶ/?q0Tt#|6gNQۧOEă1U^ Mm~TJpYcGy cJق}4(7H5, |,vV^ Ao@/} [" @C<mFEUW]?rOrs3: /<h/xv?ox ܨKOܷ^w k!v |A{RhO҆<oA]!Uiol`l7}OAk] a@y7 ;bu]fS^\\Pn B0 w`S@_0Coq ͟~'7 |bDr\`~9_8&-.=*9@z66m3 qM:dxBr>9~ʋlP!|1xN"bl6'Ӱ`ذ2
3Ɣ7∀@kv:묳1r;{
o?^- DRx8w:^؍H>@|g8vC|`"tbXaqNl0+:&dߤ%A[s^'`O?E}`F IJ`| ;lU:>i( }$CNطˇ P(/jCC~/<>I*-E:!. zD_ gܮ" p3"TmG&W^^4]}iwsFF9y^|^'Kr ۧ^h?Ax'LIcb&S,b-G 89XJ4j<%_e?:
!x㤆eC?hwyU'lo,PwHvG>Y }B۹xH \*;Ց ?X0\sA O EI }
x`nE\\p`s +. ܈k}ͽiP"%n>]CƵ@=`F+c\>1x~9LIwsj[UFq-QfFX<)yB)7!:kpT;%tp1`3 .:hg"
a##T V&D6cE~B Sxo@#CC(
q#vUǐQFޱHN0yKr6 C E\E ial/T F$&, ) G%Y\ agӏ8G=xN(" (b@YS ?G%_ORmNSxmؓ mW\VuEPoy뭷:>trb _Ey<h=Nxn@g;w#Kx6kىx>p/NGrC]w xYB{KQp\<?2A2?<f a6X]\{TTǷ}R6ÖBp_v.J <Ԉ\{c7#G<`yXcH@ͅ?=E91\˅~~#n6dRÅIG{CڄaƅI=qF"9"PA7K/u
GpN .>pNޔ& k IDAT\Kϲ ŵ FSK-k!OJ7閜GqE@D@D@D`_ $}?ظGt?6/ n^z3iDtz\>`2| [ :/ 5|Aۋtؗg" ?ͧpJG CT `"?t ېm-KF< ~' #<6XL|tʓGZ"#M( @0P>\?%|}> t OG;Ȇ> sRTh9i{2*/jhKX2S%
ܳlËзhski7iis0 !k@;OD )OS
s!!t>ge>9F"}k_K.h h
9B>H fjr;vJw uF67wD`Phm?D$ &@CPBwr@!Þ Y0P{܃ ;7 1x"Tq1` p T,Mʑ'*8
MP Gc߹I& 7<F7Ti FBca OILOaň*
Ǧ(;|b$? ~ o'Z RT}YJ}2+ &DFkNc*]m% lel [ a{[[-}绎6!<rD'h¶e_̍!xaW{[ێئ3]I<a"@(#_YrC|z!fR<?D$_6}liP/tKf|زQ !!rR>[ *_C}
ypq >}F&~}4M{v~4&?g$\0& ϋDEx!nuT`ZDTφTy%e{r<d |fs3 g-t"q<[>ýҠ$/xc"8Y
]%"pT!;F qxަzp0?'7V'!j:yd?ͱTǦ:g<7CrNxV
I7>.(e"Nr`{0`yucۃ< y:s1 #BB1<ā?7\þ쨲" " " ] 6
/"`r Q K4lo A -D<!RهzlCKvH nŋo !?'?ϰ̓WA/(8r ']<2(3y2;ر#_{칱;FKP1mi|tHC7'glTT31y?& 0+<#?:JNSE@G7V5vT}jHjxD6ut@3@á33Rf1X')#tUF2G *<$Ԙ~Uq *b 7lGgRF`xa`7]īڞ|ěH!ɛ;D ` W K |'C8<&$ϔ2SѳXW/ͧ6" G#EMeaA{C! -X`]6FklG˝
7>yr}9q
y-o 7^<ƀjȈSD@D@D@ښ
K0L6-3 4(\%{a7d7 v 'Dk(PT!8"'@ F笡ŷ#Tk(- 7yh' + Bg04U>^* 5tP7D@D S0uz B)M.G?DU <5xʃC?/ư
7s<{a<yOa 5bh x`14y&AE u(l|ɮ7k֬9yJ^xSѦ$ Ur /^;F qᘼ~DQޏ?C}z~Fyod8!XV#<.䒄idcr6:n0PO]@&c
#b҃ }50ⵘ %P.D@Dah:ɺNñ3gO? ͝cB|K56(!7Q-}cFX)eq.7>
qx0 @)%?ls8L 3S0! 1 s B?q%&c4~?m?jI&3xW@Mw;&':+4Wׁd ~ =Jg .Dx B yxgp#l!z}HLh,s1l%r 7Zgk凴X
9%
Ku3 ~iR;LB_Co̙{fnD6縶{p~:"tD@D@D@D@D@D@D@:#b8(+o%}#С e\xn%_C+L[t?VAD@Dm &OԶgT"9tΆ Kؓ 0ŞlKD@Z]Uz" /鋡@zӄ,[l;w/=E0X̵~a +#M XD@D@D@D@D b͛7@+zȐ!k%J&HˬTiD@D@D@D@҈ (bu
" " G i4_1UJE@_fէJ#" " " " " " " " h.~" " " " " " " " E@_fէJ#" " " " " " " " H/" " " " " " " "Y$eV}4" " " " " " " " ].~" " " " " " " " C 7O(9RID@D@D@D@D@D@D@D@D@bVU hYyuk@ xD/?2*tIïKV
-" " " " " " " "$ejͪ\" " " " " " " " ].Y*@5rtId" " " " " " " " J@_֬%" " " " " " " "% HծBd* ~Z*@$ KV
-" " " " " " " "$ejͪ\" " " " " " " " ].Y*@5rtId" " " " " " " " J@_֬%" " " " " " " "% HծBd* ~Z*@$ KV
-" " " " " " " "ZP(d8G5 ' J:k8 kեk֔/$,UTYUe%$1NB -mD-^`{Kw_=mYjp3nF5B~
N}zpID@D@D@D@D@D@Ҍ> ~%B1իeeeY h :+++ݻ[a^X٪b6$bx¡C DǫY46<
бU51 5tCi@hG<b6h 7$Nt@AtJyyyv{x{UX4( _Qg 4 |~-<zr8!!"R"Ϝq{!?=iE&h^;ci*йD@D@D@D@D@D@D HC`oϞ%eܥu ԭ{w]Rji鱊gO.;N<@+vr{{ZC6a`L>lkp8ל4v.̷PkO>slV][<u6W+>v=@hWWhEMΕ<U`흥l vvܸvg6[NVN8tmڱۖmؚ=yM ;̪c1r߮JeyK+y>VlHz9R5*/Hӥ _@$K 6fp_wA6g7[i >r}rm]nY4sy0ny9Y_X<f|+һ/*]e4sѐt<8-SQM@C OwCx%tɶ~n7m@ҷ&@*X~:4ܧ~6=?1Rjr%@h9VIDs@cU=_ε~ s^/˦ GآumN$5'M
[ 0`y~֫0^H HK&Hkv@:@;6Ww' ~)-6ap&+. \t=b>oyvՉMw{䃆ۨA}!x (dMؕ9ud(XM;x}nQťhl̠Ϋﭥkq#ga,ȵOh,\amwۺtoؾˉ}Z#C/ KD@D@D@D@D@De^ co`nWit/}ܢW악+G~! >=l>qn7UVZU͗U5F3\ ʣ46b@VRQiK7l?M9ĭv6imܱ˖m(H(lwހSƍۊѺx
Ӣf< ,7 )d ~S*Is6f?W[WgiS }{Z !ZnVĜ1o/kegG,?^ vdu"tmi#ūKzVUٲ5ϲGLgXvR˳H$ǹkjjl͚56tPegg7BQQursPĖZgWYmzaG qcdf(sWUYѰ >u/puf7,
c=杻g_8feYnNeE#˫OG ri86tFi!լ{J_ ^ūk-!jf5fV<OBYyyÆ
sN'[(X,fuuuֽ{w6lX"G yĦMfcƌqI c=f3f̰c=
d;i
.]GQI>{acǎu?= r!6qD)'=yJn,/Gyў}M[n;6rrl~vчUa%myXUw
`{wN^Rnm☡tCUV'Dzj{赏F\7[X4 t!_lZlf3 `Ѿ#-ͱ-+ZeXdu;4o;cYYYN#oȐ!oժUcoǎ VUUe47n>̞}YCز27o{N ӧ1 cwvۉ~zɱ;xFrwweՉ^k]qF{7Hs=v57 {OHTD߁؈a{aul"̋{ wo8NUl4 t^zuuq
10/'%ٺnlS/@WTۭOjHH 9? wcE@D@D@D@D@D@D@҃@
~kdO,s
,,;t lXĪ?J_ծ*y"=Z_m ]^lѢErJ;묳Ç':n4hqN<K o>"ݕW^isq̙31ߌg}~> mҤI/ixPv -[@Ig_~~ک>l?mѲU8XmİmUUՆ(xs߶vؿ;cz*d։v_x# "a~yͰݏ!<d" " " " " " ")TڵTq+VeYAk+-rƜhѾcYϬ?[3,{Dݻ֭[C+.>ɫp}6m~Yyyݷo_[zcx.Ä{ !*x˷}vD<A3I!q |BD iJٷx*'ڌ㎲l;hpnҲ
{VYUe۰CJb8/u:T!a_]^/5 5>7 =D+8vEz `'}NJ Ŋ7Yժ7,B |]!j~^sb à {W_u! 24_={y?ws2O=֬Y Q0x8B eA`D|_O~)x%؈
iOdo} znls؇W߽<c >]fӏ=.nn-XRm̶⻖92AլX<}ңXa#ӣ> ZAD@2 =` :Lخf=,Xfv
pȪVkhOβ mѾ#fbݼѺc=c,y Ehc =^{̽@wہ zv}>cu9Ay:/* XȢ ,Amɒ%.?ޟ3'!Å90d
=UI{;[صԞ}1nA
F
⊲xOYii[i^.Nn}nʊNj / $;z` G:vLC_D@D@D@D@D@D@D@:?SUPV q?XJ eTYղYl<Crc- v ty'to<H{' *g 0w\7l^Ccnnnr-. |G͛7;Q0(%|EGs X2 a^>oJeֹ8x+k,Z^a6mu#6
WhZ
*{ZYKkV@PNU.wZ(f"sxM ([` D3n馄pJ̭} ˝0a{L IDATl qΟ {;s]#8-_VXq>s֣G{ᇝ7tP/Nk yb #ފ 3f-\'@< P}ϭGш۰n/C vebo}hŻK-UP\EVҩʋ'Y0SY re
8
O++/CNvض-Ƈnzo8? zc(7CNp ~\sKU `ul۶m 0w ÄCtDCS1"!AaEB-[fv ʿ vXb1>78y䦒N61\9d!7nqm`>/߿-ƿ3 G ,mֳ{JiUPeFD@D@D@D@D@D@D@ڑ@ ~^3vլ*>ckYCrw; X<Vceoi;,e<Yg{饗-A0b<c^#p,Ν;B ˇG Ã
E@@ {) 0 ̙3^y>nc9XDdƌv' s=6dBm,WŻ ~C[D v0-/a]d#" " " " " " " ]@ ~;qhu;_,{t xE?VN=_!/yy aJ76U7
+,cx, C.327 , UUUn>@!81.6lpB +#`"&MrCoV'&^uU6~x|#14:9ӻ {anunX71 8'" " " " " " " "Еt5Jݺڊ ;ŲG g\m_mεKqų!-M^oxűbᢋ.ceTtm?N9r}" W\q-X݇ +uWE{g",葕8-[0\xsq<#FZ> x::GYF
jY/ADnַw|+n-E-;`ﰡ-9
v}@W$ZmiGyG]jUKYͪʭ/[BY8j YZ8wr8wgyѯY9?y2 `(- vv ś9̙EݻwSO=CD <]/r'I'Dĵkn_ 믷Yf_; .kn~ 4foӖJ܂ y
%+,I}R't>`y]D@D@D@D@D@D@D@Z@jRoF: Vx·x-^SЀUwy{Y~WG }tىp*0^X)}OUuۻwo7wn`a aMX> s{.#F$ux7+ w3DJ ۰3ڔI'Y$R7e(^l<1ψl: 1Y_R` CڔI'O:\{V0VR0W vd
oc_++ ;y5$B߰a0Za9ʜwGXϞ=wԩSmĉnHɱ ; ~zy>}<{$##H/0?ao6m%}cuu6dP??F
lϼoﱺ:b<"fW^x
'OC" " " " " " " " v7̫kgaM#^Sa {ZY o/Y~k9g4wR/?
Fkjjmґn57us+)-w)b_Mm]r)nׯ_o9ۮ<F:@Xj=IgTH<v,2pgY _ؗ2hIO kͪpH4bVOhKWg?g%1sOo4sž BX߰?r~ο|$}f$Wm=j -\j商G) yyeeE݊ Zc_o_8 ? ~i1_JZҗK m/ߵ?Ybo}ymY<ƌ8 hGOo }ۼ՚3 '" " " " " " " {H; 5rBOm/:r츉?(+/w uD@D@D@D@D@D@D@D@'YHb_%!VX%ʪB@kHE;Z@JGD@D@D@D@D@D@D@D@2 ~]Uv# /T$uWE@D@D@D@D@D@D@D@2RHD@D@D@D@D@D@D@D+וk_e82JU x |͛7ьlٲVZe;w^zb ǭ6ol=裶qƔiq̽k6mJ?7.\Оz}*ZYY~VZZ:O|M`k.[d͝;^yRΜ9vi@;9t
.FG -777e,X|+N#=|6[(JF$?Н'e XYYiQ˗ۚ5kAt|e䯾F- w݀qC3<jkk Fu].]sɓMƌXtR;sw@;/d5VgvȻN!G 7VSiNySϿjy0nV} c{G a ᎀ4uTCC4q" (C$7nCMM݆(.0~|<| ?wX]=>e{l6C+γ/X?#{ իW;!;ю 1cW\}džzGg}f={ . z˖-:z펧|.fnotmaa+w
6zdueqqc&uҫW/;v?T" " " " " " mD` fG ?jjbVY]k]],iQmH /;,C+ k,U6l[m۾>[F 0.<fȋ>qsm۶
EH/(8CKXԷo_'@!鱝8 nw}M4ɉUq_~i%Z~lgq-^F j:Y) ]ve6rHcX4"I'8! h;nBʕ+Cq}FLP7ā3" M3ן:_h;߁ b?OZ" " " " " "vA3ˎǛmrU^k][.i
RʭO /;!=săcXxuNV4jh˦<S(.1b^X`W^^n_ ~Kx}w7ߜH a BD%2+]C$ (aˊF\YW<< 6_bw/aI.aFؽ{Ͱ_ACī߱7< 8O?Ώ8e袋cu_\}""~th{-"ᐭRfXҵD}E G qu2{my4ʦڒ7oڙ' o'Ol]VXg ~k{ɟxvM7]GB d)^lzH 3M>M8X gu Flߜu;6cQ.xm߹
?|<,'<1cFB8Dc#cfΜ #t W~կ::«rN]̞=;e0o 2lac_8=}ȉ}Y-j "䂭6gO[A RȘC͘lO=M?HζҲ
gmȡÿΆ 엲 3ocn>#q8oC=mGbN>;#<ےcU_Vkg i wq? XoǍ0>}ƱlƱGYv$b%v#S^qcFy
'ed[n^~e7tCcA H/><) >KXmb@- W G2D^CpKꗹ_Չ
" " " " " " Cł Q}@FBVTZm56`r,Vg55v_ }z[Yyb
ؔI2ӈN ?!%VkE $ 5*q<X/~XtO6C iwyǞ|I7̗$|`ߵko~O?É1ڸȦM`sr .}UWt/^`x4z'p1l0Wa."kfӦMs1|zb>Dc9F Xrnʋ p?K[ou"ǰgJ ÃD@D@D@D@D@D@ڞ@?y۾bt#!5 u8;p0+_,QPgv=*
Q
7 '"~ߺ9# DN:䓝 ix -bӿ7
7 q[4IۈC6%+ָUO= y{=+y! {Nx1Dv!HA{u^ #1g /c>A<{97gYg<C Qċ/_; E#qm
" " " " " " mG`ˎR8q7s#ll=6؎?fBwOP@+" 1__O;>l'$#<bwg Z`3[s=ư_L7W i 6v; ܰGՋq<-IOػwocC<~ ?=;tP7l/A<`??q:4WeA9a2gG y}^x=Cފ7=3<=u
-s4* ~mV)@"
'WIYE",ѽ[^hH9;|}Ca.]v9pǰ^ VX`OtBѯ~XĪ}{λ
n!A,ѽzt+H~`֯_o?̯pxTr).
>G$ mn? ~tKlă<F/ }w!䁀W%O@38Ę" 6! M*Q|rǟō9zp}2765 y
qX\osI d;" ^{Kx!M\t1p?y}v& ,;ȇk.cG=g55n; x>]ztfG/^̫_<אt= &8G<
v 7oDdׯ?;ab*v}嗻SpŊNcݢ"'e</'?IB z/9&oo%ڵӗQ [mіjˊh ֭f|r/;l dklA{c횉v. c-]eյdjYUM5]20[rk}0S$B ,41f̘![nu;IxuxSd:VyTWO=.?#rҥ
s
g;p@c1`n>?$ c7 LLm8K<w YOAMh!{룵PRbq$]QUv b
l/(mi W }{Ǝf۰!Z⊀d( ~Z*V0ژm)nݻX#j>E;{BV}NTtz#iN_* h4bC/vg)gEbܵ/^D@D@D@D
$OMYL,1BH[Yb^5"v0}1GX$2+kHp(da]
fzj/>-n.=Djo GZtx77;#IU{JK(٥ A=ruTVhKm@ |+he1h 7ݠ^3Dt=&[
D@D@D@D@D@D@D@.xIV]B+<ffUeeeh-6Sfؠ 9VRJGCܛVۼʦm Y?6qx;bXwcUܬZX]=חmUEq`CE@:'wt{qwt.t~" 3\˳ 'Ik=M)-?2ć`~R+uCq V^|80~Jˉ
;cG=Vn-h$d5HanEx" l..UXX v90o==``A',5>Kx1|Vѷ17j0Jvټz;߰sϳ- ]bÏp'C{5J9m?X]mUik_EÆvq Q=m` +*vs!U{(q Yk0'O|leG=mC֞hTE@D@D@DKYa܈}o;r4]M_
}ŭ#+9
C{%5U#WWg֧0˾s(0_幅Eʝ6}lo7ߣm >ieGVr u0gkGހVT[ľ
I+V @1Nˎu
M$Yӏl9VD@D@D@ڛ@ĽOuZ,mvv-;'jHԜGQ-a;e< 'ٲɊvZUYeY~~
MDЗ6'ֽWeElȞ !7sϲmKk-imksp:ނdYVvVk%tZO/:~t)k1/_YgpXx |r:nVIؕhȺXvvu
w?$5ϝIi9><&
[nvVlҪ ByRJkTُ ]ÏmG7}A IDATYMqee9q6wQ&iIydeոL Ї
" " " " " F B}~|PTOOUfk4
VWWgX}_}
.Y ~x4q`].cF56%DEtF{9 b ZaDܫ yUt
^ۈvԈ bk1U{ 9M˦ ,j5D@D@D@D@D@D@D@2@ Rܶ*?mu~7/` n@#{Z~v^[êj,/+lQ[ܖm.q lX\'
eE@D@D@D@D@D@D@D@D_8dV^ >åUYѰ__]lJ [][g?bDr"/Xo[wWs*@&HKxm*_x# vl/ C~U6Cnն-^; O(i+A9(#7]D@D@D@D@D@D@D@D@2@ pUhoڛ'" " " " " " " " mH ati,z歙gŕ]C< 3+Q[ g<ؙOnvٷfh!k?cy.̶eg-\:Pn=\˟p}D_E@D@D@D@D@D@Dc =qα =:& |VܬD.o_a}-trGVZ[cno_Wu%DHYnO E-c, gw /^Wkfi!WvvTD@D@D@D@D@D@: }}p2fg^_1eC GRJa;0
sNｃ(*"" ŊرhS4j4[55
RP0ϻ}3 ΰ9m]}Ι{z;ttӢ ;ъWz#`0F#`!}Uޱm 7^E3ٚ3&3V0F#`0F#`B{h+@AA6o)11Q[nպu -[*55ph:YV^^ -0F#`0F`O0oOP2~N`z4zh
>\ ,Ћ/D;NG } H=jҤ:w`K/>\{xu,OhCAɌTuD#tРtÀJ1uf0F#`0;#`q#`vJLN`+))q:Ӯ#퍴i&'*C
~]\\ȽU'XkL
/L M#`0F#`D`?ܯQQ?n'# t!EGG+&fHUi[W]^=]ꬳrez˻
hUZ?X@} &̼<w p劏y>Yce(e0F'>ڧRK:@M\Un҂: HM[7T 4fβ=TZbzonm)?V>Pa;(>6Zg/!Gm7H%,lrضUaKj Ǩ4kJ6-
uPIzYvc _T= !ױ%وRtʨ#60..TiYSŋ_jÆ
NB|kժ?pǍw}oƉd̙3zjwSN5jZhQ6oƑ%ٳBf'c~v yׯ_EdddӺukן{kٲeCbߊ+GgffNNNM\;w F )I ]݈ |̙+W4kL#FPCmm+" vbQ" =[0F#P7Gu# SoPÔ`
J
ԫIO 0MnM]1[wKSNմuIKķ շTȱhB ژI7ϯ6Ͼ5wyݳ6Osy8KpRB٬n{&tg Qv)>;. Mҵz5{Z]V]c9'?bCPYje~kjL냔tį7.X1˶U,or]Nd(ٴXeb;ݩHh|EvHmB $f-WYD. ~XtlH퓵2U|r=!5D4Z7n(]p۷l"4,ȋu;n
N)%\R膰F[t8@z眠F<OHҮN; zSO}K8D:S߷~qݭ[7'$R?+] L.vZ]xП9 "OӐوK;=A K\رFMznFVlDm]1F#``=wJSTRVĘDN DU|F4}t=7y$uLJYyr\}WMtA-TZX <gۏMWRYMZ;Y㺍ӐvGJ4{QPO^XFh_}$腛U6Msuϗ?3+5#)>N@@;
~Iq"/avUaq
,5Q WolouG9w ص)51{UdF ):#,+7OW5Wfx]{k q-y oRiw% zr3Fz*1QyRi_a&R)+WvB߳T^^DEE'(ؿnϷ획
hʛ@ve./S|qϓT!U&U 5ouGl&O<A颋.G =͛皅0pŒvtm)))N:+AyY" va;⋚M>ʜ:u(KB& y믿v KE 1!oرkNgy.ʬZ7y vbwꩧSNQӦM>QoվS}ǏwyF(E K:%en%]Iy:DqW8Bov),?y~{:+Sq~& WKҹkV~iъ
*?a
X&- ^V0F#`@HIQnq*1:QŹnYee`.bںJ3% ^ڞ1ۭ?1_.-ep'.b%xR5eW6$.OIYZ$4WjlVo]]I;]G
ulnzC]77Љruxy?7IIP)BAj蠮>}K4sjuoLg Ļ|Wb_-!3Gؘh%' j){b /
vJhw9/Q~⺌RLTz~q:A%s7 |"e-w ֳ?YFŦxʋrX^U9RYq*/t8^^'$ueTک9۷py zl[d#ڶmf:
q
K4,XV D,7 pX z Y^[]=~o.^Clѣm.;۷cqb u t'N2Y^(H Uˈ;<XGR&Æ
sP}̓N:+';;j6]he9Efl˷cJwjͅ%(%:G-5]c-)gkluIɝ(#X uNB|VuBNT]SUPZiU ;5& *!ƹҡ! [[Ţ}_eYƶOӡ- jk[9
V927;#`0F~ |AX?ѻKչ}рIw ?,}:;7' SN;8gv96T.<P2[r ڃኜ[c p.O* V㞺qIw?ؿ\Jum-~g몓댣w|atr-[)[XUM[r[P?8JqvjuYuY# }{MKƨ{wt`ֺ4}z_zJE&)eoΕ7\c PוKJ;*ٲHS+,7W?WtT}.\oTLCݱ_R] ĥ(U}@1m*[vsyi/cuv_ڴc! kmTUj?H GRn_O ;/\[T]^zUח_ӒiiiB$Ѿ;/$2&$$hС] |]u^ڀea] +?G3C#O)uї=6I͒Ǘ%% n˷q9DGIݛ; :Z%Dk
*JYE%:19V kӾEEe
D[JQB p%Fk@D+v{j=]bz߯S/'+Ճ8=-^N[ťN(#`0F44;rVtm7+`K 7>i3 3u7, X;)ژQ/-8wwM濨NKJM n9%E'頖N;띘K\h;StҐ>wd_; b>[N' O 1:_'b Pt <-QiIq%nrCxu[Qi:g,u{صy3*uSIi~r in9 7'﵉E*5&l#@) JK*GL+Ŷ?m1a.`P>u?ޕLmw4M=6E%4W? tdk ;fpU^V~g,w^cM3u%G ?tc"pQ̗瓷|KbK|v%Q"o ',g܄ LQ[˪n ^?}۴>?]l!ϻKwIX=2w똮aR }$r|.Gmsx`jF]S;7u"vhUˏK 2T?ޭ>)Vum>,[n:ml
+bznܪv:k3-.?ױ+\'hQmRGXYۥx#ۥi\ŵ8@2 XYT`SA?F#`h`Ft YK56mTӄf*+/u]Һ˕_qYpݜYyyiy (t'<V||}nܵNЫ .]wSbSTXZ4.~},w̵ xkWeMƝGӶ&K=[B)qpLO֖X)1.Fqq:OV7{B>啺Eo}_8J U1R ғUVV-չUzknqm3P֛L1*e_)TB}<b: V &)4GBsdfO
g
7ŊnSE /ش
~=?qJTV&ny8J2wfCDJk5vƌNí./~ Nך 2|"^ 3ؒ2Ex^_^%m ËOK/7pv&G.r f%U &!Q7 r m& jc{2ܘyf]&ś4k1S* ۓ7hundTxXܑ6kZVMتΪ+<y.R[W#dk?RvQE=I"^vvI
QMBY71:DٵZ&hSAJk #W1F#`XLNj'*6#ҹjWeԵJѱZLq%YK1x]Ӻ
?RFFʏ,7otb {<Aˊu/otMo'ޤo|\a;}=}0'8P_U3ZU K*Px 2 EZeO2ĉ}=$ pβsWOv><yrI;iݳ3KNJy&NKT ML
*+u_4&y &R ⺌p fҍi}L**6Hn+*% gYJQ7oQiberJ,RtZu +M|">#`%xUBnݻwwl m:y?37U,pge˖-8zx^p=!uIg6\6&=zVZsrrԦM r!9ӝm EE M1N{6 }DCK&a$$Y[ #:Xagp xORfQX&hㄸBW~E=a I7p9j 3 *P+Ebb]x\ť\Eo]c0F#`@ pjStd#]|-[4'ckF<óڲsN%$i}:DŨGzgu"gonDŽNpg]|@܄ K
>+X j WVtB lR%1z`w ܽJJtcR[o0붻B攔:Uu_qIKܗ#wa:oTj`7#֢՛\>nZM9ˬKrBDʭ2ӟvK@P
Ʃ,7QLCTCۏ`
17/+[&-rViOv:ZE',RiRJQъ
D+'\}dUlG*-tp<شP BDH kol2=#znʕNa=f=
4^ڼM
/kn]ʞ4i[BxxD"~vgɒ%?գ?\f_, nx<HX~XR6OLBWiH|8yE!+;䗔iINZ$$MGm[]mVyp̰ S7KrRbnjAHKЊX _6 ~^C D"ڛ_ZDN)qڔ_aS2>F]Ynx~暼x[#`0F4 S:je*=<7ѝCTVaѝGkҚɡ s ^E.Q RnQRw~|)tθnu'?ѧ+>Un;(sY3)'Uڹm!UR˾{5TOVzthܐᰃ.),PB1.~>ᦛWX۟X /%
tw>U`Y8v`/ֿ4lME8/ IDATU0l%57
CV+*'evo=?jWtR Cp rARJ Gdhd8^ZUL& ,g缨C.S\*+S .+XvE YR<uFuԨQ 1 ! ف:z.]-/߿5vX7G8"23FLA|.#߉'(bb}[1hÝG7ty/^DIHAǒ~}q VC D@Lrgrq%/|< 7n:,YɄUݘi-Enf]frMUe5]8MJ iUn^ZImc6.[Ts2-*pL4mY*.uUbm^
q שe`'luMס͓tIPB<k3h=vƜ-ZY]fc0F#РuFhU Vxqx= -Zta ԯY_=~nz7&v@ˊcK'!!~e/wf!sj'/$ &ľ 2GrLf.-^9vIx{?_8:{ǕG35W粻F\zX}үm7VMu3ӆ:hY^=;4S7 WϿn
<b*--EcGUqiVmfWX(
ĨxLEKG++Rg\rC[BE+*b$3״?Uń.P\]쾜ުKݬ\ѭTGgWjbVyQHIL
B@+fMԥ ~:2.# qgXa ?=\UYg9b'Rxlh 9rdyn!$ RFu؏ " >Knj/pv |<O֭+'99w裏v ~Tmu31uQ7(8O]tqǩ'ܥ:=&-yJv6x}7NY2j&HnۚG{6nUF~:&Ź&m*(7U|V-yKK7~x7sSU`@
tnjj#&Y_d\%zu:i:$*T7溶һ @0?lWQiл'/+#`0Lz̶d 7c 5.]2
i7D[@Dm:q Af%mg%+Ƃzh?8&'rl1y#56U)ZC}tT~YW
Yu35wmW[ J K ^ 2Զiy?^KeW&[<AG Ytn ViÖ>P\\*D'ޟ0Ԯ\i=@e9kXTY:ŵ |yJs֨(K e}p,EkTY5E7메nsB^I N}8J:Jv<J#ڨ8We٫4
wIeYUSbSi}\$[Vq&EܐX@pS.!Ad ڪ˾B+T>Uc~'<U ;X5T>B :ylv\՝+|L;,6۹FGź# BzZbK^k1@t 3_Sr˪hS=AUWVl-tu㔋E m
Dd4@ I"&NoE;0F#`@C#[?gVka cY2gקYov/~c#:p3b%ӿK_n}>}q}^~_,!$ܗ{)ץ h] A՜j\ifݼb]
b 'x{\n/TA=dvSZ.^٫Li>߄Uyb.&(^5|%i[%(w*^3Zܩ*oLi-\{[QTtV~^UiY3V:&EX^ e dx%OR[^;{p)OENc\/Q"ת&vTُ}6C D͕RdMPwx^Zx[~U ?fF#`0
@8zU{Gb}f+mQU 0o ֧þƺcSS.^`xޗ>Oֽk,b 꾪b w:.Ƶ%c$֖w_ 3o_o *K_IjYyqu
[K{ bܧQyyJowkAd[SG;+bm#`0F#`@"тߌ3 \̙3uq|
i.^ R0k'b̈́/?f[җgK# p{jmiWV uĄY՞(Ň՞ݎ#`0F#`@#%тĉ ߗ_~ ~L<ꫯX-ZoڴiNcr f#EZ [n&5 ۺU=Do][<8PD2&ߘ[0F#` -dTY,8k,'
6LG q_ׄ ܌/n#?ݖ5XZN .0F#`0F`h]ל9s4` i¢=AB,cuS]-Z3FDi?JQL&_~>}#`0F#`"@xZx6o,b!a>@~# 4kڽ7F#`Gq*-+U0Pa$SUGlU 5MOQnIѵA؎ᆕE KNeE%4g쳚`LAl>fmڴ[~](#`0F#`0
]UaQTbc'=B%yYB s4a Pwa@=g"k<&qvI6mҥK+>hŊڸq7o^t6F#`0F#_8\ /Xy% 4P{4͡+<{˥?M װv<a1;>%^4_*TYT@eXUV ps,pb#*q%w-%&&jM7!Pâ4w\iw]wyG? ~1F#`0F#P9}5!m]~;EUȵ 1=NP g)55UM7ws,7_$ sЪmm߿6l;^c1fΜf <xz>C Q-[oiiiG/V0F#`0F#`)c
\sL ~AvX
6MбfgxVRcbbԷo_M< mڴq ؒ0F#`0F#`ԢeBܺuNw@{/ 5:V kRyť8b
?QYu\Y[2Բe yۺúoݺuNkժb)..֭[h0Xyf!,%%E. lWm VZdkx(fffm6~FzmUf0F#`O ?[Np=&AUޮ`tPQ!k߂;YFF
K
Zp۟Tҹ]5yM^-,Y&M[햎~-[ &M1.,Tm#`0F#`0/}T8xEN0JE\+,*f ~
wPl *,$M!~j4F#`0F#`PQoWQ;:?0}D[uEX 0D=Mz5 wr#`0F#`0F` D6iݫ3P̙ڴpQ݇RtN<NuU \I̾n=e u3#obbgKKm#`0F#`0B +?,ИMg^ b'诟?Ss~XQm:ꫯ9O= }p@H2[F#`0F#`
?P?~eee5~1yNc~;>SV ֆ!CW8ڲE1"~F#`0F#`" b%\c@E>X0a/\ _oyWg_Cڬ So/Rt1ݬeQw:g0F#`2>XÏC j0T~m6lTŲa?Z鯉
15V35{3/(Wcuk0F#`(@=
M.nT!αʡp|6oM}vvcn:xrǀZAF#`0FD,3<Sjm J鈩֦Mk[G f8qbCѣ`b֬YIъ|ͭTGO>ٳ|j\!j5_M|j`7ԅn?Qw:*+;6eڒ-[V u#А ZJqɊ_Y233ԶM6dv#`0F#`Cڵۥ^# ~3gƎ [~ <P7xC r>h-YDIII.Zjj
D 뮻6y;PY~M6ynfvio~ zHG' :un٩S'egg~Uyr|I_˺ןtm1 SD As̙n筺6m6mT+s%:J URRfL
6d6`R0;Ｃ]R7r||fFț0a֮]jW^]uޤi+],v7F#`0F#`v[o_~Yz>5r~ ;tbb b{>RNN{ :obܹs։>?>x8^' ]\RXYfO*'PGFF&MT֭[݄ u/ 9 X͛7ׂ b
os"~G^xeڎ8
{/Q-[t>D
LaӢE lY&2F^Cc\ﯮ]:{ݻwwn4iYp>S:uL'tkFF3#`0F#`0G
{W>d?iƌ:묳XG˱ʻ⋝83 _p!
O D#F_|QZ ',N \W^y08p O~vŋaD6ijK/Ty)N`ʎȆ0E!ǖ.]CraٱcG'F?wuVMH~9X"r!Z [BV?|D K oI,6}"IX/"4ȝX!b5*c5kv? ~uncF#`0F#`@M wy"8vXjYTT䄛1c8_֗_~鄚<'!`
oװa oT~~N9KZtMbs;Пg!zK>|9O;/N-ZD"4oމ~[byGLj., .rho^teCuV"b0&!
2Y! ~}@Bay믿vV6ִ_UR i_@i{wF#`0F7\e!3 nX!a d }İC$C۔{*哈H|ruŹcV5іD?|@%6,֯_Çw}G y$T wg1鮽P^2Zݺusuތ }ϧ}z /wN<DDDzCD x CԹsg'
8" sASLq~Yn~JV|BdO' r(Z0F#`$NCTnvܪD DpÝ1*==íq
K;,F mqD 7b23zWmU$7n
C+ s7nt>cΝ7XGDӧW۶mw[`Ks=WiR]>\wMq
OX#rLt9uވG/qx`G$>vbxx fb1ƀ;7iq}P8ƞvC0QQi$#`0F#`m}>._MW0q~-F soe 7|: 0e[!Wr- Ņ1
6"a}GB>;eb#by<nEW. m$~" rpa`b#bH٧HCpfpIu} fn.ᘱ
O>_ƺ[_ca2F#`0F#`,b1"
8 k-7tRX]։cXaVk>^jX}!$$$BՁpkcjb6W܄#`N5!7C N}W䬬,~W\qsE0dX8ࢼ&+ F"nQ/$'2+! QecI|
K$,=IJ3XezA>n.cع~1/Mḳk}3F#`0F#UW5!Vq~'qn% R =DLSO= X!"4%!V [6Έ݇) $C\iqM&v'D''66sL70&Bza .'Ovo*ujL>'tGVpf,@?02qG?7mL_Fi0F#`0F` `vUDnڱԧ:H<vgxeCʍ1cdP1ߏD\@ Ǐ >:A,ӠAU 0ňC۲enf2#y B\ ܕ"bdĠCܛ0aYԻwogȤ/ݕ>zX~3<q@$E a\ X\zp voX[qO: 1# ƚLk#k2F#`0F#$ClA
ܘûT&A[. T'fEd?3b͆5 O|N [pd/p a'1,pNXq.cLk1p˽W_}L2yLQ]ڕRwvY"t1=H%!Y#Rߘq` o!IH1q=&1Xmى$ؓgҤIn#Bpxr
9]c5EeeyݲremP˖-dXY )'+.z3c~P6m?Uk0F#`v,9%^lYH
{'?UV̔{ IDATW]f
u}]W?O}~_^puo~?o>}ԲejR.q`US"&!bL{ٷ%1eb&M[0H]d_](YFOF?A#`0F#`~{Z+ ,ꅐUb0F#`0F#`@0^0[%F#`0F#`0
r2!#`0F#`>$@L5KF1ׯ_ ~
zF#`0F#` /|Un5Hk;гZ
F#`0F#`7c_m@6Օ VzN$拎F6M>]6m"OIII߿ҔiӦ$'**J ݻZhOsPŋf͚i e#`0F#`0FX2F rD7i$\R :tB^AA֭[)S'?;iӦN+..ڵk5qD]vejٲ;'t_߾}պuk-_\?Ν &(>>>rFZb0F#`0F#`v@D ~@@:uW\R͜9S/.\脻`0c9F ~CPVV QO?̙#FVNN.Bg HF{OեK uQN3F o8IK{ Gv뮞K~ƑekݹjwoY[}v2o_7e0F#P"Z//E NbbbB/gi+,,t}-Cb qα h:th _-9[:K ,nqqq-**
mۺzyS[s;w *|wtgro E]$,kJ|qkn\.]ꬥ}~x1XUS*77W#G kL+=
&]M_V^,r.>ٳ> cbw!+gq_DõҼysW
_}U5kN8g-_SjOCZӂdmu1 ϱ~o\χc? ɸxВ{ufaB?hV;l0F#`0^NL/YbH|Fe)yb_Ϟ=w&^y9#wh;@#'PV^bfgM DZa}Zf'ٱcGYnٲݧfff78}.. ;蠃a qƅWOy**Jqq?>TADǨȱco4B /<oT&@FFF~ȋy }>< z衐cq>. 4hۏ#[nN\?npcƳ"ď"xNƍxGǘD rL'+(d1qc 8'aBWD&Q?DdCfLOWZƔ|8ÊIDñy ap瓞#<ҕAa| ̘ǖ:9'sp=q
ЏO? Bx#
ReR/k}3fh֬YN$dv|$Fx'
6O,^R&MbbҿƖΒ!2F< zP^]$Υ\$ >W q}SN95f 08m~LpZ2F#`h"Z㋧K_J T^ XH/ּ$ꆊ-+LJk^E191AM8I' V c/;w/^^ڴi|ֹgy 2b~ݣϽ^x ~]_@ 9E@F ƍ zJ3Qg2VR9x1|>w^#ux9 C]h@,ȇ XP lc'(tF)Lnt]wFBa<KW,w T)D\s.=$ z2Kx6OV5oZ!:!`0Kćڣ_!u=PqK]^=\7$#~#摈M;|m#1 ib8IlQc=ܣ<04&#W_ Q8 'ph#֝u;>y܉U T?z!?"(}/'tksS&cI` +U|\rɶ2څ .a`HLJ?X2N!fԉ >>GӶzK.? ?ޅJ l+F#`0
@伱U&\.ŹE-kyK0/Ӽr5nhpDyeǶ@c'3`%))>>@-7 abR yE4Ϳr"up ܛ
X9 }Z{ $M@jrI 5Vgl'' X'zW{\ltO~56*n`pw;![?G
xznX !"-uY"H! .VU~sח_~ٹRW`!돳AyKz 8M8yx- ;r=V^>U&m_5\pbkq?O<ֽU ck.",3˓rXg~ל iD
r[R;qhP>G"ˏbj9ND_Q<ʢ
O~D A~T8gqyH
MLEpJD3fS~A {CVx ;>#?u/ccX2 :9x'u A.Q7s' Ӷo{zF|d0F# D^b[[µ*</%_96ydNd,Y⾄Mc4 3yBu/gkU:8'2 ,"/řMyD" /L/qW_FB
j0 8͙9:EI#h"|#I8`,<с:|~<%eֆ:m ];*:Kh*k՚
JLC= D;*0NXS2fX^ w_|;s 0p kXxT5]# b}E?X?qki'VG ?XaI5W۸.M #~ UZX @,F K}@ 2ʲk;iP4%%}3fW^AnvB+Ň yl)ux^ ?H|a,|ju;bA<#6D<#I,k>\&c0F# Dෳ W/|ET-5Xl:ie/T>~Q1kt˯.SNu
z8h%7ҋ?P( + w]CDUK5b!Loye|fᎴDCRaa#v ,jK(U
g`yk1"?h~u ^}p?wOCjc~ sF W8˾6jA}T\Rs\_C?XEZX pvn{!k-Dp5b {0+҈]N|EƋ9{&ǵB D/s#w<܋LC];_}Jesu/Ef[Gg YE?yǴtun_
uZD '9 ͱ
7~m g,sBbh(Ď O%"+!M3c~## s{J G-#`0F4|-y땚0/e !K^8 //Jk2.@/|[
_6k(8D"BK," j~fX^8a
K/q*B1@3zi#%UWX@ΞPbc*?F w
}X<"V !6!jK xp$!"N}Xt Zl gau/-KJK\aǔ Xecőj-X ~(baɇ%ޯ~!%K&Tg _O2&L=]5QW\qڈ;"[B@= p152. C7_ıZq{ZE
O0I>q>"#;_ܽzgzyugp')PVϑp_g}cO~$m'F>Bb 1 qr e`9GF O<Oß5\\ԁ`m-0F#`&oև;#uge_/(,/L$^ n[}A >RSdj={z*"da1E'V>Ͻ8 ju%ޚ%<w3 eejۺ9D^\)Km[%+*xK5@pp ,h'ecȹc;/nj!(x\^iȂ`
]m": bGz:溝h-]Va靏'jէGg5G&(-b~3'bg\>;[yq`yJ1}̘bXqqepe~z'a.6g'#5p_"U_>x 'o;peaG|>g UL%,"Ekռ:k?螅e.ʹՍsrߧ{xCٰ0Ə=c>o(kOrه'(B\kpQ뀲}|p'GG/ҏ >-0F#`6;LMbPp/_~[YG[gt:OUzUsgvxEpB-
hr̋0!q{Q$/gy ?N5,wQH
?㇌إuH&nX 0O'999n&`\Uɋo GsXzy }Mn._jrZ6p9
k*,IƎ~c-8$nLVH\\r"R+K/!yY o<8sO?H5b?01q z7QF?tfp|nc aqhUv# rOW]mL[YHI7_s^zcelw'lE:k~jߦ 5V~sO? ?Q½1
OX؏Pj.ux a HH;2 #`0FG Gl td7.ɉj^!XlND?/ g\,x!y^l8eXycN岎TmB/s_,q6k^z#6` yƉ#C.9W̫Yp + `E<{ׅ B ?7xz)' E _'""p;5EC qB
p
dN""8<nS>}ct#4}<=krLuhZ t6w"O. põ aw:ˍ13u cᢍ:Unv7N7/ҲuN<56ֱDL"08X
r! _~;; 0m +e=Dck` R\+X "OV ـx3mIa#RA}{*3+G9: %%}⇏KVV+w ܉u3v5% L"o6'4ϟ?\O᳞,vpF *[nś #0F#`0oYF@{/+%%j~\x;Kvp#/\6VQbU 3 s $ zW֪/y{ niՈܡXC0#_^Lakq
aEPS q8W"Q&qְȃ~_{xghk
s3{AHo$ZnsnR7+/lHQU'/7,^u'|yqq
1CҸWI,{Ǎc.WpG
SOu [@?OowE| pQFpe >GF f Ci#1.
?\$:f
ݷ?| to3un#ݔRLje:N ڄw:3,BҹCGXNa6+`=\?ٍ1 B2FC$<-\>q^|W;"rP'c-0F#`vN`Z#`!f윓ԥS;4np
ף,
L*^.yiE2,OF2"^8oK* AjBx!V ǰdjV5}nDC+ϚY
QcX =/ ՓO>
k!^# b)~;'"09B /LA5@ONjf>}v(d ~a'b>'Y^xm# "4Slܸq]%z,kr 皎_ԡm+aKVf.>$'Vj71TC(e"I] >7#=zb -xهxsϹX^b>/0e+tB.}B]5@>>Xu V_L See,8ϵCHB̸}59Lj~XC'MDpя >?!4ER*}Mԁ8qFk CHv?<a5 sIXp'g1>ɋu)$&Ca~\ܛ-\.<05)µϵ%11 í#i-F#`0u#_[i2pڒ-[Trk6@#{T\|*b\WxP6muɫv\z]=ls[}+YlZvcվv4K$g>r ( /$^yE|EԋQ5 [3UW~YoJ ["^SVu?q!NDDp`B D9"<s&/ +DD# ,hr91:6 Xy*<X/))կ|@6lv3MovY;^}' 9 w
.YZޡ-O@6aPSb,?DDiƅ0
(#@<6,pceljK`# #><a5ýF>X]Y~ Z!R \Ms= 2ko IDAT)& F$eFs9FbVZoA^ƾ\/(,rcT9.6:ԯ
ܞ}F&|.pw ƙ1.S nrr
0~>GG2i}
ٟcK#`0FKXM=.WJ؟?b生_\X ^ty<ip]<D'5z_
Y쭹dm؞!P5DI3u@TM6ClhO"t\zѻբY=SR ֣Nឱ؇uǺ8N
#`0F#`*00N`_ ,ZK*^\<If=MOMeiip :l>J<HV;yG̶ (gk'^f_zj;
t e,qi幂"1pݙa4F#`0F@_?gW0Ϊ/1~ݙ*`0M+6Ծ4v3r+6֎GPpE&F݇+ZX2F#`0F`0o30Fe_°N#`0Fz$Ǻ*#`0F#`0F#`2ˀx#P
KTZV^9^}T ꈒl
D#`0F#`0Ef'!63[>6*X,zo :/>ECzvB#`0F#`0n ~@ǒ0{ RXM^\WUltp43:ow72 #`0F4j|?d0n~Q/(ʮ}I-H"c qcϝ;MXs{wݹ7 x0LN&GsYH $$P֧jݭV%Z齫jԜ]@ O]O72(
J>Z0xpơiؐ tÇION>4nĈ܊s @A @I`РAieah4go `IU44aiĈ=HON`q8|hiiI?ZZ
w.[|xij"Vᵶ#GͶӸDA @A @mTߦ 47!C
n^~L(n. 馛bŊղza. @A @
64XєfΜZ[ROW`"]A/hǮMLi. b@A @A455Rz=\_,"5A_hjj7@A @A @o! J`M^MHD@A @A 7ĔA @A @X=y WZS=,! _=H[A @A RJ
ѲҚBl1t4bؐe&0?. @A @A -Zλte+Cz9kKMǍL_=dt[&:A!kq @A @A tMͭtӳ҈QAq)\}`u߯x,h f_}~ MX"577)Wg݁`ecذaUPA @A Z
7f}}iV=fLZtm\'8<-YҔnx٩;B~kF`ɒ%'L?|lΝ#2eJ5kVZ`A{EАj+/ȑ#hҒvq .&Mf A @A ˛gxcWǏ㤵҇Vפ^ϋ骫JNjjjJ{:3?̙N8 ٳgE:*}3VDK[o5|魷J<@:cߟ~;. r!dUA @A ' ͔C٦~=}t' <"^cccg}C I x`{ۭ~ߥ/ |±dob '˗뮻. ~xBYO)3ه躦3X[ʱt]֘e*09ם8Vu8 @A @A tNmQǙ
gy&[UuӚuw}w:Ҍ3:ӝ/B{@B$!pճ믿>}Y?,9pG e7{/
5jT0aBZlYp$}_L;C~ܑG 6h, r-7ިg4<m5֔/rf: (ӪV%~{nj~|ϛ7/+%oB0ώ>uv~Jq @A @}@X$b:+5"՚l.A# p'S`ogA믯s/b6F Nڞ VbE`
3?ó馛#Fۦ.Oe8a7ZGaމc=\ί;SVuUK<U<qկ~53\<t9g/?O?t g}Jg裏&S埪# n&@\?cƌI{GI XIk[' A @A XԒʟZ&yV mgZ[SjMy`GZ 0F 4(niiMC>msuV gLQhcW ^1 zʽVVtLM㳨Q
3g̙lĉY G qD%T3 bG"8mbk / ,e
7\IK/Ԟ
_Wr N4]~x{4^B I All2 lZ
hgSO?(K)h_7wmt1YzncǎPxm
ƭ*?_8qKJ{0=ыp~wy眗70ooۧm& Kk>J!ݻ!
R @A 5v'ibzwޒڬi0A59Gؐ
mg!Yxy m81hiI HiLƏL/Θ.G8:hjI3-jT͖j;KLf4qHzv
ih aخWKH8HG >-}o~]<' (EY_~yS0/9 S.lDs<
q}K_o8rxks=7gZ뮻(qE8ǍE)K\qE!p>^{i#xLe-F gΚ, qA,"
TO>!>%ʧx˹"ClcZV {r)9aYHEpfidϒX G I=X K֦-bJgywٱ@tx7縈r%8H@cQ~7!O}47HwA @A l5e+v ݢq& OmИ옝҂+}&
mF & &qbd_.x8#OoA>nMpneM//|$;M4eMYT ˱;E˚_X:I [nƍ Y ~mvǤṴ%J/0y6iˍG%yyܚ=o_jZԚwi-g$80 e}wxcn*bGX~<
Q^{m ǬOG 8go~Yĸ+tGgsmY:+[J顇 ʂ ŧ8q8Ů-L<VԪ
2% 9DDΟqGx;!Ϻ__ vX D)]~ko)wseF"&xi9 L[0"
+Jbuo ҲDO8ϔ`"3~1> ]Za+qd(;&=ŋrg*+xu]{ѸFqp
9_[9[ %A @A 'Mͭi1O)Gnx) oźz{lE)CF wpZ)}lN5g 8qHj ڐvi##W:` Y; ҅wj|:fI97 ڴlAH6R1oI&JKWCYo얯J<9eQi'%˛G˚Ӄ/N EFB.ǥ'IZjimI{na2xpzktܞv46['t[ƍH՚ V:y D 17̂aœ[F !:3|QDJ,sFqS\XVuk+
`Ĺ'B{ x M6- 3}5%1練tꩧp%뉃_qd'_Õxao,qb"
cJ t?oϷwك:(-~ _. <"2(eկv'LNj_Z& 'kt_-!˔JZ/K vv>\A @A?`6v4e7˶x5ʇLw>7+}8:-\ҔHGd8$ }Llt['VO=/[, 4mJï!ya
Soiq 9ݞya
UnyjF~vg7i_Nw>^pY3ǏjLDSWg{_|?Kߞ05 ),-O2.>4-Xڔ-13}x6Bͫ]Oy'NY !Lm|)>cGt`9Ę|$tt@Q>%jzM!T50cE4%IbEk멹W?olIt2E`
H8ZB4`E+G & ȧ6Bd|lrTrւ'|r 1 U~&D߄:m{g[ Dm+^<%=-(ts^|~K<= @A *+%uxn9aT>7uRiGKF5&'Nc7Jl?![%˛aCW]ѷI<5J=Vmq?7 cn?/?L>Zڔ-շ9}q)2vN雇o71${Ԏknn8hh4fQɆ!zNWfgWL+>ۥ&Ns--۔l¥ieaР4{|sg.HC?^+Cur0N E8iB %,v %}.k"0Kt(ҙsͪㄚ-"O%?"iyS;.^QslpeC=4OC5<ma,) 93 X=ؼ Au}|XA#fkcZG#~ NXyFe-nτ0.ݪ vV`م%<1s8ϙ^܃|ZE ?B?76{qsp(ϰL4^pA @A B:teܶFۘ_76װȔ/y;f8!m{ [~l427~}08M ;<]n-mJS"[sz˹/yzkGJlq9Mس!?9-=o7 MDn+刺KGxŏ>'pIw-No(>$͜$m2vxʁ[ 6kt]~yӑwq69vuSs` ژAbdOSrY鱚"\J`Ǫ(bB a+т0Aspopαb1E cUj8V(ZjmYȞ{<餓tP{X>=,o,Ad}eJ(c4dJ58q+\0CXõg +2O&x{.ĭ*ͯ|99 J-Gc),M<C\uUyB G|Nb <y<&n5Ͽ [email protected]#?A @A >L8l1wҚt=Sc'mL
bu痮hNW>ft܈㤱=& ~+͞4 ɷ ^t:܃o})u`۔Y@wQNJNciEqZ:{ aȩk 4s~V4(<ylm3*T۞}/q6& l>.+6!4tHCQCӈam6ryW`vh{ .S,dAe+ӎuشnyv#,:y6?B`Ch?ϲAPlA"I&=3vmyj-B@Fv=rKZδCo}[Y lN"ک/{2
tPrOSX0H("XIXvcoGVjue$G %:[ QĉhjhLfEscz^,(YV)Y*l
mJ-k[o5ǯ\( $'< wS ~s9F,dGb-as' @A z>y^["6 -8*Z?ި{(k_Ȣ &h5 cQߙ8g$fm˛]3'gS"[ڵj홙aCs!O]dy5lHznN{mQl㩷'ߜN[{pHCI6'ywr<U ˽#7,JO>7_4<]DN3gwaCgs1B<z, &&l_O4\I"i)Κq?@ cwwYR@8l$kYG\$ΈxB i~l|꺂uGZO4y@`aElrO 2ҋwXU
/ Ȳ"pmn)IV,# 8ɫDS"vzYysav l\,rC._X]xYon&k$Wr% )'U!qN8 @A @w> +Y?XŵYYJxm֏W#
2(uE|-[Yn6y -Ot>[} ac 斔SwK7&l0<]|t6={4tР_' &lИn}t=M}mb#Qov2>O5ir
|}mѨ k}숒J}ЭCIϼ=/ 5/_T!+D/|්D+u#^[ U5V k}>%DO[:Z C=Msy<*ןac<8B6lgMMW;ɢXU 0=O%N[;4vl N8!
B`ɳS>UJԆ IDATmҏX+/}6]kk`43\l[\4vt6? @A z1oI˟iߠÔޝ'I~ j5R\ssk>hyhيCM ~mv5fnN{<6`
G,莦4=0+'gfn7;Ԍl%h^Spx&=L=-ƥW[7 \ziж .I|8Oe^sZZ,7<8vVcB mle?`j~4ٺDdF*"NW q(!fZM7ݔs9'[٬ttjYU<'VSNɻ%kj'M
iD6% Ue'f-sx']6iW8bxW ij+_m? @A PU5{q{RM]p<qn%ɺwE#gYmF Ӿn.cvJ6x> ǘ5[=t3}/ μ0+Ź KW4l}ݦcq{Lλ0c~?o{`ް|vpinuwxӓ3-Ypa|d4!u-76Miq#a;ol>ƬEy'S,Yc Jٺfiޢiޢe+sAُDr@Ovm,~`#nVΪO>9]z .H'xb^g`FcGt?ΔY .5ڔb1Gd# eY+C3u"Xټ=p [\Ç' i6UX w- cXUe*N'}Uѱ/~ @A ")\G {cUȲ{an>hYމ4Zt_1?m:~DO W=ؑ vDƏH/;?_sѲt䮛=0xݯzZ)u?'MMx»_KS6?웶0*['On2& ۤ#z[{&[jpYN6 zt>s4dР{ oKv&6iņ ~}An _>HWXM
:" 0Vo omr7wu(6lR֖ BǬg3B'ON{w MBM9XFZMǵ%E#盰ș,]6)&QѺxE$ v䄵5m*';
ǂ@A @} cۊO#\)o OGSd{l
70=wy
cgM<κw0+=?c~zzTA)=߯|2o1{<֎? [ϻ^SMB#Kt=IHSOO9/}Wf^|ÑyMK?| |s yG`VIycm|Z2ucKJWLgi +Qʀ!96 vE^W%t`VjmmI&LȖjk": {lfSWjd/EK:?0 ÎN7|3_nӎKr};зY9GL8N4veY+`71(\=Wp_U @A &`g }wcƯvrrN wNZ^ʛoZYִ%;ap '^ܒž`]oh;z|dfGov&T5[{Au7YZ5s[v-ZV<o$y ,H-umMDӶƾK _~̱8k3ϙ3;
2,pbƫ!Ւ$"yxE@#~u%zKS7>uʱj%Aǻf5 E 7Nq8W. @A 5P7bhCjnmMKu6#P _L]{O8b uWn:] SDTX @A @'`Z킥+P?cEA @A :%N=lj>O }V@A @A @/@A @A @ (y`VZ'ZG A @A @ 8!
ڶbc`됀57~W[W_RA @A @kZZƤ8iQ)6ިߧԜ,KUZV~=$-aPZY,R@A @A uiؐ}q4r3O˛ZҠ~c0TO_9h6O+[]@/][Rk
o=pEy @A @H%M ;"M.O-OGG<uaCQCH4r4bİBL9HE @A @X N WO˾¥_s拇HR@wA @A &b)."@A @A @ "_ zX @A @A *=һH|O%y곋A @A A._
q}0[S?~RuN QpQ zc2xa3xpL XO>vMDYzk7l<wMbg&nx6˔hy!] C ښ6d4lX3f & Ź5&q9sf.CD3@#C9iҤI!
7VX\n˗/OgN'O݈#5&lٲ4gΜx6kL#Xti;wnz?#ƿkb$&"lE,"*b@Ӫ5#6-erXFE zqC3C KVO(<މ5b
lzb[ cE=) @A @A wa ANu755[CH.U*vVë^wA @A BV,Z(=_̛QlFy
fm\yO]hhhȿk@ pY4$ .y
]w5mk%iA @A *ꓫtꫯNf"{8裏U?# > /X }O< -Ty7/}K魷Jw_:OtG#8]8c, @A @A !u,4nDZ^L⎭oFo~Xƌ:n=L,Lg}w{M|,X $t^<b c9f @A @A W!ud J<@z'
x;<01"{c:C&l m뮴^{ڪ8+6)ӦMk?^~<s Knڍ LӧOmna >t w4 tAB ᮈ}N8!mfY[xqV}%K${3߭: ;S۷\/"!K@";L~u}q @A @A إGrm婩8+VeĦ{'NhX=]b qꜻ ӛo.͙3']r%nq y뭷Vo=C:ק^ouDQ<x>c&}E$eA) 9̟ r-iٲe @¬ @A @A` NriO=T;3}X0#Pb8Qv[lEG;xgϞn馴曧:+="#Hhv) vaYLc=rxq=Pbٷns}x饗/ _ ?vX5*bH4t U3`Q#DpA @A .e[fY +F/ƻue}_U b30/.#{+R |P,Ə ><u֮֕+Wu/rޭ> /LwEw
kӽ+Y|vmt^YM4)]X9H80??#GLobQiZ):.c=2" M9/$ @A @~<q<1ΘG3M3ӌߖbC/(1o '~ ǎՎȌ ;6]s59 vJw# }Q[N0aTe]bp " 9<fd#}U' Kj3\$IN_kV謟g˿#&O1r
ɔ[T0X);g Sgy&xT*&LlYlT9" 颋.;~_n>:<PzI\lQΩ<}(+ Nv k dT?(~6O}L\ @A @ c ̠3,ovۋg_"g cV~of8̂c 036d~ӟi#lq??1
Ǐe osLK]wuY ' C2{Whxf5 ^{-w}yʸ
ڌeXU
CaW`# ڜCv)^W
]9gTRԃ#N;wŧTTi7m?| SS?+Iqy;وSW W @A @A : yձơPlI4v118s5Wc n4 qbG$1D"&g}r,=Ƹfu a#L^{m6XےZf3m#kyoq%g|&+
AAa>x%zr:ʚ
*:gWu#VwUpY=XeQ Tí*Zq[ k L|ܫc>XvsDRZϚ5+Wb1OUĞUdmDd @A @0~4V5YmVccloN@'M6$/SEH1^gQZ x`Q/_b'{~Ycdפ.K\y ]oKc80i\\3]i" #& &u 1.w~<?PY)D9 [!3%q
v)$ 1J!^jO:|\A뮻HW@_P3٭:BoNS=>3vPx>, }:lj8x"ϼ !q_j~[B0%Zϐu *g,aO @A @ vY~˚e=2/ l3XfL{(3g?mڴ馛fb".v g ;do vӉI:<1ѸظõDCBcTaˀUk; tY).Xg0)S(98בS9qʢ
eq*X
1@X K ]_*,bޯ~\9I *7 ,pQy2%fw衇f6>Cɂ*+ɽ+߆JH#~3 @A @舀<4.cJbLƴhXϢYGq;flJ8cbM( M4_q: =2Wƽ7
9ւk Sp6ÛO>} ]%{=F/ݷ 3ZqD*VUTo)nJT*s}3qlb[BoF(°|3UWt=Uuwtu0@*:l/<9KP{/^v'& A @A ;,w˳ɉs,X8" 1VabΠPVu0
2{2'1dqȰqk;gK.@~/W
ioy+^ ~ZE5~g[όCi_ՆUuR{^.+;9Vwn[ M.< qC8wy@`$$څz){;r*'(& Y_Tp{n~ˠ%f*"Ge֑È311@iLc A @A b.nd /c|fKY>K,sƑrJ>XY1WUެ@1+ѭ8c[.ƷeM;|t6 >|YV?am6q8"rOx,h]s}@~xN
L)^ QEȪS:"_Y3g5jQ \[do8iW\{:GA @A /Ʀ- c 3ۘ5zu{ř~KUq~t NXHȣ!X۞#Ob dЇ`ȠH mf QRX"FݕsX W快\IJJ#a_dLA @A ="1 Ţo YLg"]vYфqQ B! " Ў! 8[ϲXUo b8Xs]}I:`w̘16IYV:kH_O @A @A .j>V}6mW\q 1_kY?R6d G$\.cE+IoM4 ?nMAlA tM !kKsg:W\;tꩧ=s tP}5״ 2-% E,iu t_K&
%\|-!
A @A V aS;Vw~#p}f͎1ӛ"kj-G#
ZO|
5:՜gg>Ԉ~4aM~,L5O/bިҺ|1&,?Ӳup{G-kMu`pH#`7\%0h%]O[Kkk?ov8qB. S3ivn >:56_ڜL٢^C>}z^4d}(>D@GG`چNU G;ԽW82 8w_wjzY˵_Ԛb˪Δ^c))6 ~6~;]ձӇ$q
$Y_6Muʮ f}HXOxH:s,GL$^rH3ܜ9s Jx\ Zɓ'N, o8GmDd: @A @A M_GήU7լZKSY,}d'?u>*rzO/L%ʱZP{ IDATv77OwtF@A @A @) @A @A B "A u@z# kYGpA @AEhѢ]mط]tu z@~A1u@.rh4<G:a.\ε#/W袋VzRtwgy!¸r#JÂם:ůpꞮ+=긪ZOVެ x ޝ:6?<nؓ<']/iRj˂QmkQ?G-gNSvzolwղķ[a|cUuEm<??&̪!twVsM?яO~)G_xW^ P궟 n$Ħ uH"AA0r6mZo=3ҵ^O>Å^]AE_2tgW^ye
K_Rk窫* s1wM tP3fLؑ+H{nt!9qHy衇7ߜ\rIBs'uI@w;#xoN=\W|i̙>!X|+_;F>Yg:[h[o=,;vsy?6 ?N8}w <'';Y;va ?A7n\1^ pG ^kta$i|u%o2|h9Ϧ{7[Oo}[;9F_8H\ߴie` ;4bĈ|^}LG%<L.O S2A{1ʊ~U9~&M:|L[o~m9j5=3en;kWh?|& ~yq/(Oy$ p{ξ}w.:%\|x19眓wG~.腏occ{s U ߧo~b_I Ї,i5{wؤmG[n%w4::O<D@x[jc㘝6`d~G0g.^ ~O?=Cp4xPؚ]䦛nJCt=b'!CJR1!{ zꩤ!\sϴ.HKg>9oj({`Q-N0# T{ w1'?Ukuɓs 2rro:#'-Ɗ@~c,8&3#&u }gR)qwS]瞕Gy s=e>ʓ,_EV\C9S\sƌ<*ĎcyZʇE7VJww??Bݨ/vY馛fZ~_/ T>k\F)$+;CnJ-mmYv^Wu1n'N̢YٵUVц=c
,ύhK:4mV;N.EϏSg?:1Y ^_xm7ޘ;ٮN:o- u2VD?UyROǴ-Ӯ*'ƵsUsG eH<EyG>UnZ]I/PƷΟn
/A m6PUH"SouƉu*=Ґ4:d+לN} y0a+aV跁XHVX q@ƌpy yj| [n'/ }_}#<ȴvۭ QR2uB@67/ Vu:P 2dGXVWg}n4,爂-u up^xۊ /X訩?#[:m.8u gt TFT7`K/9ҭ
zO >~G ʀvZ7Xex衇&SN9%]b K?Aʞv DU^?ǭޚܛr|('EXp]B>4K6~+\"7N}w/ ^0oNϹsu\{),o{<˙. -sMI8(r}j]^**:q7N۵对܆{9LcP[ =q}e/oSx^:ϫkϭG4eʔlhAޑȸ:eOOz%説.=f uq)krԖ%/^|ŴYlqO)}gfv\=h%KRsD Xۉ&)ھVoo]u
̠ Bqm6J #8"w܉J:[:yCcC/.@y = 4 0v ot"kN;No%5~{ӧc A][uo5buLI۠ө*W7>Ҥ)
\
3gΜg啍6(9%EB=&? Q٠15B9#ozE:QgNNڔ28Z.S=X[Tv IْnӦue _:V8XS
BX[> yP-yP;0O,͟</ ʬ2F`W!!GP0ڎ"AD ( _ 3k/exzX~9S1իc}??@)&hm~sʫ2L:yaV<оi^iXͩ <}sSBsPB6Y~y(_UYqSO#_1>s ?~g:A;,ifi-N)Kʛhʍw]y0Ļe6:5>4oYFrրy+ίAT,(bke<y<sUՑx xױ1`2E@NޛY
08 "t]ǭAƲX(;&>aíL@2WsV ¬!!vy078$L(XıWgÕCJ@>bQu"5+
Z%o˷E<6`qAys=SWʿzT+G }tXDž2 ( ,? tx>ϥUa9s tSAJ@,^lDoe ^t
F-{V^n8`
m hVʇ3Q&#S0@XC(B]? \#/)y+v}@y`TN:)1ˋB/ NUpjz-BC?}c*mΜ;/X0+c 2żI%fhLj|]>/:r/ow>{F(lKH5øؘ. K qT^\"WL^[kRT z46ίYZ>&R2gi!:V6ŷuXxOO`@aU
N7Ō4Rgz
JA&ӥAe
7KCkPdE]/ 0%jXM<
5͐0m) 5^z˫ q+Ag#xpo'yXuAzȦC, ©ȠfzM'٠ĭF(qM
GѤ3H<WE@ޖ\pAާ `k_Yu{駎'y~7fn"֞ #*±ܗ
%(z#OXeB[*xP? "~:CQ$ 1LfqO-?}X +uBۡ|Rޣ˲y Ǯ6ŀ nLj YU,W.$)sҦKxx>cgN wF*k(yYY2#M 饖[,UU~^1R1'+f}Hk7
t*9o%Tb>l
N>y~
zM i
BCbqq:sD9uqTt\h$
2 2X !:Jgq\D'ϛe=3bk}PoKq2qw >Vuu)[XtXxZ|l(:jf)qPTyqasǚղF,79緲g@.-mv`ZTN+ FJhKm1`E~e]+sȿڊ}+^Fy⏀W z
zYWk+lVn >K_ED,pg뷪S#OiurG}%MK}^/` t^<o˰ÔS ,'dWA,Px/pwMh9 ѥϳ#,;{_>gNr
'X b6Q75F>Ռ(`,L(ʕok->{r(=a@P4*& ǠԛC l먛lЮrւHSimǥ^+PY03(7PQirir4;vo
ul NH@^R0\bu" )Vo kGy1quǕ"uZI1`a"Vs*W^]U; V/'/_tE0p)yQ5LAr/CS簂2PԀJN r @sOOyRU||$ ,q!9kMdU_p,,WfCҨ g'/\> kj=Z> ٥LoC?LqWOWQwI*ui)ȏ^Sʓz_^*7D>YWv0T>g^*/?3d8@=}jӔ5aY + ?^աϨqbP]W[enM3~ xӬ{)& /ltGSRtu Ƥr,W2Ly#iߖʡzMW⌫㔝>i}1 0 4: ޠzgN ku`RaټCkP:*8/XU: qDF:t M0N4vvҠo 6T
:
BJ'\76,Й#x{DV3 uꬥ%#0s͊4VC (=3Q\YġNW8 ɫN sK62БwQޠ 8"NO@BV%O'yuR%K9R9W]7Zv G kYPd+iW}%2(S誻ť
JurVJiY: t|(^&);aWJK / %\O ^HZA"w4//Y+ʧ&wNT>3FWOJ>F [}D/8i:ӥ֩__/ӟ7X+ֆ3K>u,9: Wo{枙[xDý{Pnlnhܩ?Ԧ*k^X JY_ӮG?~O)/%5 K{*44:L7Չ"ik
JV7NT
R#o|#~*?k4J> ӁPzK( ~Y1H:">!xFEejcka%\r%)я3FcFH1t^IǏ(y)\^TñN'u8y]_% tA2Q ů`%> eJeȔE$Bc۵=\_J^ PIzQ9`A"E zIc-vW]uU pXV!+Gũ
Y[ ]{-7X1' |ZS)-w) q6+ :|(\)%ݿ+F N>ѧ8yP)oW_Auo ( /:BY$|)3G*9/Q%/MIՇ!mSuҞ8h#'}}.,)X /7˴R^Ԏ)C M4Wۇ
}Μg< )EwގGޞH'tuYhнc]cQ%j=:i
Flz8+ FID~헯m@ҩ!
ϯs*bN;-u1a퍫AFՑ:7Wx Eh`y :)@:r::nD
iuI/߫&`0A.PBǼ-}'f,up0]Y Rw~5u
yZ ;u \}H)L(PX ur'!|F3ϴ_sfg=B^P fXU[<SFV^OS 3W^8_ǔ#Ok
!q`Jxb@=wGyO$Ia/4)yNXSG}T}.x(p^eE~̴w+|H5U' [eVWe,^mqRK ,rn|
UhϽ7UUo~<XOzlV1Aqe5|FI#Ôbcu1K?=/, k3nvqI5VAeI5gL,ڌի2ّ av/ӋX:턆Հ!
:CQ/C @/23-y.
u(\`3>rQtdF`pqL`z YsBB^<q6BNpo }5uU5/[L2,,yR'@_MDak>C4+y[؇3 +ܷ DzX.GX$riuoKzD4bb~KEXmeHo
zyac`n'^/ݔB. ]U+[v *_ܷ<笳eQ2_ w *[di
i3RPX !bƨE4?,H / 'a$֪t ub\9%йoe=L#vu]M!h[J?)0Uƫ< ,ҧ?ꨣ "c
Q'+f(,CI6O8/SS d/ϼ#ŝW}- }1G9 _ +
Eoޓ1GOS8X[1 1a<j_ꧯ 4nװ-ii Wn2VE@qعiyf4eĥ3!j5 UG buU[Ufd
u\`E9(ՆTokwf 'OxV33Y}^%t,{J< v{]O>+ u_:կzˁ":ʺ'q+=oСsYmOW,
qמ
ׁtq"u ?k y _[Ox+BUʜs?|aʞrP( QI]e/ѽı6HrSx#C·6?W^3ڙ/3{>)[=u^jx3 IDAT<_eĥO#)sC~U&+,q8">vwRg'=v82-U1<Pw%_: WŽ ]$W_t* ^$ \Gcb/X*[EdＨ^|uai?U~sC)
\\*rTꥱFQg@P:%\WI5ֈ5֟Bj͢FE# R'zwо "]ߝ b]go? C:Jo~1#ql x3eg.&~{C
4Z~ {pUbTo;':{XWA @A e!Wi'M 8>k$Yم1>e ӻ "XR-~kM8"M%mj=Yu$)q @A @XB# >>[sYkGg/8/
eC <{>> `z&P(<\{Ύ; @A @A _F ʢsۋEV-^k%;-8SUo4mڴL&MCoO},: 7;ZՂ֯8A u?:>`!t[[g^[cCs#VO0r@pDbg7t^o9Ԧ@A @A 0 @QsrK.egcW\qE#Y%ZΚuUǯTܳ>=]umV@\C=;<͵xq5YAweKIy Ɵ$Tw2Uߥ^p<"y-pA @A @¯ `W&+=q,Ǝ X͛7/ [ЈTUGr\br-UY vSlIxgi.~dJ*~7 ܻ{&VuYY,-\s~dgwQSm A?-4fӄM; O @A @A dag-̺r' 0:|OTY?>Ibjnּ:{gzn}6z U˧Om&{y7nrXr ba2~"~ @A @A` N {GG?QF;iҤ& #l8Z:g??Vj~l34aGrݎ- ~>^GrF χ8X,p8ܻ O~w%le_]_Q~A @A @#_O裏λŚfjSG }4ۧY`"Pb6щU 3gz+ V*%Z˽F<DCV
[ =UwggԦ :m>> 0cǏς >3 /0u(_; @A @@~<uoKɮ>bcv;E"< pyilgM{. '^Úyo^~o-?/gMBwh, KSv qԆDQ}y|M7eqoܹ^'k<}Q/;Q?Xi$ q# D@>7W^Xv?d b;\>IUx6γ Niosk
o"o}ݗן#Pq2uՕaSOeAO<<qf̘nƼO"6l3
CXXּcWn vI+Swh:|) {,! Y| .H sLӯu {loBng5>Z?:zxGpZ8+5ڽJ" -@ b <MxK_0LW_&MF~cHklՉ5Nhw
7FK{'rŋs HՕLN3Wn*K∈<H^ˏGmݲ_mSN^;,#(vDDשNJկ2+25k
(]w]H$oB>oM>8p 2 (
9f O)naj
N!m[7ީdE@+;N A`-c&KdZ5uó`aW íu:'٘er~x66Wr㵞?ڇaM]~dqvgdQ0U&O;<~ƍlhX9NNɓW/k>n@{f̹m6 x9 w1s9CL&l
W/Y ꫳygK<
ο%\ @رsn'̻$"mª oO #yXFL@iâ w;ގZgzF MϸPlzro;/XyZilimMN'N&]x7fUd\f,>R ŚD>ljWD,+a ?
ZE$87 E r ܞj.,X. Z՟d;_8Ayv{뭎N)6<~0+6M7,,VA%*@5"^Rߪ;( 1gV_ .U3gN
W < 㮲b}*Rgcl9o,ٰcddXΒ[11:tXaϬoYZGN._D<ou rЧ3:M=O=:M6-vw @A @A OLH/ U^> A @A @3 @A @A u!'A @A @1#~N6E[N&KT흘@A @}@~}Er@W[tu>|xl
p
RZҚ-oh7r4apj A @ zu_
$L # l:xlҜ(^\]X4.w^_;ꨣرcV\_\u
J3/O>/ҚRO0|H:mqi! @A [X{3tO]9'\q,Y$1S/;зx4jԨS iP7FC斖v Kwh|t:=P?_?~qkN@/I .zRM[IԚ =5oIU\<]Ƈw Xí]v!<2x٥+ῄ-J \ A/qrO*;C e#1rU W ~ǔeh]˗'ov ilҖIo?bŊ|^ӑG vivaPaÆ[!7ߜ |t 'iӦuj{#յFi3ʹ1UgkwDHWG ӪJ}EQd(@@ED
95n>}&9}=9ܙ3=}6uPA($@ HEA}~ rW9}UTo ˱h_ҍu^xD֕gҮX(sm=k;-o lw[[z aʤZ3VL ND W, /
-~s>';zKg[nk+Vɓ'ې!CڴC 䍆9++JEe\[V<R5Ed Jtu$ Ȯ]> /9cg}v;˳?x99r
:4܃êO>Ç۠A 4 pwﶞ={ژ1c=/_:&L{zssgiSo[l ;EEEG Yaa~nyijs~Id&ʛEvurwvEY^BϵQb/Bb uoժUF}i\h81{/y (((%K2wuׅ6>/7yg-
!e aD g7'gyfاMm}ɽL=k֬ MNNNhO8 }5TǍg}*--? w䁸۰aCϵx^(_ '!/? y~f<h[k엏`um~xM8ן~x).)4z [bG
ϼdm
+Ϭ
خlά'3xΤl-331 ]] NDƁlc pǃ
b ;GV ă "T|~8І[oe=NHCFp}
:9qQhcJ<p c?#>{MB#UVUYFJ/˶ )`Q.oFsyxyٙ4i]g {'7xΝkӦM wF=:pË ݻw y;>l*fh=X mo ;<3JDݹC 9r=}bH ԩSڕW^⋶iӦPwxAd뮻B grJ1@@OK>}qsO;~MmG]aK1L!Qhs{
B #ᇙ :t(IgΜڶho(pBa K/ wʏ GYfxyY6#;~ܷ'ޖg>
}*ڞ.bCh#`LB1bĈ .;z7tSc
mA ]n{n)ׂ0 ,83fxnҥw0ek / יt(F~ҷDg} Ou KM%uNx{ZJJص)OpGsK-3#2xyzA _aq~wxy9! }d;wv4IkOJ[Z $ tj z,vuڵkhA#W#H ҉#NQFÃkqrkDO4nP,DxÖc|IA*ƔSvѩ.R۷}t/g0Ac@x: E+ S :9i@/c[X->n?jcv6YjrړǸn7~a[!=dlٲ` s-\`of8G q'kCS"Zx{.>(=ŋ3|<Oy!Yʹ^{-OCX@ Gtwީy?g}6ly ZWZ mB^Vt
" A,77} B8t+%AA]OE[EX ;;C?s1+ioo }4q#RXB vUWѢ:6ܡ\2Gu e^K3*83~O~u9Xb5ZG%NxJÁWYF^Џ7 ~nX8r=#ޭ[%;u>FqQ}Ż 6_'C ~9:ZIFN=w=NR'9ҧ|Lf>,I$ǜ|./Iٳ 6ۚ
;~t-ֳGw;s<0< zZ>rG炑m>I灃y ,)6Vт_R^|w>ThD{еiʄ
;":u_^vBăF K.$|MD
= }W6Z>+K/ԞU=AlȖt:ym| <hTq̙qxsp#
'
O =:xV(v
.m?ZjKېt;g(*
~ n UTO7ckqi:o `Ha"tsnذa Cy C~3a+tc }Nr"Q ɳ0^tpB
/<? H=ᅟ3- us>`&q ^x%' 7Яa; B7>
VC,8IS "R!vpK&D$ 8GtW m u|Nm!^!N26?"P+FfsagA<k ;ᰢOuj~=Gyy,GzDzy s*0!>,#ZM"ϵ'aO(t pkܗ'p75,q-˵:#!T+rs u ǹ_xEpѺ:@( eL{62 ངBȳ" KޯKZJw 5?t;VZfOro1Y[yw\۟{ؖ.JJK翙 Ŀ\' ͳQ{C^f;ì>2([AQJ<% "P£KNE _ i5q<i4|ƈƃ1ICEC؇FB#A&/_4^tb8Fm[;X8,K熎 1Hs=%ft`hS ʆGcϐ2+H:klbSOa tTI?w/
=
+ XG߲Ƣl v^vQlo#v>5
ڛX vK| H
F7-#/5e Qst"/ yc=AǓ٧"E u^H pOS."8Cڹy~?RcXD="KL!"DPo% ɉ@g! L)hZ>)"*PC_ш~
Ӄ!Vz
! :@E`G 1q76u?oIZxq 봱ca~ _!
_ kKGyHȂ"Pʄ2eXQaEW`K9 CdL?q'׆8cXs]0ϥ/K_ˤ(\WҖ|3-?\m{ >o1R6?\_WG y$0mbd !EeFH{t-Gx, _NxH~riW9NE=yIGti@ݿ& e> eb!̌p+pwj?y軖d_{JnKMIOx]gn?~4.d1`" ~II
7%7I("< x9`΅pnLz_w);:IrEECCÇ0@ IDAT8EB@ftD0O#F _ˢ
[Ƌ $[/fw bBN0K'F*/;ht q +:n44<]|zܲ2z=~/Yz،ݭwfLO>vGyʏ>ږ יN"u=: DD <m^{k~{{~4 {r"YN ᏺ[; :[wxbu=g; S% }47D
q 3>b }$F{_Q !rL2% B"P!_B`º8A z D!7+ MhI~# G 'o<K<Hm \y.!"Jҟ|qD,\}GU)R 99xp-`NYr0">cM,ꊧ3зަp=*ψ-?>qze[kRxGZ [~^?ȱ4 p{xx_!^'0@ F6Qq{? Ec1
,VNZ,ӯ.fY(kw[%K¢`[״Km+3OɳQ JJm߾w-&lK81H#Lxh :~#pЧsTD):a4li9GFc/oH ھ(En} ηѴ('17rÊ?BSp[:ftvipiXG8yZqUfY.d+. ߴv>F;
,FC.#
0~y~pw~ sCϷN>a [o5,Wxa:%i{#
G\)D{9KXDG̣~ .P?><B}9oP'u <iEGP/'Bh1Ğ G" ҧ
doҠ~"P!L7)u'>2 V)#͖(.:m6C&
ISes29.!
8ڊF||qk]q*9=\\]8{?"+c9W̥=M]\3ދkq~ TAL_A=}
PG$g6W2$hg))c~>}6_zMt )8V\R d$[*;ZXl WOmb_N^r͞1)&-qYV։a<XD~vG-CCMCA hFK$t0Gh8R -A 1cFU/\m!5=ǽ:Vr~̭AC#LCJ &|e# % ,y)e+oe{^:ϲRxeU03qXop(X%G:\w&Zfӑv @^p7C|>' f Gp'o" aCUq35
u' AB͖
mui*?9 8 '~ s>Kq$KA-!}<Ҡmw!/B܈~N`|Hf.;'b
ց]ĢbM8{?et*9lc:D~= aAFX{!пC1ܝ#m:b
:Ż < FE/"J8ؓ>oG!/aaO%ǵ `NKO?яB?p.?c I }:eXroG> E4!*b鎺T_s02z# "#q&> (knY@0g5ž9}uxl˶} ?`ݺ2Rt+-ݺeٟ|pF 5 Я 0|E?2
MCa@
Lw <Y ~ч>BKgBT`&Ng/G8Ѩ`1G
ΑFI"<T,
I9yž;MCxZDR:t\'g
:| )/tJ獯olwkuo;d=NX(''<J**ÊX!,0\tB>ż~t 8NaI
:ʋ*/N>_rN 9t@b 1 ROx.#/;!!
ΜdQOh< uxU"M-CPh'g`=O]^00B /!KxpmD|
K? buyAc~d>"zLI]G' ( p GۈhAq!to{~>2+{Oy)"+ Vv>N|r57?H3,y&raZ#MCB~ҳkc>10K =Xqr2|p0~r\ SϜ93KxذͿh\{~spb!bB@x'~a:`s4}ːݬ.ӷa@rM
Iv$r?-i0?7]ik?v=k,qɔ lI1I4$Bp
hR~D@jÞx{8/Tt4ѹ@#WH}h4ftdq1ƒ_\\/Fh#,|%biGC?:߈ 8x1/0Ag.Tbx[U/#q d: c:`4\JR
NvM{ٰnb_Mf:v= ; xX^)B7Vtq·11+h=ý= chv>Χt4<?y"f#19</X5`Cp` xiÒZxic >YQm/; {j@XG@Q'nVh#?O`G#J)9s~ iPE W3"eVn~bB 9qtrc@D5hXm!ԑGµ3
Z2 !0' y JΈwAz~] C"nn)/Lg> CQp#%bjVRm3f. /8%7""q Hs6G uGXO,~f=OY|$SgyW#N~G ݏ{.GzȎgz6 ?'%+l@|MpU/\5nNF@a ,$7߳"ϒDrI%D@+;ߪ*lܜÝzq)?OPq.D.0tX :L&{FqcƖ;$THCG#-Gy#|~;C!!#,㫳#O( Јz:䁼xQu_mkJB ]
K6_==e.ͮ~}_R ;n@럙V4m!/EX4x'<^Hq]9RXĆ q?z{aus8{+^z:&@@ԟ͋;H ܥ8Q
s_E<u8 x6 "gߵ%G -:꒷7 8?CpE}:Q
a8Gѐ`QiY-ˈ?)|@ y.N"n"rauEz-䍾 r%ij6 9џYޟ"0a/q#> }Q PqM:),ygq<?ܧ0$. a1¹88N8&pn }acr?\h~ܷ G^=}P-\x}c~Ď?pYq1_mߵcx6s2 1g=;CzSSS0'[U6b [`a y0Rc g*ςt;翶cM-B H,<8!C'<US;
7 4 -x<\l:m 4&v?4l<_γyw#p?͏ҥ@#洤${{Q[}J++-#%?XdUb_xtu/v'/quCs|+^::& S^LfE <s Q pL>9?Wu'ҿND }l[G h=S aaG^3c=|HFÿ\ԑ= ~a% yRb_4
|sg. 9 o( CM3j!~oIX'Y=?)ƴ'ί3ү0 G8\G0(ƋEIXta؏7smCEô~rrJz :oaJk?l}3 k6,?& clk$X嚙F%u-~|EJCDM 0yˏ4~c~?X]i9Slz]Ws%qз4K\/1zb X:zLjv#Z^}R9nH16=B9]a:Q("P;mzPW;9,iEB+Qm ݲ*6Ͷ]W/_} kqYfL_Pk:â.VQ5-x4,lؼ23˧سG\zoS˾yRp՚[=]v ]O =p-zm~l V"yiN8 ~͡"`hY;Urkjx=2m{QYXW3nKwYeiӘgf8"#_kL>Z |) kpyT"VxV\0,1e
,YUo\=fO nXtݲO =/ʎ +=UVT-W:aVjIG_-`tX:"c"Y9ھDS}|
91|sK~iV
n7
i)T@G$(}h} **-A #1gtXyhAzO/|ݰKMI = =B; '{ew=1^zm+.)GZh9Ɲ=Xɷ=E L>cl![+Lbbю)vviXr" " " " -s9yRXOgo0 ;$ 9p16!Ms/-۶۶vx =¸s"wDʪJ[w ;saXo}ymZ6$}mX kJBb_S)$>VǭEc_19%" V ̬w 8/_Yl2OaE@:'EE%}>K,"ʯ
0R6xyv 7ϦL Ws<fٟ>x͜:Ѧ^8RY[`+ *
hIkIKD@D@:>4Y
B\TGQp,++&M5K ;v
+RJw;w>({g} 9r0ay\hQsmay-w>ܛϱýOר9Hq.^\}~I-<G%z$'Cl
Gⅇ
;'YsC"eOCYyyrzv`o"}S_C@;@@())˗[ =Uny9믭[n֧O|+.. . mM. |D Q0y>~wey8 > V}y#GNZ ennݻƽǹCs85 ~h C?s[n۷gu
6Zlx<6m
7 iV|O;նe_y
j\2H Ɲeii)Vè \F!
eJk6BE " " " " " K !==ΝkgqF y=z]z!qDYa-[lƍA{ǂ%" ŏ^zٝwYmI8 q8 H>?8''M{
amٲe#=Ჲp߷O?=sOs߾ R{|Ĉv woҥZϞ=0>u. ς l/B=W^yVXΑUVٍ7,[U"]lId{VTJĬH𫋎Ή@@+**
AX6l DK{3ϴLJacƌ Q/M2%$v txz[{x!)iVG fNgy& 0`, }W]u]r%N='aqoΜ9' bرc0v,o
O}x <hO<\HCڏ>hǍVh>ih A ~ p qc9>VHX :t(e9 hv[tf̘a,!߾}lݺuI]ԂG[hm{ ڵkHͭd9+<&NY,V dz^FFFcH0!6Æw " "#CyO օ ' H~TGZn8uw^{\D@D@D@D@D@ @@ mv8k֬`m6{T"Hn R B0}ŋ7+|`؈! "U }Dį%GEVfx9w eX.+5˽|߄a>1 A졇
+X># x_~6|<g}#^xᅡNP?ϒmn0<ɉ@Kג42Dk#Dc<
)hC`(/!n~a!^|Asa-# !,$ЁkNVK{>8sk82[wu1.
;\sM8ǐ૯:I#"[A !E %>GՐ^'mKג4 D>&g>1 VIr !!$Dc
X %> n9G 3dXAAA"sڒqhU Ɋh}7-TNAڭTw{M{$-V} ={vA3' VA .4kU(! *@G$ XĄ{' E`12!,uuV#
~owuW6mdo]~j-NrqX@%ć_
W_>t^Z s!5$Azý˂ވXQ&MD>IJ l~b*,_{Iꐡ.B_mE%4K<bDF=0$sm r" " " " ""! LqD ZwC|`]1Μ9Nэ B?o IDAT\pAhB@/++
6, cDcH/Al:ujQ-'mE:)B g [|yn=zj[dM>=Xr/
/JB X!M<XwѢEKB!nJ/B W^yeI 4IC+,,ʊr sTNE.]-33K_*tWz{g.`e˖ 0 "+"sȑARyXʈ+$\~}OM
b# ,Ocƌ ⋜%,c G "i̙C!Cto<Q
< ,ZW/ǰ
7cK X ⡆qjh
[]{ ϩJl :&ѯ]aGD@D@D@:> 2,>,8D,٘ `Vz 2º Y& ,ԁ u6opἈ!$QF~1O:ĢJI_Lu${5*!1'?Iâ ='L:u}
63z :+X D%$4®:Ɋ
,924.-!MNJn!ޣO_=[:4By[UU
00t䢍HK۷o_bFW:Lso^hD@F6 QQb/ + /`G[FPF ^{ {0"aCAޓR} ͖8 _; )86ܟ,VCiiGE~otGNf:\s8SoVFft;'7u:l,;^Vj}:9& J +%'X!wb*" " " " CzTy͛:BCsǂu.x|
ޘ̏1~)xD"'uԅD*4J~Fw> *ѩI 'r" " " " "\kLp1H+6x</7*b1VD@De =kkLZR?E@D@D@D@D@D@D@D@D@ڂ@Ȑh: ~Mg" " " " " " " " "p$%%QD@D@D@D@D@D@D@D@D$5B@pDtv
)-H ɒZ0>E%" " " " " " "pHMW +RdK6KH*o",AjV<B`Qq:(" " " mO@ ۞yCSԵi(6z_k:إǛ 7!Nf>{ӎ}i%f)Xڀ1>zؒһ6_|a%%%vVgȶnW oW_ɓ!#TVVC>QNZ^^PGw]+/Egm])u|a^w%'"P?okF_) IkAӟin ]jKkX~t触ݖF*;jE~i%럷͒̒v?! /;?YO[ ,{ZЋFP<ė.]j 6Uqr+{P }ge3f̰.]wʕYC+?_~e˖{mС՝M=z` vUm gii uf<,%9rss'P_!thѩ|ȉ4 :taQ ͐78!]js~m <iw9)GVmJ?]e]Y X,uٖܵYE}mǷo>y>ߎ}к}[ ﲠF⋷'؊+ 9:6j(߿!!qw17>nV? ;6|MC8qI ]v5\c{VIcvڐ'@w999#!sϧ~:.{i>`u8#m Ͽ+g^l;#ey۷oVlp`yT\;rWYg boiαnWr/2һ
}]&aū UK,5ú^ *\pAgӦM>}ѣ"mܸ1X?1clΜ9NcX auOYn+ S}'/逸|xCl|뭷B\1:}d[mUZCuQC]$eVD@D@D@D@D@D@D 1Sl_
+݆7zgD5ңvC_[c9gZr~=ǖ
_';ԁg[ڀoë BTÁmV\\lǎ {gZe^{~鑘Z'Q# 9rV^mwX#.Xa(<2#Ҳ2{vkV^^ai)k3GŪ5\gD@D@D@D@D@D@D@D }9]X,wq?([YCeA;Q$zVNJW=iEzZRrsF2$ _L:4Җ,Yb5"aȘh< `Xga^~w[hQ8|2Įj&~X2<9 Xvdς=~/\fϾב@h?Ҏm^lU%,s=:pIM9غk(o#<lYOYZO-uบ~+##ðc/E:vjoI1 1 Ãc6<#a5 8H Zvvv Ê-q[5H/
'$ ?^nE%%w ;brم[Ee~cߊوl֧Wӻub T\eED@D@D@D@D@D@D@Z@ ~%eg͎_Ȥ<,pK >J/ , u,W_~=,Oo拡6l K/
~B!Xtd!#OÆ
17ꇡ;v JWWY~Q+(,68v,Ow#`?wAeݳg6q{,+$,$eLD@D@D@D@D@D@D@A"%w h)}FrU1+zVqxe_'sHMIɖzX 55CvcŷبO/^c.N;ͶlR}uҋC{_!MR033<wwQ%6=--,qRsQ6D@;|v-ɚ7=Q(_" " " " " " " "X&UZUi%e"o~* XIem'KzT1k,xiޫm^4/ DqVjj={ }' ~99vgv;.:?+,,6w6lm{Yjj^4@ ~afX^Ҫ*gUU%%UU-WU᱖*,6bܞ={G
Cc/`
`nuG8Ԣq 1v'Y?XZݻw|`p 0,1AmӦM6bĈW^ynᆰ
1(s n5B;v cV.vճo ~F[`ԥ%wnEy|~)J|#;1n9ugZD0Ve1}yE8˽>}Us{a
`4bĦ{-z<a[reP}" x ύz"O=T
/ŋ? `QF8 qPߣGڵk_ 6aΞOXaQ%'ǿ^[eû,3#i+" " " " " " " "О Cq{n{>6@;zUU 68d#z ={I ^}Aۼys=k١C; tD X!aPa⋵VQ u!B 9OyCXx2W#G$YS5eXz-+b7h`?{%%TD@D@D@D@D@D@D@ڕ@YetSWŖ18 "Z q|f+۾RzfC& ;u 0VὣG} ,_6o y89 ocE<÷v ?~BKJJB .m߾ݶmf{o ([n րĕ0c [hQ?Æ //c' |[qIiE@D@D@D@D@D@D@D@!n g֊ͷҏZ陳,j^4&ﳪJԌJZʂzM{x@h[pa
ׯ_ obs=C!1 xҤI& zncoW[ "W^^^}a{
:4DիW/[dY&?y x6mZ#ۻ?ג"yݒSYXTl tb)" " " " " " " "ЦUK9˺N ]S_7#=2F^R
0˞GVqxeQ}Ў.[+
K=l˚ VoNvv3ƦN"$E Ce0 رcmĉ6x`?t!4b CYe[o5y80|sǏ鍊n2p!c cX0(pQ;R`a1*+/.axa1[r (R>E@D@D@D@D@D@D@DM GIN*~nk[n]/# {%g ˚oTUh/G- ~_YJ[z!]x g8ĽcN 9ݻ8fƍs'm!~ܙ܁<+,,
KOK)7ϱ> ?P{w," " " " " " " "b]t˾VcVYɺ,}E6x%w `UK+m*[3ܿa EԾ˵v9g}]m3\`]2O ?`_y=6-_m߱}3E@D@D@D@D@D@D@D A $DVƨ;UU sgK?^lk ,ka>*r3K6K=2\ t?(DdW'l֣[k¹9.)weٖٔM#Giy t,zAѳ%G:hhJ#w|v|ׇVS,>dnZڠ,mF/Pww^{\D@D@D@D@D@D@@s C4)=҇O
1S:-Ec:mAU0V'p_X @`UfVYIK ,@@@(/gn; ~Mg"bki
''" " " " " " "pp] àt14n
%-F0߿XگQD" " " " " " " M ˾`ݷkNc&}&//2w*ƟG } #jmB")FD 0>_<W(" " " " " " @s:W^E@D@D@D@D@D@D@D@D " " " " " " " " "БHHWKyz4iю*'jC@wsǹVʩ@ %ٱrL:nBΖΊ@@Ė@ _eeY.靡*DBD@D@D@D@D@D@D@:).
!" " " " " " " " 'Hӝ " " " " " " " " Nt1UG %%ŒVՓ? |?^ϏKMM3.ǖx omG
k(~h
MYaD@͛m
JJJ4^;w_zzzmǎ v৶VTTƍ
iu9 ;v֬YS6c֭Z [?V]ߏ+++<ݏDԾ57i)=jX6m
"mV}<ڛoi=zK.^}U0a ?K^^^^?rHf̘a_|-#"ֿڵk 'Lj#,;;;'o }ݻ7!.ֽAD#]8Æ
Çk={3gZFFF0+q(iG|FD$+{l[D@D@D@D@D@D@ڊ"tD BPI!NM2^|E+((>}5?" u4"q"-Y$X7pw ݻW cvQ7» yK9ww9 ܷo??5ĸs9'/*O =/ qK.VXXD9G-77>3>}z㈘k`7n}نڵk@H9y\ڊ@{מ,,NC Cr` U ܬY_~aćx^qq͏X:4Kx#
6XVVV
jÇCK/T xea
?CqQ| h"!!2 @$^ _ Dp⛲"1D>y'/ڲVD@D@D@D@D@D@ڛJ_Z "w?"!XFGCsX =G*iGC02alʕ6dȐy .Fu`! zvH qȑ!^UVCI<#vAG9V HP/#\]tEÝvi6p .$
~r%hDnݺѸv,o#>gߊ+wA[tiHE3FdlԨQEHDs;9sa20 `^l:>Ckh2JOr7hDpDD# H>}]c(0 <^DK XQz l?S;묳+x?hG$ +:!qsj컸/m!`!" A9ފE Vt_wg~;cV%e˖رcmРA'啰.BtX!6r]!bG> lj y N!FbG8m۶ 1 O8D DM[h+ڊ6
ǖ@ş;1 =:[Y ō3&{g <VETCƁ_X|yc],]j IDATXK~a(ql8ݻw3K~
x≰`.Ee/}Q ݼysȓ" wqa?, e#o ?9HJ( "LWcoǘnѢEQ-N!rM<hU<pCcQ
7 d<"mٲ%̿ǰ٨P^Ʋ}W=<X㷿-^nᆐ?'W_
GHCI/!]<v d & 7|Z4$}np,Xwyb/i{Q?$ =+mhAOXa7,H?c
V Bn?o C܈l*O*wX2_o10Z y![o } ]}8IwuWXEU{]L+pBDN B vsrr\e'1&~-i">:9Ì$" ~xU'h)MV-p!ap+pX]b8Hx,C.|H/b q<s?!X1 qu!av
V V~X͝;7$F< WXz/+F ~`d@B~# XH<G>SaaaX8G,ͭޙ oH*("B\#J+_4IY< oذaan;` >KX!,.C#?j/rK J逸>/a/G`=#;u{ﭞVX8pmX9x[D@D@D@D@D@D@ڛJ_Z W!Q?We/s1X146% /ap]<,Kxd=Xz7o^<" >*pᎰ ?"9O\81 "NREPtᎸ/C $< ɇ[ zھ = /VD@D@D@D@D@D@ڛJ_Z "{]ݱ Y 9r
?b,xr8aںc;30Z;8s`\,f͚ !!i C#~!й1#>nݺ5 p !QO> V GxC~cpa^?{jW& qyl)ar" " " " " " "($%ʕP>DXD? bX4*1>!ᮈnXyG <x0̳\{>]tE6s`ᇕ߂ q`<GX4!oXGO?ݦL B <0BÇmĉa1% @$]83Yti ͞=;뭷
[|y0.""ZΙ3'p'7VVUYზ/ޙW"Rm-eA;ߪ*_~axiSE#eUV omX!qt* yB,zpĈA(+# -i c =rϑ<c!뎡XbHXghI<|X+z<X?-" " " " " " %&粒-55zΩ~OnL\CK~;- 5DE,BlEE0C"\
qŞooEME|q叞oP'" " " " " " n_ts^1bEV緿bEOm"/ Ｇ[~?t4 /mܸ ]qa `Ƥs
ƻxb۽{wc77C 7o *cH;̘
sαÇѣ8+b5CݰaCؿ;âChٴiSXxƏ VG @]vYuEV^m\rI[l +˖<1tE"֭[B
\pAi+" " " " " " " "zZpŤ-/ "ץ^7Jb
T° رcÜfO' v
7^D7a{;O<{CcU6D{7o/bL
#~{3q =\lƌ5?Q@2b)
~IVIe63`N5!ir^ND@D@D@D@D@D@D@Du $X VoH, m۶o߾矇},\<nvڰs#GݻwBWc/͒%KJ, "ڱ"(~ }Q{7lܸq{W^y%⋃ ۍ7hSN>(l Yu֬YvW+_WALCI{
Z/*zlX2+5 RKaه"ib(ϩj+" " " " " " " G ?bMV&n߾= w믿n_}UȰC2馛uce"yǃŜ_+Wn>l8뭷;ѣêXٳ:C|YuX= e$=B8O5Yg"+A B(k7|3=eʔ jӦM C}3? "!C1?9>CND@D@D@D@D@D@D@D $PR,pN[dq WDbx+l]+V>20#FT؉ xX2w`_!Z15vϨptX.ClD<"]Ϟ=C: C8XXd-1=9w " ~v[Qo6a0' lݑ&<L>"bI9`-<&Mڊ"vYs1Q
Q y`نE8*G4۱cG8 DVo8.(pۚ㰂:pQхE?aP9ذ Q<V͇e /& ^wuZ ]~92+3<3 ~jS'OEVD@D@D@D@D@D@D@D$ tK8@z
6byCratCn_:8 q!.. Z `}h{ׇsH9!c IM=ACHeQF 8Ǽj1s S&>&=b0։m͚5q=D@D@D@D@D@D@D@D@Z@rEV"`14nqZ]ED+3~ܷXy!p ǼEb[qaś6m
m-B""Vp8̬KC d,7p@۷o >|8Xs D|/Ö ˊ8@0j=sc
SX^ " $
X$Ih] in_| CC嘿3_1
jPCpB,<".DsaYE΅ŋQ;4h#_.q$cHG[ᶜc˂!ǖBPjptovX} ÞC daÆ?/V^m,hޘ1cTF9g 0`@=G Xɗ' %bC#֎@HH:%-}8VEC\r6)c8(@!E#!d]uU!N j^{m̰#]Hp8[MG>̖(Ν,'q| <hׯ@܂˖- hpw7ے%K` Coa7C~
Ndx o=\sMqkh}I%
gYYUeZNNjX{
կJ Ve(.m;[CcX B&^C$osoR~c ?l)!MF a?DFe'۵kedf[FFMvoӼC2,`Otm|(~'-55zi>~
ŋr
/QO<'ykQAӏ+߈H`Үi|t_qEy@c9* ^|@{s=Zi^KkצsY5p}9:7q0췶!o8#* TlC ֥|n棳" "О nϫpj{-qM^ΙY' Xthou#3N@[ Xc5 l3'x6b 00*@b@ۻwoZ t0 H <×)_צ_z b,"1VX" /r#" " " " " " " " " YXD@D@D@D@D@D@D@D@ĺ ʍ4f;902iknnn Tڲ%m-D@D@D@D@D@D@D@DT' z+ jժFo >lk#GBz]rnKo[r*:p Jʪ*?|rrY.]LD ڵ22-##MZYYiy[UU
ri51/߿xv 媪2 ɕ!" "m6x`KJJڊ@`mȐ!- "l 0\&PRR
)
z16--ziR;& Nq+" "жh/@
;zhE@D@D@D@DN)kF_3ѿ)1 CT >t\G@_)$4</\e>э
;>%9` Ր<η=>ɞyvGGmҥqmE@D@D@ }}Yx燗r_ cK>v5=GG|WTTx1om۶Q"
wkN \xlx;8"ƻ'vKߜ鳘+){o>-+|4Mlb7I3EPr0$A ѧ 83P(Q@AQ#Q%
4}ugs8{{;wwUZ_j?ܛpv];Ｓ|+_e|?q WuSPKľK-eM1 3\"0!\tEe e뭷.رcrYgU^mnt'tR]m4/{e9,}{?.x;<Pn2qzOƁe5zkG Y4 7nt,7ٺDɵy̘7o{/7su*-جP D+l5ô{61HF6H38zPN=6!`˦5/= {\'?яc=V>jgȓ#p]w뮻
T3,r=9CG Ydr65a+wKwk?r=~4F`=2,S z q=qw)^lmBDP++㌙i6S'/&i'e;CcE KJ_iz曋M4wV[5X?~|mV(fzgkYkzv" H[Jٞ)yc|ey橷鰍a Vk6ŶJmYRyUa 1~PRO>*s\rIMtId[O;ڶO< pCzORaxkeꘫ鸡ҫ ,t<$݁䷿mYorrZm Dy?uŇb(0? Ty8"g:SnUy.2 z_o߭K!+o%" gԡ2q |-,>4g:4\ adJ"\ ._l&&st[l&?RŸK+Io@83xg D`0=ev+?Ϫ
po%( G5:{Vu>nD>pC&v^ [yY>ag#D=M퇼1nF6# o<@J 5 ^wlt} $}
U
$@ JqKC)n^y#ÌMB``lC`ѦIxC1Q{YyKyh[p[W\qE^W\qrᇗkt} g}W u3':!M! d[$3[n_k o2~ "^*. иJ3>}M7T6t7wD
u_7AU? 7__{JQ ^P9UGZ<.[ [4 ?1Vb N(PY#X#`(2ΓBבjWDť\!/_΅G1ko!
Ŷ
+TCHQ2Bx9fl4 %h
\u0A!aC04) a WeUWdpߔ%@;Tzْ{x6G-RqK5}c5"\u& | &
{CI1qZ]xˏsRa/z]zhR?v8r
p
<+wU糛16nsG^w e/Z;o%ܗ0{>$+ܓf爜 ҰtȟI(i7)^nC)W\ERW8(7e*Ҹ|LʡXGD DHD2<x^{&G_nԓ6פ p6@wyiʏ/Auӈr7_Y]$W\.˯ij51E;<kz#-yF>\~!gA*ypIR
Fѩ4< %ʀAV@f,0Ţ"$4*a Szkw}wm`ncDΛ
%Ϗ} 31tHof`BYiO{h Z^6S!ikHE ÄbJXF"e?@# ]ʆ}+:Q5IBҡt\@KYTTO h>Hk0@'-dk<7 (LVB@0Җo,C$0v ŽkN3d"L `_i`ncB'pu/;Ѥ#@ =e;f,loO8ϱ}DƼKY؊Aϋ۰4 :_+[yg|-wԏ ډ Px1ΈkpfЯg?#qY ލ5j<iWV %^|3 IDATdo^r2#{鈲Iht\sa
6B˳wK9+[Ke| 1#ǃU]IMz4AkOڂ'Tڔ{p.pR>^',aM y3
= hSU JU W\SA q Эo_W#hb6-;ָ2ń
ip$] n(vnk]Ӗt*!-t
yn=rI>fx)hƐ*1(NiY7:l EJ(Wl6=`f"AW[^A{zE=.$"@ z8BO.\ @_G@ۏ!t c}7rA ٌdL&U$݃ _"O &4h܃g?dx`4螜q.R!l&z4(c4R&Pgۚkj Ʒ1VH ?@!/\c_zw[(-l} ?ci0 8G`1 cf9yAwa-4#UjVA9,&ᦜ>s\}(xy:g('Wz|mO Sve:~:OTnqs&` &]\.](gm t16c ƫ\;dSǸՊ&@ ʃ$R~6$fu p[M#b 1!TzF$ Y(#\C,`cU q !H!73(DO»uʎ, M>42aM#I1<dC@ ʖQXBm -C@1@VuܲC#mK!O=nHF?j.~WS |՞fy 82shAJ02&M'D1sFڏC1Q& $ ڷh o#jt Kx 0]o~A?z%oM&G
2xXH
6ؠU'0".Dhl9d {qD7j*6 ` yDX^`ܒe` o
[vJ
b7<-Ev {^VkʙngyraK;%/bil--t#1)ώ4eD_}~A~ In!RpNq T??P H$TFդkگ=墜 7 ^DJVdOH_[
I(N^nz6秮jTύ+%LDeN&FLjD{QGqPFn}QUxp u>: @qXW1&, &<e*@2{Fa:0\SaqF 3
a#J~
K}~xFQHrAS\ڄEB%:3t:m={; mDѻ&&rݞnftfɤS%fJi ! 8m:uq3 cgH92tLKy9$# =z7`<~0GaZ3F/=U)@"=c8 [6*=F0#x {^ ۃ}Ƈ rH1'ݝ$&Gv1 1 M._a_ӽHDB91<XۤGGhƜ@ IeW;QHV /7lLuj YΖ} X%p/e_mvGWs<% 8 giu6NǑ>Z>rI=Q1ƋT@Xo,&~4&P_> S G$űh[m g6=c(alD۠y"K :
f8ᐮ#Rc-3<?
( gڌT%(L 2ɡYj Q-EQ8 uj{ QC U"i(52KE~;]14}
y4HD%ʐשSbSCe
<N*9BAAIp:
Jϻ2<(G72G]fm?u?D ;SBc ': d`>G8\"Q=uTb#FPSuEW#ᔣ7tS pQR>/0+b 6 zPtM_D yhg]onv3lv7>#a#&s0)@"=^MBѮ`o&BON?:5qH`q@3Z iGt1<VSVU6{9}]k}Vk锃2f~c2r!c7;P@ J?Hwҏx_S|Fz|HθNQ[7kl syFfҧL;qP O:D 1m .N<yu8s<r[[ajûϱC95s~ϸgY=8{^~=Ï
R>#oq0x܌2Ir/!sWdmƘT~D]~E #Cx=qe R*T.NExdU4D
Fyb:ѡi8f(#P01 B< {QlSt<Ӫ"נ0_9y"hx!n(] :c3A
DAtH~yT3aI"]C;PZ %0p1uyXH߬xTuY"u][
[BQBr Cq9\t.6㽌A3ޫ~kD Jf*u궸96/ákBG 25+ W?WG }aDe UI?=Q^` (#ơ{)@"0h Q`hm^۵Io~ }L}~Y !tI?B%`)@"}hlEd7`ꈸ"<0o@~nI>0/"1Xul7dɛ tYI<ȞqkfCB_Ev#/2Ov_VIM2&XSf lnLqLJbs6h'h|j,G=7 и Y\gpCĸm .,RkQV*ݎP{-cW%M̑r]]ikf}si$ʟRoM ;O p ^ `1M?:w7+oyT P淫?< QbB%f#4 K2DUVUd e wh0 4hª
E!LϪ*[<(.Gڦ<K% Ϯr(D~u84n
hG#p<Y'Nq)p{Q 0C8 zU z,)(!-> pMɃ 2t(gu2ҡ }EUousjz u?k;wup+>uW]V_=kMEd=c»==mbd20aum;R:#@_*sQڬp7<.ge
2_Dl|y$݃" 02 }6O(7}}@/6N/l$a jL֘ æI;{ɔ$ 756 mK Y+@u3_2/%gr#d${ I6 R?}@LGyh67fD*rci)k-W/,F QC6E 7އl6@
H|('}s I2egs;Qx)kX_ Fqd 7<;ۑpQ|DETީNkD\D8q+L'j-Ӹ~Je#<Ee }ta H Bq(Mp MA JҾ[߽=?SL ($QQa R\4&lJ[ŴW#7TZ"@D^k`2ELAА2Ѹ(P6'|
/JSg;<Dt2 J<ajĈ>qĮQ 0A4JKƑ2 6:s>B 8@4#%Dftf{I9nWc# ;Kɳzcb{#אgRh1G(7 敫L>|ۙ 1 H<K%:,tjv B? 1Hv-`Eo~3 ov7wP/ 2?Rf<G >Жu-g?ѮLڽ ї4tD 0g3\wq"MRF ƅVc*$q ljƎ =nC }p*<;Aa[
,=+B8o+yzJNsI|+O8sB؋
:h\a±%A2{ @#P
B$AGBxڒ[qpCʇr\; XD_lRM;cwǸLUBpaEp2s"=Z='l
c<UWZE $Fڌ?B+lgE9,iT Gw( 0U7IMP"Td1'|r% JݧD4,ˠ`S ~D Ĕex[rj
AWKwɣ /T'1B]'p4!<#~g
Q.z6@~¬?pk <@uB)Cz ( ! uN*! :PpG }tQ(H<0 tPAe)B秭G6/S'oF*{6aitBrs j>\T__Sk h"=b}M=,, ⾯
ڽ_S73Pe{#x<H]߭Mkx@x{=g0֪O&W#-0cRg0GYqeNE &|lϣ,p1>3l- aorG &nu)0_qub3o}QB<ߚFؔl\ Ux .3R]L#cI5D15MXJ</ qԊC<S'u;!|iMgχ Ӆ5^!3}:Q7iS~M?8['KPYY3&a<AygP(SKkB:mZyˤI+{a)3l3EH(R؈=AF@,G1،V(P[;DĻOyRh, kSE x;YNQtJ#
*bFCD6(Q i+b6wͅS* ߵi.fWS'C AHZ m?̌?|#X~Q^fg0G 9}jh \M{,m;Ml[;m:NbW=YPna %<# z;Eت{{Ow>`ծWZge %&Hf5,7C7|.HD`p`s 0mg ۺ?6 B &h)6`xkf TpI* d%b)dn62q$u yE<#nb|,xGT5H+Qԟ^
J/,8Mo|Xn L[gm!MdgY Cu@;TګWQ}[}AԵ^HkoMΘN RڕzcQ_%@Do(G+ДS.TE{P8 []\Q\hReLsS;pP@G2T`UB$@KrU@ Ux
ۑ ĵi;$&e'O>StO%B
'O5aʀG#Y}t4nG4!ˀC
ҡxw#
/Q〛sϊ)&< u.~DFyF O8Z;B19vJ{I5ߙCub oP@"$@"0\;vdU w>+Ώ4I&bogӷJ [>KOn{ iNc7b m 0lhm ?i֗sJN?yt[:=Mץnw[ˇE-U ~@1 aQ{댂kJ'7Ø@uͰ9=L0賗5$&"oG
MćB hk|_j>XqX8<H[z
:3= $@"н_hK1یz6L%?3ï[x#XQځ}s cIxuNLn}]&y C!k+0v"
a}]g;'@"$@"$@"$@"RpiFUe3
8HD HD HD HY
oB|7ϊ<'@"$@"$@"$@" .7xfl@"$@"$@"$@"$"߰/OD HD HD HD H$ό-HD HD HD HD VV@"$@"$@"$@"$"Y_~L<돯JMp 佃} fm!}hY9Kxu,ßLA"$@qlD`0:6hn\Y6g7ǖeɯrUW6۬\wue6k-lIk馛w8[lE}` 7|2iҤ*|QgFͻMV siWfD={饗/$@"t zzʔ)%U6-5ZM06ꫯfٌBgNZm~>ҵƌ ٞ}nʴri٧ /&M,s5W p@#?s2~CV
驧&iSqƥ1:H30iMGԵgϹ D H\ lLfVFKYm 塇 *Q\htms2j[ƛJO+ /p?~|=>h :mK"?fT@" Ⱦ ,5Ptd<<|ɲb̎)+1~,VvMֲfd;uF% E0Oi+AcJ<gmy#y+HD`H = Ϣֽ̺eӽe3)SYCupv e|@"$@"$@"$@"$@"0]#<2 G<t%@"$@"$@"$@"$݈_+Ե9^{UV^ybwYniĉ> wˋ/X<2y\ N jϏjC
._53p"$@"$@"$@"$,'z?O*H袋W\Qoi Kz ed
s9g?+/|旕lK*_n$y+|&6^eU[lQ6=3>S7Q c监 ID+%HD HD HD H IDATD 2)h_r-5XU&M* ~x9S?_ś3(|;o^V[ N;Jŵ86 {mf= < W xryUrpW/ ,@ !{}z监 tPy& n{{%kIpyLD HD HD HDK{RK-U< q묳N]wy+s ,jd~- kmOf!ݐg {q%t"+y#C! ]vm[
6ؠq +7J+T:ꨚ,qO /p}' Oǹ暫 @yo[ruו_=
+P3P7&@"$@"$@"*pr$`0=
{_|q%_ [o$2(0Zp{n%w߲|y!7<s"YdnydM7T9|hef^u#8 N!UE!JRw]uoqo hxtKK-$@"$@"$@"$݀ ƌT57!V^}j)cǎ)S_ZN)ؐ\ 2B -TJj~W)`C-
,A HD<x s1|fmձ [/r=Q#+w_b?/db__ܹ) C'?;s9 `c%*H L n6լݒFm#ytr/dd#HD HD`4#n_]Yn /Tdj+_'"ocke'S 5dQ0 x@n?O q%>v<#<@GMۻ O, @e_uYw=ss=wd^30 sQ_3FKwaaw
&B1pLozJQ7|yo!lOݞH{sVJ-QO5n 25\\Q|xzF\
t"Ż Iimj~su=kwijW3]y$@"$lvQ1V;"o,Њ=ۊgcvBZf|G#iK ky)/j%)7zWf}|\ߖ=w~{9p k1cf+=p9 ݧ;8 ?ۯ/^*R
a;ʣ>Zs6#9{!)c0{i_yYN1M6٤l=
M>K&LӨMG!A" 8-N 'I'u+g\?0x.{v &=ܳ.;s#my iۋ^u}71 4^6bK{6Cm?+ߤL-?mLR= ?Q+<a+{UsiY{ߐ&Nɓ/{iyV|d+}_ ?_:<k̤ O~}m0l;aRR}ċ'J#5$@"$lo8lw w]h\sͲ2T=qec&
g \E;{)f
ߔ[ qٺo ~yw;{F|jHNE a ljJ^;% o۲馛3EVVVŊf+$|7pb~Vl/V\`BI^/7U} -Pvqj@EKxNYcʜsQ܆w݈'T$ _ n\sOQ4:HǞ
n @+Oc-i|=~" bI/?1
4? .z"3 Y 4!
L#n?S{ 3 1``pNIQt
uޤ AI;fSE+۽s8!V[%ښv\;9m@^Z<_s»$VLj{9G {vSe(f+#uXG>Rs9x3D c)sף0ơ:(dX*=+Շꈰ=p!I0:1xvʏ㚾[^`#Fu]wSW]uU59VY}.o@ $@"0BauzqLMq9j=6sic ~J^!
n//]Ďa{j')K/chq(DN8"ved &~͢xOd*An,'q\:H9~Wr҄l;&Qq!&S9x6 -
'R|^i߭ZeWljǎ[.5墟|5VY+q3.(C}'(oA{9{)/G&?Qoϕ spej~ST\
MerMEVyKP)yi7G#+ݼw*H- D*T0qNAHȏ|P2Jg }$F~;!L;>ʍ'ᮻZ`'xb =GEx@@PW:z.foN#90ڌʬ~o&wl
r:H6-fM '!!N%_pȣv ٩Sֹ f=:[u' .:DyI6 akHX;ƔB ̢j3+3Qv% +t/-:fH}Po+mM?DS B=>O;' %-N\g]tEϪ
I-+<Fȧ4"$F dx}ȫx{ ~xqGwa8QHFk/ޙ$@" %J0/1}8{@6 b
lyIv' Scc9Lo'瞴ثƍ
/ L88VG/h?z!LkO~o&8M4z)R 6N2@!ьvɏMƦa z衵lk"R3.i0j' 㛈K'_2 BIzM?e{F&Rao_MkwP_/rWg VVYqr{IeO ܨ\qϏ>VV]q29fLyW g\X&.@YjEn;nU]zaoKq#!qŔ4*4̹ʺ,SA&%N7P >" Ѐ
i@ hHkХI"k ԈA>':vy8'1ˠ1Rd%)0 AR ¾G8pao3,DẺb JѠS!
J[]Qwxj ڢNAxuįq MKjGnJy裏n3s0_ A TyWIpf܃g &ɉ7.U`NOڴ]AˊGuH 0IJ!XΊyEɮbL3KS*ݎdcHg$D Jz>d1f +m2ckD wʇƗGun!y}<AO! yR
"ixf3ĵQ}!;]^Z"$@"0Qяɑ.x~/#C}h&,` U}^ӮlM[3Xc=6.c>7Z;@ OtqH8 ۜ=܄r5a(; ųS@K-T #QG!ۇ cc44;K8m">ϖRW< :VsO=dGcH:î2q O>beW4FGw 0{qʔ^{뗎+G W|]=^zkO-eRɾ_z|y YZp2*WCQC!)ThDz`;Ҧ&*NT8!nq:c4
&)IҠQliwWQI;S*3wcyŚkdD)V (w o+&74@DB@*e# : N:
D2 }uuK{A,0,ĥc6Ů# t gmib %CgL+ ^~:ַ*pݟq<Fڪ{O{ü۳!)8 uH{&>3y ^!Iy#fN| 6SlXMiwW +>@fTX+m֤kR'I EyVV
z@#9a IumE ;G*CJyЎS!EmW19d
ՇFNC^KD Hf6Hf1HȆԏL"WL0#v0= /+T"5 ;_" KLVI4+ [˸3#byY|-KC'l"KNaϮ9餓&1~c=IQN%c>}aGS qq Q]cw`k)S!p@n5C®Sg8Q}dk7g c7xDlwV83 # f}lYjŊ/~⨃Ig|OKt?`ײąooWl7N~yg>j#9 ?
42p Ѯk<># (Xf`
@!e
\4blxxK '4_G
({jLE=)6^L z.KυOPhؗC\@ Gk[?gQ2G;g)>F
Q@!i#>ҧ̠FvCu⼦S~u!xtތ) HHDz/;Pthc]>i'SIsmK f` N1C1 -f-~-#lk'-}~
;棇<$A'-ZxaA81pqW_ԇO"$@"0{mE63?ױ!Kv ۚ}_e\@yt7Kw@Ĕa2۳IWE^)m EtGbM6kY+n &[ hlYI Q;Jpcrov&g q_|!A ]a3cM[I<k\]FCy&3؉M0w&=+
w3HP q-_qu+ؓO __t"eE'cO=|/U S? Yp«و'
)&MŻ&Qy$&
mIA,Q!HwP$A$}UaH\l MB' "WC&G:55"gh~&ё6W@iwyޑ1 3t:MzH'7`4k6bl N\o (JgZ rrrwHŵ&=Ry1 Id}/i ^a|a#f:JpU݆
AHx;ʷkKy .ץ/v2D HD`(Ї!xx#y.H 6$j$я}aH
{=^q=<֣2&Ґ<b [ rn|䔱42VHY;OoXe^^Vv';/엾exVqz M&cDZx+":sq8'xU_xQ}4;;+ -rev(C ܰ5לo++/tYcʇޫ|'˺k\>w O
w
fTxEĠpFߧ!#y t9RFS< :t/!ʐ }d+NIPw:2tfa"V䁧#b!4a#ԙp<#i̳{HT- -,w@ytIh!q-#(OG7FO%#Md@j3-P/jR?F"
Ż# t7PYKQG ȃxkmh˄1+? ܵ 9D7Yj])@"$p! c[#|A talK+lL]O g{8ض1>FM7KBYbSTf&/.Rʇ폨S Nrkq46J,=8&qO&7!v,z~c>URn @.aI-UxLZD<:3e/oxNV?ȱKP/VϾ\wufmzOozP`M ч Eݪ)[Y(k 7w$s@~1XغQa ŲAKlp! rTLTpy0nXX.:w
"~~E>cO3 !<u~e#gH{\#ܣIMS c N!s rA[ H3+o)Қj)Ai{<Hᦴ |:'^9uIZvC2vaH|C aĞzꩵh;j>J.93H/"ϲ(K=X&HE>HK D HUt/e _ވ6;d5I<~ݳ!G}_x VID|Zm-׃<c#H1aLbw!K$яL+ *{kZ f\zaI>N|x}uSl+wJx 6@ug;%aϰ]نHU Crtvm6{[yǕlyd_9~wM/=BYm /L~eщ Տ}tC>"
c?O.ʾҋu HIF Գ7f(DLBU";_U.~:ċ{6)uct::|:Cu #{-0N3(F\s8t
̟͌ ^x:gM[QZW8E;NG7ŸB8 =uHO ;5 ftlSD䉛W.̽ 9`\.2yⵅp A(N{:VY>7e! k2l'ڝ2І1QNM9g6Pbpis Ry@S2*lb`ia@EZ%Fޡtk>m[gD0 R=7Ak /ꪰ 7y) v>{^I2#=2B)K1T
ޝ$^?MDŽn͜
>Xu}Mx}U6l?K*Mj!V06%[@OvF_Ʈɑ)] cy ;s
q%,SZvč{H(vJoe#1B
CwU-a͖ HDg{~ IDAT,7'
a,.W1P4Zz+/ 673*.cUG*~UG؍~[ׂM>[l\CS Naߩa8Q>e'}u 4qpN?e)Ww-}ߔkolel4mGIoe6OO]o ;5SM+>x4ib$yQM9-9Ԉzrr6q\ QΔFwPЈ#dE%Eiv=DEc ! (AV&g)u
(N ~HvJuz:/rָ(O_~#]uI3u ue5ND!=tL;3 q r8q;! )3eèc(}N5yu孜[!)JCfO<<ʽ^4֚]t]ȏ|'i^lg:;vNiw0~`m{<h[oD } #%[#_&y{arهŧ79їnRڄ4˫;xQ_Bΰ/KN~H:c @o~}((MG Qg㈦-϶ פA\뫼"o"t6ô)i[=:mb<z?l`a[uFL 4f</P 87<3_>?-7Y2|}вE2`erܸ9ʂ MX?{wƩb{@"ЕBd tat f_;2L(z Y*{l¸ c4;4My+%#.Ynvagl3܋[wqxh rrl#T'O<'Aw*;ZEzkZ3?gvEw !&,"x{ѶaD HD`f#K?{o#^כI+FLxڲ뼹LVg?u]:fEig/4qU;["ʰs8 ꛦ-6oW\:Gȏ0qy) c38wtqvX3ϕԑe,quګcN~XZT>gr|_:|㇕%8ä``q$#FۗA77#y v<^UDfyk
|n0-ku9 |oWz۽ND HD`譟j+{Ks7tSb;RKN64xY@ʧ`<ih'#m a#C}?=Z>O=[ *晻 [^}O ^?||WOd vX>χ%G· ~:/( 7 `P<=7ѹ
[ -=)<
y#%=W" ~3va~-Ff$]l"$#
ē1R^-ę%Pzn [ d BoV-l, 0+OYxFʺ}~|+O?\g.)zO QV]a2s
];O.reՕ+믵JUljY[
Txjx
cڹ暾=wS ÷E뮫}}n><7 G_i>-Y9c|tLBn>gGeD HD lf,I 3g+pY`¼>˯TϾUW\.}ˢ,X\`B/ WeeR#s}7O->2ސ3)o6?8Yю=;3CюsAx?1렒9MD{@~G;<FkJx n͗G;5!g =溛˗>2<sO~[套_{ruIo3E< O<L'(|{/ ~_f\3v c|dF?ڑ ~k(B \E0gVD HD HD HF(OZ }쉲Ģ緫g?˷%^}!e{p˝g[I 3 44(3D HD HD HD iXe?v?_UxZ+wf ;f<V>o1cǖeU/jDŽ[| ^^rVoZ6YͲ+^3}`f*OD HD HD HD`&#_b;$s5X~">t{'
7Pw_,5>d ~,K.dcq&g%vE)y!'-R^y>c}՞~*ء;P[kSů gy~vyf x≲4v#>n |;Z"$@"$@"$@"00G]}=\k>Zz_3s3(-ػ[ʁ X[n}{eetM
koєDtygCֽy ?s6^fgp}ѵMO92qIJ;T5 &T<
RoA0rm-ܲ~\# /\V^yx
Gq\z裏.j$@"$@"$@"$ GXoꫯ^3Sx*VG^w]wUϾ:z.N>Շ_v}&gܻ+˾; %Kp:mZZ CUW~ZO=T P<[o]vy |^xr5pu7\ 3+RGOD'@"$@"$@"$@"07n\c9j /o_W r(:S?4wUV|xE ?xW]uAL4>h*2Q)P u <yre y䑲.TWL8ZkWXah$ .`y;Y hQkf"I
9;>7D HD HD HD`D#_2wp7Vw eO]ۯ+<e嗯o@ >O8l= %]CeCObkSLe.[:^~kz8wpiM2˯Ӓ^nX{ @l}_$@"$@"$@"$݁ ܰъ+XG馛|x`%e]Vɾ6ڨlS?}/IݑLŬ@W~[guK,QϚzD ??$ ;yW= 5P?r@?b-=S<b}S?x%
)g;
7ܰ]^I wQEYZeZ&KxEބf a *MҿbU NHo{ Ykf홼$@"$@"$@"Fr>avmW :\1Ǝn .yėXYx_W5 !rгݱR?LF?^x
k [7D]墋.eV+G qDWv5
4lnKj"Of{lf%?ow_oc?^+G9P(vZ%,QvOӟ= ğg4K ~M}:aB D!QLo}[{}.o&@"$@"$@"$
> i|3/~ebN~T^ Gc9~O@
GvDHc \^m,@p ˲\bj̳oc۷vrWRq- cFs' x r!eK.zqNC^h/j d;XrI'Uo?H= }ؾHž>
n^guV% $@"$@"$@"0 [jMpsYeg 2JeY~gUUW]U}6ʼ !4N ﾟH3
K%o'7pCݔfͽ/Cs]ֶ5l>: ˹[_ڑ}$<#
,xR"2S9iZ묂 eӛϻn|P y6$@"$@"$@"$ ml3fV1 BۏٞwyJnuqt{g w$Zߕ'@WzLw^n.ECkz {"biFَ'\Pĭ6 vء|.sNAq
'
9:",='{U|)8ʛP:0KPXkO~;\N|OD HD HD HF وC=sK|:HdMYS+OXB"0 hlPq{[y{CCxYAyYUO<! {~k
Gƻ>~> Bx!, (}w}w:|2Z gsP_!&l@ $<(MFKuǣ71ӟ. V&hKD HD HD HF ޜIpiV H>sD`f"U 6 2 eo;}^(~'ܵ^[?Xq6T7\~`C!АW\qE%4@ X"<+owσ.3}S34 ? 6= =?w)! m j8{ ~arXKD HD HD H>@$É@W~@vCYnO= 1cfPXj;^W㽆$G qYk#]wݵ Ŗ?^_̵ y{8DX;'-E!Uh5\S < $ } Pn4ݏۥ[1lyUy)@"$@"$@"$@"$#ٞ}nJiӦg~L4ydk?矯H1n>`IxYC"
De &yy47ע=^_?zJ/v_w-qev{tjj:w_
a9~yo,7u''i^/-xk94Fk1G@ݚ<yrܹ?:},y5HD`f!Mvr=ޕκ[ƌV-b.]sec H(k4}sAY1n3n e&MW?u ~G(UI9a[YbC0 JŽ`}O@ahiI'T=-EYMd3N 1ɳ:&D HD HD HD
t 7@ <X{/r\uU˺[?!
yғID HD HD HD ~2L4 0%HD HD HD HD !HD HD HD HD HFI̜$@"$@"$@"$@"$u HD HD HD HD Mh*K"$@"$@"$@"$,@~|H D HD HD HD HF tH9 IENDB` | PNG
IHDR { IDATx řNؼ9H"H9cr t>پw'DEI"g*9RCk4
߂tWWW=]ַߪ
)dpFBp$B " /*SE ~D@D@D@D@D@D@D@D@D D3,*
X,f۶mM|)#" " gϞ֫W/ BP$AZ@H*O%&" " " " N[jYn, ]" "Кx{n+,,aÆIkMJ+#/#QH'6lpO:HD t ED #Buۭo߾Q.BZ"tD@D@D@D@D[ZZjC ݧf4D@Du qʲ>}Ν;%.^$e@%v"` ϙ3gӯ_?;s-mKq˖-{ԩS[H:>'X ;v trtr ]v?neeeMciӦȑvYgQ{G]?s`0?usѢEn#F8xL~w57? [E'RdvW%Ъ f"(9LR ݻwOWxUUUlxѣAa5V]]m+WtoqQ&! xLLJ a"h 烸'^>}ڵN# i m|M5ogKǟOi4krr}g6w\Wر'" " " " " " " @ ~}wy4p@뜋mz7?/8͚5ͳB>}Y'!X껭СC\/wd+V" @27y+`%HG< ~a;q<]o}駮 E e gy 'NI&|=waCN+B 'yǍgwd|QG 2?(" " " " " " " D+Vۘ1cҎi^l
zUTT$t kAx
7n6cec9y=s6h 曝HF(C0Չ뮄bp;q
v.^8ĭtB$9m
"R6I/V2w ג ;G/"R"߿%(t:"!>}N z! = ?'̯T}D ChCcX4eayf'P}x%?L9yM]"*>nz>O%R
n4I)ȹRz!4)f\=zyNpFt- \{ 7MD@D@D@D@D@D@ }\b ^w 4;qqa*<7zpԨQXiV*NxvPD$*4L_W^y5_y,>wn۶'tI{-SnH8~NRx!qCۄ R
%5` ܞ '57֭[ݲַg sOr3f4@//fyik:D7ntS`5x|ƌܐ~ ,_7lTv쾜i|nݲeuVYt$~i}ߜ6*qHaa` #^|E;S] tp6Tf l8Cwﻶ2'vW8`gi%_tC⳨V^+))q O渱c:a P
xo dIQ7~xбasɒ%9(ǐ!C?nj ϩy뭷<arqH>2e^^ {)8 9#4D:.Lǡ
yX&4 s
mħA>}#\KAD@D@D@҅
+31 H^
n:g+2G1vq9?쩅 :)R{ BL~G|q<cѰ؟:Df 8o9&Olc7 QM8(v6&O;/ a5 s'tC߁sە)1i06e@P>|Y[* }"&`STn [
~_߾}a "rM8&sLÂ8\r%vG8@6(mm,K/ik4[ODo/"A|rG>rm
%>/`6[!Aa`<#ocwߝ0$N;4[x3 4~!p|1 b=Ug㸈=X;ܿ1n {1ghhq2| .h a7 ~3 0 p҈; =>xKX ?%m_|ħ# A4_8!U`82|8G `n081ޒs㊁{5CD@D@D@D `ab !FQFBA$W_M&eFޮwlW@6/A<@e: V^Z2ԋxt^q,y/PSmt΅/yܹs
ǹyW>1ɨlJL ;(# K8~ ؘl\N7y
Ɓ6&y
tα{}'V_>O8(>% [ |Iz%N5+y"/B" N
" -#@:-bʽF ?3}/sp|9]_ihO:DwW:>p x;9і~2Fq@D~`${*߂ XbԩSݜo\xT$F
^C?| <lNvn ]` n>xᩈK\88 \X<dVO_q=)fFl@ qKcEݲe E?iX
d Ϲx3@ĸL}:|z|
ΒCp<48k(axH`hT7)>`,"BR~E6m߭O0xta;#!D1ۜ<hJޞ%)/m"^QDJPaKa#abS":N(bwb/{2hҡă/U / O
M/v)SOK<ȓr<e"?8${ BT?p]ßapP =-}/ aR-XMغ} 챋4?Lˈ>^m3]lb]N& p/Is=o@8ټh
9v]Kh)$Ŵ /ZH /Lx^M{j tQ/ hϋ(D@G[罙~q Ϭ'?G[NGoy00Hk8bpfl*\\^8_aNTCP J4i.rI:q?7p^`"<DaC@9]s@| P^ظ1^6$1q1xxcY(?O|p "/oP|6 0q;n/
" " " "V`飳oldl7:u^@>DÖ^a ?~cWvF@`bW1DBH:Tt۰HN%#r52 >?|r i{ےm ;^r ^{ͥMy iC6#$. s 8/qr N(&8$缔^)/=O>Y* z,As0OCuw9ҷ!>!D@G 1,ܯS8ns?"ip8m4: /dhG_ f|?s쩧r<8>̽yҏs=^(Q
k^Z/VrSf{p mpM]»;9|]>{`!OAO0
Xoho5/Fo}{رo?@#rPP8VVe_
ryϜ93?9T#։}<G^7~p 1.E|R<9k&a pc!B '$"ô7n|>|OYc{C}_Q>}!C?gr&eH8MF%m*~r4 n~ Ɩt$ lb:س*98;Atr6 6 v30l:%:t hYBC v4v`=9ϟG> ;y~zN RT6n; D^WϧLߗza^u/" }`|`sm`# # ͛7uHw? =qS&K iǙ av4q9{?"/63mЦ##o~ӝowi ܻ|OVR] g7b /D|@(e~Bqp vGkADx $fxv23p
@c&̘xYȓ҇^st҂#pAraqػ 7ypt*.7$r{V\ }1P8 a"r^ޖSVMͅT7<-+y&`lr$CC
lHMm|"bl@\ G<5oE @јI` '~ u
x
o(Ƭhi@{3 ⓟ{ĖSI& 6ÂAyOgo9f~mJ蒇rN9l*< RlA ttZ:ܜg<cSTCzSK
FؚA[&>P\0Dkh2} ^CP@\OKo<@ kG%oh U/BvG3fpm;_ x>/=mo9n yvv᠑2#F ϳQ8o!WИdz^P.<'c` `}?9wDu o^x4 p<:d{xhP0
pY
C ՚m(R6$QTm,/C!p#&rr>ͅ.U@\>$d;,q 7#?'r,q>ACB} 0EO<.5|C&.(
';teo,߹13TO}"=CG #Hx]DGt<f/ñB2-d
.T9}QDdɁ'U0`aJi68vp[0=cbS&ۃ7cݟ39 ϧ?ٿoL넾楺w> } ؗ kuC lO.~@W'_k8 ʼnoG)3 #&"`1,}~0D/mzιن_
YG'NA/jp9]ڋ(|:| 0`g70'߾
?* Gw.
':秾)F YB$.bUT[qq?@8eʔ1Rr yGH }܀FG0~K^
췵CB
?7?}ݜO!]_s FZ9Iw ?Fi,yÂA͊K4oN0K% wh+dQmmːZ:sx
`_G?),d 9Kw#,NO?}ۙtI
~ɶ/?q0Tt#|6gNQۧOEă1U^ Mm~TJpYcGy cJق}4(7H5, |,vV^ Ao@/} [" @C<mFEUW]?rOrs3: /<h/xv?ox ܨKOܷ^w k!v |A{RhO҆<oA]!Uiol`l7}OAk] a@y7 ;bu]fS^\\Pn B0 w`S@_0Coq ͟~'7 |bDr\`~9_8&-.=*9@z66m3 qM:dxBr>9~ʋlP!|1xN"bl6'Ӱ`ذ2
3Ɣ7∀@kv:묳1r;{
o?^- DRx8w:^؍H>@|g8vC|`"tbXaqNl0+:&dߤ%A[s^'`O?E}`F IJ`| ;lU:>i( }$CNطˇ P(/jCC~/<>I*-E:!. zD_ gܮ" p3"TmG&W^^4]}iwsFF9y^|^'Kr ۧ^h?Ax'LIcb&S,b-G 89XJ4j<%_e?:
!x㤆eC?hwyU'lo,PwHvG>Y }B۹xH \*;Ց ?X0\sA O EI }
x`nE\\p`s +. ܈k}ͽiP"%n>]CƵ@=`F+c\>1x~9LIwsj[UFq-QfFX<)yB)7!:kpT;%tp1`3 .:hg"
a##T V&D6cE~B Sxo@#CC(
q#vUǐQFޱHN0yKr6 C E\E ial/T F$&, ) G%Y\ agӏ8G=xN(" (b@YS ?G%_ORmNSxmؓ mW\VuEPoy뭷:>trb _Ey<h=Nxn@g;w#Kx6kىx>p/NGrC]w xYB{KQp\<?2A2?<f a6X]\{TTǷ}R6ÖBp_v.J <Ԉ\{c7#G<`yXcH@ͅ?=E91\˅~~#n6dRÅIG{CڄaƅI=qF"9"PA7K/u
GpN .>pNޔ& k IDAT\Kϲ ŵ FSK-k!OJ7閜GqE@D@D@D`_ $}?ظGt?6/ n^z3iDtz\>`2| [ :/ 5|Aۋtؗg" ?ͧpJG CT `"?t ېm-KF< ~' #<6XL|tʓGZ"#M( @0P>\?%|}> t OG;Ȇ> sRTh9i{2*/jhKX2S%
ܳlËзhski7iis0 !k@;OD )OS
s!!t>ge>9F"}k_K.h h
9B>H fjr;vJw uF67wD`Phm?D$ &@CPBwr@!Þ Y0P{܃ ;7 1x"Tq1` p T,Mʑ'*8
MP Gc߹I& 7<F7Ti FBca OILOaň*
Ǧ(;|b$? ~ o'Z RT}YJ}2+ &DFkNc*]m% lel [ a{[[-}绎6!<rD'h¶e_̍!xaW{[ێئ3]I<a"@(#_YrC|z!fR<?D$_6}liP/tKf|زQ !!rR>[ *_C}
ypq >}F&~}4M{v~4&?g$\0& ϋDEx!nuT`ZDTφTy%e{r<d |fs3 g-t"q<[>ýҠ$/xc"8Y
]%"pT!;F qxަzp0?'7V'!j:yd?ͱTǦ:g<7CrNxV
I7>.(e"Nr`{0`yucۃ< y:s1 #BB1<ā?7\þ쨲" " " ] 6
/"`r Q K4lo A -D<!RهzlCKvH nŋo !?'?ϰ̓WA/(8r ']<2(3y2;ر#_{칱;FKP1mi|tHC7'glTT31y?& 0+<#?:JNSE@G7V5vT}jHjxD6ut@3@á33Rf1X')#tUF2G *<$Ԙ~Uq *b 7lGgRF`xa`7]īڞ|ěH!ɛ;D ` W K |'C8<&$ϔ2SѳXW/ͧ6" G#EMeaA{C! -X`]6FklG˝
7>yr}9q
y-o 7^<ƀjȈSD@D@D@ښ
K0L6-3 4(\%{a7d7 v 'Dk(PT!8"'@ F笡ŷ#Tk(- 7yh' + Bg04U>^* 5tP7D@D S0uz B)M.G?DU <5xʃC?/ư
7s<{a<yOa 5bh x`14y&AE u(l|ɮ7k֬9yJ^xSѦ$ Ur /^;F qᘼ~DQޏ?C}z~Fyod8!XV#<.䒄idcr6:n0PO]@&c
#b҃ }50ⵘ %P.D@Dah:ɺNñ3gO? ͝cB|K56(!7Q-}cFX)eq.7>
qx0 @)%?ls8L 3S0! 1 s B?q%&c4~?m?jI&3xW@Mw;&':+4Wׁd ~ =Jg .Dx B yxgp#l!z}HLh,s1l%r 7Zgk凴X
9%
Ku3 ~iR;LB_Co̙{fnD6縶{p~:"tD@D@D@D@D@D@D@:#b8(+o%}#С e\xn%_C+L[t?VAD@Dm &OԶgT"9tΆ Kؓ 0ŞlKD@Z]Uz" /鋡@zӄ,[l;w/=E0X̵~a +#M XD@D@D@D@D b͛7@+zȐ!k%J&HˬTiD@D@D@D@҈ (bu
" " G i4_1UJE@_fէJ#" " " " " " " " h.~" " " " " " " " E@_fէJ#" " " " " " " " H/" " " " " " " "Y$eV}4" " " " " " " " ].~" " " " " " " " C 7O(9RID@D@D@D@D@D@D@D@D@bVU hYyuk@ xD/?2*tIïKV
-" " " " " " " "$ejͪ\" " " " " " " " ].Y*@5rtId" " " " " " " " J@_֬%" " " " " " " "% HծBd* ~Z*@$ KV
-" " " " " " " "$ejͪ\" " " " " " " " ].Y*@5rtId" " " " " " " " J@_֬%" " " " " " " "% HծBd* ~Z*@$ KV
-" " " " " " " "ZP(d8G5 ' J:k8 kեk֔/$,UTYUe%$1NB -mD-^`{Kw_=mYjp3nF5B~
N}zpID@D@D@D@D@D@Ҍ> ~%B1իeeeY h :+++ݻ[a^X٪b6$bx¡C DǫY46<
бU51 5tCi@hG<b6h 7$Nt@AtJyyyv{x{UX4( _Qg 4 |~-<zr8!!"R"Ϝq{!?=iE&h^;ci*йD@D@D@D@D@D@D HC`oϞ%eܥu ԭ{w]Rji鱊gO.;N<@+vr{{ZC6a`L>lkp8ל4v.̷PkO>slV][<u6W+>v=@hWWhEMΕ<U`흥l vvܸvg6[NVN8tmڱۖmؚ=yM ;̪c1r߮JeyK+y>VlHz9R5*/Hӥ _@$K 6fp_wA6g7[i >r}rm]nY4sy0ny9Y_X<f|+һ/*]e4sѐt<8-SQM@C OwCx%tɶ~n7m@ҷ&@*X~:4ܧ~6=?1Rjr%@h9VIDs@cU=_ε~ s^/˦ GآumN$5'M
[ 0`y~֫0^H HK&Hkv@:@;6Ww' ~)-6ap&+. \t=b>oyvՉMw{䃆ۨA}!x (dMؕ9ud(XM;x}nQťhl̠Ϋﭥkq#ga,ȵOh,\amwۺtoؾˉ}Z#C/ KD@D@D@D@D@De^ co`nWit/}ܢW악+G~! >=l>qn7UVZU͗U5F3\ ʣ46b@VRQiK7l?M9ĭv6imܱ˖m(H(lwހSƍۊѺx
Ӣf< ,7 )d ~S*Is6f?W[WgiS }{Z !ZnVĜ1o/kegG,?^ vdu"tmi#ūKzVUٲ5ϲGLgXvR˳H$ǹkjjl͚56tPegg7BQQursPĖZgWYmzaG qcdf(sWUYѰ >u/puf7,
c=杻g_8feYnNeE#˫OG ri86tFi!լ{J_ ^ūk-!jf5fV<OBYyyÆ
sN'[(X,fuuuֽ{w6lX"G yĦMfcƌqI c=f3f̰c=
d;i
.]GQI>{acǎu?= r!6qD)'=yJn,/Gyў}M[n;6rrl~vчUa%myXUw
`{wN^Rnm☡tCUV'Dzj{赏F\7[X4 t!_lZlf3 `Ѿ#-ͱ-+ZeXdu;4o;cYYYN#oȐ!oժUcoǎ VUUe47n>̞}YCز27o{N ӧ1 cwvۉ~zɱ;xFrwweՉ^k]qF{7Hs=v57 {OHTD߁؈a{aul"̋{ wo8NUl4 t^zuuq
10/'%ٺnlS/@WTۭOjHH 9? wcE@D@D@D@D@D@D@҃@
~kdO,s
,,;t lXĪ?J_ծ*y"=Z_m ]^lѢErJ;묳Ç':n4hqN<K o>"ݕW^isq̙31ߌg}~> mҤI/ixPv -[@Ig_~~ک>l?mѲU8XmİmUUՆ(xs߶vؿ;cz*d։v_x# "a~yͰݏ!<d" " " " " " ")TڵTq+VeYAk+-rƜhѾcYϬ?[3,{Dݻ֭[C+.>ɫp}6m~Yyyݷo_[zcx.Ä{ !*x˷}vD<A3I!q |BD iJٷx*'ڌ㎲l;hpnҲ
{VYUe۰CJb8/u:T!a_]^/5 5>7 =D+8vEz `'}NJ Ŋ7Yժ7,B |]!j~^sb à {W_u! 24_={y?ws2O=֬Y Q0x8B eA`D|_O~)x%؈
iOdo} znls؇W߽<c >]fӏ=.nn-XRm̶⻖92AլX<}ңXa#ӣ> ZAD@2 =` :Lخf=,Xfv
pȪVkhOβ mѾ#fbݼѺc=c,y Ehc =^{̽@wہ zv}>cu9Ay:/* XȢ ,Amɒ%.?ޟ3'!Å90d
=UI{;[صԞ}1nA
F
⊲xOYii[i^.Nn}nʊNj / $;z` G:vLC_D@D@D@D@D@D@D@:?SUPV q?XJ eTYղYl<Crc- v ty'to<H{' *g 0w\7l^Ccnnnr-. |G͛7;Q0(%|EGs X2 a^>oJeֹ8x+k,Z^a6mu#6
WhZ
*{ZYKkV@PNU.wZ(f"sxM ([` D3n馄pJ̭} ˝0a{L IDATl qΟ {;s]#8-_VXq>s֣G{ᇝ7tP/Nk yb #ފ 3f-\'@< P}ϭGш۰n/C vebo}hŻK-UP\EVҩʋ'Y0SY re
8
O++/CNvض-Ƈnzo8? zc(7CNp ~\sKU `ul۶m 0w ÄCtDCS1"!AaEB-[fv ʿ vXb1>78y䦒N61\9d!7nqm`>/߿-ƿ3 G ,mֳ{JiUPeFD@D@D@D@D@D@D@ڑ@ ~^3vլ*>ckYCrw; X<Vceoi;,e<Yg{饗-A0b<c^#p,Ν;B ˇG Ã
E@@ {) 0 ̙3^y>nc9XDdƌv' s=6dBm,WŻ ~C[D v0-/a]d#" " " " " " " ]@ ~;qhu;_,{t xE?VN=_!/yy aJ76U7
+,cx, C.327 , UUUn>@!81.6lpB +#`"&MrCoV'&^uU6~x|#14:9ӻ {anunX71 8'" " " " " " " "Еt5Jݺڊ ;ŲG g\m_mεKqų!-M^oxűbᢋ.ceTtm?N9r}" W\q-X݇ +uWE{g",葕8-[0\xsq<#FZ> x::GYF
jY/ADnַw|+n-E-;`ﰡ-9
v}@W$ZmiGyG]jUKYͪʭ/[BY8j YZ8wr8wgyѯY9?y2 `(- vv ś9̙EݻwSO=CD <]/r'I'Dĵkn_ 믷Yf_; .kn~ 4foӖJ܂ y
%+,I}R't>`y]D@D@D@D@D@D@D@Z@jRoF: Vx·x-^SЀUwy{Y~WG }tىp*0^X)}OUuۻwo7wn`a aMX> s{.#F$ux7+ w3DJ ۰3ڔI'Y$R7e(^l<1ψl: 1Y_R` CڔI'O:\{V0VR0W vd
oc_++ ;y5$B߰a0Za9ʜwGXϞ=wԩSmĉnHɱ ; ~zy>}<{$##H/0?ao6m%}cuu6dP??F
lϼoﱺ:b<"fW^x
'OC" " " " " " " " v7̫kgaM#^Sa {ZY o/Y~k9g4wR/?
Fkjjmґn57us+)-w)b_Mm]r)nׯ_o9ۮ<F:@Xj=IgTH<v,2pgY _ؗ2hIO kͪpH4bVOhKWg?g%1sOo4sž BX߰?r~ο|$}f$Wm=j -\j商G) yyeeE݊ Zc_o_8 ? ~i1_JZҗK m/ߵ?Ybo}ymY<ƌ8 hGOo }ۼ՚3 '" " " " " " " {H; 5rBOm/:r츉?(+/w uD@D@D@D@D@D@D@D@'YHb_%!VX%ʪB@kHE;Z@JGD@D@D@D@D@D@D@D@2 ~]Uv# /T$uWE@D@D@D@D@D@D@D@2RHD@D@D@D@D@D@D@D+וk_e82JU x |͛7ьlٲVZe;w^zb ǭ6ol=裶qƔiq̽k6mJ?7.\Оz}*ZYY~VZZ:O|M`k.[d͝;^yRΜ9vi@;9t
.FG -777e,X|+N#=|6[(JF$?Н'e XYYiQ˗ۚ5kAt|e䯾F- w݀qC3<jkk Fu].]sɓMƌXtR;sw@;/d5VgvȻN!G 7VSiNySϿjy0nV} c{G a ᎀ4uTCC4q" (C$7nCMM݆(.0~|<| ?wX]=>e{l6C+γ/X?#{ իW;!;ю 1cW\}džzGg}f={ . z˖-:z펧|.fnotmaa+w
6zdueqqc&uҫW/;v?T" " " " " " mD` fG ?jjbVY]k]],iQmH /;,C+ k,U6l[m۾>[F 0.<fȋ>qsm۶
EH/(8CKXԷo_'@!鱝8 nw}M4ɉUq_~i%Z~lgq-^F j:Y) ]ve6rHcX4"I'8! h;nBʕ+Cq}FLP7ā3" M3ן:_h;߁ b?OZ" " " " " "vA3ˎǛmrU^k][.i
RʭO /;!=săcXxuNV4jh˦<S(.1b^X`W^^n_ ~Kx}w7ߜH a BD%2+]C$ (aˊF\YW<< 6_bw/aI.aFؽ{Ͱ_ACī߱7< 8O?Ώ8e袋cu_\}""~th{-"ᐭRfXҵD}E G qu2{my4ʦڒ7oڙ' o'Ol]VXg ~k{ɟxvM7]GB d)^lzH 3M>M8X gu Flߜu;6cQ.xm߹
?|<,'<1cFB8Dc#cfΜ #t W~կ::«rN]̞=;e0o 2lac_8=}ȉ}Y-j "䂭6gO[A RȘC͘lO=M?HζҲ
gmȡÿΆ 엲 3ocn>#q8oC=mGbN>;#<ےcU_Vkg i wq? XoǍ0>}ƱlƱGYv$b%v#S^qcFy
'ed[n^~e7tCcA H/><) >KXmb@- W G2D^CpKꗹ_Չ
" " " " " " Cł Q}@FBVTZm56`r,Vg55v_ }z[Yyb
ؔI2ӈN ?!%VkE $ 5*q<X/~XtO6C iwyǞ|I7̗$|`ߵko~O?É1ڸȦM`sr .}UWt/^`x4z'p1l0Wa."kfӦMs1|zb>Dc9F Xrnʋ p?K[ou"ǰgJ ÃD@D@D@D@D@D@ڞ@?y۾bt#!5 u8;p0+_,QPgv=*
Q
7 '"~ߺ9# DN:䓝 ix -bӿ7
7 q[4IۈC6%+ָUO= y{=+y! {Nx1Dv!HA{u^ #1g /c>A<{97gYg<C Qċ/_; E#qm
" " " " " " mG`ˎR8q7s#ll=6؎?fBwOP@+" 1__O;>l'$#<bwg Z`3[s=ư_L7W i 6v; ܰGՋq<-IOػwocC<~ ?=;tP7l/A<`??q:4WeA9a2gG y}^x=Cފ7=3<=u
-s4* ~mV)@"
'WIYE",ѽ[^hH9;|}Ca.]v9pǰ^ VX`OtBѯ~XĪ}{λ
n!A,ѽzt+H~`֯_o?̯pxTr).
>G$ mn? ~tKlă<F/ }w!䁀W%O@38Ę" 6! M*Q|rǟō9zp}2765 y
qX\osI d;" ^{Kx!M\t1p?y}v& ,;ȇk.cG=g55n; x>]ztfG/^̫_<אt= &8G<
v 7oDdׯ?;ab*v}嗻SpŊNcݢ"'e</'?IB z/9&oo%ڵӗQ [mіjˊh ֭f|r/;l dklA{c횉v. c-]eյdjYUM5]20[rk}0S$B ,41f̘![nu;IxuxSd:VyTWO=.?#rҥ
s
g;p@c1`n>?$ c7 LLm8K<w YOAMh!{룵PRbq$]QUv b
l/(mi W }{Ǝf۰!Z⊀d( ~Z*V0ژm)nݻX#j>E;{BV}NTtz#iN_* h4bC/vg)gEbܵ/^D@D@D@D
$OMYL,1BH[Yb^5"v0}1GX$2+kHp(da]
fzj/>-n.=Djo GZtx77;#IU{JK(٥ A=ruTVhKm@ |+he1h 7ݠ^3Dt=&[
D@D@D@D@D@D@D@.xIV]B+<ffUeeeh-6Sfؠ 9VRJGCܛVۼʦm Y?6qx;bXwcUܬZX]=חmUEq`CE@:'wt{qwt.t~" 3\˳ 'Ik=M)-?2ć`~R+uCq V^|80~Jˉ
;cG=Vn-h$d5HanEx" l..UXX v90o==``A',5>Kx1|Vѷ17j0Jvټz;߰sϳ- ]bÏp'C{5J9m?X]mUik_EÆvq Q=m` +*vs!U{(q Yk0'O|leG=mC֞hTE@D@D@DKYa܈}o;r4]M_
}ŭ#+9
C{%5U#WWg֧0˾s(0_幅Eʝ6}lo7ߣm >ieGVr u0gkGހVT[ľ
I+V @1Nˎu
M$Yӏl9VD@D@D@ڛ@ĽOuZ,mvv-;'jHԜGQ-a;e< 'ٲɊvZUYeY~~
MDЗ6'ֽWeElȞ !7sϲmKk-imksp:ނdYVvVk%tZO/:~t)k1/_YgpXx |r:nVIؕhȺXvvu
w?$5ϝIi9><&
[nvVlҪ ByRJkTُ ]ÏmG7}A IDATYMqee9q6wQ&iIydeոL Ї
" " " " " F B}~|PTOOUfk4
VWWgX}_}
.Y ~x4q`].cF56%DEtF{9 b ZaDܫ yUt
^ۈvԈ bk1U{ 9M˦ ,j5D@D@D@D@D@D@D@2@ Rܶ*?mu~7/` n@#{Z~v^[êj,/+lQ[ܖm.q lX\'
eE@D@D@D@D@D@D@D@D_8dV^ >åUYѰ__]lJ [][g?bDr"/Xo[wWs*@&HKxm*_x# vl/ C~U6Cnն-^; O(i+A9(#7]D@D@D@D@D@D@D@D@2@ pUhoڛ'" " " " " " " " mH ati,z歙gŕ]C< 3+Q[ g<ؙOnvٷfh!k?cy.̶eg-\:Pn=\˟p}D_E@D@D@D@D@D@Dc =qα =:& |VܬD.o_a}-trGVZ[cno_Wu%DHYnO E-c, gw /^Wkfi!WvvTD@D@D@D@D@D@: }}p2fg^_1eC GRJa;0
sNｃ(*"" ŊرhS4j4[55
RP0ϻ}3 ΰ9m]}Ι{z;ttӢ ;ъWz#`0F#`!}Uޱm 7^E3ٚ3&3V0F#`0F#`B{h+@AA6o)11Q[nպu -[*55ph:YV^^ -0F#`0F`O0oOP2~N`z4zh
>\ ,Ћ/D;NG } H=jҤ:w`K/>\{xu,OhCAɌTuD#tРtÀJ1uf0F#`0;#`q#`vJLN`+))q:Ӯ#퍴i&'*C
~]\\ȽU'XkL
/L M#`0F#`D`?ܯQQ?n'# t!EGG+&fHUi[W]^=]ꬳrez˻
hUZ?X@} &̼<w p劏y>Yce(e0F'>ڧRK:@M\Un҂: HM[7T 4fβ=TZbzonm)?V>Pa;(>6Zg/!Gm7H%,lrضUaKj Ǩ4kJ6-
uPIzYvc _T= !ױ%وRtʨ#60..TiYSŋ_jÆ
NB|kժ?pǍw}oƉd̙3zjwSN5jZhQ6oƑ%ٳBf'c~v yׯ_EdddӺukן{kٲeCbߊ+GgffNNNM\;w F )I ]݈ |̙+W4kL#FPCmm+" vbQ" =[0F#P7Gu# SoPÔ`
J
ԫIO 0MnM]1[wKSNմuIKķ շTȱhB ژI7ϯ6Ͼ5wyݳ6Osy8KpRB٬n{&tg Qv)>;. Mҵz5{Z]V]c9'?bCPYje~kjL냔tį7.X1˶U,or]Nd(ٴXeb;ݩHh|EvHmB $f-WYD. ~XtlH퓵2U|r=!5D4Z7n(]p۷l"4,ȋu;n
N)%\R膰F[t8@z眠F<OHҮN; zSO}K8D:S߷~qݭ[7'$R?+] L.vZ]xП9 "OӐوK;=A K\رFMznFVlDm]1F#``=wJSTRVĘDN DU|F4}t=7y$uLJYyr\}WMtA-TZX <gۏMWRYMZ;Y㺍ӐvGJ4{QPO^XFh_}$腛U6Msuϗ?3+5#)>N@@;
~Iq"/avUaq
,5Q WolouG9w ص)51{UdF ):#,+7OW5Wfx]{k q-y oRiw% zr3Fz*1QyRi_a&R)+WvB߳T^^DEE'(ؿnϷ획
hʛ@ve./S|qϓT!U&U 5ouGl&O<A颋.G =͛皅0pŒvtm)))N:+AyY" va;⋚M>ʜ:u(KB& y믿v KE 1!oرkNgy.ʬZ7y vbwꩧSNQӦM>QoվS}ǏwyF(E K:%en%]Iy:DqW8Bov),?y~{:+Sq~& WKҹkV~iъ
*?a
X&- ^V0F#`@HIQnq*1:QŹnYee`.bںJ3% ^ڞ1ۭ?1_.-ep'.b%xR5eW6$.OIYZ$4WjlVo]]I;]G
ulnzC]77Љruxy?7IIP)BAj蠮>}K4sjuoLg Ļ|Wb_-!3Gؘh%' j){b /
vJhw9/Q~⺌RLTz~q:A%s7 |"e-w ֳ?YFŦxʋrX^U9RYq*/t8^^'$ueTک9۷py zl[d#ڶmf:
q
K4,XV D,7 pX z Y^[]=~o.^Clѣm.;۷cqb u t'N2Y^(H Uˈ;<XGR&Æ
sP}̓N:+';;j6]he9Efl˷cJwjͅ%(%:G-5]c-)gkluIɝ(#X uNB|VuBNT]SUPZiU ;5& *!ƹҡ! [[Ţ}_eYƶOӡ- jk[9
V927;#`0F~ |AX?ѻKչ}рIw ?,}:;7' SN;8gv96T.<P2[r ڃኜ[c p.O* V㞺qIw?ؿ\Jum-~g몓댣w|atr-[)[XUM[r[P?8JqvjuYuY# }{MKƨ{wt`ֺ4}z_zJE&)eoΕ7\c PוKJ;*ٲHS+,7W?WtT}.\oTLCݱ_R] ĥ(U}@1m*[vsyi/cuv_ڴc! kmTUj?H GRn_O ;/\[T]^zUח_ӒiiiB$Ѿ;/$2&$$hС] |]u^ڀea] +?G3C#O)uї=6I͒Ǘ%% n˷q9DGIݛ; :Z%Dk
*JYE%:19V kӾEEe
D[JQB p%Fk@D+v{j=]bz߯S/'+Ճ8=-^N[ťN(#`0F44;rVtm7+`K 7>i3 3u7, X;)ژQ/-8wwM濨NKJM n9%E'頖N;띘K\h;StҐ>wd_; b>[N' O 1:_'b Pt <-QiIq%nrCxu[Qi:g,u{صy3*uSIi~r in9 7'﵉E*5&l#@) JK*GL+Ŷ?m1a.`P>u?ޕLmw4M=6E%4W? tdk ;fpU^V~g,w^cM3u%G ?tc"pQ̗瓷|KbK|v%Q"o ',g܄ LQ[˪n ^?}۴>?]l!ϻKwIX=2w똮aR }$r|.Gmsx`jF]S;7u"vhUˏK 2T?ޭ>)Vum>,[n:ml
+bznܪv:k3-.?ױ+\'hQmRGXYۥx#ۥi\ŵ8@2 XYT`SA?F#`h`Ft YK56mTӄf*+/u]Һ˕_qYpݜYyyiy (t'<V||}nܵNЫ .]wSbSTXZ4.~},w̵ xkWeMƝGӶ&K=[B)qpLO֖X)1.Fqq:OV7{B>啺Eo}_8J U1R ғUVV-չUzknqm3P֛L1*e_)TB}<b: V &)4GBsdfO
g
7ŊnSE /ش
~=?qJTV&ny8J2wfCDJk5vƌNí./~ Nך 2|"^ 3ؒ2Ex^_^%m ËOK/7pv&G.r f%U &!Q7 r m& jc{2ܘyf]&ś4k1S* ۓ7hundTxXܑ6kZVMتΪ+<y.R[W#dk?RvQE=I"^vvI
QMBY71:DٵZ&hSAJk #W1F#`XLNj'*6#ҹjWeԵJѱZLq%YK1x]Ӻ
?RFFʏ,7otb {<Aˊu/otMo'ޤo|\a;}=}0'8P_U3ZU K*Px 2 EZeO2ĉ}=$ pβsWOv><yrI;iݳ3KNJy&NKT ML
*+u_4&y &R ⺌p fҍi}L**6Hn+*% gYJQ7oQiberJ,RtZu +M|">#`%xUBnݻwwl m:y?37U,pge˖-8zx^p=!uIg6\6&=zVZsrrԦM r!9ӝm EE M1N{6 }DCK&a$$Y[ #:Xagp xORfQX&hㄸBW~E=a I7p9j 3 *P+Ebb]x\ť\Eo]c0F#`@ pjStd#]|-[4'ckF<óڲsN%$i}:DŨGzgu"gonDŽNpg]|@܄ K
>+X j WVtB lR%1z`w ܽJJtcR[o0붻B攔:Uu_qIKܗ#wa:oTj`7#֢՛\>nZM9ˬKrBDʭ2ӟvK@P
Ʃ,7QLCTCۏ`
17/+[&-rViOv:ZE',RiRJQъ
D+'\}dUlG*-tp<شP BDH kol2=#znʕNa=f=
4^ڼM
/kn]ʞ4i[BxxD"~vgɒ%?գ?\f_, nx<HX~XR6OLBWiH|8yE!+;䗔iINZ$$MGm[]mVyp̰ S7KrRbnjAHKЊX _6 ~^C D"ڛ_ZDN)qڔ_aS2>F]Ynx~暼x[#`0F4 S:je*=<7ѝCTVaѝGkҚɡ s ^E.Q RnQRw~|)tθnu'?ѧ+>Un;(sY3)'Uڹm!UR˾{5TOVzthܐᰃ.),PB1.~>ᦛWX۟X /%
tw>U`Y8v`/ֿ4lME8/ IDATU0l%57
CV+*'evo=?jWtR Cp rARJ Gdhd8^ZUL& ,g缨C.S\*+S .+XvE YR<uFuԨQ 1 ! ف:z.]-/߿5vX7G8"23FLA|.#߉'(bb}[1hÝG7ty/^DIHAǒ~}q VC D@Lrgrq%/|< 7n:,YɄUݘi-Enf]frMUe5]8MJ iUn^ZImc6.[Ts2-*pL4mY*.uUbm^
q שe`'luMס͓tIPB<k3h=vƜ-ZY]fc0F#РuFhU Vxqx= -Zta ԯY_=~nz7&v@ˊcK'!!~e/wf!sj'/$ &ľ 2GrLf.-^9vIx{?_8:{ǕG35W粻F\zX}үm7VMu3ӆ:hY^=;4S7 WϿn
<b*--EcGUqiVmfWX(
ĨxLEKG++Rg\rC[BE+*b$3״?Uń.P\]쾜ުKݬ\ѭTGgWjbVyQHIL
B@+fMԥ ~:2.# qgXa ?=\UYg9b'Rxlh 9rdyn!$ RFu؏ " >Knj/pv |<O֭+'99w裏v ~Tmu31uQ7(8O]tqǩ'ܥ:=&-yJv6x}7NY2j&HnۚG{6nUF~:&Ź&m*(7U|V-yKK7~x7sSU`@
tnjj#&Y_d\%zu:i:$*T7溶һ @0?lWQiл'/+#`0Lz̶d 7c 5.]2
i7D[@Dm:q Af%mg%+Ƃzh?8&'rl1y#56U)ZC}tT~YW
Yu35wmW[ J K ^ 2Զiy?^KeW&[<AG Ytn ViÖ>P\\*D'ޟ0Ԯ\i=@e9kXTY:ŵ |yJs֨(K e}p,EkTY5E7메nsB^I N}8J:Jv<J#ڨ8We٫4
wIeYUSbSi}\$[Vq&EܐX@pS.!Ad ڪ˾B+T>Uc~'<U ;X5T>B :ylv\՝+|L;,6۹FGź# BzZbK^k1@t 3_Sr˪hS=AUWVl-tu㔋E m
Dd4@ I"&NoE;0F#`@C#[?gVka cY2gקYov/~c#:p3b%ӿK_n}>}q}^~_,!$ܗ{)ץ h] A՜j\ifݼb]
b 'x{\n/TA=dvSZ.^٫Li>߄Uyb.&(^5|%i[%(w*^3Zܩ*oLi-\{[QTtV~^UiY3V:&EX^ e dx%OR[^;{p)OENc\/Q"ת&vTُ}6C D͕RdMPwx^Zx[~U ?fF#`0
@8zU{Gb}f+mQU 0o ֧þƺcSS.^`xޗ>Oֽk,b 꾪b w:.Ƶ%c$֖w_ 3o_o *K_IjYyqu
[K{ bܧQyyJowkAd[SG;+bm#`0F#`@"тߌ3 \̙3uq|
i.^ R0k'b̈́/?f[җgK# p{jmiWV uĄY՞(Ň՞ݎ#`0F#`@#%тĉ ߗ_~ ~L<ꫯX-ZoڴiNcr f#EZ [n&5 ۺU=Do][<8PD2&ߘ[0F#` -dTY,8k,'
6LG q_ׄ ܌/n#?ݖ5XZN .0F#`0F`h]ל9s4` i¢=AB,cuS]-Z3FDi?JQL&_~>}#`0F#`"@xZx6o,b!a>@~# 4kڽ7F#`Gq*-+U0Pa$SUGlU 5MOQnIѵA؎ᆕE KNeE%4g쳚`LAl>fmڴ[~](#`0F#`0
]UaQTbc'=B%yYB s4a Pwa@=g"k<&qvI6mҥK+>hŊڸq7o^t6F#`0F#_8\ /Xy% 4P{4͡+<{˥?M װv<a1;>%^4_*TYT@eXUV ps,pb#*q%w-%&&jM7!Pâ4w\iw]wyG? ~1F#`0F#P9}5!m]~;EUȵ 1=NP g)55UM7ws,7_$ sЪmm߿6l;^c1fΜf <xz>C Q-[oiiiG/V0F#`0F#`)c
\sL ~AvX
6MбfgxVRcbbԷo_M< mڴq ؒ0F#`0F#`ԢeBܺuNw@{/ 5:V kRyť8b
?QYu\Y[2Բe yۺúoݺuNkժb)..֭[h0Xyf!,%%E. lWm VZdkx(fffm6~FzmUf0F#`O ?[Np=&AUޮ`tPQ!k߂;YFF
K
Zp۟Tҹ]5yM^-,Y&M[햎~-[ &M1.,Tm#`0F#`0/}T8xEN0JE\+,*f ~
wPl *,$M!~j4F#`0F#`PQoWQ;:?0}D[uEX 0D=Mz5 wr#`0F#`0F` D6iݫ3P̙ڴpQ݇RtN<NuU \I̾n=e u3#obbgKKm#`0F#`0B +?,ИMg^ b'诟?Ss~XQm:ꫯ9O= }p@H2[F#`0F#`
?P?~eee5~1yNc~;>SV ֆ!CW8ڲE1"~F#`0F#`" b%\c@E>X0a/\ _oyWg_Cڬ So/Rt1ݬeQw:g0F#`2>XÏC j0T~m6lTŲa?Z鯉
15V35{3/(Wcuk0F#`(@=
M.nT!αʡp|6oM}vvcn:xrǀZAF#`0FD,3<Sjm J鈩֦Mk[G f8qbCѣ`b֬YIъ|ͭTGO>ٳ|j\!j5_M|j`7ԅn?Qw:*+;6eڒ-[V u#А ZJqɊ_Y233ԶM6dv#`0F#`Cڵۥ^# ~3gƎ [~ <P7xC r>h-YDIII.Zjj
D 뮻6y;PY~M6ynfvio~ zHG' :un٩S'egg~Uyr|I_˺ןtm1 SD As̙n筺6m6mT+s%:J URRfL
6d6`R0;Ｃ]R7r||fFț0a֮]jW^]uޤi+],v7F#`0F#`v[o_~Yz>5r~ ;tbb b{>RNN{ :obܹs։>?>x8^' ]\RXYfO*'PGFF&MT֭[݄ u/ 9 X͛7ׂ b
os"~G^xeڎ8
{/Q-[t>D
LaӢE lY&2F^Cc\ﯮ]:{ݻwwn4iYp>S:uL'tkFF3#`0F#`0G
{W>d?iƌ:묳XG˱ʻ⋝83 _p!
O D#F_|QZ ',N \W^y08p O~vŋaD6ijK/Ty)N`ʎȆ0E!ǖ.]CraٱcG'F?wuVMH~9X"r!Z [BV?|D K oI,6}"IX/"4ȝX!b5*c5kv? ~uncF#`0F#`@M wy"8vXjYTT䄛1c8_֗_~鄚<'!`
oװa oT~~N9KZtMbs;Пg!zK>|9O;/N-ZD"4oމ~[byGLj., .rho^teCuV"b0&!
2Y! ~}@Bay믿vV6ִ_UR i_@i{wF#`0F7\e!3 nX!a d }İC$C۔{*哈H|ruŹcV5іD?|@%6,֯_Çw}G y$T wg1鮽P^2Zݺusuތ }ϧ}z /wN<DDDzCD x CԹsg'
8" sASLq~Yn~JV|BdO' r(Z0F#`$NCTnvܪD DpÝ1*==íq
K;,F mqD 7b23zWmU$7n
C+ s7nt>cΝ7XGDӧW۶mw[`Ks=WiR]>\wMq
OX#rLt9uވG/qx`G$>vbxx fb1ƀ;7iq}P8ƞvC0QQi$#`0F#`m}>._MW0q~-F soe 7|: 0e[!Wr- Ņ1
6"a}GB>;eb#by<nEW. m$~" rpa`b#bH٧HCpfpIu} fn.ᘱ
O>_ƺ[_ca2F#`0F#`,b1"
8 k-7tRX]։cXaVk>^jX}!$$$BՁpkcjb6W܄#`N5!7C N}W䬬,~W\qsE0dX8ࢼ&+ F"nQ/$'2+! QecI|
K$,=IJ3XezA>n.cع~1/Mḳk}3F#`0F#UW5!Vq~'qn% R =DLSO= X!"4%!V [6Έ݇) $C\iqM&v'D''66sL70&Bza .'Ovo*ujL>'tGVpf,@?02qG?7mL_Fi0F#`0F` `vUDnڱԧ:H<vgxeCʍ1cdP1ߏD\@ Ǐ >:A,ӠAU 0ňC۲enf2#y B\ ܕ"bdĠCܛ0aYԻwogȤ/ݕ>zX~3<q@$E a\ X\zp voX[qO: 1# ƚLk#k2F#`0F#$ClA
ܘûT&A[. T'fEd?3b͆5 O|N [pd/p a'1,pNXq.cLk1p˽W_}L2yLQ]ڕRwvY"t1=H%!Y#Rߘq` o!IH1q=&1Xmى$ؓgҤIn#Bpxr
9]c5EeeyݲremP˖-dXY )'+.z3c~P6m?Uk0F#`v,9%^lYH
{'?UV̔{ IDATW]f
u}]W?O}~_^puo~?o>}ԲejR.q`US"&!bL{ٷ%1eb&M[0H]d_](YFOF?A#`0F#`~{Z+ ,ꅐUb0F#`0F#`@0^0[%F#`0F#`0
r2!#`0F#`>$@L5KF1ׯ_ ~
zF#`0F#` /|Un5Hk;гZ
F#`0F#`7c_m@6Օ VzN$拎F6M>]6m"OIII߿ҔiӦ$'**J ݻZhOsPŋf͚i e#`0F#`0FX2F rD7i$\R :tB^AA֭[)S'?;iӦN+..ڵk5qD]vejٲ;'t_߾}պuk-_\?Ν &(>>>rFZb0F#`0F#`v@D ~@@:uW\R͜9S/.\脻`0c9F ~CPVV QO?̙#FVNN.Bg HF{OեK uQN3F o8IK{ Gv뮞K~ƑekݹjwoY[}v2o_7e0F#P"Z//E NbbbB/gi+,,t}-Cb qα h:th _-9[:K ,nqqq-**
mۺzyS[s;w *|wtgro E]$,kJ|qkn\.]ꬥ}~x1XUS*77W#G kL+=
&]M_V^,r.>ٳ> cbw!+gq_DõҼysW
_}U5kN8g-_SjOCZӂdmu1 ϱ~o\χc? ɸxВ{ufaB?hV;l0F#`0^NL/YbH|Fe)yb_Ϟ=w&^y9#wh;@#'PV^bfgM DZa}Zf'ٱcGYnٲݧfff78}.. ;蠃a qƅWOy**Jqq?>TADǨȱco4B /<oT&@FFF~ȋy }>< z衐cq>. 4hۏ#[nN\?npcƳ"ď"xNƍxGǘD rL'+(d1qc 8'aBWD&Q?DdCfLOWZƔ|8ÊIDñy ap瓞#<ҕAa| ̘ǖ:9'sp=q
ЏO? Bx#
ReR/k}3fh֬YN$dv|$Fx'
6O,^R&MbbҿƖΒ!2F< zP^]$Υ\$ >W q}SN95f 08m~LpZ2F#`h"Z㋧K_J T^ XH/ּ$ꆊ-+LJk^E191AM8I' V c/;w/^^ڴi|ֹgy 2b~ݣϽ^x ~]_@ 9E@F ƍ zJ3Qg2VR9x1|>w^#ux9 C]h@,ȇ XP lc'(tF)Lnt]wFBa<KW,w T)D\s.=$ z2Kx6OV5oZ!:!`0Kćڣ_!u=PqK]^=\7$#~#摈M;|m#1 ib8IlQc=ܣ<04&#W_ Q8 'ph#֝u;>y܉U T?z!?"(}/'tksS&cI` +U|\rɶ2څ .a`HLJ?X2N!fԉ >>GӶzK.? ?ޅJ l+F#`0
@伱U&\.ŹE-kyK0/Ӽr5nhpDyeǶ@c'3`%))>>@-7 abR yE4Ϳr"up ܛ
X9 }Z{ $M@jrI 5Vgl'' X'zW{\ltO~56*n`pw;![?G
xznX !"-uY"H! .VU~sח_~ٹRW`!돳AyKz 8M8yx- ;r=V^>U&m_5\pbkq?O<ֽU ck.",3˓rXg~ל iD
r[R;qhP>G"ˏbj9ND_Q<ʢ
O~D A~T8gqyH
MLEpJD3fS~A {CVx ;>#?u/ccX2 :9x'u A.Q7s' Ӷo{zF|d0F# D^b[[µ*</%_96ydNd,Y⾄Mc4 3yBu/gkU:8'2 ,"/řMyD" /L/qW_FB
j0 8͙9:EI#h"|#I8`,<с:|~<%eֆ:m ];*:Kh*k՚
JLC= D;*0NXS2fX^ w_|;s 0p kXxT5]# b}E?X?qki'VG ?XaI5W۸.M #~ UZX @,F K}@ 2ʲk;iP4%%}3fW^AnvB+Ň yl)ux^ ?H|a,|ju;bA<#6D<#I,k>\&c0F# Dෳ W/|ET-5Xl:ie/T>~Q1kt˯.SNu
z8h%7ҋ?P( + w]CDUK5b!Loye|fᎴDCRaa#v ,jK(U
g`yk1"?h~u ^}p?wOCjc~ sF W8˾6jA}T\Rs\_C?XEZX pvn{!k-Dp5b {0+҈]N|EƋ9{&ǵB D/s#w<܋LC];_}Jesu/Ef[Gg YE?yǴtun_
uZD '9 ͱ
7~m g,sBbh(Ď O%"+!M3c~## s{J G-#`0F4|-y땚0/e !K^8 //Jk2.@/|[
_6k(8D"BK," j~fX^8a
K/q*B1@3zi#%UWX@ΞPbc*?F w
}X<"V !6!jK xp$!"N}Xt Zl gau/-KJK\aǔ Xecőj-X ~(baɇ%ޯ~!%K&Tg _O2&L=]5QW\qڈ;"[B@= p152. C7_ıZq{ZE
O0I>q>"#;_ܽzgzyugp')PVϑp_g}cO~$m'F>Bb 1 qr e`9GF O<Oß5\\ԁ`m-0F#`&oև;#uge_/(,/L$^ n[}A >RSdj={z*"da1E'V>Ͻ8 ju%ޚ%<w3 eejۺ9D^\)Km[%+*xK5@pp ,h'ecȹc;/nj!(x\^iȂ`
]m": bGz:溝h-]Va靏'jէGg5G&(-b~3'bg\>;[yq`yJ1}̘bXqqepe~z'a.6g'#5p_"U_>x 'o;peaG|>g UL%,"Ekռ:k?螅e.ʹՍsrߧ{xCٰ0Ə=c>o(kOrه'(B\kpQ뀲}|p'GG/ҏ >-0F#`6;LMbPp/_~[YG[gt:OUzUsgvxEpB-
hr̋0!q{Q$/gy ?N5,wQH
?㇌إuH&nX 0O'999n&`\Uɋo GsXzy }Mn._jrZ6p9
k*,IƎ~c-8$nLVH\\r"R+K/!yY o<8sO?H5b?01q z7QF?tfp|nc aqhUv# rOW]mL[YHI7_s^zcelw'lE:k~jߦ 5V~sO? ?Q½1
OX؏Pj.ux a HH;2 #`0FG Gl td7.ɉj^!XlND?/ g\,x!y^l8eXycN岎TmB/s_,q6k^z#6` yƉ#C.9W̫Yp + `E<{ׅ B ?7xz)' E _'""p;5EC qB
p
dN""8<nS>}ct#4}<=krLuhZ t6w"O. põ aw:ˍ13u cᢍ:Unv7N7/ҲuN<56ֱDL"08X
r! _~;; 0m +e=Dck` R\+X "OV ـx3mIa#RA}{*3+G9: %%}⇏KVV+w ܉u3v5% L"o6'4ϟ?\O᳞,vpF *[nś #0F#`0oYF@{/+%%j~\x;Kvp#/\6VQbU 3 s $ zW֪/y{ niՈܡXC0#_^Lakq
aEPS q8W"Q&qְȃ~_{xghk
s3{AHo$ZnsnR7+/lHQU'/7,^u'|yqq
1CҸWI,{Ǎc.WpG
SOu [@?OowE| pQFpe >GF f Ci#1.
?\$:f
ݷ?| to3un#ݔRLje:N ڄw:3,BҹCGXNa6+`=\?ٍ1 B2FC$<-\>q^|W;"rP'c-0F#`vN`Z#`!f윓ԥS;4np
ף,
L*^.yiE2,OF2"^8oK* AjBx!V ǰdjV5}nDC+ϚY
QcX =/ ՓO>
k!^# b)~;'"09B /LA5@ONjf>}v(d ~a'b>'Y^xm# "4Slܸq]%z,kr 皎_ԡm+aKVf.>$'Vj71TC(e"I] >7#=zb -xهxsϹX^b>/0e+tB.}B]5@>>Xu V_L See,8ϵCHB̸}59Lj~XC'MDpя >?!4ER*}Mԁ8qFk CHv?<a5 sIXp'g1>ɋu)$&Ca~\ܛ-\.<05)µϵ%11 í#i-F#`0u#_[i2pڒ-[Trk6@#{T\|*b\WxP6muɫv\z]=ls[}+YlZvcվv4K$g>r ( /$^yE|EԋQ5 [3UW~YoJ ["^SVu?q!NDDp`B D9"<s&/ +DD# ,hr91:6 Xy*<X/))կ|@6lv3MovY;^}' 9 w
.YZޡ-O@6aPSb,?DDiƅ0
(#@<6,pceljK`# #><a5ýF>X]Y~ Z!R \Ms= 2ko IDAT)& F$eFs9FbVZoA^ƾ\/(,rcT9.6:ԯ
ܞ}F&|.pw ƙ1.S nrr
0~>GG2i}
ٟcK#`0FKXM=.WJ؟?b生_\X ^ty<ip]<D'5z_
Y쭹dm؞!P5DI3u@TM6ClhO"t\zѻբY=SR ֣Nឱ؇uǺ8N
#`0F#`*00N`_ ,ZK*^\<If=MOMeiip :l>J<HV;yG̶ (gk'^f_zj;
t e,qi幂"1pݙa4F#`0F@_?gW0Ϊ/1~ݙ*`0M+6Ծ4v3r+6֎GPpE&F݇+ZX2F#`0F`0o30Fe_°N#`0Fz$Ǻ*#`0F#`0F#`2ˀx#P
KTZV^9^}T ꈒl
D#`0F#`0Ef'!63[>6*X,zo :/>ECzvB#`0F#`0n ~@ǒ0{ RXM^\WUltp43:ow72 #`0F4j|?d0n~Q/(ʮ}I-H"c qcϝ;MXs{wݹ7 x0LN&GsYH $$P֧jݭV%Z齫jԜ]@ O]O72(
J>Z0xpơiؐ tÇION>4nĈ܊s @A @I`РAieah4go `IU44aiĈ=HON`q8|hiiI?ZZ
w.[|xij"Vᵶ#GͶӸDA @A @mTߦ 47!C
n^~L(n. 馛bŊղza. @A @
64XєfΜZ[ROW`"]A/hǮMLi. b@A @A455Rz=\_,"5A_hjj7@A @A @o! J`M^MHD@A @A 7ĔA @A @X=y WZS=,! _=H[A @A RJ
ѲҚBl1t4bؐe&0?. @A @A -Zλte+Cz9kKMǍL_=dt[&:A!kq @A @A tMͭtӳ҈QAq)\}`u߯x,h f_}~ MX"577)Wg݁`ecذaUPA @A Z
7f}}iV=fLZtm\'8<-YҔnx٩;B~kF`ɒ%'L?|lΝ#2eJ5kVZ`A{EАj+/ȑ#hҒvq .&Mf A @A ˛gxcWǏ㤵҇Vפ^ϋ骫JNjjjJ{:3?̙N8 ٳgE:*}3VDK[o5|魷J<@:cߟ~;. r!dUA @A ' ͔C٦~=}t' <"^cccg}C I x`{ۭ~ߥ/ |±dob '˗뮻. ~xBYO)3ه躦3X[ʱt]֘e*09ם8Vu8 @A @A tNmQǙ
gy&[UuӚuw}w:Ҍ3:ӝ/B{@B$!pճ믿>}Y?,9pG e7{/
5jT0aBZlYp$}_L;C~ܑG 6h, r-7ިg4<m5֔/rf: (ӪV%~{nj~|ϛ7/+%oB0ώ>uv~Jq @A @}@X$b:+5"՚l.A# p'S`ogA믯s/b6F Nڞ VbE`
3?ó馛#Fۦ.Oe8a7ZGaމc=\ί;SVuUK<U<qկ~53\<t9g/?O?t g}Jg裏&S埪# n&@\?cƌI{GI XIk[' A @A XԒʟZ&yV mgZ[SjMy`GZ 0F 4(niiMC>msuV gLQhcW ^1 zʽVVtLM㳨Q
3g̙lĉY G qD%T3 bG"8mbk / ,e
7\IK/Ԟ
_Wr N4]~x{4^B I All2 lZ
hgSO?(K)h_7wmt1YzncǎPxm
ƭ*?_8qKJ{0=ыp~wy眗70ooۧm& Kk>J!ݻ!
R @A 5v'ibzwޒڬi0A59Gؐ
mg!Yxy m81hiI HiLƏL/Θ.G8:hjI3-jT͖j;KLf4qHzv
ih aخWKH8HG >-}o~]<' (EY_~yS0/9 S.lDs<
q}K_o8rxks=7gZ뮻(qE8ǍE)K\qE!p>^{i#xLe-F gΚ, qA,"
TO>!>%ʧx˹"ClcZV {r)9aYHEpfidϒX G I=X K֦-bJgywٱ@tx7縈r%8H@cQ~7!O}47HwA @A l5e+v ݢq& OmИ옝҂+}&
mF & &qbd_.x8#OoA>nMpneM//|$;M4eMYT ˱;E˚_X:I [nƍ Y ~mvǤṴ%J/0y6iˍG%yyܚ=o_jZԚwi-g$80 e}wxcn*bGX~<
Q^{m ǬOG 8go~Yĸ+tGgsmY:+[J顇 ʂ ŧ8q8Ů-L<VԪ
2% 9DDΟqGx;!Ϻ__ vX D)]~ko)wseF"&xi9 L[0"
+Jbuo ҲDO8ϔ`"3~1> ]Za+qd(;&=ŋrg*+xu]{ѸFqp
9_[9[ %A @A 'Mͭi1O)Gnx) oźz{lE)CF wpZ)}lN5g 8qHj ڐvi##W:` Y; ҅wj|:fI97 ڴlAH6R1oI&JKWCYo얯J<9eQi'%˛G˚Ӄ/N EFB.ǥ'IZjimI{na2xpzktܞv46['t[ƍH՚ V:y D 17̂aœ[F !:3|QDJ,sFqS\XVuk+
`Ĺ'B{ x M6- 3}5%1練tꩧp%뉃_qd'_Õxao,qb"
cJ t?oϷwك:(-~ _. <"2(eկv'LNj_Z& 'kt_-!˔JZ/K vv>\A @A?`6v4e7˶x5ʇLw>7+}8:-\ҔHGd8$ }Llt['VO=/[, 4mJï!ya
Soiq 9ݞya
UnyjF~vg7i_Nw>^pY3ǏjLDSWg{_|?Kߞ05 ),-O2.>4-Xڔ-13}x6Bͫ]Oy'NY !Lm|)>cGt`9Ę|$tt@Q>%jzM!T50cE4%IbEk멹W?olIt2E`
H8ZB4`E+G & ȧ6Bd|lrTrւ'|r 1 U~&D߄:m{g[ Dm+^<%=-(ts^|~K<= @A *+%uxn9aT>7uRiGKF5&'Nc7Jl?![%˛aCW]ѷI<5J=Vmq?7 cn?/?L>Zڔ-շ9}q)2vN雇o71${Ԏknn8hh4fQɆ!zNWfgWL+>ۥ&Ns--۔l¥ieaР4{|sg.HC?^+Cur0N E8iB %,v %}.k"0Kt(ҙsͪㄚ-"O%?"iyS;.^QslpeC=4OC5<ma,) 93 X=ؼ Au}|XA#fkcZG#~ NXyFe-nτ0.ݪ vV`م%<1s8ϙ^܃|ZE ?B?76{qsp(ϰL4^pA @A B:teܶFۘ_76װȔ/y;f8!m{ [~l427~}08M ;<]n-mJS"[sz˹/yzkGJlq9Mس!?9-=o7 MDn+刺KGxŏ>'pIw-No(>$͜$m2vxʁ[ 6kt]~yӑwq69vuSs` ژAbdOSrY鱚"\J`Ǫ(bB a+т0Aspopαb1E cUj8V(ZjmYȞ{<餓tP{X>=,o,Ad}eJ(c4dJ58q+\0CXõg +2O&x{.ĭ*ͯ|99 J-Gc),M<C\uUyB G|Nb <y<&n5Ͽ [email protected]#?A @A >L8l1wҚt=Sc'mL
bu痮hNW>ft܈㤱=& ~+͞4 ɷ ^t:܃o})u`۔Y@wQNJNciEqZ:{ aȩk 4s~V4(<ylm3*T۞}/q6& l>.+6!4tHCQCӈam6ryW`vh{ .S,dAe+ӎuشnyv#,:y6?B`Ch?ϲAPlA"I&=3vmyj-B@Fv=rKZδCo}[Y lN"ک/{2
tPrOSX0H("XIXvcoGVjue$G %:[ QĉhjhLfEscz^,(YV)Y*l
mJ-k[o5ǯ\( $'< wS ~s9F,dGb-as' @A z>y^["6 -8*Z?ި{(k_Ȣ &h5 cQߙ8g$fm˛]3'gS"[ڵj홙aCs!O]dy5lHznN{mQl㩷'ߜN[{pHCI6'ywr<U ˽#7,JO>7_4<]DN3gwaCgs1B<z, &&l_O4\I"i)Κq?@ cwwYR@8l$kYG\$ΈxB i~l|꺂uGZO4y@`aElrO 2ҋwXU
/ Ȳ"pmn)IV,# 8ɫDS"vzYysav l\,rC._X]xYon&k$Wr% )'U!qN8 @A @w> +Y?XŵYYJxm֏W#
2(uE|-[Yn6y -Ot>[} ac 斔SwK7&l0<]|t6={4tР_' &lИn}t=M}mb#Qov2>O5ir
|}mѨ k}숒J}ЭCIϼ=/ 5/_T!+D/|්D+u#^[ U5V k}>%DO[:Z C=Msy<*ןac<8B6lgMMW;ɢXU 0=O%N[;4vl N8!
B`ɳS>UJԆ IDATmҏX+/}6]kk`43\l[\4vt6? @A z1oI˟iߠÔޝ'I~ j5R\ssk>hyhيCM ~mv5fnN{<6`
G,莦4=0+'gfn7;Ԍl%h^Spx&=L=-ƥW[7 \ziж .I|8Oe^sZZ,7<8vVcB mle?`j~4ٺDdF*"NW q(!fZM7ݔs9'[٬ttjYU<'VSNɻ%kj'M
iD6% Ue'f-sx']6iW8bxW ij+_m? @A PU5{q{RM]p<qn%ɺwE#gYmF Ӿn.cvJ6x> ǘ5[=t3}/ μ0+Ź KW4l}ݦcq{Lλ0c~?o{`ް|vpinuwxӓ3-Ypa|d4!u-76Miq#a;ol>ƬEy'S,Yc Jٺfiޢiޢe+sAُDr@Ovm,~`#nVΪO>9]z .H'xb^g`FcGt?ΔY .5ڔb1Gd# eY+C3u"Xټ=p [\Ç' i6UX w- cXUe*N'}Uѱ/~ @A ")\G {cUȲ{an>hYމ4Zt_1?m:~DO W=ؑ vDƏH/;?_sѲt䮛=0xݯzZ)u?'MMx»_KS6?웶0*['On2& ۤ#z[{&[jpYN6 zt>s4dР{ oKv&6iņ ~}An _>HWXM
:" 0Vo omr7wu(6lR֖ BǬg3B'ON{w MBM9XFZMǵ%E#盰ș,]6)&QѺxE$ v䄵5m*';
ǂ@A @} cۊO#\)o OGSd{l
70=wy
cgM<κw0+=?c~zzTA)=߯|2o1{<֎? [ϻ^SMB#Kt=IHSOO9/}Wf^|ÑyMK?| |s yG`VIycm|Z2ucKJWLgi +Qʀ!96 vE^W%t`VjmmI&LȖjk": {lfSWjd/EK:?0 ÎN7|3_nӎKr};зY9GL8N4veY+`71(\=Wp_U @A &`g }wcƯvrrN wNZ^ʛoZYִ%;ap '^ܒž`]oh;z|dfGov&T5[{Au7YZ5s[v-ZV<o$y ,H-umMDӶƾK _~̱8k3ϙ3;
2,pbƫ!Ւ$"yxE@#~u%zKS7>uʱj%Aǻf5 E 7Nq8W. @A 5P7bhCjnmMKu6#P _L]{O8b uWn:] SDTX @A @'`Z킥+P?cEA @A :%N=lj>O }V@A @A @/@A @A @ (y`VZ'ZG A @A @ 8!
ڶbc`됀57~W[W_RA @A @kZZƤ8iQ)6ިߧԜ,KUZV~=$-aPZY,R@A @A uiؐ}q4r3O˛ZҠ~c0TO_9h6O+[]@/][Rk
o=pEy @A @H%M ;"M.O-OGG<uaCQCH4r4bİBL9HE @A @X N WO˾¥_s拇HR@wA @A &b)."@A @A @ "_ zX @A @A *=һH|O%y곋A @A A._
q}0[S?~RuN QpQ zc2xa3xpL XO>vMDYzk7l<wMbg&nx6˔hy!] C ښ6d4lX3f & Ź5&q9sf.CD3@#C9iҤI!
7VX\n˗/OgN'O݈#5&lٲ4gΜx6kL#Xti;wnz?#ƿkb$&"lE,"*b@Ӫ5#6-erXFE zqC3C KVO(<މ5b
lzb[ cE=) @A @A wa ANu755[CH.U*vVë^wA @A BV,Z(=_̛QlFy
fm\yO]hhhȿk@ pY4$ .y
]w5mk%iA @A *ꓫtꫯNf"{8裏U?# > /X }O< -Ty7/}K魷Jw_:OtG#8]8c, @A @A !u,4nDZ^L⎭oFo~Xƌ:n=L,Lg}w{M|,X $t^<b c9f @A @A W!ud J<@z'
x;<01"{c:C&l m뮴^{ڪ8+6)ӦMk?^~<s Knڍ LӧOmna >t w4 tAB ᮈ}N8!mfY[xqV}%K${3߭: ;S۷\/"!K@";L~u}q @A @A إGrm婩8+VeĦ{'NhX=]b qꜻ ӛo.͙3']r%nq y뭷Vo=C:ק^ouDQ<x>c&}E$eA) 9̟ r-iٲe @¬ @A @A` NriO=T;3}X0#Pb8Qv[lEG;xgϞn馴曧:+="#Hhv) vaYLc=rxq=Pbٷns}x饗/ _ ?vX5*bH4t U3`Q#DpA @A .e[fY +F/ƻue}_U b30/.#{+R |P,Ə ><u֮֕+Wu/rޭ> /LwEw
kӽ+Y|vmt^YM4)]X9H80??#GLobQiZ):.c=2" M9/$ @A @~<q<1ΘG3M3ӌߖbC/(1o '~ ǎՎȌ ;6]s59 vJw# }Q[N0aTe]bp " 9<fd#}U' Kj3\$IN_kV謟g˿#&O1r
ɔ[T0X);g Sgy&xT*&LlYlT9" 颋.;~_n>:<PzI\lQΩ<}(+ Nv k dT?(~6O}L\ @A @ c ̠3,ovۋg_"g cV~of8̂c 036d~ӟi#lq??1
Ǐe osLK]wuY ' C2{Whxf5 ^{-w}yʸ
ڌeXU
CaW`# ڜCv)^W
]9gTRԃ#N;wŧTTi7m?| SS?+Iqy;وSW W @A @A : yձơPlI4v118s5Wc n4 qbG$1D"&g}r,=Ƹfu a#L^{m6XےZf3m#kyoq%g|&+
AAa>x%zr:ʚ
*:gWu#VwUpY=XeQ Tí*Zq[ k L|ܫc>XvsDRZϚ5+Wb1OUĞUdmDd @A @0~4V5YmVccloN@'M6$/SEH1^gQZ x`Q/_b'{~Ycdפ.K\y ]oKc80i\\3]i" #& &u 1.w~<?PY)D9 [!3%q
v)$ 1J!^jO:|\A뮻HW@_P3٭:BoNS=>3vPx>, }:lj8x"ϼ !q_j~[B0%Zϐu *g,aO @A @ vY~˚e=2/ l3XfL{(3g?mڴ馛fb".v g ;do vӉI:<1ѸظõDCBcTaˀUk; tY).Xg0)S(98בS9qʢ
eq*X
1@X K ]_*,bޯ~\9I *7 ,pQy2%fw衇f6>Cɂ*+ɽ+߆JH#~3 @A @舀<4.cJbLƴhXϢYGq;flJ8cbM( M4_q: =2Wƽ7
9ւk Sp6ÛO>} ]%{=F/ݷ 3ZqD*VUTo)nJT*s}3qlb[BoF(°|3UWt=Uuwtu0@*:l/<9KP{/^v'& A @A ;,w˳ɉs,X8" 1VabΠPVu0
2{2'1dqȰqk;gK.@~/W
ioy+^ ~ZE5~g[όCi_ՆUuR{^.+;9Vwn[ M.< qC8wy@`$$څz){;r*'(& Y_Tp{n~ˠ%f*"Ge֑È311@iLc A @A b.nd /c|fKY>K,sƑrJ>XY1WUެ@1+ѭ8c[.ƷeM;|t6 >|YV?am6q8"rOx,h]s}@~xN
L)^ QEȪS:"_Y3g5jQ \[do8iW\{:GA @A /Ʀ- c 3ۘ5zu{ř~KUq~t NXHȣ!X۞#Ob dЇ`ȠH mf QRX"FݕsX W快\IJJ#a_dLA @A ="1 Ţo YLg"]vYфqQ B! " Ў! 8[ϲXUo b8Xs]}I:`w̘16IYV:kH_O @A @A .j>V}6mW\q 1_kY?R6d G$\.cE+IoM4 ?nMAlA tM !kKsg:W\;tꩧ=s tP}5״ 2-% E,iu t_K&
%\|-!
A @A V aS;Vw~#p}f͎1ӛ"kj-G#
ZO|
5:՜gg>Ԉ~4aM~,L5O/bިҺ|1&,?Ӳup{G-kMu`pH#`7\%0h%]O[Kkk?ov8qB. S3ivn >:56_ڜL٢^C>}z^4d}(>D@GG`چNU G;ԽW82 8w_wjzY˵_Ԛb˪Δ^c))6 ~6~;]ձӇ$q
$Y_6Muʮ f}HXOxH:s,GL$^rH3ܜ9s Jx\ Zɓ'N, o8GmDd: @A @A M_GήU7լZKSY,}d'?u>*rzO/L%ʱZP{ IDATv77OwtF@A @A @) @A @A B "A u@z# kYGpA @AEhѢ]mط]tu z@~A1u@.rh4<G:a.\ε#/W袋VzRtwgy!¸r#JÂם:ůpꞮ+=긪ZOVެ x ޝ:6?<nؓ<']/iRj˂QmkQ?G-gNSvzolwղķ[a|cUuEm<??&̪!twVsM?яO~)G_xW^ P궟 n$Ħ uH"AA0r6mZo=3ҵ^O>Å^]AE_2tgW^ye
K_Rk窫* s1wM tP3fLؑ+H{nt!9qHy衇7ߜ\rIBs'uI@w;#xoN=\W|i̙>!X|+_;F>Yg:[h[o=,;vsy?6 ?N8}w <'';Y;va ?A7n\1^ pG ^kta$i|u%o2|h9Ϧ{7[Oo}[;9F_8H\ߴie` ;4bĈ|^}LG%<L.O S2A{1ʊ~U9~&M:|L[o~m9j5=3en;kWh?|& ~yq/(Oy$ p{ξ}w.:%\|x19眓wG~.腏occ{s U ߧo~b_I Ї,i5{wؤmG[n%w4::O<D@x[jc㘝6`d~G0g.^ ~O?=Cp4xPؚ]䦛nJCt=b'!CJR1!{ zꩤ!\sϴ.HKg>9oj({`Q-N0# T{ w1'?Ukuɓs 2rro:#'-Ɗ@~c,8&3#&u }gR)qwS]瞕Gy s=e>ʓ,_EV\C9S\sƌ<*ĎcyZʇE7VJww??Bݨ/vY馛fZ~_/ T>k\F)$+;CnJ-mmYv^Wu1n'N̢YٵUVц=c
,ύhK:4mV;N.EϏSg?:1Y ^_xm7ޘ;ٮN:o- u2VD?UyROǴ-Ӯ*'ƵsUsG eH<EyG>UnZ]I/PƷΟn
/A m6PUH"SouƉu*=Ґ4:d+לN} y0a+aV跁XHVX q@ƌpy yj| [n'/ }_}#<ȴvۭ QR2uB@67/ Vu:P 2dGXVWg}n4,爂-u up^xۊ /X訩?#[:m.8u gt TFT7`K/9ҭ
zO >~G ʀvZ7Xex衇&SN9%]b K?Aʞv DU^?ǭޚܛr|('EXp]B>4K6~+\"7N}w/ ^0oNϹsu\{),o{<˙. -sMI8(r}j]^**:q7N۵对܆{9LcP[ =q}e/oSx^:ϫkϭG4eʔlhAޑȸ:eOOz%説.=f uq)krԖ%/^|ŴYlqO)}gfv\=h%KRsD Xۉ&)ھVoo]u
̠ Bqm6J #8"w܉J:[:yCcC/.@y = 4 0v ot"kN;No%5~{ӧc A][uo5buLI۠ө*W7>Ҥ)
\
3gΜg啍6(9%EB=&? Q٠15B9#ozE:QgNNڔ28Z.S=X[Tv IْnӦue _:V8XS
BX[> yP-yP;0O,͟</ ʬ2F`W!!GP0ڎ"AD ( _ 3k/exzX~9S1իc}??@)&hm~sʫ2L:yaV<оi^iXͩ <}sSBsPB6Y~y(_UYqSO#_1>s ?~g:A;,ifi-N)Kʛhʍw]y0Ļe6:5>4oYFrրy+ίAT,(bke<y<sUՑx xױ1`2E@NޛY
08 "t]ǭAƲX(;&>aíL@2WsV ¬!!vy078$L(XıWgÕCJ@>bQu"5+
Z%o˷E<6`qAys=SWʿzT+G }tXDž2 ( ,? tx>ϥUa9s tSAJ@,^lDoe ^t
F-{V^n8`
m hVʇ3Q&#S0@XC(B]? \#/)y+v}@y`TN:)1ˋB/ NUpjz-BC?}c*mΜ;/X0+c 2żI%fhLj|]>/:r/ow>{F(lKH5øؘ. K qT^\"WL^[kRT z46ίYZ>&R2gi!:V6ŷuXxOO`@aU
N7Ō4Rgz
JA&ӥAe
7KCkPdE]/ 0%jXM<
5͐0m) 5^z˫ q+Ag#xpo'yXuAzȦC, ©ȠfzM'٠ĭF(qM
GѤ3H<WE@ޖ\pAާ `k_Yu{駎'y~7fn"֞ #*±ܗ
%(z#OXeB[*xP? "~:CQ$ 1LfqO-?}X +uBۡ|Rޣ˲y Ǯ6ŀ nLj YU,W.$)sҦKxx>cgN wF*k(yYY2#M 饖[,UU~^1R1'+f}Hk7
t*9o%Tb>l
N>y~
zM i
BCbqq:sD9uqTt\h$
2 2X !:Jgq\D'ϛe=3bk}PoKq2qw >Vuu)[XtXxZ|l(:jf)qPTyqasǚղF,79緲g@.-mv`ZTN+ FJhKm1`E~e]+sȿڊ}+^Fy⏀W z
zYWk+lVn >K_ED,pg뷪S#OiurG}%MK}^/` t^<o˰ÔS ,'dWA,Px/pwMh9 ѥϳ#,;{_>gNr
'X b6Q75F>Ռ(`,L(ʕok->{r(=a@P4*& ǠԛC l먛lЮrւHSimǥ^+PY03(7PQirir4;vo
ul NH@^R0\bu" )Vo kGy1quǕ"uZI1`a"Vs*W^]U; V/'/_tE0p)yQ5LAr/CS簂2PԀJN r @sOOyRU||$ ,q!9kMdU_p,,WfCҨ g'/\> kj=Z> ٥LoC?LqWOWQwI*ui)ȏ^Sʓz_^*7D>YWv0T>g^*/?3d8@=}jӔ5aY + ?^աϨqbP]W[enM3~ xӬ{)& /ltGSRtu Ƥr,W2Ly#iߖʡzMW⌫㔝>i}1 0 4: ޠzgN ku`RaټCkP:*8/XU: qDF:t M0N4vvҠo 6T
:
BJ'\76,Й#x{DV3 uꬥ%#0s͊4VC (=3Q\YġNW8 ɫN sK62БwQޠ 8"NO@BV%O'yuR%K9R9W]7Zv G kYPd+iW}%2(S誻ť
JurVJiY: t|(^&);aWJK / %\O ^HZA"w4//Y+ʧ&wNT>3FWOJ>F [}D/8i:ӥ֩__/ӟ7X+ֆ3K>u,9: Wo{枙[xDý{Pnlnhܩ?Ԧ*k^X JY_ӮG?~O)/%5 K{*44:L7Չ"ik
JV7NT
R#o|#~*?k4J> ӁPzK( ~Y1H:">!xFEejcka%\r%)я3FcFH1t^IǏ(y)\^TñN'u8y]_% tA2Q ů`%> eJeȔE$Bc۵=\_J^ PIzQ9`A"E zIc-vW]uU pXV!+Gũ
Y[ ]{-7X1' |ZS)-w) q6+ :|(\)%ݿ+F N>ѧ8yP)oW_Auo ( /:BY$|)3G*9/Q%/MIՇ!mSuҞ8h#'}}.,)X /7˴R^Ԏ)C M4Wۇ
}Μg< )EwގGޞH'tuYhнc]cQ%j=:i
Flz8+ FID~헯m@ҩ!
ϯs*bN;-u1a퍫AFՑ:7Wx Eh`y :)@:r::nD
iuI/߫&`0A.PBǼ-}'f,up0]Y Rw~5u
yZ ;u \}H)L(PX ur'!|F3ϴ_sfg=B^P fXU[<SFV^OS 3W^8_ǔ#Ok
!q`Jxb@=wGyO$Ia/4)yNXSG}T}.x(p^eE~̴w+|H5U' [eVWe,^mqRK ,rn|
UhϽ7UUo~<XOzlV1Aqe5|FI#Ôbcu1K?=/, k3nvqI5VAeI5gL,ڌի2ّ av/ӋX:턆Հ!
:CQ/C @/23-y.
u(\`3>rQtdF`pqL`z YsBB^<q6BNpo }5uU5/[L2,,yR'@_MDak>C4+y[؇3 +ܷ DzX.GX$riuoKzD4bb~KEXmeHo
zyac`n'^/ݔB. ]U+[v *_ܷ<笳eQ2_ w *[di
i3RPX !bƨE4?,H / 'a$֪t ub\9%йoe=L#vu]M!h[J?)0Uƫ< ,ҧ?ꨣ "c
Q'+f(,CI6O8/SS d/ϼ#ŝW}- }1G9 _ +
Eoޓ1GOS8X[1 1a<j_ꧯ 4nװ-ii Wn2VE@qعiyf4eĥ3!j5 UG buU[Ufd
u\`E9(ՆTokwf 'OxV33Y}^%t,{J< v{]O>+ u_:կzˁ":ʺ'q+=oСsYmOW,
qמ
ׁtq"u ?k y _[Ox+BUʜs?|aʞrP( QI]e/ѽı6HrSx#C·6?W^3ڙ/3{>)[=u^jx3 IDAT<_eĥO#)sC~U&+,q8">vwRg'=v82-U1<Pw%_: WŽ ]$W_t* ^$ \Gcb/X*[EdＨ^|uai?U~sC)
\\*rTꥱFQg@P:%\WI5ֈ5֟Bj͢FE# R'zwо "]ߝ b]go? C:Jo~1#ql x3eg.&~{C
4Z~ {pUbTo;':{XWA @A e!Wi'M 8>k$Yم1>e ӻ "XR-~kM8"M%mj=Yu$)q @A @XB# >>[sYkGg/8/
eC <{>> `z&P(<\{Ύ; @A @A _F ʢsۋEV-^k%;-8SUo4mڴL&MCoO},: 7;ZՂ֯8A u?:>`!t[[g^[cCs#VO0r@pDbg7t^o9Ԧ@A @A 0 @QsrK.egcW\qE#Y%ZΚuUǯTܳ>=]umV@\C=;<͵xq5YAweKIy Ɵ$Tw2Uߥ^p<"y-pA @A @¯ `W&+=q,Ǝ X͛7/ [ЈTUGr\br-UY vSlIxgi.~dJ*~7 ܻ{&VuYY,-\s~dgwQSm A?-4fӄM; O @A @A dag-̺r' 0:|OTY?>Ibjnּ:{gzn}6z U˧Om&{y7nrXr ba2~"~ @A @A` N {GG?QF;iҤ& #l8Z:g??Vj~l34aGrݎ- ~>^GrF χ8X,p8ܻ O~w%le_]_Q~A @A @#_O裏λŚfjSG }4ۧY`"Pb6щU 3gz+ V*%Z˽F<DCV
[ =UwggԦ :m>> 0cǏς >3 /0u(_; @A @@~<uoKɮ>bcv;E"< pyilgM{. '^Úyo^~o-?/gMBwh, KSv qԆDQ}y|M7eqoܹ^'k<}Q/;Q?Xi$ q# D@>7W^Xv?d b;\>IUx6γ Niosk
o"o}ݗן#Pq2uՕaSOeAO<<qf̘nƼO"6l3
CXXּcWn vI+Swh:|) {,! Y| .H sLӯu {loBng5>Z?:zxGpZ8+5ڽJ" -@ b <MxK_0LW_&MF~cHklՉ5Nhw
7FK{'rŋs HՕLN3Wn*K∈<H^ˏGmݲ_mSN^;,#(vDDשNJկ2+25k
(]w]H$oB>oM>8p 2 (
9f O)naj
N!m[7ީdE@+;N A`-c&KdZ5uó`aW íu:'٘er~x66Wr㵞?ڇaM]~dqvgdQ0U&O;<~ƍlhX9NNɓW/k>n@{f̹m6 x9 w1s9CL&l
W/Y ꫳygK<
ο%\ @رsn'̻$"mª oO #yXFL@iâ w;ގZgzF MϸPlzro;/XyZilimMN'N&]x7fUd\f,>R ŚD>ljWD,+a ?
ZE$87 E r ܞj.,X. Z՟d;_8Ayv{뭎N)6<~0+6M7,,VA%*@5"^Rߪ;( 1gV_ .U3gN
W < 㮲b}*Rgcl9o,ٰcddXΒ[11:tXaϬoYZGN._D<ou rЧ3:M=O=:M6-vw @A @A OLH/ U^> A @A @3 @A @A u!'A @A @1#~N6E[N&KT흘@A @}@~}Er@W[tu>|xl
p
RZҚ-oh7r4apj A @ zu_
$L # l:xlҜ(^\]X4.w^_;ꨣرcV\_\u
J3/O>/ҚRO0|H:mqi! @A [X{3tO]9'\q,Y$1S/;зx4jԨS iP7FC斖v Kwh|t:=P?_?~qkN@/I .zRM[IԚ =5oIU\<]Ƈw Xí]v!<2x٥+ῄ-J \ A/qrO*;C e#1rU W ~ǔeh]˗'ov ilҖIo?bŊ|^ӑG vivaPaÆ[!7ߜ |t 'iӦuj{#յFi3ʹ1UgkwDHWG ӪJ}EQd(@@ED
95n>}&9}=9ܙ3=}6uPA($@ HEA}~ rW9}UTo ˱h_ҍu^xD֕gҮX(sm=k;-o lw[[z aʤZ3VL ND W, /
-~s>';zKg[nk+Vɓ'ې!CڴC 䍆9++JEe\[V<R5Ed Jtu$ Ȯ]> /9cg}v;˳?x99r
:4܃êO>Ç۠A 4 pwﶞ={ژ1c=/_:&L{zssgiSo[l ;EEEG Yaa~nyijs~Id&ʛEvurwvEY^BϵQb/Bb uoժUF}i\h81{/y (((%K2wuׅ6>/7yg-
!e aD g7'gyfاMm}ɽL=k֬ MNNNhO8 }5TǍg}*--? w䁸۰aCϵx^(_ '!/? y~f<h[k엏`um~xM8ן~x).)4z [bG
ϼdm
+Ϭ
خlά'3xΤl-331 ]] NDƁlc pǃ
b ;GV ă "T|~8І[oe=NHCFp}
:9qQhcJ<p c?#>{MB#UVUYFJ/˶ )`Q.oFsyxyٙ4i]g {'7xΝkӦM wF=:pË ݻw y;>l*fh=X mo ;<3JDݹC 9r=}bH ԩSڕW^⋶iӦPwxAd뮻B grJ1@@OK>}qsO;~MmG]aK1L!Qhs{
B #ᇙ :t(IgΜڶho(pBa K/ wʏ GYfxyY6#;~ܷ'ޖg>
}*ڞ.bCh#`LB1bĈ .;z7tSc
mA ]n{n)ׂ0 ,83fxnҥw0ek / יt(F~ҷDg} Ou KM%uNx{ZJJص)OpGsK-3#2xyzA _aq~wxy9! }d;wv4IkOJ[Z $ tj z,vuڵkhA#W#H ҉#NQFÃkqrkDO4nP,DxÖc|IA*ƔSvѩ.R۷}t/g0Ac@x: E+ S :9i@/c[X->n?jcv6YjrړǸn7~a[!=dlٲ` s-\`of8G q'kCS"Zx{.>(=ŋ3|<Oy!Yʹ^{-OCX@ Gtwީy?g}6ly ZWZ mB^Vt
" A,77} B8t+%AA]OE[EX ;;C?s1+ioo }4q#RXB vUWѢ:6ܡ\2Gu e^K3*83~O~u9Xb5ZG%NxJÁWYF^Џ7 ~nX8r=#ޭ[%;u>FqQ}Ż 6_'C ~9:ZIFN=w=NR'9ҧ|Lf>,I$ǜ|./Iٳ 6ۚ
;~t-ֳGw;s<0< zZ>rG炑m>I灃y ,)6Vт_R^|w>ThD{еiʄ
;":u_^vBăF K.$|MD
= }W6Z>+K/ԞU=AlȖt:ym| <hTq̙qxsp#
'
O =:xV(v
.m?ZjKېt;g(*
~ n UTO7ckqi:o `Ha"tsnذa Cy C~3a+tc }Nr"Q ɳ0^tpB
/<? H=ᅟ3- us>`&q ^x%' 7Яa; B7>
VC,8IS "R!vpK&D$ 8GtW m u|Nm!^!N26?"P+FfsagA<k ;ᰢOuj~=Gyy,GzDzy s*0!>,#ZM"ϵ'aO(t pkܗ'p75,q-˵:#!T+rs u ǹ_xEpѺ:@( eL{62 ངBȳ" KޯKZJw 5?t;VZfOro1Y[yw\۟{ؖ.JJK翙 Ŀ\' ͳQ{C^f;ì>2([AQJ<% "P£KNE _ i5q<i4|ƈƃ1ICEC؇FB#A&/_4^tb8Fm[;X8,K熎 1Hs=%ft`hS ʆGcϐ2+H:klbSOa tTI?w/
=
+ XG߲Ƣl v^vQlo#v>5
ڛX vK| H
F7-#/5e Qst"/ yc=AǓ٧"E u^H pOS."8Cڹy~?RcXD="KL!"DPo% ɉ@g! L)hZ>)"*PC_ш~
Ӄ!Vz
! :@E`G 1q76u?oIZxq 봱ca~ _!
_ kKGyHȂ"Pʄ2eXQaEW`K9 CdL?q'׆8cXs]0ϥ/K_ˤ(\WҖ|3-?\m{ >o1R6?\_WG y$0mbd !EeFH{t-Gx, _NxH~riW9NE=yIGti@ݿ& e> eb!̌p+pwj?y軖d_{JnKMIOx]gn?~4.d1`" ~II
7%7I("< x9`΅pnLz_w);:IrEECCÇ0@ IDAT8EB@ftD0O#F _ˢ
[Ƌ $[/fw bBN0K'F*/;ht q +:n44<]|zܲ2z=~/Yz،ݭwfLO>vGyʏ>ږ יN"u=: DD <m^{k~{{~4 {r"YN ᏺ[; :[wxbu=g; S% }47D
q 3>b }$F{_Q !rL2% B"P!_B`º8A z D!7+ MhI~# G 'o<K<Hm \y.!"Jҟ|qD,\}GU)R 99xp-`NYr0">cM,ꊧ3зަp=*ψ-?>qze[kRxGZ [~^?ȱ4 p{xx_!^'0@ F6Qq{? Ec1
,VNZ,ӯ.fY(kw[%K¢`[״Km+3OɳQ JJm߾w-&lK81H#Lxh :~#pЧsTD):a4li9GFc/oH ھ(En} ηѴ('17rÊ?BSp[:ftvipiXG8yZqUfY.d+. ߴv>F;
,FC.#
0~y~pw~ sCϷN>a [o5,Wxa:%i{#
G\)D{9KXDG̣~ .P?><B}9oP'u <iEGP/'Bh1Ğ G" ҧ
doҠ~"P!L7)u'>2 V)#͖(.:m6C&
ISes29.!
8ڊF||qk]q*9=\\]8{?"+c9W̥=M]\3ދkq~ TAL_A=}
PG$g6W2$hg))c~>}6_zMt )8V\R d$[*;ZXl WOmb_N^r͞1)&-qYV։a<XD~vG-CCMCA hFK$t0Gh8R -A 1cFU/\m!5=ǽ:Vr~̭AC#LCJ &|e# % ,y)e+oe{^:ϲRxeU03qXop(X%G:\w&Zfӑv @^p7C|>' f Gp'o" aCUq35
u' AB͖
mui*?9 8 '~ s>Kq$KA-!}<Ҡmw!/B܈~N`|Hf.;'b
ց]ĢbM8{?et*9lc:D~= aAFX{!пC1ܝ#m:b
:Ż < FE/"J8ؓ>oG!/aaO%ǵ `NKO?яB?p.?c I }:eXroG> E4!*b鎺T_s02z# "#q&> (knY@0g5ž9}uxl˶} ?`ݺ2Rt+-ݺeٟ|pF 5 Я 0|E?2
MCa@
Lw <Y ~ч>BKgBT`&Ng/G8Ѩ`1G
ΑFI"<T,
I9yž;MCxZDR:t\'g
:| )/tJ獯olwkuo;d=NX(''<J**ÊX!,0\tB>ż~t 8NaI
:ʋ*/N>_rN 9t@b 1 ROx.#/;!!
ΜdQOh< uxU"M-CPh'g`=O]^00B /!KxpmD|
K? buyAc~d>"zLI]G' ( p GۈhAq!to{~>2+{Oy)"+ Vv>N|r57?H3,y&raZ#MCB~ҳkc>10K =Xqr2|p0~r\ SϜ93KxذͿh\{~spb!bB@x'~a:`s4}ːݬ.ӷa@rM
Iv$r?-i0?7]ik?v=k,qɔ lI1I4$Bp
hR~D@jÞx{8/Tt4ѹ@#WH}h4ftdq1ƒ_\\/Fh#,|%biGC?:߈ 8x1/0Ag.Tbx[U/#q d: c:`4\JR
NvM{ٰnb_Mf:v= ; xX^)B7Vtq·11+h=ý= chv>Χt4<?y"f#19</X5`Cp` xiÒZxic >YQm/; {j@XG@Q'nVh#?O`G#J)9s~ iPE W3"eVn~bB 9qtrc@D5hXm!ԑGµ3
Z2 !0' y JΈwAz~] C"nn)/Lg> CQp#%bjVRm3f. /8%7""q Hs6G uGXO,~f=OY|$SgyW#N~G ݏ{.GzȎgz6 ?'%+l@|MpU/\5nNF@a ,$7߳"ϒDrI%D@+;ߪ*lܜÝzq)?OPq.D.0tX :L&{FqcƖ;$THCG#-Gy#|~;C!!#,㫳#O( Јz:䁼xQu_mkJB ]
K6_==e.ͮ~}_R ;n@럙V4m!/EX4x'<^Hq]9RXĆ q?z{aus8{+^z:&@@ԟ͋;H ܥ8Q
s_E<u8 x6 "gߵ%G -:꒷7 8?CpE}:Q
a8Gѐ`QiY-ˈ?)|@ y.N"n"rauEz-䍾 r%ij6 9џYޟ"0a/q#> }Q PqM:),ygq<?ܧ0$. a1¹88N8&pn }acr?\h~ܷ G^=}P-\x}c~Ď?pYq1_mߵcx6s2 1g=;CzSSS0'[U6b [`a y0Rc g*ςt;翶cM-B H,<8!C'<US;
7 4 -x<\l:m 4&v?4l<_γyw#p?͏ҥ@#洤${{Q[}J++-#%?XdUb_xtu/v'/quCs|+^::& S^LfE <s Q pL>9?Wu'ҿND }l[G h=S aaG^3c=|HFÿ\ԑ= ~a% yRb_4
|sg. 9 o( CM3j!~oIX'Y=?)ƴ'ί3ү0 G8\G0(ƋEIXta؏7smCEô~rrJz :oaJk?l}3 k6,?& clk$X嚙F%u-~|EJCDM 0yˏ4~c~?X]i9Slz]Ws%qз4K\/1zb X:zLjv#Z^}R9nH16=B9]a:Q("P;mzPW;9,iEB+Qm ݲ*6Ͷ]W/_} kqYfL_Pk:â.VQ5-x4,lؼ23˧سG\zoS˾yRp՚[=]v ]O =p-zm~l V"yiN8 ~͡"`hY;Urkjx=2m{QYXW3nKwYeiӘgf8"#_kL>Z |) kpyT"VxV\0,1e
,YUo\=fO nXtݲO =/ʎ +=UVT-W:aVjIG_-`tX:"c"Y9ھDS}|
91|sK~iV
n7
i)T@G$(}h} **-A #1gtXyhAzO/|ݰKMI = =B; '{ew=1^zm+.)GZh9Ɲ=Xɷ=E L>cl![+Lbbю)vviXr" " " " -s9yRXOgo0 ;$ 9p16!Ms/-۶۶vx =¸s"wDʪJ[w ;saXo}ymZ6$}mX kJBb_S)$>VǭEc_19%" V ̬w 8/_Yl2OaE@:'EE%}>K,"ʯ
0R6xyv 7ϦL Ws<fٟ>x͜:Ѧ^8RY[`+ *
hIkIKD@D@:>4Y
B\TGQp,++&M5K ;v
+RJw;w>({g} 9r0ay\hQsmay-w>ܛϱýOר9Hq.^\}~I-<G%z$'Cl
Gⅇ
;'YsC"eOCYyyrzv`o"}S_C@;@@())˗[ =Uny9믭[n֧O|+.. . mM. |D Q0y>~wey8 > V}y#GNZ ennݻƽǹCs85 ~h C?s[n۷gu
6Zlx<6m
7 iV|O;նe_y
j\2H Ɲeii)Vè \F!
eJk6BE " " " " " K !==ΝkgqF y=z]z!qDYa-[lƍA{ǂ%" ŏ^zٝwYmI8 q8 H>?8''M{
amٲe#=Ჲp߷O?=sOs߾ R{|Ĉv woҥZϞ=0>u. ς l/B=W^yVXΑUVٍ7,[U"]lId{VTJĬH𫋎Ή@@+**
AX6l DK{3ϴLJacƌ Q/M2%$v txz[{x!)iVG fNgy& 0`, }W]u]r%N='aqoΜ9' bرc0v,o
O}x <hO<\HCڏ>hǍVh>ih A ~ p qc9>VHX :t(e9 hv[tf̘a,!߾}lݺuI]ԂG[hm{ ڵkHͭd9+<&NY,V dz^FFFcH0!6Æw " "#CyO օ ' H~TGZn8uw^{\D@D@D@D@D@ @@ mv8k֬`m6{T"Hn R B0}ŋ7+|`؈! "U }Dį%GEVfx9w eX.+5˽|߄a>1 A졇
+X># x_~6|<g}#^xᅡNP?ϒmn0<ɉ@Kג42Dk#Dc<
)hC`(/!n~a!^|Asa-# !,$ЁkNVK{>8sk82[wu1.
;\sM8ǐ૯:I#"[A !E %>GՐ^'mKג4 D>&g>1 VIr !!$Dc
X %> n9G 3dXAAA"sڒqhU Ɋh}7-TNAڭTw{M{$-V} ={vA3' VA .4kU(! *@G$ XĄ{' E`12!,uuV#
~owuW6mdo]~j-NrqX@%ć_
W_>t^Z s!5$Azý˂ވXQ&MD>IJ l~b*,_{Iꐡ.B_mE%4K<bDF=0$sm r" " " " ""! LqD ZwC|`]1Μ9Nэ B?o IDAT\pAhB@/++
6, cDcH/Al:ujQ-'mE:)B g [|yn=zj[dM>=Xr/
/JB X!M<XwѢEKB!nJ/B W^yeI 4IC+,,ʊr sTNE.]-33K_*tWz{g.`e˖ 0 "+"sȑARyXʈ+$\~}OM
b# ,Ocƌ ⋜%,c G "i̙C!Cto<Q
< ,ZW/ǰ
7cK X ⡆qjh
[]{ ϩJl :&ѯ]aGD@D@D@:> 2,>,8D,٘ `Vz 2º Y& ,ԁ u6opἈ!$QF~1O:ĢJI_Lu${5*!1'?Iâ ='L:u}
63z :+X D%$4®:Ɋ
,924.-!MNJn!ޣO_=[:4By[UU
00t䢍HK۷o_bFW:Lso^hD@F6 QQb/ + /`G[FPF ^{ {0"aCAޓR} ͖8 _; )86ܟ,VCiiGE~otGNf:\s8SoVFft;'7u:l,;^Vj}:9& J +%'X!wb*" " " " CzTy͛:BCsǂu.x|
ޘ̏1~)xD"'uԅD*4J~Fw> *ѩI 'r" " " " "\kLp1H+6x</7*b1VD@De =kkLZR?E@D@D@D@D@D@D@D@D@ڂ@Ȑh: ~Mg" " " " " " " " "p$%%QD@D@D@D@D@D@D@D@D$5B@pDtv
)-H ɒZ0>E%" " " " " " "pHMW +RdK6KH*o",AjV<B`Qq:(" " " mO@ ۞yCSԵi(6z_k:إǛ 7!Nf>{ӎ}i%f)Xڀ1>zؒһ6_|a%%%vVgȶnW oW_ɓ!#TVVC>QNZ^^PGw]+/Egm])u|a^w%'"P?okF_) IkAӟin ]jKkX~t触ݖF*;jE~i%럷͒̒v?! /;?YO[ ,{ZЋFP<ė.]j 6Uqr+{P }ge3f̰.]wʕYC+?_~e˖{mС՝M=z` vUm gii uf<,%9rss'P_!thѩ|ȉ4 :taQ ͐78!]js~m <iw9)GVmJ?]e]Y X,uٖܵYE}mǷo>y>ߎ}к}[ ﲠF⋷'؊+ 9:6j(߿!!qw17>nV? ;6|MC8qI ]v5\c{VIcvڐ'@w999#!sϧ~:.{i>`u8#m Ͽ+g^l;#ey۷oVlp`yT\;rWYg boiαnWr/2һ
}]&aū UK,5ú^ *\pAgӦM>}ѣ"mܸ1X?1clΜ9NcX auOYn+ S}'/逸|xCl|뭷B\1:}d[mUZCuQC]$eVD@D@D@D@D@D@D 1Sl_
+݆7zgD5ңvC_[c9gZr~=ǖ
_';ԁg[ڀoë BTÁmV\\lǎ {gZe^{~鑘Z'Q# 9rV^mwX#.Xa(<2#Ҳ2{vkV^^ai)k3GŪ5\gD@D@D@D@D@D@D@D }9]X,wq?([YCeA;Q$zVNJW=iEzZRrsF2$ _L:4Җ,Yb5"aȘh< `Xga^~w[hQ8|2Įj&~X2<9 Xvdς=~/\fϾב@h?Ҏm^lU%,s=:pIM9غk(o#<lYOYZO-uบ~+##ðc/E:vjoI1 1 Ãc6<#a5 8H Zvvv Ê-q[5H/
'$ ?^nE%%w ;brم[Ee~cߊوl֧Wӻub T\eED@D@D@D@D@D@D@Z@ ~%eg͎_Ȥ<,pK >J/ , u,W_~=,Oo拡6l K/
~B!Xtd!#OÆ
17ꇡ;v JWWY~Q+(,68v,Ow#`?wAeݳg6q{,+$,$eLD@D@D@D@D@D@D@A"%w h)}FrU1+zVqxe_'sHMIɖzX 55CvcŷبO/^c.N;ͶlR}uҋC{_!MR033<wwQ%6=--,qRsQ6D@;|v-ɚ7=Q(_" " " " " " " "X&UZUi%e"o~* XIem'KzT1k,xiޫm^4/ DqVjj={ }' ~99vgv;.:?+,,6w6lm{Yjj^4@ ~afX^Ҫ*gUU%%UU-WU᱖*,6bܞ={G
Cc/`
`nuG8Ԣq 1v'Y?XZݻw|`p 0,1AmӦM6bĈW^ynᆰ
1(s n5B;v cV.vճo ~F[`ԥ%wnEy|~)J|#;1n9ugZD0Ve1}yE8˽>}Us{a
`4bĦ{-z<a[reP}" x ύz"O=T
/ŋ? `QF8 qPߣGڵk_ 6aΞOXaQ%'ǿ^[eû,3#i+" " " " " " " "О Cq{n{>6@;zUU 68d#z ={I ^}Aۼys=k١C; tD X!aPa⋵VQ u!B 9OyCXx2W#G$YS5eXz-+b7h`?{%%TD@D@D@D@D@D@D@ڕ@YetSWŖ18 "Z q|f+۾RzfC& ;u 0VὣG} ,_6o y89 ocE<÷v ?~BKJJB .m߾ݶmf{o ([n րĕ0c [hQ?Æ //c' |[qIiE@D@D@D@D@D@D@D@!n g֊ͷҏZ陳,j^4&ﳪJԌJZʂzM{x@h[pa
ׯ_ obs=C!1 xҤI& zncoW[ "W^^^}a{
:4DիW/[dY&?y x6mZ#ۻ?ג"yݒSYXTl tb)" " " " " " " "ЦUK9˺N ]S_7#=2F^R
0˞GVqxeQ}Ў.[+
K=l˚ VoNvv3ƦN"$E Ce0 رcmĉ6x`?t!4b CYe[o5y80|sǏ鍊n2p!c cX0(pQ;R`a1*+/.axa1[r (R>E@D@D@D@D@D@D@DM GIN*~nk[n]/# {%g ˚oTUh/G- ~_YJ[z!]x g8ĽcN 9ݻ8fƍs'm!~ܙ܁<+,,
KOK)7ϱ> ?P{w," " " " " " " "b]t˾VcVYɺ,}E6x%w `UK+m*[3ܿa EԾ˵v9g}]m3\`]2O ?`_y=6-_m߱}3E@D@D@D@D@D@D@D A $DVƨ;UU sgK?^lk ,ka>*r3K6K=2\ t?(DdW'l֣[k¹9.)weٖٔM#Giy t,zAѳ%G:hhJ#w|v|ׇVS,>dnZڠ,mF/Pww^{\D@D@D@D@D@D@@s C4)=҇O
1S:-Ec:mAU0V'p_X @`UfVYIK ,@@@(/gn; ~Mg"bki
''" " " " " " "pp] àt14n
%-F0߿XگQD" " " " " " " M ˾`ݷkNc&}&//2w*ƟG } #jmB")FD 0>_<W(" " " " " " @s:W^E@D@D@D@D@D@D@D@D " " " " " " " " "БHHWKyz4iю*'jC@wsǹVʩ@ %ٱrL:nBΖΊ@@Ė@ _eeY.靡*DBD@D@D@D@D@D@D@:).
!" " " " " " " " 'Hӝ " " " " " " " " Nt1UG %%ŒVՓ? |?^ϏKMM3.ǖx omG
k(~h
MYaD@͛m
JJJ4^;w_zzzmǎ v৶VTTƍ
iu9 ;v֬YS6c֭Z [?V]ߏ+++<ݏDԾ57i)=jX6m
"mV}<ڛoi=zK.^}U0a ?K^^^^?rHf̘a_|-#"ֿڵk 'Lj#,;;;'o }ݻ7!.ֽAD#]8Æ
Çk={3gZFFF0+q(iG|FD$+{l[D@D@D@D@D@D@ڊ"tD BPI!NM2^|E+((>}5?" u4"q"-Y$X7pw ݻW cvQ7» yK9ww9 ܷo??5ĸs9'/*O =/ qK.VXXD9G-77>3>}z㈘k`7n}نڵk@H9y\ڊ@{מ,,NC Cr` U ܬY_~aćx^qq͏X:4Kx#
6XVVV
jÇCK/T xea
?CqQ| h"!!2 @$^ _ Dp⛲"1D>y'/ڲVD@D@D@D@D@D@ڛJ_Z "w?"!XFGCsX =G*iGC02alʕ6dȐy .Fu`! zvH qȑ!^UVCI<#vAG9V HP/#\]tEÝvi6p .$
~r%hDnݺѸv,o#>gߊ+wA[tiHE3FdlԨQEHDs;9sa20 `^l:>Ckh2JOr7hDpDD# H>}]c(0 <^DK XQz l?S;묳+x?hG$ +:!qsj컸/m!`!" A9ފE Vt_wg~;cV%e˖رcmРA'啰.BtX!6r]!bG> lj y N!FbG8m۶ 1 O8D DM[h+ڊ6
ǖ@ş;1 =:[Y ō3&{g <VETCƁ_X|yc],]j IDATXK~a(ql8ݻw3K~
x≰`.Ee/}Q ݼysȓ" wqa?, e#o ?9HJ( "LWcoǘnѢEQ-N!rM<hU<pCcQ
7 d<"mٲ%̿ǰ٨P^Ʋ}W=<X㷿-^nᆐ?'W_
GHCI/!]<v d & 7|Z4$}np,Xwyb/i{Q?$ =+mhAOXa7,H?c
V Bn?o C܈l*O*wX2_o10Z y![o } ]}8IwuWXEU{]L+pBDN B vsrr\e'1&~-i">:9Ì$" ~xU'h)MV-p!ap+pX]b8Hx,C.|H/b q<s?!X1 qu!av
V V~X͝;7$F< WXz/+F ~`d@B~# XH<G>SaaaX8G,ͭޙ oH*("B\#J+_4IY< oذaan;` >KX!,.C#?j/rK J逸>/a/G`=#;u{ﭞVX8pmX9x[D@D@D@D@D@D@ڛJ_Z W!Q?We/s1X146% /ap]<,Kxd=Xz7o^<" >*pᎰ ?"9O\81 "NREPtᎸ/C $< ɇ[ zھ = /VD@D@D@D@D@D@ڛJ_Z "{]ݱ Y 9r
?b,xr8aںc;30Z;8s`\,f͚ !!i C#~!й1#>nݺ5 p !QO> V GxC~cpa^?{jW& qyl)ar" " " " " " "($%ʕP>DXD? bX4*1>!ᮈnXyG <x0̳\{>]tE6s`ᇕ߂ q`<GX4!oXGO?ݦL B <0BÇmĉa1% @$]83Yti ͞=;뭷
[|y0.""ZΙ3'p'7VVUYზ/ޙW"Rm-eA;ߪ*_~axiSE#eUV omX!qt* yB,zpĈA(+# -i c =rϑ<c!뎡XbHXghI<|X+z<X?-" " " " " " %&粒-55zΩ~OnL\CK~;- 5DE,BlEE0C"\
qŞooEME|q叞oP'" " " " " " n_ts^1bEV緿bEOm"/ Ｇ[~?t4 /mܸ ]qa `Ƥs
ƻxb۽{wc77C 7o *cH;̘
sαÇѣ8+b5CݰaCؿ;âChٴiSXxƏ VG @]vYuEV^m\rI[l +˖<1tE"֭[B
\pAi+" " " " " " " "zZpŤ-/ "ץ^7Jb
T° رcÜfO' v
7^D7a{;O<{CcU6D{7o/bL
#~{3q =\lƌ5?Q@2b)
~IVIe63`N5!ir^ND@D@D@D@D@D@D@Du $X VoH, m۶o߾矇},\<nvڰs#GݻwBWc/͒%KJ, "ڱ"(~ }Q{7lܸq{W^y%⋃ ۍ7hSN>(l Yu֬YvW+_WALCI{
Z/*zlX2+5 RKaه"ib(ϩj+" " " " " " " G ?bMV&n߾= w믿n_}UȰC2馛uce"yǃŜ_+Wn>l8뭷;ѣêXٳ:C|YuX= e$=B8O5Yg"+A B(k7|3=eʔ jӦM C}3? "!C1?9>CND@D@D@D@D@D@D@D $PR,pN[dq WDbx+l]+V>20#FT؉ xX2w`_!Z15vϨptX.ClD<"]Ϟ=C: C8XXd-1=9w " ~v[Qo6a0' lݑ&<L>"bI9`-<&Mڊ"vYs1Q
Q y`نE8*G4۱cG8 DVo8.(pۚ㰂:pQхE?aP9ذ Q<V͇e /& ^wuZ ]~92+3<3 ~jS'OEVD@D@D@D@D@D@D@D$ tK8@z
6byCratCn_:8 q!.. Z `}h{ׇsH9!c IM=ACHeQF 8Ǽj1s S&>&=b0։m͚5q=D@D@D@D@D@D@D@D@Z@rEV"`14nqZ]ED+3~ܷXy!p ǼEb[qaś6m
m-B""Vp8̬KC d,7p@۷o >|8Xs D|/Ö ˊ8@0j=sc
SX^ " $
X$Ih] in_| CC嘿3_1
jPCpB,<".DsaYE΅ŋQ;4h#_.q$cHG[ᶜc˂!ǖBPjptovX} ÞC daÆ?/V^m,hޘ1cTF9g 0`@=G Xɗ' %bC#֎@HH:%-}8VEC\r6)c8(@!E#!d]uU!N j^{m̰#]Hp8[MG>̖(Ν,'q| <hׯ@܂˖- hpw7ے%K` Coa7C~
Ndx o=\sMqkh}I%
gYYUeZNNjX{
կJ Ve(.m;[CcX B&^C$osoR~c ?l)!MF a?DFe'۵kedf[FFMvoӼC2,`Otm|(~'-55zi>~
ŋr
/QO<'ykQAӏ+߈H`Үi|t_qEy@c9* ^|@{s=Zi^KkצsY5p}9:7q0췶!o8#* TlC ֥|n棳" "О nϫpj{-qM^ΙY' Xthou#3N@[ Xc5 l3'x6b 00*@b@ۻwoZ t0 H <×)_צ_z b,"1VX" /r#" " " " " " " " " YXD@D@D@D@D@D@D@D@ĺ ʍ4f;902iknnn Tڲ%m-D@D@D@D@D@D@D@DT' z+ jժFo >lk#GBz]rnKo[r*:p Jʪ*?|rrY.]LD ڵ22-##MZYYiy[UU
ri51/߿xv 媪2 ɕ!" "m6x`KJJڊ@`mȐ!- "l 0\&PRR
)
z16--ziR;& Nq+" "жh/@
;zhE@D@D@D@DN)kF_3ѿ)1 CT >t\G@_)$4</\e>э
;>%9` Ր<η=>ɞyvGGmҥqmE@D@D@ }}Yx燗r_ cK>v5=GG|WTTx1om۶Q"
wkN \xlx;8"ƻ'vKߜ鳘+){o>-+|4Mlb7I3EPr0$A ѧ 83P(Q@AQ#Q%
4}ugs8{{;wwUZ_j?ܛpv];Ｓ|+_e|?q WuSPKľK-eM1 3\"0!\tEe e뭷.رcrYgU^mnt'tR]m4/{e9,}{?.x;<Pn2qzOƁe5zkG Y4 7nt,7ٺDɵy̘7o{/7su*-جP D+l5ô{61HF6H38zPN=6!`˦5/= {\'?яc=V>jgȓ#p]w뮻
T3,r=9CG Ydr65a+wKwk?r=~4F`=2,S z q=qw)^lmBDP++㌙i6S'/&i'e;CcE KJ_iz曋M4wV[5X?~|mV(fzgkYkzv" H[Jٞ)yc|ey橷鰍a Vk6ŶJmYRyUa 1~PRO>*s\rIMtId[O;ڶO< pCzORaxkeꘫ鸡ҫ ,t<$݁䷿mYorrZm Dy?uŇb(0? Ty8"g:SnUy.2 z_o߭K!+o%" gԡ2q |-,>4g:4\ adJ"\ ._l&&st[l&?RŸK+Io@83xg D`0=ev+?Ϫ
po%( G5:{Vu>nD>pC&v^ [yY>ag#D=M퇼1nF6# o<@J 5 ^wlt} $}
U
$@ JqKC)n^y#ÌMB``lC`ѦIxC1Q{YyKyh[p[W\qE^W\qrᇗkt} g}W u3':!M! d[$3[n_k o2~ "^*. иJ3>}M7T6t7wD
u_7AU? 7__{JQ ^P9UGZ<.[ [4 ?1Vb N(PY#X#`(2ΓBבjWDť\!/_΅G1ko!
Ŷ
+TCHQ2Bx9fl4 %h
\u0A!aC04) a WeUWdpߔ%@;Tzْ{x6G-RqK5}c5"\u& | &
{CI1qZ]xˏsRa/z]zhR?v8r
p
<+wU糛16nsG^w e/Z;o%ܗ0{>$+ܓf爜 ҰtȟI(i7)^nC)W\ERW8(7e*Ҹ|LʡXGD DHD2<x^{&G_nԓ6פ p6@wyiʏ/Auӈr7_Y]$W\.˯ij51E;<kz#-yF>\~!gA*ypIR
Fѩ4< %ʀAV@f,0Ţ"$4*a Szkw}wm`ncDΛ
%Ϗ} 31tHof`BYiO{h Z^6S!ikHE ÄbJXF"e?@# ]ʆ}+:Q5IBҡt\@KYTTO h>Hk0@'-dk<7 (LVB@0Җo,C$0v ŽkN3d"L `_i`ncB'pu/;Ѥ#@ =e;f,loO8ϱ}DƼKY؊Aϋ۰4 :_+[yg|-wԏ ډ Px1ΈkpfЯg?#qY ލ5j<iWV %^|3 IDATdo^r2#{鈲Iht\sa
6B˳wK9+[Ke| 1#ǃU]IMz4AkOڂ'Tڔ{p.pR>^',aM y3
= hSU JU W\SA q Эo_W#hb6-;ָ2ń
ip$] n(vnk]Ӗt*!-t
yn=rI>fx)hƐ*1(NiY7:l EJ(Wl6=`f"AW[^A{zE=.$"@ z8BO.\ @_G@ۏ!t c}7rA ٌdL&U$݃ _"O &4h܃g?dx`4螜q.R!l&z4(c4R&Pgۚkj Ʒ1VH ?@!/\c_zw[(-l} ?ci0 8G`1 cf9yAwa-4#UjVA9,&ᦜ>s\}(xy:g('Wz|mO Sve:~:OTnqs&` &]\.](gm t16c ƫ\;dSǸՊ&@ ʃ$R~6$fu p[M#b 1!TzF$ Y(#\C,`cU q !H!73(DO»uʎ, M>42aM#I1<dC@ ʖQXBm -C@1@VuܲC#mK!O=nHF?j.~WS |՞fy 82shAJ02&M'D1sFڏC1Q& $ ڷh o#jt Kx 0]o~A?z%oM&G
2xXH
6ؠU'0".Dhl9d {qD7j*6 ` yDX^`ܒe` o
[vJ
b7<-Ev {^VkʙngyraK;%/bil--t#1)ώ4eD_}~A~ In!RpNq T??P H$TFդkگ=墜 7 ^DJVdOH_[
I(N^nz6秮jTύ+%LDeN&FLjD{QGqPFn}QUxp u>: @qXW1&, &<e*@2{Fa:0\SaqF 3
a#J~
K}~xFQHrAS\ڄEB%:3t:m={; mDѻ&&rݞnftfɤS%fJi ! 8m:uq3 cgH92tLKy9$# =z7`<~0GaZ3F/=U)@"=c8 [6*=F0#x {^ ۃ}Ƈ rH1'ݝ$&Gv1 1 M._a_ӽHDB91<XۤGGhƜ@ IeW;QHV /7lLuj YΖ} X%p/e_mvGWs<% 8 giu6NǑ>Z>rI=Q1ƋT@Xo,&~4&P_> S G$űh[m g6=c(alD۠y"K :
f8ᐮ#Rc-3<?
( gڌT%(L 2ɡYj Q-EQ8 uj{ QC U"i(52KE~;]14}
y4HD%ʐשSbSCe
<N*9BAAIp:
Jϻ2<(G72G]fm?u?D ;SBc ': d`>G8\"Q=uTb#FPSuEW#ᔣ7tS pQR>/0+b 6 zPtM_D yhg]onv3lv7>#a#&s0)@"=^MBѮ`o&BON?:5qH`q@3Z iGt1<VSVU6{9}]k}Vk锃2f~c2r!c7;P@ J?Hwҏx_S|Fz|HθNQ[7kl syFfҧL;qP O:D 1m .N<yu8s<r[[ajûϱC95s~ϸgY=8{^~=Ï
R>#oq0x܌2Ir/!sWdmƘT~D]~E #Cx=qe R*T.NExdU4D
Fyb:ѡi8f(#P01 B< {QlSt<Ӫ"נ0_9y"hx!n(] :c3A
DAtH~yT3aI"]C;PZ %0p1uyXH߬xTuY"u][
[BQBr Cq9\t.6㽌A3ޫ~kD Jf*u궸96/ákBG 25+ W?WG }aDe UI?=Q^` (#ơ{)@"0h Q`hm^۵Io~ }L}~Y !tI?B%`)@"}hlEd7`ꈸ"<0o@~nI>0/"1Xul7dɛ tYI<ȞqkfCB_Ev#/2Ov_VIM2&XSf lnLqLJbs6h'h|j,G=7 и Y\gpCĸm .,RkQV*ݎP{-cW%M̑r]]ikf}si$ʟRoM ;O p ^ `1M?:w7+oyT P淫?< QbB%f#4 K2DUVUd e wh0 4hª
E!LϪ*[<(.Gڦ<K% Ϯr(D~u84n
hG#p<Y'Nq)p{Q 0C8 zU z,)(!-> pMɃ 2t(gu2ҡ }EUousjz u?k;wup+>uW]V_=kMEd=c»==mbd20aum;R:#@_*sQڬp7<.ge
2_Dl|y$݃" 02 }6O(7}}@/6N/l$a jL֘ æI;{ɔ$ 756 mK Y+@u3_2/%gr#d${ I6 R?}@LGyh67fD*rci)k-W/,F QC6E 7އl6@
H|('}s I2egs;Qx)kX_ Fqd 7<;ۑpQ|DETީNkD\D8q+L'j-Ӹ~Je#<Ee }ta H Bq(Mp MA JҾ[߽=?SL ($QQa R\4&lJ[ŴW#7TZ"@D^k`2ELAА2Ѹ(P6'|
/JSg;<Dt2 J<ajĈ>qĮQ 0A4JKƑ2 6:s>B 8@4#%Dftf{I9nWc# ;Kɳzcb{#אgRh1G(7 敫L>|ۙ 1 H<K%:,tjv B? 1Hv-`Eo~3 ov7wP/ 2?Rf<G >Жu-g?ѮLڽ ї4tD 0g3\wq"MRF ƅVc*$q ljƎ =nC }p*<;Aa[
,=+B8o+yzJNsI|+O8sB؋
:h\a±%A2{ @#P
B$AGBxڒ[qpCʇr\; XD_lRM;cwǸLUBpaEp2s"=Z='l
c<UWZE $Fڌ?B+lgE9,iT Gw( 0U7IMP"Td1'|r% JݧD4,ˠ`S ~D Ĕex[rj
AWKwɣ /T'1B]'p4!<#~g
Q.z6@~¬?pk <@uB)Cz ( ! uN*! :PpG }tQ(H<0 tPAe)B秭G6/S'oF*{6aitBrs j>\T__Sk h"=b}M=,, ⾯
ڽ_S73Pe{#x<H]߭Mkx@x{=g0֪O&W#-0cRg0GYqeNE &|lϣ,p1>3l- aorG &nu)0_qub3o}QB<ߚFؔl\ Ux .3R]L#cI5D15MXJ</ qԊC<S'u;!|iMgχ Ӆ5^!3}:Q7iS~M?8['KPYY3&a<AygP(SKkB:mZyˤI+{a)3l3EH(R؈=AF@,G1،V(P[;DĻOyRh, kSE x;YNQtJ#
*bFCD6(Q i+b6wͅS* ߵi.fWS'C AHZ m?̌?|#X~Q^fg0G 9}jh \M{,m;Ml[;m:NbW=YPna %<# z;Eت{{Ow>`ծWZge %&Hf5,7C7|.HD`p`s 0mg ۺ?6 B &h)6`xkf TpI* d%b)dn62q$u yE<#nb|,xGT5H+Qԟ^
J/,8Mo|Xn L[gm!MdgY Cu@;TګWQ}[}AԵ^HkoMΘN RڕzcQ_%@Do(G+ДS.TE{P8 []\Q\hReLsS;pP@G2T`UB$@KrU@ Ux
ۑ ĵi;$&e'O>StO%B
'O5aʀG#Y}t4nG4!ˀC
ҡxw#
/Q〛sϊ)&< u.~DFyF O8Z;B19vJ{I5ߙCub oP@"$@"0\;vdU w>+Ώ4I&bogӷJ [>KOn{ iNc7b m 0lhm ?i֗sJN?yt[:=Mץnw[ˇE-U ~@1 aQ{댂kJ'7Ø@uͰ9=L0賗5$&"oG
MćB hk|_j>XqX8<H[z
:3= $@"н_hK1یz6L%?3ï[x#XQځ}s cIxuNLn}]&y C!k+0v"
a}]g;'@"$@"$@"$@"RpiFUe3
8HD HD HD HY
oB|7ϊ<'@"$@"$@"$@" .7xfl@"$@"$@"$@"$"߰/OD HD HD HD H$ό-HD HD HD HD VV@"$@"$@"$@"$"Y_~L<돯JMp 佃} fm!}hY9Kxu,ßLA"$@qlD`0:6hn\Y6g7ǖeɯrUW6۬\wue6k-lIk馛w8[lE}` 7|2iҤ*|QgFͻMV siWfD={饗/$@"t zzʔ)%U6-5ZM06ꫯfٌBgNZm~>ҵƌ ٞ}nʴri٧ /&M,s5W p@#?s2~CV
驧&iSqƥ1:H30iMGԵgϹ D H\ lLfVFKYm 塇 *Q\htms2j[ƛJO+ /p?~|=>h :mK"?fT@" Ⱦ ,5Ptd<<|ɲb̎)+1~,VvMֲfd;uF% E0Oi+AcJ<gmy#y+HD`H = Ϣֽ̺eӽe3)SYCupv e|@"$@"$@"$@"$@"0]#<2 G<t%@"$@"$@"$@"$݈_+Ե9^{UV^ybwYniĉ> wˋ/X<2y\ N jϏjC
._53p"$@"$@"$@"$,'z?O*H袋W\Qoi Kz ed
s9g?+/|旕lK*_n$y+|&6^eU[lQ6=3>S7Q c监 ID+%HD HD HD H IDATD 2)h_r-5XU&M* ~x9S?_ś3(|;o^V[ N;Jŵ86 {mf= < W xryUrpW/ ,@ !{}z监 tPy& n{{%kIpyLD HD HD HDK{RK-U< q묳N]wy+s ,jd~- kmOf!ݐg {q%t"+y#C! ]vm[
6ؠq +7J+T:ꨚ,qO /p}' Oǹ暫 @yo[ruו_=
+P3P7&@"$@"$@"*pr$`0=
{_|q%_ [o$2(0Zp{n%w߲|y!7<s"YdnydM7T9|hef^u#8 N!UE!JRw]uoqo hxtKK-$@"$@"$@"$݀ ƌT57!V^}j)cǎ)S_ZN)ؐ\ 2B -TJj~W)`C-
,A HD<x s1|fmձ [/r=Q#+w_b?/db__ܹ) C'?;s9 `c%*H L n6լݒFm#ytr/dd#HD HD`4#n_]Yn /Tdj+_'"ocke'S 5dQ0 x@n?O q%>v<#<@GMۻ O, @e_uYw=ss=wd^30 sQ_3FKwaaw
&B1pLozJQ7|yo!lOݞH{sVJ-QO5n 25\\Q|xzF\
t"Ż Iimj~su=kwijW3]y$@"$lvQ1V;"o,Њ=ۊgcvBZf|G#iK ky)/j%)7zWf}|\ߖ=w~{9p k1cf+=p9 ݧ;8 ?ۯ/^*R
a;ʣ>Zs6#9{!)c0{i_yYN1M6٤l=
M>K&LӨMG!A" 8-N 'I'u+g\?0x.{v &=ܳ.;s#my iۋ^u}71 4^6bK{6Cm?+ߤL-?mLR= ?Q+<a+{UsiY{ߐ&Nɓ/{iyV|d+}_ ?_:<k̤ O~}m0l;aRR}ċ'J#5$@"$lo8lw w]h\sͲ2T=qec&
g \E;{)f
ߔ[ qٺo ~yw;{F|jHNE a ljJ^;% o۲馛3EVVVŊf+$|7pb~Vl/V\`BI^/7U} -Pvqj@EKxNYcʜsQ܆w݈'T$ _ n\sOQ4:HǞ
n @+Oc-i|=~" bI/?1
4? .z"3 Y 4!
L#n?S{ 3 1``pNIQt
uޤ AI;fSE+۽s8!V[%ښv\;9m@^Z<_s»$VLj{9G {vSe(f+#uXG>Rs9x3D c)sף0ơ:(dX*=+Շꈰ=p!I0:1xvʏ㚾[^`#Fu]wSW]uU59VY}.o@ $@"0BauzqLMq9j=6sic ~J^!
n//]Ďa{j')K/chq(DN8"ved &~͢xOd*An,'q\:H9~Wr҄l;&Qq!&S9x6 -
'R|^i߭ZeWljǎ[.5墟|5VY+q3.(C}'(oA{9{)/G&?Qoϕ spej~ST\
MerMEVyKP)yi7G#+ݼw*H- D*T0qNAHȏ|P2Jg }$F~;!L;>ʍ'ᮻZ`'xb =GEx@@PW:z.foN#90ڌʬ~o&wl
r:H6-fM '!!N%_pȣv ٩Sֹ f=:[u' .:DyI6 akHX;ƔB ̢j3+3Qv% +t/-:fH}Po+mM?DS B=>O;' %-N\g]tEϪ
I-+<Fȧ4"$F dx}ȫx{ ~xqGwa8QHFk/ޙ$@" %J0/1}8{@6 b
lyIv' Scc9Lo'瞴ثƍ
/ L88VG/h?z!LkO~o&8M4z)R 6N2@!ьvɏMƦa z衵lk"R3.i0j' 㛈K'_2 BIzM?e{F&Rao_MkwP_/rWg VVYqr{IeO ܨ\qϏ>VV]q29fLyW g\X&.@YjEn;nU]zaoKq#!qŔ4*4̹ʺ,SA&%N7P >" Ѐ
i@ hHkХI"k ԈA>':vy8'1ˠ1Rd%)0 AR ¾G8pao3,DẺb JѠS!
J[]Qwxj ڢNAxuįq MKjGnJy裏n3s0_ A TyWIpf܃g &ɉ7.U`NOڴ]AˊGuH 0IJ!XΊyEɮbL3KS*ݎdcHg$D Jz>d1f +m2ckD wʇƗGun!y}<AO! yR
"ixf3ĵQ}!;]^Z"$@"0Qяɑ.x~/#C}h&,` U}^ӮlM[3Xc=6.c>7Z;@ OtqH8 ۜ=܄r5a(; ųS@K-T #QG!ۇ cc44;K8m">ϖRW< :VsO=dGcH:î2q O>beW4FGw 0{qʔ^{뗎+G W|]=^zkO-eRɾ_z|y YZp2*WCQC!)ThDz`;Ҧ&*NT8!nq:c4
&)IҠQliwWQI;S*3wcyŚkdD)V (w o+&74@DB@*e# : N:
D2 }uuK{A,0,ĥc6Ů# t gmib %CgL+ ^~:ַ*pݟq<Fڪ{O{ü۳!)8 uH{&>3y ^!Iy#fN| 6SlXMiwW +>@fTX+m֤kR'I EyVV
z@#9a IumE ;G*CJyЎS!EmW19d
ՇFNC^KD Hf6Hf1HȆԏL"WL0#v0= /+T"5 ;_" KLVI4+ [˸3#byY|-KC'l"KNaϮ9餓&1~c=IQN%c>}aGS qq Q]cw`k)S!p@n5C®Sg8Q}dk7g c7xDlwV83 # f}lYjŊ/~⨃Ig|OKt?`ײąooWl7N~yg>j#9 ?
42p Ѯk<># (Xf`
@!e
\4blxxK '4_G
({jLE=)6^L z.KυOPhؗC\@ Gk[?gQ2G;g)>F
Q@!i#>ҧ̠FvCu⼦S~u!xtތ) HHDz/;Pthc]>i'SIsmK f` N1C1 -f-~-#lk'-}~
;棇<$A'-ZxaA81pqW_ԇO"$@"0{mE63?ױ!Kv ۚ}_e\@yt7Kw@Ĕa2۳IWE^)m EtGbM6kY+n &[ hlYI Q;Jpcrov&g q_|!A ]a3cM[I<k\]FCy&3؉M0w&=+
w3HP q-_qu+ؓO __t"eE'cO=|/U S? Yp«و'
)&MŻ&Qy$&
mIA,Q!HwP$A$}UaH\l MB' "WC&G:55"gh~&ё6W@iwyޑ1 3t:MzH'7`4k6bl N\o (JgZ rrrwHŵ&=Ry1 Id}/i ^a|a#f:JpU݆
AHx;ʷkKy .ץ/v2D HD`(Ї!xx#y.H 6$j$я}aH
{=^q=<֣2&Ґ<b [ rn|䔱42VHY;OoXe^^Vv';/엾exVqz M&cDZx+":sq8'xU_xQ}4;;+ -rev(C ܰ5לo++/tYcʇޫ|'˺k\>w O
w
fTxEĠpFߧ!#y t9RFS< :t/!ʐ }d+NIPw:2tfa"V䁧#b!4a#ԙp<#i̳{HT- -,w@ytIh!q-#(OG7FO%#Md@j3-P/jR?F"
Ż# t7PYKQG ȃxkmh˄1+? ܵ 9D7Yj])@"$p! c[#|A talK+lL]O g{8ض1>FM7KBYbSTf&/.Rʇ폨S Nrkq46J,=8&qO&7!v,z~c>URn @.aI-UxLZD<:3e/oxNV?ȱKP/VϾ\wufmzOozP`M ч Eݪ)[Y(k 7w$s@~1XغQa ŲAKlp! rTLTpy0nXX.:w
"~~E>cO3 !<u~e#gH{\#ܣIMS c N!s rA[ H3+o)Қj)Ai{<Hᦴ |:'^9uIZvC2vaH|C aĞzꩵh;j>J.93H/"ϲ(K=X&HE>HK D HUt/e _ވ6;d5I<~ݳ!G}_x VID|Zm-׃<c#H1aLbw!K$яL+ *{kZ f\zaI>N|x}uSl+wJx 6@ug;%aϰ]نHU Crtvm6{[yǕlyd_9~wM/=BYm /L~eщ Տ}tC>"
c?O.ʾҋu HIF Գ7f(DLBU";_U.~:ċ{6)uct::|:Cu #{-0N3(F\s8t
̟͌ ^x:gM[QZW8E;NG7ŸB8 =uHO ;5 ftlSD䉛W.̽ 9`\.2yⵅp A(N{:VY>7e! k2l'ڝ2І1QNM9g6Pbpis Ry@S2*lb`ia@EZ%Fޡtk>m[gD0 R=7Ak /ꪰ 7y) v>{^I2#=2B)K1T
ޝ$^?MDŽn͜
>Xu}Mx}U6l?K*Mj!V06%[@OvF_Ʈɑ)] cy ;s
q%,SZvč{H(vJoe#1B
CwU-a͖ HDg{~ IDAT,7'
a,.W1P4Zz+/ 673*.cUG*~UG؍~[ׂM>[l\CS Naߩa8Q>e'}u 4qpN?e)Ww-}ߔkolel4mGIoe6OO]o ;5SM+>x4ib$yQM9-9Ԉzrr6q\ QΔFwPЈ#dE%Eiv=DEc ! (AV&g)u
(N ~HvJuz:/rָ(O_~#]uI3u ue5ND!=tL;3 q r8q;! )3eèc(}N5yu孜[!)JCfO<<ʽ^4֚]t]ȏ|'i^lg:;vNiw0~`m{<h[oD } #%[#_&y{arهŧ79їnRڄ4˫;xQ_Bΰ/KN~H:c @o~}((MG Qg㈦-϶ פA\뫼"o"t6ô)i[=:mb<z?l`a[uFL 4f</P 87<3_>?-7Y2|}вE2`erܸ9ʂ MX?{wƩb{@"ЕBd tat f_;2L(z Y*{l¸ c4;4My+%#.Ynvagl3܋[wqxh rrl#T'O<'Aw*;ZEzkZ3?gvEw !&,"x{ѶaD HD`f#K?{o#^כI+FLxڲ뼹LVg?u]:fEig/4qU;["ʰs8 ꛦ-6oW\:Gȏ0qy) c38wtqvX3ϕԑe,quګcN~XZT>gr|_:|㇕%8ä``q$#FۗA77#y v<^UDfyk
|n0-ku9 |oWz۽ND HD`譟j+{Ks7tSb;RKN64xY@ʧ`<ih'#m a#C}?=Z>O=[ *晻 [^}O ^?||WOd vX>χ%G· ~:/( 7 `P<=7ѹ
[ -=)<
y#%=W" ~3va~-Ff$]l"$#
ē1R^-ę%Pzn [ d BoV-l, 0+OYxFʺ}~|+O?\g.)zO QV]a2s
];O.reՕ+믵JUljY[
Txjx
cڹ暾=wS ÷E뮫}}n><7 G_i>-Y9c|tLBn>gGeD HD lf,I 3g+pY`¼>˯TϾUW\.}ˢ,X\`B/ WeeR#s}7O->2ސ3)o6?8Yю=;3CюsAx?1렒9MD{@~G;<FkJx n͗G;5!g =溛˗>2<sO~[套_{ruIo3E< O<L'(|{/ ~_f\3v c|dF?ڑ ~k(B \E0gVD HD HD HF(OZ }쉲Ģ緫g?˷%^}!e{p˝g[I 3 44(3D HD HD HD iXe?v?_UxZ+wf ;f<V>o1cǖeU/jDŽ[| ^^rVoZ6YͲ+^3}`f*OD HD HD HD`&#_b;$s5X~">t{'
7Pw_,5>d ~,K.dcq&g%vE)y!'-R^y>c}՞~*ء;P[kSů gy~vyf x≲4v#>n |;Z"$@"$@"$@"00G]}=\k>Zz_3s3(-ػ[ʁ X[n}{eetM
koєDtygCֽy ?s6^fgp}ѵMO92qIJ;T5 &T<
RoA0rm-ܲ~\# /\V^yx
Gq\z裏.j$@"$@"$@"$ GXoꫯ^3Sx*VG^w]wUϾ:z.N>Շ_v}&gܻ+˾; %Kp:mZZ CUW~ZO=T P<[o]vy |^xr5pu7\ 3+RGOD'@"$@"$@"$@"07n\c9j /o_W r(:S?4wUV|xE ?xW]uAL4>h*2Q)P u <yre y䑲.TWL8ZkWXah$ .`y;Y hQkf"I
9;>7D HD HD HD`D#_2wp7Vw eO]ۯ+<e嗯o@ >O8l= %]CeCObkSLe.[:^~kz8wpiM2˯Ӓ^nX{ @l}_$@"$@"$@"$݁ ܰъ+XG馛|x`%e]Vɾ6ڨlS?}/IݑLŬ@W~[guK,QϚzD ??$ ;yW= 5P?r@?b-=S<b}S?x%
)g;
7ܰ]^I wQEYZeZ&KxEބf a *MҿbU NHo{ Ykf홼$@"$@"$@"Fr>avmW :\1Ǝn .yėXYx_W5 !rгݱR?LF?^x
k [7D]墋.eV+G qDWv5
4lnKj"Of{lf%?ow_oc?^+G9P(vZ%,QvOӟ= ğg4K ~M}:aB D!QLo}[{}.o&@"$@"$@"$
> i|3/~ebN~T^ Gc9~O@
GvDHc \^m,@p ˲\bj̳oc۷vrWRq- cFs' x r!eK.zqNC^h/j d;XrI'Uo?H= }ؾHž>
n^guV% $@"$@"$@"0 [jMpsYeg 2JeY~gUUW]U}6ʼ !4N ﾟH3
K%o'7pCݔfͽ/Cs]ֶ5l>: ˹[_ڑ}$<#
,xR"2S9iZ묂 eӛϻn|P y6$@"$@"$@"$ ml3fV1 BۏٞwyJnuqt{g w$Zߕ'@WzLw^n.ECkz {"biFَ'\Pĭ6 vء|.sNAq
'
9:",='{U|)8ʛP:0KPXkO~;\N|OD HD HD HF وC=sK|:HdMYS+OXB"0 hlPq{[y{CCxYAyYUO<! {~k
Gƻ>~> Bx!, (}w}w:|2Z gsP_!&l@ $<(MFKuǣ71ӟ. V&hKD HD HD HF ޜIpiV H>sD`f"U 6 2 eo;}^(~'ܵ^[?Xq6T7\~`C!АW\qE%4@ X"<+owσ.3}S34 ? 6= =?w)! m j8{ ~arXKD HD HD H>@$É@W~@vCYnO= 1cfPXj;^W㽆$G qYk#]wݵ Ŗ?^_̵ y{8DX;'-E!Uh5\S < $ } Pn4ݏۥ[1lyUy)@"$@"$@"$@"$#ٞ}nJiӦg~L4ydk?矯H1n>`IxYC"
De &yy47ע=^_?zJ/v_w-qev{tjj:w_
a9~yo,7u''i^/-xk94Fk1G@ݚ<yrܹ?:},y5HD`f!Mvr=ޕκ[ƌV-b.]sec H(k4}sAY1n3n e&MW?u ~G(UI9a[YbC0 JŽ`}O@ahiI'T=-EYMd3N 1ɳ:&D HD HD HD
t 7@ <X{/r\uU˺[?!
yғID HD HD HD ~2L4 0%HD HD HD HD !HD HD HD HD HFI̜$@"$@"$@"$@"$u HD HD HD HD Mh*K"$@"$@"$@"$,@~|H D HD HD HD HF tH9 IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/styles/common-style.css | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
html, body {
height: 100%
}
body {
min-width: 960px;
color: #797979;
padding: 0 !important;
margin: 0 !important;
font-size: 13px;
background: #f1f2f7;
font-family: 'Open Sans', sans-serif;
}
body.modal-open {
overflow: visible;
}
a {
cursor: pointer;
}
p, td, span {
word-wrap: break-word;
word-break: break-all;
}
.modal {
overflow-y: scroll
}
.no-radius {
border-radius: 0;
}
.no-border {
border: 0;
}
.no-margin {
margin: 0;
}
.cursor-pointer {
cursor: pointer;
}
.word-break {
word-wrap: break-word;
word-break: break-all;
}
.border {
border: solid 1px #c3c3c3;
}
.padding-top-5 {
padding-top: 5px;
}
.border-top {
border-top: 1px solid #ddd;
}
.bg-info, .bg-primary, .bg-warning, .bg-danger, .bg-success {
padding: 10px;
}
.active {
background: #f5f5f5;
}
.label-default-light {
background: #A4A4A4
}
.panel-default .panel-heading {
color: #797979;
}
pre, .pre {
white-space: pre-wrap; /* Since CSS 2.1 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
.hover:hover {
background: #f5f5f5;
cursor: pointer
}
.highlight {
background: #ffa;
}
.hide-border-top {
border-top: 0;
}
.logo {
font-size: 25px;
}
.i-20 {
height: 20px;
width: 20px;
}
.i-25-20 {
height: 20px;
width: 25px;
}
.i-15 {
height: 15px;
width: 15px;
}
.badge {
padding: 1px 4px;
}
.badge-grey {
background: #777;
color: #fff;
}
.badge-white {
background: #ffffff;
color: #6c6c6c;
}
.modal-dialog {
width: 960px;
}
.apollo-container {
min-height: 90%;
}
.navbar-default {
background-color: #ffffff;
border: none;
}
.footer {
width: 100%;
height: 75px;
margin-top: 50px;
padding-top: 25px;
}
/*panel*/
.panel {
border: 1px solid #ddd;
}
table th {
text-align: center;
}
/*首页*/
.site-notice {
padding: 5px 0;
text-align: center;
background-color: #208d4e;
}
.site-notice {
color: #eee;
}
.site-notice a {
color: #ffffff;
}
.site-notice a:hover {
text-underline: none;
}
.site-notice .selected {
color: #000000;
}
.site-header {
position: relative;
text-align: center;
background-color: #27AE60;
color: #fff;
margin-bottom: 0;
}
.site-header .search {
border: 2px solid #27AE60;
-webkit-box-shadow: none;
box-shadow: none;
font-size: 16px;
padding: 13px 30px;
border-radius: 0;
height: auto;
text-align: center;
}
.site-header h1 {
font-size: 56px;
text-shadow: -5px 5px 0 rgba(0, 0, 0, 0.1);
}
.site-header span {
font-size: 14px;
}
.list-group {
margin-top: 20px;
}
.side-bar {
position: absolute;
width: 195px;
top: 85px;
left: 15px;
margin-bottom: 25px;
background: #f1f2f7;
z-index: 2;
}
.position-absolute {
position: absolute;
}
.position-fix {
position: fixed;
}
.view-mode-1 {
margin-left: 235px;
padding-right: 15px;
}
.view-mode-2 {
padding: 0 15px;
}
.side-bar-switch {
padding: 10px 10px;
margin-right: 30px;
}
.node-treeview {
color: #797979;
}
.apps .apps-description {
color: gray;
font-size: 16px;
}
.app {
padding-bottom: 75px;
overflow: hidden;
}
.app td, th {
display: table-cell;
vertical-align: inherit;
}
.project-info {
width: 100%;
}
.panel-heading {
border-color: #eff2f7;
font-size: 16px;
font-weight: 300;
}
.panel-heading .header-namespace {
min-width: 415px;
}
.panel-heading .header-buttons {
min-width: 405px;
}
#treeview .list-group {
margin: 0;
}
#treeview .list-group .list-group-item {
border: 0;
border-top: 1px solid #eff2f7;
}
.project-info th {
text-align: right;
padding: 4px 2px;
width: 5em;
}
.project-info td {
border-bottom: 1px dotted gray;
padding: 4px 6px;
}
.project-info td span {
margin-right: 5px;
}
#config-info {
min-height: 500px;
}
#config-edit {
border: 1px solid #ddd;
border-radius: 3px;
}
#config-edit .panel-heading {
border-bottom: 1px solid #ddd;
}
.tocify-header {
font-size: 14px;
}
.tocify-subheader {
font-size: 13px;
}
.config-item-container .panel {
border-radius: 0;
}
.config-item-container .panel-heading b {
font-size: 18px;
}
.config-item-container .form-control[disabled] {
background: #ffffff;
border: 0;
}
.config-item-container .second-panel-heading .ns_btn {
width: 25px;
height: 25px;
border-top: solid 1px #ffffff;
}
.config-item-container .second-panel-heading .nav-tabs .node_active {
border-bottom: 3px #1b6d85 solid;
}
.config-item-container .config-items {
height: 500px;
overflow: scroll;
}
.config-item-container .panel-heading button img {
width: 12px;
height: 12px;
}
.config-item-container .panel-heading a img {
width: 12px;
height: 12px;
}
.config-item-container .panel-heading li img {
width: 12px;
height: 12px;
}
.config-item-container .second-panel-heading {
height: 45px;
}
.config-item-container .second-panel-heading a {
height: 35px;
color: #555;
font-size: 13px;
margin-bottom: 2px;
}
.namespace-panel {
border-top: 0;
border-bottom: 0;
}
.namespace-panel .namespace-name {
font-size: 20px;
}
.namespace-panel .namespace-label {
margin-left: 5px;
}
.namespace-panel .namespace-attribute-panel {
margin-left: 0;
color: #fff;
border-top: 0;
background: #f1f2f7;
}
.namespace-panel .namespace-attribute-public {
margin-right:5px;
}
.namespace-panel .second-panel-heading .nav-tabs {
border-bottom: 0;
}
.namespace-panel .namespace-view-table td img {
cursor: pointer;
width: 23px;
height: 23px;
}
.namespace-panel .namespace-view-table table {
table-layout: inherit;
}
.namespace-panel .namespace-view-table td {
word-wrap: break-word;
}
.namespace-panel .namespace-view-table .glyphicon {
cursor: pointer;
}
.namespace-panel .namespace-view-table .search-input {
padding: 15px 0 15px 10px;
}
.namespace-panel .namespace-view-table .search-input input {
width: 350px;
}
.namespace-panel .no-config-panel {
padding: 15px 0;
}
.namespace-panel .history-view {
padding: 10px 20px;
}
.namespace-panel .instance-view .btn-primary .badge {
color: #337ab7;
background-color: #fff;
}
.namespace-panel .instance-view .btn-default .badge {
background: #777;
color: #fff;
}
.namespace-panel .rules-manage-view {
padding: 45px 20px;
}
.line {
width: 20px;
border: 1px solid #ddd;
}
.editable-table > tbody > tr > td {
padding: 4px
}
.editable-text {
padding-left: 4px;
padding-top: 4px;
padding-bottom: 4px;
display: inline-block;
}
.editable-table tbody > tr > td > .controls {
/ / width: 100 %
}
.editable-input {
padding-left: 3px;
}
.editable-input.input-sm {
height: 30px;
font-size: 14px;
padding-top: 4px;
padding-bottom: 4px;
}
.list-group-item .btn-title {
color: gray;
font-size: 14px;
margin: 0;
}
.list-group-item .icon-project-manage {
background: url(../img/manage.png) no-repeat;
}
.list-group-item .icon-accesskey-manage {
background: url(../img/secret.png) no-repeat;
}
.list-group-item .icon-plus-orange {
background: url(../img/add.png) no-repeat;
}
.list-group-item .icon-text {
background-size: 20px;
background-position: 5% 50%;
padding: 5px 0 5px 50px;
}
/*搜索框*/
::-webkit-scrollbar {
width: 0;
height: 0;
background: rgba(255, 255, 255, 0);
}
::-webkit-scrollbar-thumb:vertical {
background: rgba(255, 255, 255, 0);
border-radius: 10px;
}
::-webkit-scrollbar-thumb:vertical:hover {
background: rgba(255, 255, 255, 0);
}
.app-list {
width: 350px;
height: 200px;
position: absolute;
margin-left: 0;
cursor: pointer;
background: #ffffff;
border: 1px solid #ddd;
overflow-y: scroll;
z-index: 1000;
}
.app-list .app-item {
font-size: medium;
padding: 5px 10px;
}
.app-list .app-item:hover {
color: #ffffff;
background: #C3C3C3;
}
.app-list .app-selected {
color: #ffffff;
background: #c3c3c3;
}
.item-container {
border: solid 1px #f1f2f7;
margin-top: 15px;
padding: 20px 15px
}
.item-container .item-info {
margin-left: 5px;
}
.change-type-mark {
width: 5px;
height: 5px;
}
.release-history .media-body {
padding-left: 20px;
}
.release-history .panel-body .load-more {
margin-top: 20px;
}
.release-history .media-body textarea {
margin-top: 10px;
}
.release-history .release-history-container {
padding: 0;
}
.release-history .release-history-list {
max-height: 750px;
padding: 0;
border-right: solid 1px #eff2f7;
overflow: scroll;
}
.release-history .release-history-list .media {
position: relative;
margin: 0;
padding: 10px;
border-bottom: solid 1px #eff2f7;
}
.release-history .release-history-list .release-operation {
position: absolute;
right: 0;
top: 0;
width: 5px;
height: 100%;
}
.release-history .release-history-list .media .media-left {
padding-top: 10px;
}
.release-history .release-history-list .media .media-body .release-title {
padding: 0;
}
.release-history .release-history-list .emergency-publish {
position: absolute;
left: 0;
top: 0;
}
.release-history .release-history-list .load-more {
height: 45px;
background: #f5f5f5;
}
.release-history .release-operation-normal {
background: #316510;
}
.release-history .release-operation-rollback {
background: #997f1c;
}
.release-history .release-operation-gray {
background: #999999;
}
.release-history .operation-caption-container {
position: relative;
}
.release-history .section-title {
padding: 15px 10px 0 10px;
}
.release-history .operation-caption {
position: absolute;
top: 45px;
width: 100px;
height: 18px;
color: #fff;
font-size: 12px;
}
.release-history .panel-heading .back-btn {
position: absolute;
top: 45px;
right: 10px;
}
.release-history .release-info {
padding: 0;
border: 0;
}
.release-history .panel-heading {
padding: 15px;
}
.release-history .panel-heading button img {
width: 12px;
height: 12px;
}
.empty-container {
padding: 15px;
}
.valdr-message {
display: none;
}
.valdr-message.ng-dirty.ng-invalid.ng-touched {
display: inline;
color: #a94442;
}
.form-group .form-control.ng-invalid.ng-dirty.ng-touched {
border-color: #a94442;
}
.app-not-found {
padding-top: 50px;
font-size: 18px;
}
/*index page*/
#app-list h5 {
word-wrap: break-word;
word-break: break-all;
}
#app-list .media-body {
padding-top: 15px;
}
#app-list .media {
background: #fff;
display: table;
}
#app-list .media-left {
width: 1000px;
color: #fff;
display: table-cell;
vertical-align: middle;
}
#app-list .more-img {
width: 30px;
height: 30px;
}
#app-list .app-panel {
position: relative;
height: 100px;
}
#app-list .operate-panel {
position: absolute;
top: 5px;
right: 20px;
}
.create-app-list .media-left {
background: #a9d96c;
}
.create-app-list .create-btn {
background: #a9d96c;
color: #fff
}
.create-app-list .create-btn:hover {
background: #81AB56;
}
.create-app-list .create-btn img {
width: 26px;
height: 26px
}
.favorites-app-list .media-left {
background: #57c8f2;
}
.favorites-app-list .no-favorites {
padding-bottom: 15px;
}
.visit-app-list .media-left {
background: #41cac0;
}
#rulesModal .rules-ip-selector {
width: 500px;
height: 50px;
}
#rulesModal textarea {
width: 500px;
margin-bottom: 5px;
}
#rulesModal .rule-edit-panel {
padding: 15px 0;
}
#rulesModal .add-rule {
margin-left: 15px;
}
#rulesModal .select2-container .select2-search__field:not([placeholder='']) {
width: auto !important;
}
.search-onblur {
width: 165px;
background: #f5f5f5;
}
.search-focus {
width: 165px;
background: #fff;
}
.project-setting .panel-body {
padding-top: 35px
}
.project-setting .panel-body .context {
padding-left: 30px;
padding-right: 30px;
}
.app-search-list .select2-container, .app-search-list .select2-container .select2-selection {
height: 34px;
}
.app-search-list .select2-container .select2-selection .select2-selection__rendered {
line-height: 34px;
font-size: 14px;
} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
html, body {
height: 100%
}
body {
min-width: 960px;
color: #797979;
padding: 0 !important;
margin: 0 !important;
font-size: 13px;
background: #f1f2f7;
font-family: 'Open Sans', sans-serif;
}
body.modal-open {
overflow: visible;
}
a {
cursor: pointer;
}
p, td, span {
word-wrap: break-word;
word-break: break-all;
}
.modal {
overflow-y: scroll
}
.no-radius {
border-radius: 0;
}
.no-border {
border: 0;
}
.no-margin {
margin: 0;
}
.cursor-pointer {
cursor: pointer;
}
.word-break {
word-wrap: break-word;
word-break: break-all;
}
.border {
border: solid 1px #c3c3c3;
}
.padding-top-5 {
padding-top: 5px;
}
.border-top {
border-top: 1px solid #ddd;
}
.bg-info, .bg-primary, .bg-warning, .bg-danger, .bg-success {
padding: 10px;
}
.active {
background: #f5f5f5;
}
.label-default-light {
background: #A4A4A4
}
.panel-default .panel-heading {
color: #797979;
}
pre, .pre {
white-space: pre-wrap; /* Since CSS 2.1 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
.hover:hover {
background: #f5f5f5;
cursor: pointer
}
.highlight {
background: #ffa;
}
.hide-border-top {
border-top: 0;
}
.logo {
font-size: 25px;
}
.i-20 {
height: 20px;
width: 20px;
}
.i-25-20 {
height: 20px;
width: 25px;
}
.i-15 {
height: 15px;
width: 15px;
}
.badge {
padding: 1px 4px;
}
.badge-grey {
background: #777;
color: #fff;
}
.badge-white {
background: #ffffff;
color: #6c6c6c;
}
.modal-dialog {
width: 960px;
}
.apollo-container {
min-height: 90%;
}
.navbar-default {
background-color: #ffffff;
border: none;
}
.footer {
width: 100%;
height: 75px;
margin-top: 50px;
padding-top: 25px;
}
/*panel*/
.panel {
border: 1px solid #ddd;
}
table th {
text-align: center;
}
/*首页*/
.site-notice {
padding: 5px 0;
text-align: center;
background-color: #208d4e;
}
.site-notice {
color: #eee;
}
.site-notice a {
color: #ffffff;
}
.site-notice a:hover {
text-underline: none;
}
.site-notice .selected {
color: #000000;
}
.site-header {
position: relative;
text-align: center;
background-color: #27AE60;
color: #fff;
margin-bottom: 0;
}
.site-header .search {
border: 2px solid #27AE60;
-webkit-box-shadow: none;
box-shadow: none;
font-size: 16px;
padding: 13px 30px;
border-radius: 0;
height: auto;
text-align: center;
}
.site-header h1 {
font-size: 56px;
text-shadow: -5px 5px 0 rgba(0, 0, 0, 0.1);
}
.site-header span {
font-size: 14px;
}
.list-group {
margin-top: 20px;
}
.side-bar {
position: absolute;
width: 195px;
top: 85px;
left: 15px;
margin-bottom: 25px;
background: #f1f2f7;
z-index: 2;
}
.position-absolute {
position: absolute;
}
.position-fix {
position: fixed;
}
.view-mode-1 {
margin-left: 235px;
padding-right: 15px;
}
.view-mode-2 {
padding: 0 15px;
}
.side-bar-switch {
padding: 10px 10px;
margin-right: 30px;
}
.node-treeview {
color: #797979;
}
.apps .apps-description {
color: gray;
font-size: 16px;
}
.app {
padding-bottom: 75px;
overflow: hidden;
}
.app td, th {
display: table-cell;
vertical-align: inherit;
}
.project-info {
width: 100%;
}
.panel-heading {
border-color: #eff2f7;
font-size: 16px;
font-weight: 300;
}
.panel-heading .header-namespace {
min-width: 415px;
}
.panel-heading .header-buttons {
min-width: 405px;
}
#treeview .list-group {
margin: 0;
}
#treeview .list-group .list-group-item {
border: 0;
border-top: 1px solid #eff2f7;
}
.project-info th {
text-align: right;
padding: 4px 2px;
width: 5em;
}
.project-info td {
border-bottom: 1px dotted gray;
padding: 4px 6px;
}
.project-info td span {
margin-right: 5px;
}
#config-info {
min-height: 500px;
}
#config-edit {
border: 1px solid #ddd;
border-radius: 3px;
}
#config-edit .panel-heading {
border-bottom: 1px solid #ddd;
}
.tocify-header {
font-size: 14px;
}
.tocify-subheader {
font-size: 13px;
}
.config-item-container .panel {
border-radius: 0;
}
.config-item-container .panel-heading b {
font-size: 18px;
}
.config-item-container .form-control[disabled] {
background: #ffffff;
border: 0;
}
.config-item-container .second-panel-heading .ns_btn {
width: 25px;
height: 25px;
border-top: solid 1px #ffffff;
}
.config-item-container .second-panel-heading .nav-tabs .node_active {
border-bottom: 3px #1b6d85 solid;
}
.config-item-container .config-items {
height: 500px;
overflow: scroll;
}
.config-item-container .panel-heading button img {
width: 12px;
height: 12px;
}
.config-item-container .panel-heading a img {
width: 12px;
height: 12px;
}
.config-item-container .panel-heading li img {
width: 12px;
height: 12px;
}
.config-item-container .second-panel-heading {
height: 45px;
}
.config-item-container .second-panel-heading a {
height: 35px;
color: #555;
font-size: 13px;
margin-bottom: 2px;
}
.namespace-panel {
border-top: 0;
border-bottom: 0;
}
.namespace-panel .namespace-name {
font-size: 20px;
}
.namespace-panel .namespace-label {
margin-left: 5px;
}
.namespace-panel .namespace-attribute-panel {
margin-left: 0;
color: #fff;
border-top: 0;
background: #f1f2f7;
}
.namespace-panel .namespace-attribute-public {
margin-right:5px;
}
.namespace-panel .second-panel-heading .nav-tabs {
border-bottom: 0;
}
.namespace-panel .namespace-view-table td img {
cursor: pointer;
width: 23px;
height: 23px;
}
.namespace-panel .namespace-view-table table {
table-layout: inherit;
}
.namespace-panel .namespace-view-table td {
word-wrap: break-word;
}
.namespace-panel .namespace-view-table .glyphicon {
cursor: pointer;
}
.namespace-panel .namespace-view-table .search-input {
padding: 15px 0 15px 10px;
}
.namespace-panel .namespace-view-table .search-input input {
width: 350px;
}
.namespace-panel .no-config-panel {
padding: 15px 0;
}
.namespace-panel .history-view {
padding: 10px 20px;
}
.namespace-panel .instance-view .btn-primary .badge {
color: #337ab7;
background-color: #fff;
}
.namespace-panel .instance-view .btn-default .badge {
background: #777;
color: #fff;
}
.namespace-panel .rules-manage-view {
padding: 45px 20px;
}
.line {
width: 20px;
border: 1px solid #ddd;
}
.editable-table > tbody > tr > td {
padding: 4px
}
.editable-text {
padding-left: 4px;
padding-top: 4px;
padding-bottom: 4px;
display: inline-block;
}
.editable-table tbody > tr > td > .controls {
/ / width: 100 %
}
.editable-input {
padding-left: 3px;
}
.editable-input.input-sm {
height: 30px;
font-size: 14px;
padding-top: 4px;
padding-bottom: 4px;
}
.list-group-item .btn-title {
color: gray;
font-size: 14px;
margin: 0;
}
.list-group-item .icon-project-manage {
background: url(../img/manage.png) no-repeat;
}
.list-group-item .icon-accesskey-manage {
background: url(../img/secret.png) no-repeat;
}
.list-group-item .icon-plus-orange {
background: url(../img/add.png) no-repeat;
}
.list-group-item .icon-text {
background-size: 20px;
background-position: 5% 50%;
padding: 5px 0 5px 50px;
}
/*搜索框*/
::-webkit-scrollbar {
width: 0;
height: 0;
background: rgba(255, 255, 255, 0);
}
::-webkit-scrollbar-thumb:vertical {
background: rgba(255, 255, 255, 0);
border-radius: 10px;
}
::-webkit-scrollbar-thumb:vertical:hover {
background: rgba(255, 255, 255, 0);
}
.app-list {
width: 350px;
height: 200px;
position: absolute;
margin-left: 0;
cursor: pointer;
background: #ffffff;
border: 1px solid #ddd;
overflow-y: scroll;
z-index: 1000;
}
.app-list .app-item {
font-size: medium;
padding: 5px 10px;
}
.app-list .app-item:hover {
color: #ffffff;
background: #C3C3C3;
}
.app-list .app-selected {
color: #ffffff;
background: #c3c3c3;
}
.item-container {
border: solid 1px #f1f2f7;
margin-top: 15px;
padding: 20px 15px
}
.item-container .item-info {
margin-left: 5px;
}
.change-type-mark {
width: 5px;
height: 5px;
}
.release-history .media-body {
padding-left: 20px;
}
.release-history .panel-body .load-more {
margin-top: 20px;
}
.release-history .media-body textarea {
margin-top: 10px;
}
.release-history .release-history-container {
padding: 0;
}
.release-history .release-history-list {
max-height: 750px;
padding: 0;
border-right: solid 1px #eff2f7;
overflow: scroll;
}
.release-history .release-history-list .media {
position: relative;
margin: 0;
padding: 10px;
border-bottom: solid 1px #eff2f7;
}
.release-history .release-history-list .release-operation {
position: absolute;
right: 0;
top: 0;
width: 5px;
height: 100%;
}
.release-history .release-history-list .media .media-left {
padding-top: 10px;
}
.release-history .release-history-list .media .media-body .release-title {
padding: 0;
}
.release-history .release-history-list .emergency-publish {
position: absolute;
left: 0;
top: 0;
}
.release-history .release-history-list .load-more {
height: 45px;
background: #f5f5f5;
}
.release-history .release-operation-normal {
background: #316510;
}
.release-history .release-operation-rollback {
background: #997f1c;
}
.release-history .release-operation-gray {
background: #999999;
}
.release-history .operation-caption-container {
position: relative;
}
.release-history .section-title {
padding: 15px 10px 0 10px;
}
.release-history .operation-caption {
position: absolute;
top: 45px;
width: 100px;
height: 18px;
color: #fff;
font-size: 12px;
}
.release-history .panel-heading .back-btn {
position: absolute;
top: 45px;
right: 10px;
}
.release-history .release-info {
padding: 0;
border: 0;
}
.release-history .panel-heading {
padding: 15px;
}
.release-history .panel-heading button img {
width: 12px;
height: 12px;
}
.empty-container {
padding: 15px;
}
.valdr-message {
display: none;
}
.valdr-message.ng-dirty.ng-invalid.ng-touched {
display: inline;
color: #a94442;
}
.form-group .form-control.ng-invalid.ng-dirty.ng-touched {
border-color: #a94442;
}
.app-not-found {
padding-top: 50px;
font-size: 18px;
}
/*index page*/
#app-list h5 {
word-wrap: break-word;
word-break: break-all;
}
#app-list .media-body {
padding-top: 15px;
}
#app-list .media {
background: #fff;
display: table;
}
#app-list .media-left {
width: 1000px;
color: #fff;
display: table-cell;
vertical-align: middle;
}
#app-list .more-img {
width: 30px;
height: 30px;
}
#app-list .app-panel {
position: relative;
height: 100px;
}
#app-list .operate-panel {
position: absolute;
top: 5px;
right: 20px;
}
.create-app-list .media-left {
background: #a9d96c;
}
.create-app-list .create-btn {
background: #a9d96c;
color: #fff
}
.create-app-list .create-btn:hover {
background: #81AB56;
}
.create-app-list .create-btn img {
width: 26px;
height: 26px
}
.favorites-app-list .media-left {
background: #57c8f2;
}
.favorites-app-list .no-favorites {
padding-bottom: 15px;
}
.visit-app-list .media-left {
background: #41cac0;
}
#rulesModal .rules-ip-selector {
width: 500px;
height: 50px;
}
#rulesModal textarea {
width: 500px;
margin-bottom: 5px;
}
#rulesModal .rule-edit-panel {
padding: 15px 0;
}
#rulesModal .add-rule {
margin-left: 15px;
}
#rulesModal .select2-container .select2-search__field:not([placeholder='']) {
width: auto !important;
}
.search-onblur {
width: 165px;
background: #f5f5f5;
}
.search-focus {
width: 165px;
background: #fff;
}
.project-setting .panel-body {
padding-top: 35px
}
.project-setting .panel-body .context {
padding-left: 30px;
padding-right: 30px;
}
.app-search-list .select2-container, .app-search-list .select2-container .select2-selection {
height: 34px;
}
.app-search-list .select2-container .select2-selection .select2-selection__rendered {
line-height: 34px;
font-size: 14px;
} | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/util/NamespaceUtil.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.util;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import org.springframework.stereotype.Component;
/**
* @author Jason Song([email protected])
*/
@Component
public class NamespaceUtil {
private final AppNamespaceServiceWithCache appNamespaceServiceWithCache;
public NamespaceUtil(final AppNamespaceServiceWithCache appNamespaceServiceWithCache) {
this.appNamespaceServiceWithCache = appNamespaceServiceWithCache;
}
public String filterNamespaceName(String namespaceName) {
if (namespaceName.toLowerCase().endsWith(".properties")) {
int dotIndex = namespaceName.lastIndexOf(".");
return namespaceName.substring(0, dotIndex);
}
return namespaceName;
}
public String normalizeNamespace(String appId, String namespaceName) {
AppNamespace appNamespace = appNamespaceServiceWithCache.findByAppIdAndNamespace(appId, namespaceName);
if (appNamespace != null) {
return appNamespace.getName();
}
appNamespace = appNamespaceServiceWithCache.findPublicNamespaceByName(namespaceName);
if (appNamespace != null) {
return appNamespace.getName();
}
return namespaceName;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.util;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import org.springframework.stereotype.Component;
/**
* @author Jason Song([email protected])
*/
@Component
public class NamespaceUtil {
private final AppNamespaceServiceWithCache appNamespaceServiceWithCache;
public NamespaceUtil(final AppNamespaceServiceWithCache appNamespaceServiceWithCache) {
this.appNamespaceServiceWithCache = appNamespaceServiceWithCache;
}
public String filterNamespaceName(String namespaceName) {
if (namespaceName.toLowerCase().endsWith(".properties")) {
int dotIndex = namespaceName.lastIndexOf(".");
return namespaceName.substring(0, dotIndex);
}
return namespaceName;
}
public String normalizeNamespace(String appId, String namespaceName) {
AppNamespace appNamespace = appNamespaceServiceWithCache.findByAppIdAndNamespace(appId, namespaceName);
if (appNamespace != null) {
return appNamespace.getName();
}
appNamespace = appNamespaceServiceWithCache.findPublicNamespaceByName(namespaceName);
if (appNamespace != null) {
return appNamespace.getName();
}
return namespaceName;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/login.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en" ng-app="login">
<head>
<meta charset="UTF-8">
<title>{{ 'Common.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/font-awesome.min.css">
<style type="text/css">
body {
padding-top: 90px;
background: #F7F7F7;
color: #666666;
font-family: 'Roboto', sans-serif;
font-weight: 100;
}
body {
width: 100%;
background: -webkit-linear-gradient(left, #22d686, #24d3d3, #22d686, #24d3d3);
background: linear-gradient(to right, #22d686, #24d3d3, #22d686, #24d3d3);
background-size: 600% 100%;
}
.panel {
border-radius: 5px;
}
label {
font-weight: 300;
}
.panel-login {
border: none;
-webkit-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
-moz-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
}
.panel-login .checkbox input[type=checkbox] {
margin-left: 0px;
}
.panel-login .checkbox label {
padding-left: 25px;
font-weight: 300;
display: inline-block;
position: relative;
}
.panel-login .checkbox {
padding-left: 20px;
}
.panel-login .checkbox label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: 0px;
border: 1px solid #cccccc;
border-radius: 3px;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
}
.panel-login .checkbox label::after {
display: inline-block;
position: absolute;
width: 16px;
height: 16px;
left: 0;
top: 0;
margin-left: 0px;
padding-left: 3px;
padding-top: 1px;
font-size: 11px;
color: #555555;
}
.panel-login .checkbox input[type="checkbox"] {
opacity: 0;
}
.panel-login .checkbox input[type="checkbox"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.panel-login .checkbox input[type="checkbox"]:checked + label::after {
font-family: 'FontAwesome';
content: "\f00c";
}
.panel-login > .panel-heading .tabs {
padding: 0;
}
.panel-login h2 {
font-size: 20px;
font-weight: 300;
margin: 30px;
}
.panel-login > .panel-heading {
color: #848c9d;
background-color: #e8e9ec;
border-color: #fff;
text-align: center;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom: 0px;
padding: 0px 15px;
}
.panel-login .form-group {
padding: 0 30px;
}
.panel-login > .panel-heading .login {
padding: 20px 30px;
border-bottom-leftt-radius: 5px;
}
.panel-login > .panel-heading .register {
padding: 20px 30px;
background: #2d3b55;
border-bottom-right-radius: 5px;
}
.panel-login > .panel-heading a {
text-decoration: none;
color: #666;
font-weight: 300;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
}
.panel-login > .panel-heading a#register-form-link {
color: #fff;
width: 100%;
text-align: right;
}
.panel-login > .panel-heading a#login-form-link {
width: 100%;
text-align: left;
}
.panel-login input[type="text"], .panel-login input[type="email"], .panel-login input[type="password"] {
height: 45px;
border: 0;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: 1px solid #e7e7e7;
border-radius: 0px;
padding: 6px 0px;
}
.panel-login input:hover,
.panel-login input:focus {
outline: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border-color: #ccc;
}
.btn-login {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-login:hover,
.btn-login:focus {
color: #fff;
background-color: #2D3B55;
}
.forgot-password {
text-decoration: underline;
color: #888;
}
.forgot-password:hover,
.forgot-password:focus {
text-decoration: underline;
color: #666;
}
.btn-register {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-register:hover,
.btn-register:focus {
color: #fff;
background-color: #2D3B55;
}
</style>
</head>
<body>
<div class="container" ng-controller="LoginController">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-login">
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form id="login-form" action="signin" method="post" role="form" style="display: block;">
<p class="text-center"><img src="img/logo-detail.png" style="width: 500px;"></p>
<div class="form-group">
<input type="text" name="username" tabindex="1" class="form-control"
placeholder="Username" value="">
</div>
<div class="form-group">
<input type="password" name="password" tabindex="2"
class="form-control" placeholder="Password">
</div>
<div class="form-group" style="color: red">
<small ng-bind="info"></small>
</div>
<div class="col-xs-12 form-group pull-right">
<input type="submit" name="login-submit" id="login-submit" tabindex="4"
class="form-control btn btn-login" value="{{'Login.Login' | translate }}">
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/LoginController.js"></script>
<script type="application/javascript">
$(function () {
$('#login-form-link').click(function (e) {
$("#login-form").delay(100).fadeIn(100);
$("#register-form").fadeOut(100);
$('#register-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
$('#register-form-link').click(function (e) {
$("#register-form").delay(100).fadeIn(100);
$("#login-form").fadeOut(100);
$('#login-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
});
</script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en" ng-app="login">
<head>
<meta charset="UTF-8">
<title>{{ 'Common.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/font-awesome.min.css">
<style type="text/css">
body {
padding-top: 90px;
background: #F7F7F7;
color: #666666;
font-family: 'Roboto', sans-serif;
font-weight: 100;
}
body {
width: 100%;
background: -webkit-linear-gradient(left, #22d686, #24d3d3, #22d686, #24d3d3);
background: linear-gradient(to right, #22d686, #24d3d3, #22d686, #24d3d3);
background-size: 600% 100%;
}
.panel {
border-radius: 5px;
}
label {
font-weight: 300;
}
.panel-login {
border: none;
-webkit-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
-moz-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
}
.panel-login .checkbox input[type=checkbox] {
margin-left: 0px;
}
.panel-login .checkbox label {
padding-left: 25px;
font-weight: 300;
display: inline-block;
position: relative;
}
.panel-login .checkbox {
padding-left: 20px;
}
.panel-login .checkbox label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: 0px;
border: 1px solid #cccccc;
border-radius: 3px;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
}
.panel-login .checkbox label::after {
display: inline-block;
position: absolute;
width: 16px;
height: 16px;
left: 0;
top: 0;
margin-left: 0px;
padding-left: 3px;
padding-top: 1px;
font-size: 11px;
color: #555555;
}
.panel-login .checkbox input[type="checkbox"] {
opacity: 0;
}
.panel-login .checkbox input[type="checkbox"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.panel-login .checkbox input[type="checkbox"]:checked + label::after {
font-family: 'FontAwesome';
content: "\f00c";
}
.panel-login > .panel-heading .tabs {
padding: 0;
}
.panel-login h2 {
font-size: 20px;
font-weight: 300;
margin: 30px;
}
.panel-login > .panel-heading {
color: #848c9d;
background-color: #e8e9ec;
border-color: #fff;
text-align: center;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom: 0px;
padding: 0px 15px;
}
.panel-login .form-group {
padding: 0 30px;
}
.panel-login > .panel-heading .login {
padding: 20px 30px;
border-bottom-leftt-radius: 5px;
}
.panel-login > .panel-heading .register {
padding: 20px 30px;
background: #2d3b55;
border-bottom-right-radius: 5px;
}
.panel-login > .panel-heading a {
text-decoration: none;
color: #666;
font-weight: 300;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
}
.panel-login > .panel-heading a#register-form-link {
color: #fff;
width: 100%;
text-align: right;
}
.panel-login > .panel-heading a#login-form-link {
width: 100%;
text-align: left;
}
.panel-login input[type="text"], .panel-login input[type="email"], .panel-login input[type="password"] {
height: 45px;
border: 0;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: 1px solid #e7e7e7;
border-radius: 0px;
padding: 6px 0px;
}
.panel-login input:hover,
.panel-login input:focus {
outline: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border-color: #ccc;
}
.btn-login {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-login:hover,
.btn-login:focus {
color: #fff;
background-color: #2D3B55;
}
.forgot-password {
text-decoration: underline;
color: #888;
}
.forgot-password:hover,
.forgot-password:focus {
text-decoration: underline;
color: #666;
}
.btn-register {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-register:hover,
.btn-register:focus {
color: #fff;
background-color: #2D3B55;
}
</style>
</head>
<body>
<div class="container" ng-controller="LoginController">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-login">
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form id="login-form" action="signin" method="post" role="form" style="display: block;">
<p class="text-center"><img src="img/logo-detail.png" style="width: 500px;"></p>
<div class="form-group">
<input type="text" name="username" tabindex="1" class="form-control"
placeholder="Username" value="">
</div>
<div class="form-group">
<input type="password" name="password" tabindex="2"
class="form-control" placeholder="Password">
</div>
<div class="form-group" style="color: red">
<small ng-bind="info"></small>
</div>
<div class="col-xs-12 form-group pull-right">
<input type="submit" name="login-submit" id="login-submit" tabindex="4"
class="form-control btn btn-login" value="{{'Login.Login' | translate }}">
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/LoginController.js"></script>
<script type="application/javascript">
$(function () {
$('#login-form-link').click(function (e) {
$("#login-form").delay(100).fadeIn(100);
$("#register-form").fadeOut(100);
$('#register-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
$('#register-form-link').click(function (e) {
$("#register-form").delay(100).fadeIn(100);
$("#login-form").fadeOut(100);
$('#login-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
});
</script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/resources/static/img/manage.png | PNG
IHDR X vIDATx^AoJ6 mSSOBF"lXB87
X>O H@=>( 8%;m|ݙy1}ޏ.!$pil < @ l$ H`Af
g5$ iB2gK @f˭g-l,\)1] "G|2t0P $UU?v%=ҵ
E p{'ZDv[wb]HNt-)8^
(m\-#G$ NVYp@6VC a7W|
U TW% H ]5pDG nCi∌@"n#*,|Rڄ F^w,qDD KjW8GBrptF ѐ$xo>/F *9";։#$ >/+WܡEdF[*p$?2_,nMѭʄ"xMW/T|3@k / q "t8~qnT5sJ"I 9`Fj,S:F GH.j{
@R6g 8rF )?@p@6! X c GnH $a H8rB )?/@I@ dŭ\r p@.PW ё H@㈌@#* $H $(8!@㈄@G$ Hn8" @r ;H 9@ iH )@ i:OH xsA- q8.X " 8 v @ 8D 54 u! G1 u ,mn׳m^=WˌJ}9u'>
@j r@+¬8*$ǭ&=@j BLOc~=l'ck粙 H
@<s+Dawk|{? LG&]<Fo㙮@ǦqoE-cWzbڇL4O# 8~"ޤ4AiY?*87o28^ynOZ= f
$GF H
1 H}X K=ۥI&C8Nr9p 3 @ԉ@ _n P?3L(I:ޤ_4Ŧq9^>u1$MC n bZSx A4=G HH `@rD8 $( D DFI$ HH LD@d38 $3 D $:% 跗"S]d p )QN PG u 4 %p HCX 4&\q HÀh G Z^r(o/
ǙjbU4憚}+ּ cгnw\RPZ GRi:Ϗ/FO{kI I@N[63^yE I @.vn[1O^,ͭ|,DQY'|7x(,c0Hd{={Ҝ,DQHE|%$" )q8 [EV$2 )wsFH l. p lQg͂$ Ҩ>A }4$ mr"L;oX~b^w\gO6)cFu&pm~~|
+4pyid1n HˈJ @ŸY$ Y,#.B+ Jf d D+YE 2" d1n HˈJ @ŸY$PWMH6B pBr@;N/}%uf^z Ӑ~>~P맗,m~MDԛ 84\DxtgN_V U/E}t8?} qG9QoNV^3Ʒ*
~ U:=?~*oy )K|}m̥nV^d*Z3Û@ cՅA{ HEIHEA @Ju:h%[l\ ) bB c ޙX t 7NKi 峃Ȱ5< ==?o,<ѳ>,a|)ry !+ ` !+ ` X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( <D )uEm}/r 9L\d^|$tӯ@ҳ2=@L㾴Xwf >@|8] q0 >@|:u {^wMhL*8 >VVhts-~B{[+[\Xxo5k0v/TSC&z? 5Wn>eD w6\@ŖV7WIsK vsE OBvH06
X6YGğL;9_>?~^5q~@^'e!Zhy,4ރú2wu!Z!u͡|@4:MTH`H6 Ղ% ӵM @lF` Htm ۼQ-X l0] 6oT } N> IENDB` | PNG
IHDR X vIDATx^AoJ6 mSSOBF"lXB87
X>O H@=>( 8%;m|ݙy1}ޏ.!$pil < @ l$ H`Af
g5$ iB2gK @f˭g-l,\)1] "G|2t0P $UU?v%=ҵ
E p{'ZDv[wb]HNt-)8^
(m\-#G$ NVYp@6VC a7W|
U TW% H ]5pDG nCi∌@"n#*,|Rڄ F^w,qDD KjW8GBrptF ѐ$xo>/F *9";։#$ >/+WܡEdF[*p$?2_,nMѭʄ"xMW/T|3@k / q "t8~qnT5sJ"I 9`Fj,S:F GH.j{
@R6g 8rF )?@p@6! X c GnH $a H8rB )?/@I@ dŭ\r p@.PW ё H@㈌@#* $H $(8!@㈄@G$ Hn8" @r ;H 9@ iH )@ i:OH xsA- q8.X " 8 v @ 8D 54 u! G1 u ,mn׳m^=WˌJ}9u'>
@j r@+¬8*$ǭ&=@j BLOc~=l'ck粙 H
@<s+Dawk|{? LG&]<Fo㙮@ǦqoE-cWzbڇL4O# 8~"ޤ4AiY?*87o28^ynOZ= f
$GF H
1 H}X K=ۥI&C8Nr9p 3 @ԉ@ _n P?3L(I:ޤ_4Ŧq9^>u1$MC n bZSx A4=G HH `@rD8 $( D DFI$ HH LD@d38 $3 D $:% 跗"S]d p )QN PG u 4 %p HCX 4&\q HÀh G Z^r(o/
ǙjbU4憚}+ּ cгnw\RPZ GRi:Ϗ/FO{kI I@N[63^yE I @.vn[1O^,ͭ|,DQY'|7x(,c0Hd{={Ҝ,DQHE|%$" )q8 [EV$2 )wsFH l. p lQg͂$ Ҩ>A }4$ mr"L;oX~b^w\gO6)cFu&pm~~|
+4pyid1n HˈJ @ŸY$ Y,#.B+ Jf d D+YE 2" d1n HˈJ @ŸY$PWMH6B pBr@;N/}%uf^z Ӑ~>~P맗,m~MDԛ 84\DxtgN_V U/E}t8?} qG9QoNV^3Ʒ*
~ U:=?~*oy )K|}m̥nV^d*Z3Û@ cՅA{ HEIHEA @Ju:h%[l\ ) bB c ޙX t 7NKi 峃Ȱ5< ==?o,<ѳ>,a|)ry !+ ` !+ ` X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( !T@E1֠bR Q
X b2:AJ% D)Xt`
J A !+ `A 5( <D )uEm}/r 9L\d^|$tӯ@ҳ2=@L㾴Xwf >@|8] q0 >@|:u {^wMhL*8 >VVhts-~B{[+[\Xxo5k0v/TSC&z? 5Wn>eD w6\@ŖV7WIsK vsE OBvH06
X6YGğL;9_>?~^5q~@^'e!Zhy,4ރú2wu!Z!u͡|@4:MTH`H6 Ղ% ӵM @lF` Htm ۼQ-X l0] 6oT } N> IENDB` | -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/BootstrapConfigTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants;
import com.google.common.collect.Sets;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.env.EnvironmentPostProcessor;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.List;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(Enclosed.class)
public class BootstrapConfigTest {
private static final String TEST_BEAN_CONDITIONAL_ON_KEY = "apollo.test.testBean";
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
private static final String someProperty = "someProperty";
private static final String someValue = "someValue";
@Autowired(required = false)
private TestBean testBean;
@ApolloConfig
private Config config;
@Value("${" + someProperty + "}")
private String someInjectedValue;
private static Config mockedConfig;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
mockedConfig = mock(Config.class);
when(mockedConfig.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY, someProperty));
when(mockedConfig.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.TRUE.toString());
when(mockedConfig.getProperty(eq(someProperty), anyString())).thenReturn(someValue);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mockedConfig);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
Assert.assertEquals(mockedConfig, config);
Assert.assertEquals(someValue, someInjectedValue);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES,
String.format("%s, %s", ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE));
Config config = mock(Config.class);
Config anotherConfig = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.TRUE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, anotherConfig);
mockConfig(FX_APOLLO_NAMESPACE, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndNamespacesAndConditionalOnWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES,
String.format("%s, %s", "application.yml", FX_APOLLO_NAMESPACE));
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case6.yml"));
Config anotherConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, anotherConfig);
mockConfig(FX_APOLLO_NAMESPACE, anotherConfig);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOnFailed extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
Config config = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.FALSE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOnFailedWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, "application.yml");
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case7.yml"));
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOff extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOffWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, "application.yml");
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case8.yml"));
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapDisabledAndDefaultNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
Config config = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.FALSE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapDisabledAndDefaultNamespacesAndConditionalOff extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndEagerLoadEnabled extends
AbstractSpringIntegrationTest {
@BeforeClass
public static void beforeClass() {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, "true");
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED);
doTearDown();
}
@Test
public void test() {
List<EnvironmentPostProcessor> processorList = SpringFactoriesLoader.loadFactories(EnvironmentPostProcessor.class, getClass().getClassLoader());
boolean containsApollo = false;
for (EnvironmentPostProcessor postProcessor : processorList) {
if (postProcessor instanceof ApolloApplicationContextInitializer) {
containsApollo = true;
break;
}
}
Assert.assertTrue(containsApollo);
}
}
@EnableAutoConfiguration
@Configuration
static class ConfigurationWithoutConditionalOnProperty {
@Bean
public TestBean testBean() {
return new TestBean();
}
}
@ConditionalOnProperty(TEST_BEAN_CONDITIONAL_ON_KEY)
@EnableAutoConfiguration
@Configuration
static class ConfigurationWithConditionalOnProperty {
@Bean
public TestBean testBean() {
return new TestBean();
}
}
static class TestBean {
public boolean execute() {
return true;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer;
import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants;
import com.google.common.collect.Sets;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.env.EnvironmentPostProcessor;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.List;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(Enclosed.class)
public class BootstrapConfigTest {
private static final String TEST_BEAN_CONDITIONAL_ON_KEY = "apollo.test.testBean";
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
private static final String someProperty = "someProperty";
private static final String someValue = "someValue";
@Autowired(required = false)
private TestBean testBean;
@ApolloConfig
private Config config;
@Value("${" + someProperty + "}")
private String someInjectedValue;
private static Config mockedConfig;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
mockedConfig = mock(Config.class);
when(mockedConfig.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY, someProperty));
when(mockedConfig.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.TRUE.toString());
when(mockedConfig.getProperty(eq(someProperty), anyString())).thenReturn(someValue);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mockedConfig);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
Assert.assertEquals(mockedConfig, config);
Assert.assertEquals(someValue, someInjectedValue);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES,
String.format("%s, %s", ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE));
Config config = mock(Config.class);
Config anotherConfig = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.TRUE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, anotherConfig);
mockConfig(FX_APOLLO_NAMESPACE, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndNamespacesAndConditionalOnWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES,
String.format("%s, %s", "application.yml", FX_APOLLO_NAMESPACE));
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case6.yml"));
Config anotherConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, anotherConfig);
mockConfig(FX_APOLLO_NAMESPACE, anotherConfig);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOnFailed extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
Config config = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.FALSE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOnFailedWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, "application.yml");
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case7.yml"));
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOff extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndDefaultNamespacesAndConditionalOffWithYamlFile extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES, "application.yml");
prepareYamlConfigFile("application.yml", readYamlContentAsConfigFileProperties("case8.yml"));
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_NAMESPACES);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapDisabledAndDefaultNamespacesAndConditionalOn extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
Config config = mock(Config.class);
when(config.getPropertyNames()).thenReturn(Sets.newHashSet(TEST_BEAN_CONDITIONAL_ON_KEY));
when(config.getProperty(eq(TEST_BEAN_CONDITIONAL_ON_KEY), anyString())).thenReturn(Boolean.FALSE.toString());
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNull(testBean);
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapDisabledAndDefaultNamespacesAndConditionalOff extends
AbstractSpringIntegrationTest {
@Autowired(required = false)
private TestBean testBean;
@BeforeClass
public static void beforeClass() throws Exception {
doSetUp();
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
doTearDown();
}
@Test
public void test() throws Exception {
Assert.assertNotNull(testBean);
Assert.assertTrue(testBean.execute());
}
}
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = ConfigurationWithoutConditionalOnProperty.class)
@DirtiesContext
public static class TestWithBootstrapEnabledAndEagerLoadEnabled extends
AbstractSpringIntegrationTest {
@BeforeClass
public static void beforeClass() {
doSetUp();
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "true");
System.setProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, "true");
Config config = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
}
@AfterClass
public static void afterClass() {
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
System.clearProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED);
doTearDown();
}
@Test
public void test() {
List<EnvironmentPostProcessor> processorList = SpringFactoriesLoader.loadFactories(EnvironmentPostProcessor.class, getClass().getClassLoader());
boolean containsApollo = false;
for (EnvironmentPostProcessor postProcessor : processorList) {
if (postProcessor instanceof ApolloApplicationContextInitializer) {
containsApollo = true;
break;
}
}
Assert.assertTrue(containsApollo);
}
}
@EnableAutoConfiguration
@Configuration
static class ConfigurationWithoutConditionalOnProperty {
@Bean
public TestBean testBean() {
return new TestBean();
}
}
@ConditionalOnProperty(TEST_BEAN_CONDITIONAL_ON_KEY)
@EnableAutoConfiguration
@Configuration
static class ConfigurationWithConditionalOnProperty {
@Bean
public TestBean testBean() {
return new TestBean();
}
}
static class TestBean {
public boolean execute() {
return true;
}
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/ReleaseCompareResult.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import java.util.LinkedList;
import java.util.List;
public class ReleaseCompareResult {
private List<Change> changes = new LinkedList<>();
public void addEntityPair(ChangeType type, KVEntity firstEntity, KVEntity secondEntity) {
changes.add(new Change(type, new EntityPair<>(firstEntity, secondEntity)));
}
public boolean hasContent(){
return !changes.isEmpty();
}
public List<Change> getChanges() {
return changes;
}
public void setChanges(List<Change> changes) {
this.changes = changes;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import java.util.LinkedList;
import java.util.List;
public class ReleaseCompareResult {
private List<Change> changes = new LinkedList<>();
public void addEntityPair(ChangeType type, KVEntity firstEntity, KVEntity secondEntity) {
changes.add(new Change(type, new EntityPair<>(firstEntity, secondEntity)));
}
public boolean hasContent(){
return !changes.isEmpty();
}
public List<Change> getChanges() {
return changes;
}
public void setChanges(List<Change> changes) {
this.changes = changes;
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ClusterService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ClusterService {
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ClusterAPI clusterAPI;
public ClusterService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ClusterAPI clusterAPI) {
this.userInfoHolder = userInfoHolder;
this.clusterAPI = clusterAPI;
}
public List<ClusterDTO> findClusters(Env env, String appId) {
return clusterAPI.findClustersByApp(appId, env);
}
public ClusterDTO createCluster(Env env, ClusterDTO cluster) {
if (!clusterAPI.isClusterUnique(cluster.getAppId(), env, cluster.getName())) {
throw new BadRequestException(String.format("cluster %s already exists.", cluster.getName()));
}
ClusterDTO clusterDTO = clusterAPI.create(env, cluster);
Tracer.logEvent(TracerEventType.CREATE_CLUSTER, cluster.getAppId(), "0", cluster.getName());
return clusterDTO;
}
public void deleteCluster(Env env, String appId, String clusterName){
clusterAPI.delete(env, appId, clusterName, userInfoHolder.getUser().getUserId());
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName){
return clusterAPI.loadCluster(appId, env, clusterName);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ClusterService {
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ClusterAPI clusterAPI;
public ClusterService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ClusterAPI clusterAPI) {
this.userInfoHolder = userInfoHolder;
this.clusterAPI = clusterAPI;
}
public List<ClusterDTO> findClusters(Env env, String appId) {
return clusterAPI.findClustersByApp(appId, env);
}
public ClusterDTO createCluster(Env env, ClusterDTO cluster) {
if (!clusterAPI.isClusterUnique(cluster.getAppId(), env, cluster.getName())) {
throw new BadRequestException(String.format("cluster %s already exists.", cluster.getName()));
}
ClusterDTO clusterDTO = clusterAPI.create(env, cluster);
Tracer.logEvent(TracerEventType.CREATE_CLUSTER, cluster.getAppId(), "0", cluster.getName());
return clusterDTO;
}
public void deleteCluster(Env env, String appId, String clusterName){
clusterAPI.delete(env, appId, clusterName, userInfoHolder.getUser().getUserId());
}
public ClusterDTO loadCluster(String appId, Env env, String clusterName){
return clusterAPI.loadCluster(appId, env, clusterName);
}
}
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./scripts/flyway/portaldb/V1.1.2__extend_username.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo config db from v1.7.0 to v1.8.0
Use ApolloPortalDB;
ALTER TABLE `App`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `AppNamespace`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Consumer`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ConsumerRole`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ConsumerToken`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Favorite`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Permission`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Role`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `RolePermission`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ServerConfig`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `UserRole`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo config db from v1.7.0 to v1.8.0
Use ApolloPortalDB;
ALTER TABLE `App`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `AppNamespace`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Consumer`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ConsumerRole`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ConsumerToken`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Favorite`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Permission`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `Role`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `RolePermission`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `ServerConfig`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
ALTER TABLE `UserRole`
MODIFY COLUMN `DataChange_CreatedBy` VARCHAR(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
MODIFY COLUMN `DataChange_LastModifiedBy` VARCHAR(64) DEFAULT '' COMMENT '最后修改人邮箱前缀';
| -1 |
apolloconfig/apollo | 3,677 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题 | ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | klboke | 2021-05-11T09:35:40Z | 2021-05-23T11:44:16Z | f41a73b92d19383bbb542c51b0f6d062e9e80e3b | dc41c934349af28631cc5b2d9b2bdf75eac9d1f3 | 解决日志系统未初始化完成时，apollo 的加载日志没法输出问题. ## What's the purpose of this PR
> 解决问题：
解决 spring boot 方式集成时，配置 `apollo.bootstrap.eagerLoad.enabled` 情况下，apollo 的加载日志没法输出问题。
> 设计原理：
封装一个基于 guava-cache 的日志输出内容存储容器 `DeferredLogUtil`，将 apollo 初始化时的日志信息，添加到延迟输出的日志容器。在日志系统加载完成也就是 EnvironmentPostProcessor 事件立刻回放，最终实现的效果和不开启 `apollo.bootstrap.eagerLoad.enabled` 是一样的，设计过程参考了 [spring-boot#DeferredLog](https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java) | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAspectJAutoProxy
@Configuration
@EnableAutoConfiguration(exclude = {LdapAutoConfiguration.class})
@EnableTransactionManagement
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
PortalApplication.class, PortalOpenApiConfig.class})
public class PortalApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(PortalApplication.class, args);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAspectJAutoProxy
@Configuration
@EnableAutoConfiguration(exclude = {LdapAutoConfiguration.class})
@EnableTransactionManagement
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
PortalApplication.class, PortalOpenApiConfig.class})
public class PortalApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(PortalApplication.class, args);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./CHANGES.md | Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.function.Functions;
import com.ctrip.framework.apollo.util.parser.Parsers;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author Jason Song([email protected])
*/
public abstract class AbstractConfig implements Config {
private static final Logger logger = LoggerFactory.getLogger(AbstractConfig.class);
private static final ExecutorService m_executorService;
private final List<ConfigChangeListener> m_listeners = Lists.newCopyOnWriteArrayList();
private final Map<ConfigChangeListener, Set<String>> m_interestedKeys = Maps.newConcurrentMap();
private final Map<ConfigChangeListener, Set<String>> m_interestedKeyPrefixes = Maps.newConcurrentMap();
private final ConfigUtil m_configUtil;
private volatile Cache<String, Integer> m_integerCache;
private volatile Cache<String, Long> m_longCache;
private volatile Cache<String, Short> m_shortCache;
private volatile Cache<String, Float> m_floatCache;
private volatile Cache<String, Double> m_doubleCache;
private volatile Cache<String, Byte> m_byteCache;
private volatile Cache<String, Boolean> m_booleanCache;
private volatile Cache<String, Date> m_dateCache;
private volatile Cache<String, Long> m_durationCache;
private final Map<String, Cache<String, String[]>> m_arrayCache;
private final List<Cache> allCaches;
private final AtomicLong m_configVersion; //indicate config version
protected PropertiesFactory propertiesFactory;
static {
m_executorService = Executors.newCachedThreadPool(ApolloThreadFactory
.create("Config", true));
}
public AbstractConfig() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
m_configVersion = new AtomicLong();
m_arrayCache = Maps.newConcurrentMap();
allCaches = Lists.newArrayList();
propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class);
}
@Override
public void addChangeListener(ConfigChangeListener listener) {
addChangeListener(listener, null);
}
@Override
public void addChangeListener(ConfigChangeListener listener, Set<String> interestedKeys) {
addChangeListener(listener, interestedKeys, null);
}
@Override
public void addChangeListener(ConfigChangeListener listener, Set<String> interestedKeys, Set<String> interestedKeyPrefixes) {
if (!m_listeners.contains(listener)) {
m_listeners.add(listener);
if (interestedKeys != null && !interestedKeys.isEmpty()) {
m_interestedKeys.put(listener, Sets.newHashSet(interestedKeys));
}
if (interestedKeyPrefixes != null && !interestedKeyPrefixes.isEmpty()) {
m_interestedKeyPrefixes.put(listener, Sets.newHashSet(interestedKeyPrefixes));
}
}
}
@Override
public boolean removeChangeListener(ConfigChangeListener listener) {
m_interestedKeys.remove(listener);
m_interestedKeyPrefixes.remove(listener);
return m_listeners.remove(listener);
}
@Override
public Integer getIntProperty(String key, Integer defaultValue) {
try {
if (m_integerCache == null) {
synchronized (this) {
if (m_integerCache == null) {
m_integerCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_INT_FUNCTION, m_integerCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getIntProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Long getLongProperty(String key, Long defaultValue) {
try {
if (m_longCache == null) {
synchronized (this) {
if (m_longCache == null) {
m_longCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_LONG_FUNCTION, m_longCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getLongProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Short getShortProperty(String key, Short defaultValue) {
try {
if (m_shortCache == null) {
synchronized (this) {
if (m_shortCache == null) {
m_shortCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_SHORT_FUNCTION, m_shortCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getShortProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Float getFloatProperty(String key, Float defaultValue) {
try {
if (m_floatCache == null) {
synchronized (this) {
if (m_floatCache == null) {
m_floatCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_FLOAT_FUNCTION, m_floatCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getFloatProperty for %s failed, return default value %f", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Double getDoubleProperty(String key, Double defaultValue) {
try {
if (m_doubleCache == null) {
synchronized (this) {
if (m_doubleCache == null) {
m_doubleCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DOUBLE_FUNCTION, m_doubleCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDoubleProperty for %s failed, return default value %f", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Byte getByteProperty(String key, Byte defaultValue) {
try {
if (m_byteCache == null) {
synchronized (this) {
if (m_byteCache == null) {
m_byteCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_BYTE_FUNCTION, m_byteCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getByteProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Boolean getBooleanProperty(String key, Boolean defaultValue) {
try {
if (m_booleanCache == null) {
synchronized (this) {
if (m_booleanCache == null) {
m_booleanCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_BOOLEAN_FUNCTION, m_booleanCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getBooleanProperty for %s failed, return default value %b", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public String[] getArrayProperty(String key, final String delimiter, String[] defaultValue) {
try {
if (!m_arrayCache.containsKey(delimiter)) {
synchronized (this) {
if (!m_arrayCache.containsKey(delimiter)) {
m_arrayCache.put(delimiter, this.<String[]>newCache());
}
}
}
Cache<String, String[]> cache = m_arrayCache.get(delimiter);
String[] result = cache.getIfPresent(key);
if (result != null) {
return result;
}
return getValueAndStoreToCache(key, new Function<String, String[]>() {
@Override
public String[] apply(String input) {
return input.split(delimiter);
}
}, cache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getArrayProperty for %s failed, return default value", key), ex));
}
return defaultValue;
}
@Override
public <T extends Enum<T>> T getEnumProperty(String key, Class<T> enumType, T defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Enum.valueOf(enumType, value);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getEnumProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, Date defaultValue) {
try {
if (m_dateCache == null) {
synchronized (this) {
if (m_dateCache == null) {
m_dateCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DATE_FUNCTION, m_dateCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, String format, Date defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Parsers.forDate().parse(value, format);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, String format, Locale locale, Date defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Parsers.forDate().parse(value, format, locale);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public long getDurationProperty(String key, long defaultValue) {
try {
if (m_durationCache == null) {
synchronized (this) {
if (m_durationCache == null) {
m_durationCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DURATION_FUNCTION, m_durationCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDurationProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public <T> T getProperty(String key, Function<String, T> function, T defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return function.apply(value);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
private <T> T getValueFromCache(String key, Function<String, T> parser, Cache<String, T> cache, T defaultValue) {
T result = cache.getIfPresent(key);
if (result != null) {
return result;
}
return getValueAndStoreToCache(key, parser, cache, defaultValue);
}
private <T> T getValueAndStoreToCache(String key, Function<String, T> parser, Cache<String, T> cache, T defaultValue) {
long currentConfigVersion = m_configVersion.get();
String value = getProperty(key, null);
if (value != null) {
T result = parser.apply(value);
if (result != null) {
synchronized (this) {
if (m_configVersion.get() == currentConfigVersion) {
cache.put(key, result);
}
}
return result;
}
}
return defaultValue;
}
private <T> Cache<String, T> newCache() {
Cache<String, T> cache = CacheBuilder.newBuilder()
.maximumSize(m_configUtil.getMaxConfigCacheSize())
.expireAfterAccess(m_configUtil.getConfigCacheExpireTime(), m_configUtil.getConfigCacheExpireTimeUnit())
.build();
allCaches.add(cache);
return cache;
}
/**
* Clear config cache
*/
protected void clearConfigCache() {
synchronized (this) {
for (Cache c : allCaches) {
if (c != null) {
c.invalidateAll();
}
}
m_configVersion.incrementAndGet();
}
}
protected void fireConfigChange(final ConfigChangeEvent changeEvent) {
for (final ConfigChangeListener listener : m_listeners) {
// check whether the listener is interested in this change event
if (!isConfigChangeListenerInterested(listener, changeEvent)) {
continue;
}
m_executorService.submit(new Runnable() {
@Override
public void run() {
String listenerName = listener.getClass().getName();
Transaction transaction = Tracer.newTransaction("Apollo.ConfigChangeListener", listenerName);
try {
listener.onChange(changeEvent);
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
Tracer.logError(ex);
logger.error("Failed to invoke config change listener {}", listenerName, ex);
} finally {
transaction.complete();
}
}
});
}
}
private boolean isConfigChangeListenerInterested(ConfigChangeListener configChangeListener, ConfigChangeEvent configChangeEvent) {
Set<String> interestedKeys = m_interestedKeys.get(configChangeListener);
Set<String> interestedKeyPrefixes = m_interestedKeyPrefixes.get(configChangeListener);
if ((interestedKeys == null || interestedKeys.isEmpty())
&& (interestedKeyPrefixes == null || interestedKeyPrefixes.isEmpty())) {
return true; // no interested keys means interested in all keys
}
if (interestedKeys != null) {
for (String interestedKey : interestedKeys) {
if (configChangeEvent.isChanged(interestedKey)) {
return true;
}
}
}
if (interestedKeyPrefixes != null) {
for (String prefix : interestedKeyPrefixes) {
for (final String changedKey : configChangeEvent.changedKeys()) {
if (changedKey.startsWith(prefix)) {
return true;
}
}
}
}
return false;
}
List<ConfigChange> calcPropertyChanges(String namespace, Properties previous,
Properties current) {
if (previous == null) {
previous = propertiesFactory.getPropertiesInstance();
}
if (current == null) {
current = propertiesFactory.getPropertiesInstance();
}
Set<String> previousKeys = previous.stringPropertyNames();
Set<String> currentKeys = current.stringPropertyNames();
Set<String> commonKeys = Sets.intersection(previousKeys, currentKeys);
Set<String> newKeys = Sets.difference(currentKeys, commonKeys);
Set<String> removedKeys = Sets.difference(previousKeys, commonKeys);
List<ConfigChange> changes = Lists.newArrayList();
for (String newKey : newKeys) {
changes.add(new ConfigChange(namespace, newKey, null, current.getProperty(newKey),
PropertyChangeType.ADDED));
}
for (String removedKey : removedKeys) {
changes.add(new ConfigChange(namespace, removedKey, previous.getProperty(removedKey), null,
PropertyChangeType.DELETED));
}
for (String commonKey : commonKeys) {
String previousValue = previous.getProperty(commonKey);
String currentValue = current.getProperty(commonKey);
if (Objects.equal(previousValue, currentValue)) {
continue;
}
changes.add(new ConfigChange(namespace, commonKey, previousValue, currentValue,
PropertyChangeType.MODIFIED));
}
return changes;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.function.Functions;
import com.ctrip.framework.apollo.util.parser.Parsers;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author Jason Song([email protected])
*/
public abstract class AbstractConfig implements Config {
private static final Logger logger = LoggerFactory.getLogger(AbstractConfig.class);
private static final ExecutorService m_executorService;
private final List<ConfigChangeListener> m_listeners = Lists.newCopyOnWriteArrayList();
private final Map<ConfigChangeListener, Set<String>> m_interestedKeys = Maps.newConcurrentMap();
private final Map<ConfigChangeListener, Set<String>> m_interestedKeyPrefixes = Maps.newConcurrentMap();
private final ConfigUtil m_configUtil;
private volatile Cache<String, Integer> m_integerCache;
private volatile Cache<String, Long> m_longCache;
private volatile Cache<String, Short> m_shortCache;
private volatile Cache<String, Float> m_floatCache;
private volatile Cache<String, Double> m_doubleCache;
private volatile Cache<String, Byte> m_byteCache;
private volatile Cache<String, Boolean> m_booleanCache;
private volatile Cache<String, Date> m_dateCache;
private volatile Cache<String, Long> m_durationCache;
private final Map<String, Cache<String, String[]>> m_arrayCache;
private final List<Cache> allCaches;
private final AtomicLong m_configVersion; //indicate config version
protected PropertiesFactory propertiesFactory;
static {
m_executorService = Executors.newCachedThreadPool(ApolloThreadFactory
.create("Config", true));
}
public AbstractConfig() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
m_configVersion = new AtomicLong();
m_arrayCache = Maps.newConcurrentMap();
allCaches = Lists.newArrayList();
propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class);
}
@Override
public void addChangeListener(ConfigChangeListener listener) {
addChangeListener(listener, null);
}
@Override
public void addChangeListener(ConfigChangeListener listener, Set<String> interestedKeys) {
addChangeListener(listener, interestedKeys, null);
}
@Override
public void addChangeListener(ConfigChangeListener listener, Set<String> interestedKeys, Set<String> interestedKeyPrefixes) {
if (!m_listeners.contains(listener)) {
m_listeners.add(listener);
if (interestedKeys != null && !interestedKeys.isEmpty()) {
m_interestedKeys.put(listener, Sets.newHashSet(interestedKeys));
}
if (interestedKeyPrefixes != null && !interestedKeyPrefixes.isEmpty()) {
m_interestedKeyPrefixes.put(listener, Sets.newHashSet(interestedKeyPrefixes));
}
}
}
@Override
public boolean removeChangeListener(ConfigChangeListener listener) {
m_interestedKeys.remove(listener);
m_interestedKeyPrefixes.remove(listener);
return m_listeners.remove(listener);
}
@Override
public Integer getIntProperty(String key, Integer defaultValue) {
try {
if (m_integerCache == null) {
synchronized (this) {
if (m_integerCache == null) {
m_integerCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_INT_FUNCTION, m_integerCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getIntProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Long getLongProperty(String key, Long defaultValue) {
try {
if (m_longCache == null) {
synchronized (this) {
if (m_longCache == null) {
m_longCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_LONG_FUNCTION, m_longCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getLongProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Short getShortProperty(String key, Short defaultValue) {
try {
if (m_shortCache == null) {
synchronized (this) {
if (m_shortCache == null) {
m_shortCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_SHORT_FUNCTION, m_shortCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getShortProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Float getFloatProperty(String key, Float defaultValue) {
try {
if (m_floatCache == null) {
synchronized (this) {
if (m_floatCache == null) {
m_floatCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_FLOAT_FUNCTION, m_floatCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getFloatProperty for %s failed, return default value %f", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Double getDoubleProperty(String key, Double defaultValue) {
try {
if (m_doubleCache == null) {
synchronized (this) {
if (m_doubleCache == null) {
m_doubleCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DOUBLE_FUNCTION, m_doubleCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDoubleProperty for %s failed, return default value %f", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Byte getByteProperty(String key, Byte defaultValue) {
try {
if (m_byteCache == null) {
synchronized (this) {
if (m_byteCache == null) {
m_byteCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_BYTE_FUNCTION, m_byteCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getByteProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Boolean getBooleanProperty(String key, Boolean defaultValue) {
try {
if (m_booleanCache == null) {
synchronized (this) {
if (m_booleanCache == null) {
m_booleanCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_BOOLEAN_FUNCTION, m_booleanCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getBooleanProperty for %s failed, return default value %b", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public String[] getArrayProperty(String key, final String delimiter, String[] defaultValue) {
try {
if (!m_arrayCache.containsKey(delimiter)) {
synchronized (this) {
if (!m_arrayCache.containsKey(delimiter)) {
m_arrayCache.put(delimiter, this.<String[]>newCache());
}
}
}
Cache<String, String[]> cache = m_arrayCache.get(delimiter);
String[] result = cache.getIfPresent(key);
if (result != null) {
return result;
}
return getValueAndStoreToCache(key, new Function<String, String[]>() {
@Override
public String[] apply(String input) {
return input.split(delimiter);
}
}, cache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getArrayProperty for %s failed, return default value", key), ex));
}
return defaultValue;
}
@Override
public <T extends Enum<T>> T getEnumProperty(String key, Class<T> enumType, T defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Enum.valueOf(enumType, value);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getEnumProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, Date defaultValue) {
try {
if (m_dateCache == null) {
synchronized (this) {
if (m_dateCache == null) {
m_dateCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DATE_FUNCTION, m_dateCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, String format, Date defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Parsers.forDate().parse(value, format);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public Date getDateProperty(String key, String format, Locale locale, Date defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return Parsers.forDate().parse(value, format, locale);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDateProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public long getDurationProperty(String key, long defaultValue) {
try {
if (m_durationCache == null) {
synchronized (this) {
if (m_durationCache == null) {
m_durationCache = newCache();
}
}
}
return getValueFromCache(key, Functions.TO_DURATION_FUNCTION, m_durationCache, defaultValue);
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getDurationProperty for %s failed, return default value %d", key,
defaultValue), ex));
}
return defaultValue;
}
@Override
public <T> T getProperty(String key, Function<String, T> function, T defaultValue) {
try {
String value = getProperty(key, null);
if (value != null) {
return function.apply(value);
}
} catch (Throwable ex) {
Tracer.logError(new ApolloConfigException(
String.format("getProperty for %s failed, return default value %s", key,
defaultValue), ex));
}
return defaultValue;
}
private <T> T getValueFromCache(String key, Function<String, T> parser, Cache<String, T> cache, T defaultValue) {
T result = cache.getIfPresent(key);
if (result != null) {
return result;
}
return getValueAndStoreToCache(key, parser, cache, defaultValue);
}
private <T> T getValueAndStoreToCache(String key, Function<String, T> parser, Cache<String, T> cache, T defaultValue) {
long currentConfigVersion = m_configVersion.get();
String value = getProperty(key, null);
if (value != null) {
T result = parser.apply(value);
if (result != null) {
synchronized (this) {
if (m_configVersion.get() == currentConfigVersion) {
cache.put(key, result);
}
}
return result;
}
}
return defaultValue;
}
private <T> Cache<String, T> newCache() {
Cache<String, T> cache = CacheBuilder.newBuilder()
.maximumSize(m_configUtil.getMaxConfigCacheSize())
.expireAfterAccess(m_configUtil.getConfigCacheExpireTime(), m_configUtil.getConfigCacheExpireTimeUnit())
.build();
allCaches.add(cache);
return cache;
}
/**
* Clear config cache
*/
protected void clearConfigCache() {
synchronized (this) {
for (Cache c : allCaches) {
if (c != null) {
c.invalidateAll();
}
}
m_configVersion.incrementAndGet();
}
}
/**
* @param changes map's key is config property's key
*/
protected void fireConfigChange(String namespace, Map<String, ConfigChange> changes) {
final Set<String> changedKeys = changes.keySet();
final List<ConfigChangeListener> listeners = this.findMatchedConfigChangeListeners(changedKeys);
// notify those listeners
for (ConfigChangeListener listener : listeners) {
Set<String> interestedChangedKeys = resolveInterestedChangedKeys(listener, changedKeys);
InterestedConfigChangeEvent interestedConfigChangeEvent = new InterestedConfigChangeEvent(
namespace, changes, interestedChangedKeys);
this.notifyAsync(listener, interestedConfigChangeEvent);
}
}
/**
* Fire the listeners by event.
*/
protected void fireConfigChange(final ConfigChangeEvent changeEvent) {
final List<ConfigChangeListener> listeners = this
.findMatchedConfigChangeListeners(changeEvent.changedKeys());
// notify those listeners
for (ConfigChangeListener listener : listeners) {
this.notifyAsync(listener, changeEvent);
}
}
private List<ConfigChangeListener> findMatchedConfigChangeListeners(Set<String> changedKeys) {
final List<ConfigChangeListener> configChangeListeners = new ArrayList<>();
for (ConfigChangeListener configChangeListener : this.m_listeners) {
// check whether the listener is interested in this change event
if (this.isConfigChangeListenerInterested(configChangeListener, changedKeys)) {
configChangeListeners.add(configChangeListener);
}
}
return configChangeListeners;
}
private void notifyAsync(final ConfigChangeListener listener, final ConfigChangeEvent changeEvent) {
m_executorService.submit(new Runnable() {
@Override
public void run() {
String listenerName = listener.getClass().getName();
Transaction transaction = Tracer.newTransaction("Apollo.ConfigChangeListener", listenerName);
try {
listener.onChange(changeEvent);
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
Tracer.logError(ex);
logger.error("Failed to invoke config change listener {}", listenerName, ex);
} finally {
transaction.complete();
}
}
});
}
private boolean isConfigChangeListenerInterested(ConfigChangeListener configChangeListener, Set<String> changedKeys) {
Set<String> interestedKeys = m_interestedKeys.get(configChangeListener);
Set<String> interestedKeyPrefixes = m_interestedKeyPrefixes.get(configChangeListener);
if ((interestedKeys == null || interestedKeys.isEmpty())
&& (interestedKeyPrefixes == null || interestedKeyPrefixes.isEmpty())) {
return true; // no interested keys means interested in all keys
}
if (interestedKeys != null) {
for (String interestedKey : interestedKeys) {
if (changedKeys.contains(interestedKey)) {
return true;
}
}
}
if (interestedKeyPrefixes != null) {
for (String prefix : interestedKeyPrefixes) {
for (final String changedKey : changedKeys) {
if (changedKey.startsWith(prefix)) {
return true;
}
}
}
}
return false;
}
private Set<String> resolveInterestedChangedKeys(ConfigChangeListener configChangeListener, Set<String> changedKeys) {
Set<String> interestedChangedKeys = new HashSet<>();
if (this.m_interestedKeys.containsKey(configChangeListener)) {
Set<String> interestedKeys = this.m_interestedKeys.get(configChangeListener);
for (String interestedKey : interestedKeys) {
if (changedKeys.contains(interestedKey)) {
interestedChangedKeys.add(interestedKey);
}
}
}
if (this.m_interestedKeyPrefixes.containsKey(configChangeListener)) {
Set<String> interestedKeyPrefixes = this.m_interestedKeyPrefixes.get(configChangeListener);
for (String interestedKeyPrefix : interestedKeyPrefixes) {
for (String changedKey : changedKeys) {
if (changedKey.startsWith(interestedKeyPrefix)) {
interestedChangedKeys.add(changedKey);
}
}
}
}
return Collections.unmodifiableSet(interestedChangedKeys);
}
List<ConfigChange> calcPropertyChanges(String namespace, Properties previous,
Properties current) {
if (previous == null) {
previous = propertiesFactory.getPropertiesInstance();
}
if (current == null) {
current = propertiesFactory.getPropertiesInstance();
}
Set<String> previousKeys = previous.stringPropertyNames();
Set<String> currentKeys = current.stringPropertyNames();
Set<String> commonKeys = Sets.intersection(previousKeys, currentKeys);
Set<String> newKeys = Sets.difference(currentKeys, commonKeys);
Set<String> removedKeys = Sets.difference(previousKeys, commonKeys);
List<ConfigChange> changes = Lists.newArrayList();
for (String newKey : newKeys) {
changes.add(new ConfigChange(namespace, newKey, null, current.getProperty(newKey),
PropertyChangeType.ADDED));
}
for (String removedKey : removedKeys) {
changes.add(new ConfigChange(namespace, removedKey, previous.getProperty(removedKey), null,
PropertyChangeType.DELETED));
}
for (String commonKey : commonKeys) {
String previousValue = previous.getProperty(commonKey);
String currentValue = current.getProperty(commonKey);
if (Objects.equal(previousValue, currentValue)) {
continue;
}
changes.add(new ConfigChange(namespace, commonKey, previousValue, currentValue,
PropertyChangeType.MODIFIED));
}
return changes;
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.RateLimiter;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = DeferredLoggerFactory.getLogger(DefaultConfig.class);
private final String m_namespace;
private final Properties m_resourceProperties;
private final AtomicReference<Properties> m_configProperties;
private final ConfigRepository m_configRepository;
private final RateLimiter m_warnLogRateLimiter;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace of this config instance
* @param configRepository the config repository for this config instance
*/
public DefaultConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_resourceProperties = loadFromResource(m_namespace);
m_configRepository = configRepository;
m_configProperties = new AtomicReference<>();
m_warnLogRateLimiter = RateLimiter.create(0.017); // 1 warning log output per minute
initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
m_namespace, ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
// step 1: check system properties, i.e. -Dkey=value
String value = System.getProperty(key);
// step 2: check local cached properties file
if (value == null && m_configProperties.get() != null) {
value = m_configProperties.get().getProperty(key);
}
/**
* step 3: check env variable, i.e. PATH=...
* normally system environment variables are in UPPERCASE, however there might be exceptions.
* so the caller should provide the key in the right case
*/
if (value == null) {
value = System.getenv(key);
}
// step 4: check properties file from classpath
if (value == null && m_resourceProperties != null) {
value = m_resourceProperties.getProperty(key);
}
if (value == null && m_configProperties.get() == null && m_warnLogRateLimiter.tryAcquire()) {
logger.warn(
"Could not load config for namespace {} from Apollo, please check whether the configs are released in Apollo! Return default value now!",
m_namespace);
}
return value == null ? defaultValue : value;
}
@Override
public Set<String> getPropertyNames() {
Properties properties = m_configProperties.get();
if (properties == null) {
return Collections.emptySet();
}
return stringPropertyNames(properties);
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
private Set<String> stringPropertyNames(Properties properties) {
//jdk9以下版本Properties#enumerateStringProperties方法存在性能问题，keys() + get(k) 重复迭代, jdk9之后改为entrySet遍历.
Map<String, String> h = new LinkedHashMap<>();
for (Map.Entry<Object, Object> e : properties.entrySet()) {
Object k = e.getKey();
Object v = e.getValue();
if (k instanceof String && v instanceof String) {
h.put((String) k, (String) v);
}
}
return h.keySet();
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties.get())) {
return;
}
ConfigSourceType sourceType = m_configRepository.getSourceType();
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
Map<String, ConfigChange> actualChanges = updateAndCalcConfigChanges(newConfigProperties,
sourceType);
//check double checked result
if (actualChanges.isEmpty()) {
return;
}
this.fireConfigChange(new ConfigChangeEvent(m_namespace, actualChanges));
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties.set(newConfigProperties);
m_sourceType = sourceType;
}
private Map<String, ConfigChange> updateAndCalcConfigChanges(Properties newConfigProperties,
ConfigSourceType sourceType) {
List<ConfigChange> configChanges =
calcPropertyChanges(m_namespace, m_configProperties.get(), newConfigProperties);
ImmutableMap.Builder<String, ConfigChange> actualChanges =
new ImmutableMap.Builder<>();
/** === Double check since DefaultConfig has multiple config sources ==== **/
//1. use getProperty to update configChanges's old value
for (ConfigChange change : configChanges) {
change.setOldValue(this.getProperty(change.getPropertyName(), change.getOldValue()));
}
//2. update m_configProperties
updateConfig(newConfigProperties, sourceType);
clearConfigCache();
//3. use getProperty to update configChange's new value and calc the final changes
for (ConfigChange change : configChanges) {
change.setNewValue(this.getProperty(change.getPropertyName(), change.getNewValue()));
switch (change.getChangeType()) {
case ADDED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getOldValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
case MODIFIED:
if (!Objects.equals(change.getOldValue(), change.getNewValue())) {
actualChanges.put(change.getPropertyName(), change);
}
break;
case DELETED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getNewValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
default:
//do nothing
break;
}
}
return actualChanges.build();
}
private Properties loadFromResource(String namespace) {
String name = String.format("META-INF/config/%s.properties", namespace);
InputStream in = ClassLoaderUtil.getLoader().getResourceAsStream(name);
Properties properties = null;
if (in != null) {
properties = propertiesFactory.getPropertiesInstance();
try {
properties.load(in);
} catch (IOException ex) {
Tracer.logError(ex);
logger.error("Load resource config for namespace {} failed", namespace, ex);
} finally {
try {
in.close();
} catch (IOException ex) {
// ignore
}
}
}
return properties;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.RateLimiter;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = DeferredLoggerFactory.getLogger(DefaultConfig.class);
private final String m_namespace;
private final Properties m_resourceProperties;
private final AtomicReference<Properties> m_configProperties;
private final ConfigRepository m_configRepository;
private final RateLimiter m_warnLogRateLimiter;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace of this config instance
* @param configRepository the config repository for this config instance
*/
public DefaultConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_resourceProperties = loadFromResource(m_namespace);
m_configRepository = configRepository;
m_configProperties = new AtomicReference<>();
m_warnLogRateLimiter = RateLimiter.create(0.017); // 1 warning log output per minute
initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
m_namespace, ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
// step 1: check system properties, i.e. -Dkey=value
String value = System.getProperty(key);
// step 2: check local cached properties file
if (value == null && m_configProperties.get() != null) {
value = m_configProperties.get().getProperty(key);
}
/**
* step 3: check env variable, i.e. PATH=...
* normally system environment variables are in UPPERCASE, however there might be exceptions.
* so the caller should provide the key in the right case
*/
if (value == null) {
value = System.getenv(key);
}
// step 4: check properties file from classpath
if (value == null && m_resourceProperties != null) {
value = m_resourceProperties.getProperty(key);
}
if (value == null && m_configProperties.get() == null && m_warnLogRateLimiter.tryAcquire()) {
logger.warn(
"Could not load config for namespace {} from Apollo, please check whether the configs are released in Apollo! Return default value now!",
m_namespace);
}
return value == null ? defaultValue : value;
}
@Override
public Set<String> getPropertyNames() {
Properties properties = m_configProperties.get();
if (properties == null) {
return Collections.emptySet();
}
return stringPropertyNames(properties);
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
private Set<String> stringPropertyNames(Properties properties) {
//jdk9以下版本Properties#enumerateStringProperties方法存在性能问题，keys() + get(k) 重复迭代, jdk9之后改为entrySet遍历.
Map<String, String> h = new LinkedHashMap<>();
for (Map.Entry<Object, Object> e : properties.entrySet()) {
Object k = e.getKey();
Object v = e.getValue();
if (k instanceof String && v instanceof String) {
h.put((String) k, (String) v);
}
}
return h.keySet();
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties.get())) {
return;
}
ConfigSourceType sourceType = m_configRepository.getSourceType();
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
Map<String, ConfigChange> actualChanges = updateAndCalcConfigChanges(newConfigProperties,
sourceType);
//check double checked result
if (actualChanges.isEmpty()) {
return;
}
this.fireConfigChange(m_namespace, actualChanges);
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties.set(newConfigProperties);
m_sourceType = sourceType;
}
private Map<String, ConfigChange> updateAndCalcConfigChanges(Properties newConfigProperties,
ConfigSourceType sourceType) {
List<ConfigChange> configChanges =
calcPropertyChanges(m_namespace, m_configProperties.get(), newConfigProperties);
ImmutableMap.Builder<String, ConfigChange> actualChanges =
new ImmutableMap.Builder<>();
/** === Double check since DefaultConfig has multiple config sources ==== **/
//1. use getProperty to update configChanges's old value
for (ConfigChange change : configChanges) {
change.setOldValue(this.getProperty(change.getPropertyName(), change.getOldValue()));
}
//2. update m_configProperties
updateConfig(newConfigProperties, sourceType);
clearConfigCache();
//3. use getProperty to update configChange's new value and calc the final changes
for (ConfigChange change : configChanges) {
change.setNewValue(this.getProperty(change.getPropertyName(), change.getNewValue()));
switch (change.getChangeType()) {
case ADDED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getOldValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
case MODIFIED:
if (!Objects.equals(change.getOldValue(), change.getNewValue())) {
actualChanges.put(change.getPropertyName(), change);
}
break;
case DELETED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getNewValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
default:
//do nothing
break;
}
}
return actualChanges.build();
}
private Properties loadFromResource(String namespace) {
String name = String.format("META-INF/config/%s.properties", namespace);
InputStream in = ClassLoaderUtil.getLoader().getResourceAsStream(name);
Properties properties = null;
if (in != null) {
properties = propertiesFactory.getPropertiesInstance();
try {
properties.load(in);
} catch (IOException ex) {
Tracer.logError(ex);
logger.error("Load resource config for namespace {} failed", namespace, ex);
} finally {
try {
in.close();
} catch (IOException ex) {
// ignore
}
}
}
return properties;
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
/**
* @author Jason Song([email protected])
*/
public class SimpleConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = LoggerFactory.getLogger(SimpleConfig.class);
private final String m_namespace;
private final ConfigRepository m_configRepository;
private volatile Properties m_configProperties;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace for this config instance
* @param configRepository the config repository for this config instance
*/
public SimpleConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_configRepository = configRepository;
this.initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
if (m_configProperties == null) {
logger.warn("Could not load config from Apollo, always return default value!");
return defaultValue;
}
return this.m_configProperties.getProperty(key, defaultValue);
}
@Override
public Set<String> getPropertyNames() {
if (m_configProperties == null) {
return Collections.emptySet();
}
return m_configProperties.stringPropertyNames();
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties)) {
return;
}
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
List<ConfigChange> changes = calcPropertyChanges(namespace, m_configProperties, newConfigProperties);
Map<String, ConfigChange> changeMap = Maps.uniqueIndex(changes,
new Function<ConfigChange, String>() {
@Override
public String apply(ConfigChange input) {
return input.getPropertyName();
}
});
updateConfig(newConfigProperties, m_configRepository.getSourceType());
clearConfigCache();
this.fireConfigChange(new ConfigChangeEvent(m_namespace, changeMap));
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties = newConfigProperties;
m_sourceType = sourceType;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
/**
* @author Jason Song([email protected])
*/
public class SimpleConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = LoggerFactory.getLogger(SimpleConfig.class);
private final String m_namespace;
private final ConfigRepository m_configRepository;
private volatile Properties m_configProperties;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace for this config instance
* @param configRepository the config repository for this config instance
*/
public SimpleConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_configRepository = configRepository;
this.initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
if (m_configProperties == null) {
logger.warn("Could not load config from Apollo, always return default value!");
return defaultValue;
}
return this.m_configProperties.getProperty(key, defaultValue);
}
@Override
public Set<String> getPropertyNames() {
if (m_configProperties == null) {
return Collections.emptySet();
}
return m_configProperties.stringPropertyNames();
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties)) {
return;
}
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
List<ConfigChange> changes = calcPropertyChanges(namespace, m_configProperties, newConfigProperties);
Map<String, ConfigChange> changeMap = Maps.uniqueIndex(changes,
new Function<ConfigChange, String>() {
@Override
public String apply(ConfigChange input) {
return input.getPropertyName();
}
});
updateConfig(newConfigProperties, m_configRepository.getSourceType());
clearConfigCache();
this.fireConfigChange(m_namespace, changeMap);
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties = newConfigProperties;
m_sourceType = sourceType;
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.model;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song([email protected])
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**
* Constructor.
* @param namespace the namespace of this change
* @param changes the actual changes
*/
public ConfigChangeEvent(String namespace,
Map<String, ConfigChange> changes) {
m_namespace = namespace;
m_changes = changes;
}
/**
* Get the keys changed.
* @return the list of the keys
*/
public Set<String> changedKeys() {
return m_changes.keySet();
}
/**
* Get a specific change instance for the key specified.
* @param key the changed key
* @return the change instance
*/
public ConfigChange getChange(String key) {
return m_changes.get(key);
}
/**
* Check whether the specified key is changed
* @param key the key
* @return true if the key is changed, false otherwise.
*/
public boolean isChanged(String key) {
return m_changes.containsKey(key);
}
/**
* Get the namespace of this change event.
* @return the namespace
*/
public String getNamespace() {
return m_namespace;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.model;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song([email protected])
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**
* Constructor.
* @param namespace the namespace of this change
* @param changes the actual changes
*/
public ConfigChangeEvent(String namespace,
Map<String, ConfigChange> changes) {
this.m_namespace = namespace;
this.m_changes = changes;
}
/**
* Get the keys changed.
* @return the list of the keys
*/
public Set<String> changedKeys() {
return m_changes.keySet();
}
/**
* Maybe subclass override this method.
*
* @return interested and changed keys
*/
public Set<String> interestedChangedKeys() {
return Collections.emptySet();
}
/**
* Get a specific change instance for the key specified.
* @param key the changed key
* @return the change instance
*/
public ConfigChange getChange(String key) {
return m_changes.get(key);
}
/**
* Check whether the specified key is changed
* @param key the key
* @return true if the key is changed, false otherwise.
*/
public boolean isChanged(String key) {
return m_changes.containsKey(key);
}
/**
* Get the namespace of this change event.
* @return the namespace
*/
public String getNamespace() {
return m_namespace;
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import org.awaitility.core.ThrowingRunnable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigTest {
private File someResourceDir;
private String someNamespace;
private ConfigRepository configRepository;
private Properties someProperties;
private ConfigSourceType someSourceType;
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someResourceDir = new File(ClassLoaderUtil.getClassPath() + "/META-INF/config");
someResourceDir.mkdirs();
someNamespace = "someName";
configRepository = mock(ConfigRepository.class);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someResourceDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
@Test
public void testGetPropertyWithAllPropertyHierarchy() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String lastKey = "lastKey";
String someResourceValue = "resource-value";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someLocalFileValue);
someProperties.setProperty(anotherKey, someLocalFileValue);
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.write(someKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(anotherKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(lastKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
String someKeyValue = defaultConfig.getProperty(someKey, null);
String anotherKeyValue = defaultConfig.getProperty(anotherKey, null);
String lastKeyValue = defaultConfig.getProperty(lastKey, null);
//clean up
System.clearProperty(someKey);
assertEquals(someSystemPropertyValue, someKeyValue);
assertEquals(someLocalFileValue, anotherKeyValue);
assertEquals(someResourceValue, lastKeyValue);
assertEquals(someSourceType, defaultConfig.getSourceType());
}
@Test
public void testGetIntProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getIntProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithPropertyChanges() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer anotherValue = 3;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, String.valueOf(anotherValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithSmallCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
String anotherKey = "anotherKey";
Integer anotherValue = 3;
Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithSmallCache());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(someProperties.getProperty(anotherKey)).thenReturn(String.valueOf(anotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(anotherKey);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithShortExpireTime() throws Exception {
final String someKey = "someKey";
final Integer someValue = 2;
final Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithShortExpireTime());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
final DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
await().atMost(500, TimeUnit.MILLISECONDS).untilAsserted(new ThrowingRunnable() {
@Override
public void run() throws Throwable {
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
});
}
@Test
public void testGetLongProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Long someValue = 2L;
Long someDefaultValue = -1L;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getLongProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getLongProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetShortProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Short someValue = 2;
Short someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getShortProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getShortProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetFloatProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Float someValue = 2.20f;
Float someDefaultValue = -1f;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getFloatProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getFloatProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetDoubleProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Double someValue = 2.20d;
Double someDefaultValue = -1d;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getDoubleProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getDoubleProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetByteProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Byte someValue = 10;
Byte someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getByteProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getByteProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetBooleanProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Boolean someValue = true;
Boolean someDefaultValue = false;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getBooleanProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getBooleanProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetArrayProperty() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
}
@Test
public void testGetArrayPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
verify(someProperties, times(3)).getProperty(someKey);
}
@Test
public void testGetArrayPropertyMultipleTimesWithCacheAndValueChanges() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String[] values = new String[]{"a", "b", "c"};
String[] anotherValues = new String[]{"b", "c", "d"};
String someValue = Joiner.on(someDelimiter).join(values);
String anotherValue = Joiner.on(someDelimiter).join(anotherValues);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, anotherValue);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertArrayEquals(anotherValues, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
}
@Test
public void testGetDatePropertyWithFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithFormat(defaultConfig, shortDate, "shortDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "mediumDateProperty", "yyyy-MM-dd HH:mm:ss",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "mediumDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, longDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss.SSS",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "longDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, someDefaultValue, "stringProperty", "yyyy-MM-dd", someDefaultValue);
}
@Test
public void testGetDatePropertyWithNoFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithoutFormat(defaultConfig, shortDate, "shortDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, mediumDate, "mediumDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, longDate, "longDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, someDefaultValue, "stringProperty", someDefaultValue);
}
@Test
public void testGetEnumProperty() throws Exception {
SomeEnum someDefaultValue = SomeEnum.defaultValue;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("enumProperty", "someValue");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(SomeEnum.someValue, defaultConfig.getEnumProperty("enumProperty", SomeEnum.class, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getEnumProperty("stringProperty", SomeEnum.class, someDefaultValue));
}
@Test
public void testGetDurationProperty() throws Exception {
long someDefaultValue = 1000;
long result = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("durationProperty", "2D3H4m5S123ms");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(result, defaultConfig.getDurationProperty("durationProperty", someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getDurationProperty("stringProperty", someDefaultValue));
}
@Test
public void testOnRepositoryChange() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String keyToBeDeleted = "keyToBeDeleted";
String keyToBeDeletedValue = "keyToBeDeletedValue";
String yetAnotherKey = "yetAnotherKey";
String yetAnotherValue = "yetAnotherValue";
String yetAnotherResourceValue = "yetAnotherResourceValue";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.putAll(ImmutableMap
.of(someKey, someLocalFileValue, anotherKey, someLocalFileValue, keyToBeDeleted,
keyToBeDeletedValue, yetAnotherKey, yetAnotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.append(yetAnotherKey + "=" + yetAnotherResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someSourceType, defaultConfig.getSourceType());
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
defaultConfig.addChangeListener(someListener);
Properties newProperties = new Properties();
String someKeyNewValue = "new-some-value";
String anotherKeyNewValue = "another-new-value";
String newKey = "newKey";
String newValue = "newValue";
newProperties.putAll(ImmutableMap
.of(someKey, someKeyNewValue, anotherKey, anotherKeyNewValue, newKey, newValue));
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
defaultConfig.onRepositoryChange(someNamespace, newProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
//clean up
System.clearProperty(someKey);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(4, changeEvent.changedKeys().size());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(someLocalFileValue, anotherKeyChange.getOldValue());
assertEquals(anotherKeyNewValue, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, anotherKeyChange.getChangeType());
ConfigChange yetAnotherKeyChange = changeEvent.getChange(yetAnotherKey);
assertEquals(yetAnotherValue, yetAnotherKeyChange.getOldValue());
assertEquals(yetAnotherResourceValue, yetAnotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, yetAnotherKeyChange.getChangeType());
ConfigChange keyToBeDeletedChange = changeEvent.getChange(keyToBeDeleted);
assertEquals(keyToBeDeletedValue, keyToBeDeletedChange.getOldValue());
assertEquals(null, keyToBeDeletedChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, keyToBeDeletedChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, defaultConfig.getSourceType());
}
@Test
public void testFireConfigChangeWithInterestedKeys() throws Exception {
String someKeyChanged = "someKeyChanged";
String anotherKeyChanged = "anotherKeyChanged";
String someKeyNotChanged = "someKeyNotChanged";
String someNamespace = "someNamespace";
Map<String, ConfigChange> changes = Maps.newHashMap();
changes.put(someKeyChanged, mock(ConfigChange.class));
changes.put(anotherKeyChanged, mock(ConfigChange.class));
ConfigChangeEvent someChangeEvent = new ConfigChangeEvent(someNamespace, changes);
final SettableFuture<ConfigChangeEvent> interestedInAllKeysFuture = SettableFuture.create();
ConfigChangeListener interestedInAllKeys = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInAllKeysFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKey = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyNotChangedFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKeyNotChanged = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyNotChangedFuture.set(changeEvent);
}
};
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(interestedInAllKeys);
config.addChangeListener(interestedInSomeKey, Sets.newHashSet(someKeyChanged));
config.addChangeListener(interestedInSomeKeyNotChanged, Sets.newHashSet(someKeyNotChanged));
config.fireConfigChange(someChangeEvent);
ConfigChangeEvent changeEvent = interestedInAllKeysFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent, changeEvent);
assertEquals(someChangeEvent, interestedInSomeKeyFuture.get(500, TimeUnit.MILLISECONDS));
assertFalse(interestedInSomeKeyNotChangedFuture.isDone());
}
@Test
public void testRemoveChangeListener() throws Exception {
String someNamespace = "someNamespace";
final ConfigChangeEvent someConfigChangeEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherConfigChangeEvent = mock(ConfigChangeEvent.class);
final SettableFuture<ConfigChangeEvent> someListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> someListenerFuture2 = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
someListenerFuture1.set(changeEvent);
} else {
someListenerFuture2.set(changeEvent);
}
}
};
final SettableFuture<ConfigChangeEvent> anotherListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> anotherListenerFuture2 = SettableFuture.create();
ConfigChangeListener anotherListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
anotherListenerFuture1.set(changeEvent);
} else {
anotherListenerFuture2.set(changeEvent);
}
}
};
ConfigChangeListener yetAnotherListener = mock(ConfigChangeListener.class);
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(someListener);
config.addChangeListener(anotherListener);
config.fireConfigChange(someConfigChangeEvent);
assertEquals(someConfigChangeEvent, someListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertEquals(someConfigChangeEvent, anotherListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertFalse(config.removeChangeListener(yetAnotherListener));
assertTrue(config.removeChangeListener(someListener));
config.fireConfigChange(anotherConfigChangeEvent);
assertEquals(anotherConfigChangeEvent, anotherListenerFuture2.get(500, TimeUnit.MILLISECONDS));
TimeUnit.MILLISECONDS.sleep(100);
assertFalse(someListenerFuture2.isDone());
}
@Test
public void testGetPropertyNames() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
//set up config repo
someProperties = new Properties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithOrderedProperties() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
//set up config repo
someProperties = new OrderedProperties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithNullProp() {
when(configRepository.getConfig()).thenReturn(null);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(Collections.emptySet(), propertyNames);
}
@Test
public void testGetPropertyWithFunction() throws Exception {
String someKey = "someKey";
String someValue = "a,b,c";
String someNullKey = "someNullKey";
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(defaultConfig.getProperty(someKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList("a", "b", "c"));
assertEquals(defaultConfig.getProperty(someNullKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList());
}
@Test
public void testLoadFromRepositoryFailedAndThenRecovered() {
String someKey = "someKey";
String someValue = "someValue";
String someDefaultValue = "someDefaultValue";
ConfigSourceType someSourceType = ConfigSourceType.REMOTE;
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
verify(configRepository, times(1)).addChangeListener(defaultConfig);
assertEquals(ConfigSourceType.NONE, defaultConfig.getSourceType());
assertEquals(someDefaultValue, defaultConfig.getProperty(someKey, someDefaultValue));
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getSourceType()).thenReturn(someSourceType);
defaultConfig.onRepositoryChange(someNamespace, someProperties);
assertEquals(someSourceType, defaultConfig.getSourceType());
assertEquals(someValue, defaultConfig.getProperty(someKey, someDefaultValue));
}
private void checkDatePropertyWithFormat(Config config, Date expected, String propertyName, String format, Date
defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, format, defaultValue));
}
private void checkDatePropertyWithoutFormat(Config config, Date expected, String propertyName, Date defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, defaultValue));
}
private Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
private enum SomeEnum {
someValue, defaultValue
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 10;
}
@Override
public long getConfigCacheExpireTime() {
return 1;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MINUTES;
}
}
public static class MockConfigUtilWithSmallCache extends MockConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 1;
}
}
public static class MockConfigUtilWithShortExpireTime extends MockConfigUtil {
@Override
public long getConfigCacheExpireTime() {
return 50;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MILLISECONDS;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import org.awaitility.core.ThrowingRunnable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import com.google.common.util.concurrent.SettableFuture;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* @author Jason Song([email protected])
*/
public class DefaultConfigTest {
private File someResourceDir;
private String someNamespace;
private ConfigRepository configRepository;
private Properties someProperties;
private ConfigSourceType someSourceType;
private PropertiesFactory propertiesFactory;
@Before
public void setUp() throws Exception {
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someResourceDir = new File(ClassLoaderUtil.getClassPath() + "/META-INF/config");
someResourceDir.mkdirs();
someNamespace = "someName";
configRepository = mock(ConfigRepository.class);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someResourceDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
@Test
public void testGetPropertyWithAllPropertyHierarchy() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String lastKey = "lastKey";
String someResourceValue = "resource-value";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someLocalFileValue);
someProperties.setProperty(anotherKey, someLocalFileValue);
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.write(someKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(anotherKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
Files.append(System.getProperty("line.separator"), resourceFile, Charsets.UTF_8);
Files.append(lastKey + "=" + someResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
String someKeyValue = defaultConfig.getProperty(someKey, null);
String anotherKeyValue = defaultConfig.getProperty(anotherKey, null);
String lastKeyValue = defaultConfig.getProperty(lastKey, null);
//clean up
System.clearProperty(someKey);
assertEquals(someSystemPropertyValue, someKeyValue);
assertEquals(someLocalFileValue, anotherKeyValue);
assertEquals(someResourceValue, lastKeyValue);
assertEquals(someSourceType, defaultConfig.getSourceType());
}
@Test
public void testGetIntProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getIntProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer someDefaultValue = -1;
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithPropertyChanges() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
Integer anotherValue = 3;
Integer someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, String.valueOf(anotherValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertEquals(anotherValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
}
@Test
public void testGetIntPropertyMultipleTimesWithSmallCache() throws Exception {
String someKey = "someKey";
Integer someValue = 2;
String anotherKey = "anotherKey";
Integer anotherValue = 3;
Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithSmallCache());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(someProperties.getProperty(anotherKey)).thenReturn(String.valueOf(anotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
assertEquals(anotherValue, defaultConfig.getIntProperty(anotherKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(anotherKey);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
@Test
public void testGetIntPropertyMultipleTimesWithShortExpireTime() throws Exception {
final String someKey = "someKey";
final Integer someValue = 2;
final Integer someDefaultValue = -1;
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtilWithShortExpireTime());
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
final DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
await().atMost(500, TimeUnit.MILLISECONDS).untilAsserted(new ThrowingRunnable() {
@Override
public void run() throws Throwable {
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
assertEquals(someValue, defaultConfig.getIntProperty(someKey, someDefaultValue));
verify(someProperties, times(2)).getProperty(someKey);
}
});
}
@Test
public void testGetLongProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Long someValue = 2L;
Long someDefaultValue = -1L;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getLongProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getLongProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetShortProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Short someValue = 2;
Short someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getShortProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getShortProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetFloatProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Float someValue = 2.20f;
Float someDefaultValue = -1f;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getFloatProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getFloatProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetDoubleProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Double someValue = 2.20d;
Double someDefaultValue = -1d;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getDoubleProperty(someKey, someDefaultValue), 0.001);
assertEquals(someDefaultValue, defaultConfig.getDoubleProperty(someStringKey, someDefaultValue), 0.001);
}
@Test
public void testGetByteProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Byte someValue = 10;
Byte someDefaultValue = -1;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getByteProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getByteProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetBooleanProperty() throws Exception {
String someStringKey = "someStringKey";
String someStringValue = "someStringValue";
String someKey = "someKey";
Boolean someValue = true;
Boolean someDefaultValue = false;
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someStringKey, someStringValue);
someProperties.setProperty(someKey, String.valueOf(someValue));
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someValue, defaultConfig.getBooleanProperty(someKey, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getBooleanProperty(someStringKey, someDefaultValue));
}
@Test
public void testGetArrayProperty() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
}
@Test
public void testGetArrayPropertyMultipleTimesWithCache() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String someInvalidDelimiter = "{";
String[] values = new String[]{"a", "b", "c"};
String someValue = Joiner.on(someDelimiter).join(values);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = mock(Properties.class);
when(someProperties.getProperty(someKey)).thenReturn(someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
verify(someProperties, times(1)).getProperty(someKey);
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
assertArrayEquals(someDefaultValue, defaultConfig.getArrayProperty(someKey, someInvalidDelimiter,
someDefaultValue));
verify(someProperties, times(3)).getProperty(someKey);
}
@Test
public void testGetArrayPropertyMultipleTimesWithCacheAndValueChanges() throws Exception {
String someKey = "someKey";
String someDelimiter = ",";
String[] values = new String[]{"a", "b", "c"};
String[] anotherValues = new String[]{"b", "c", "d"};
String someValue = Joiner.on(someDelimiter).join(values);
String anotherValue = Joiner.on(someDelimiter).join(anotherValues);
String[] someDefaultValue = new String[]{"1", "2"};
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
Properties anotherProperties = new Properties();
anotherProperties.setProperty(someKey, anotherValue);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertArrayEquals(values, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
defaultConfig.onRepositoryChange(someNamespace, anotherProperties);
assertArrayEquals(anotherValues, defaultConfig.getArrayProperty(someKey, someDelimiter, someDefaultValue));
}
@Test
public void testGetDatePropertyWithFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithFormat(defaultConfig, shortDate, "shortDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "mediumDateProperty", "yyyy-MM-dd HH:mm:ss",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "mediumDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, longDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss.SSS",
someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, mediumDate, "longDateProperty", "yyyy-MM-dd HH:mm:ss", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, shortDate, "longDateProperty", "yyyy-MM-dd", someDefaultValue);
checkDatePropertyWithFormat(defaultConfig, someDefaultValue, "stringProperty", "yyyy-MM-dd", someDefaultValue);
}
@Test
public void testGetDatePropertyWithNoFormat() throws Exception {
Date someDefaultValue = new Date();
Date shortDate = assembleDate(2016, 9, 28, 0, 0, 0, 0);
Date mediumDate = assembleDate(2016, 9, 28, 15, 10, 10, 0);
Date longDate = assembleDate(2016, 9, 28, 15, 10, 10, 123);
//set up config repo
someProperties = new Properties();
someProperties.setProperty("shortDateProperty", "2016-09-28");
someProperties.setProperty("mediumDateProperty", "2016-09-28 15:10:10");
someProperties.setProperty("longDateProperty", "2016-09-28 15:10:10.123");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
checkDatePropertyWithoutFormat(defaultConfig, shortDate, "shortDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, mediumDate, "mediumDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, longDate, "longDateProperty", someDefaultValue);
checkDatePropertyWithoutFormat(defaultConfig, someDefaultValue, "stringProperty", someDefaultValue);
}
@Test
public void testGetEnumProperty() throws Exception {
SomeEnum someDefaultValue = SomeEnum.defaultValue;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("enumProperty", "someValue");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(SomeEnum.someValue, defaultConfig.getEnumProperty("enumProperty", SomeEnum.class, someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getEnumProperty("stringProperty", SomeEnum.class, someDefaultValue));
}
@Test
public void testGetDurationProperty() throws Exception {
long someDefaultValue = 1000;
long result = 2 * 24 * 3600 * 1000 + 3 * 3600 * 1000 + 4 * 60 * 1000 + 5 * 1000 + 123;
//set up config repo
someProperties = new Properties();
someProperties.setProperty("durationProperty", "2D3H4m5S123ms");
someProperties.setProperty("stringProperty", "someString");
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(result, defaultConfig.getDurationProperty("durationProperty", someDefaultValue));
assertEquals(someDefaultValue, defaultConfig.getDurationProperty("stringProperty", someDefaultValue));
}
@Test
public void testOnRepositoryChange() throws Exception {
String someKey = "someKey";
String someSystemPropertyValue = "system-property-value";
String anotherKey = "anotherKey";
String someLocalFileValue = "local-file-value";
String keyToBeDeleted = "keyToBeDeleted";
String keyToBeDeletedValue = "keyToBeDeletedValue";
String yetAnotherKey = "yetAnotherKey";
String yetAnotherValue = "yetAnotherValue";
String yetAnotherResourceValue = "yetAnotherResourceValue";
//set up system property
System.setProperty(someKey, someSystemPropertyValue);
//set up config repo
someProperties = new Properties();
someProperties.putAll(ImmutableMap
.of(someKey, someLocalFileValue, anotherKey, someLocalFileValue, keyToBeDeleted,
keyToBeDeletedValue, yetAnotherKey, yetAnotherValue));
when(configRepository.getConfig()).thenReturn(someProperties);
someSourceType = ConfigSourceType.LOCAL;
when(configRepository.getSourceType()).thenReturn(someSourceType);
//set up resource file
File resourceFile = new File(someResourceDir, someNamespace + ".properties");
Files.append(yetAnotherKey + "=" + yetAnotherResourceValue, resourceFile, Charsets.UTF_8);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(someSourceType, defaultConfig.getSourceType());
final SettableFuture<ConfigChangeEvent> configChangeFuture = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
configChangeFuture.set(changeEvent);
}
};
defaultConfig.addChangeListener(someListener);
Properties newProperties = new Properties();
String someKeyNewValue = "new-some-value";
String anotherKeyNewValue = "another-new-value";
String newKey = "newKey";
String newValue = "newValue";
newProperties.putAll(ImmutableMap
.of(someKey, someKeyNewValue, anotherKey, anotherKeyNewValue, newKey, newValue));
ConfigSourceType anotherSourceType = ConfigSourceType.REMOTE;
when(configRepository.getSourceType()).thenReturn(anotherSourceType);
defaultConfig.onRepositoryChange(someNamespace, newProperties);
ConfigChangeEvent changeEvent = configChangeFuture.get(500, TimeUnit.MILLISECONDS);
//clean up
System.clearProperty(someKey);
assertEquals(someNamespace, changeEvent.getNamespace());
assertEquals(4, changeEvent.changedKeys().size());
ConfigChange anotherKeyChange = changeEvent.getChange(anotherKey);
assertEquals(someLocalFileValue, anotherKeyChange.getOldValue());
assertEquals(anotherKeyNewValue, anotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, anotherKeyChange.getChangeType());
ConfigChange yetAnotherKeyChange = changeEvent.getChange(yetAnotherKey);
assertEquals(yetAnotherValue, yetAnotherKeyChange.getOldValue());
assertEquals(yetAnotherResourceValue, yetAnotherKeyChange.getNewValue());
assertEquals(PropertyChangeType.MODIFIED, yetAnotherKeyChange.getChangeType());
ConfigChange keyToBeDeletedChange = changeEvent.getChange(keyToBeDeleted);
assertEquals(keyToBeDeletedValue, keyToBeDeletedChange.getOldValue());
assertEquals(null, keyToBeDeletedChange.getNewValue());
assertEquals(PropertyChangeType.DELETED, keyToBeDeletedChange.getChangeType());
ConfigChange newKeyChange = changeEvent.getChange(newKey);
assertEquals(null, newKeyChange.getOldValue());
assertEquals(newValue, newKeyChange.getNewValue());
assertEquals(PropertyChangeType.ADDED, newKeyChange.getChangeType());
assertEquals(anotherSourceType, defaultConfig.getSourceType());
}
@Test
public void testFireConfigChangeWithInterestedKeys() throws Exception {
String someKeyChanged = "someKeyChanged";
String anotherKeyChanged = "anotherKeyChanged";
String someKeyNotChanged = "someKeyNotChanged";
String someNamespace = "someNamespace";
Map<String, ConfigChange> changes = Maps.newHashMap();
changes.put(someKeyChanged, mock(ConfigChange.class));
changes.put(anotherKeyChanged, mock(ConfigChange.class));
ConfigChangeEvent someChangeEvent = new ConfigChangeEvent(someNamespace, changes);
final SettableFuture<ConfigChangeEvent> interestedInAllKeysFuture = SettableFuture.create();
ConfigChangeListener interestedInAllKeys = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInAllKeysFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKey = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyFuture.set(changeEvent);
}
};
final SettableFuture<ConfigChangeEvent> interestedInSomeKeyNotChangedFuture = SettableFuture.create();
ConfigChangeListener interestedInSomeKeyNotChanged = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
interestedInSomeKeyNotChangedFuture.set(changeEvent);
}
};
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(interestedInAllKeys);
config.addChangeListener(interestedInSomeKey, Sets.newHashSet(someKeyChanged));
config.addChangeListener(interestedInSomeKeyNotChanged, Sets.newHashSet(someKeyNotChanged));
config.fireConfigChange(someChangeEvent);
ConfigChangeEvent changeEvent = interestedInAllKeysFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent, changeEvent);
{
// hidden variables in scope
ConfigChangeEvent actualConfigChangeEvent = interestedInSomeKeyFuture.get(500, TimeUnit.MILLISECONDS);
assertEquals(someChangeEvent.changedKeys(), actualConfigChangeEvent.changedKeys());
for (String changedKey : someChangeEvent.changedKeys()) {
ConfigChange expectConfigChange = someChangeEvent.getChange(changedKey);
ConfigChange actualConfigChange = actualConfigChangeEvent.getChange(changedKey);
assertEquals(expectConfigChange, actualConfigChange);
}
}
assertFalse(interestedInSomeKeyNotChangedFuture.isDone());
}
@Test
public void testRemoveChangeListener() throws Exception {
String someNamespace = "someNamespace";
final ConfigChangeEvent someConfigChangeEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherConfigChangeEvent = mock(ConfigChangeEvent.class);
final SettableFuture<ConfigChangeEvent> someListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> someListenerFuture2 = SettableFuture.create();
ConfigChangeListener someListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
someListenerFuture1.set(changeEvent);
} else {
someListenerFuture2.set(changeEvent);
}
}
};
final SettableFuture<ConfigChangeEvent> anotherListenerFuture1 = SettableFuture.create();
final SettableFuture<ConfigChangeEvent> anotherListenerFuture2 = SettableFuture.create();
ConfigChangeListener anotherListener = new ConfigChangeListener() {
@Override
public void onChange(ConfigChangeEvent changeEvent) {
if (someConfigChangeEvent == changeEvent) {
anotherListenerFuture1.set(changeEvent);
} else {
anotherListenerFuture2.set(changeEvent);
}
}
};
ConfigChangeListener yetAnotherListener = mock(ConfigChangeListener.class);
DefaultConfig config = new DefaultConfig(someNamespace, mock(ConfigRepository.class));
config.addChangeListener(someListener);
config.addChangeListener(anotherListener);
config.fireConfigChange(someConfigChangeEvent);
assertEquals(someConfigChangeEvent, someListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertEquals(someConfigChangeEvent, anotherListenerFuture1.get(500, TimeUnit.MILLISECONDS));
assertFalse(config.removeChangeListener(yetAnotherListener));
assertTrue(config.removeChangeListener(someListener));
config.fireConfigChange(anotherConfigChangeEvent);
assertEquals(anotherConfigChangeEvent, anotherListenerFuture2.get(500, TimeUnit.MILLISECONDS));
TimeUnit.MILLISECONDS.sleep(100);
assertFalse(someListenerFuture2.isDone());
}
@Test
public void testGetPropertyNames() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
//set up config repo
someProperties = new Properties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithOrderedProperties() {
String someKeyPrefix = "someKey";
String someValuePrefix = "someValue";
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
//set up config repo
someProperties = new OrderedProperties();
for (int i = 0; i < 10; i++) {
someProperties.setProperty(someKeyPrefix + i, someValuePrefix + i);
}
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig = new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(10, propertyNames.size());
assertEquals(someProperties.stringPropertyNames(), propertyNames);
}
@Test
public void testGetPropertyNamesWithNullProp() {
when(configRepository.getConfig()).thenReturn(null);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
Set<String> propertyNames = defaultConfig.getPropertyNames();
assertEquals(Collections.emptySet(), propertyNames);
}
@Test
public void testGetPropertyWithFunction() throws Exception {
String someKey = "someKey";
String someValue = "a,b,c";
String someNullKey = "someNullKey";
//set up config repo
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getConfig()).thenReturn(someProperties);
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
assertEquals(defaultConfig.getProperty(someKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList("a", "b", "c"));
assertEquals(defaultConfig.getProperty(someNullKey, new Function<String, List<String>>() {
@Override
public List<String> apply(String s) {
return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
}
}, Lists.<String>newArrayList()), Lists.newArrayList());
}
@Test
public void testLoadFromRepositoryFailedAndThenRecovered() {
String someKey = "someKey";
String someValue = "someValue";
String someDefaultValue = "someDefaultValue";
ConfigSourceType someSourceType = ConfigSourceType.REMOTE;
when(configRepository.getConfig()).thenThrow(mock(RuntimeException.class));
DefaultConfig defaultConfig =
new DefaultConfig(someNamespace, configRepository);
verify(configRepository, times(1)).addChangeListener(defaultConfig);
assertEquals(ConfigSourceType.NONE, defaultConfig.getSourceType());
assertEquals(someDefaultValue, defaultConfig.getProperty(someKey, someDefaultValue));
someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
when(configRepository.getSourceType()).thenReturn(someSourceType);
defaultConfig.onRepositoryChange(someNamespace, someProperties);
assertEquals(someSourceType, defaultConfig.getSourceType());
assertEquals(someValue, defaultConfig.getProperty(someKey, someDefaultValue));
}
private void checkDatePropertyWithFormat(Config config, Date expected, String propertyName, String format, Date
defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, format, defaultValue));
}
private void checkDatePropertyWithoutFormat(Config config, Date expected, String propertyName, Date defaultValue) {
assertEquals(expected, config.getDateProperty(propertyName, defaultValue));
}
private Date assembleDate(int year, int month, int day, int hour, int minute, int second, int millisecond) {
Calendar date = Calendar.getInstance();
date.set(year, month - 1, day, hour, minute, second); //Month in Calendar is 0 based
date.set(Calendar.MILLISECOND, millisecond);
return date.getTime();
}
private enum SomeEnum {
someValue, defaultValue
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 10;
}
@Override
public long getConfigCacheExpireTime() {
return 1;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MINUTES;
}
}
public static class MockConfigUtilWithSmallCache extends MockConfigUtil {
@Override
public long getMaxConfigCacheSize() {
return 1;
}
}
public static class MockConfigUtilWithShortExpireTime extends MockConfigUtil {
@Override
public long getConfigCacheExpireTime() {
return 50;
}
@Override
public TimeUnit getConfigCacheExpireTimeUnit() {
return TimeUnit.MILLISECONDS;
}
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update and another for the @ApolloConfigChangeListener annotation
verify(applicationConfig, times(2)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean.class, AppConfig10.class);
final ArgumentCaptor<Set> interestedKeyPrefixesArgumentCaptor = ArgumentCaptor
.forClass(Set.class);
verify(applicationConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
interestedKeyPrefixesArgumentCaptor.capture());
assertEquals(1, interestedKeyPrefixesArgumentCaptor.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set<String> interestedKeyPrefixes : interestedKeyPrefixesArgumentCaptor.getAllValues()) {
result.addAll(interestedKeyPrefixes);
}
assertEquals(Sets.newHashSet("logging.level", "number"), result);
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeyPrefixes_fire() {
// default mock, useless here
// just for speed up test without waiting
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
SimpleConfig simpleConfig = spy(
this.prepareConfig(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
new Properties()));
mockConfig(TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE,
simpleConfig);
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.class, AppConfig11.class);
verify(simpleConfig, atLeastOnce())
.addChangeListener(any(ConfigChangeListener.class), anySetOf(String.class),
anySetOf(String.class));
Properties properties = new Properties();
properties.put("logging.level.com", "debug");
properties.put("logging.level.root", "warn");
properties.put("number.value", "333");
// publish config change
simpleConfig.onRepositoryChange(
TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1.SPECIAL_NAMESPACE, properties);
// get event from bean
ConfigChangeEvent configChangeEvent = bean.getConfigChangeEvent();
Set<String> interestedChangedKeys = configChangeEvent.interestedChangedKeys();
assertEquals(Sets.newHashSet("logging.level.com", "logging.level.root", "number.value"),
interestedChangedKeys);
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update and another for the @ApolloConfigChangeListener annotation
verify(applicationConfig, times(2)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig10 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig11 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 bean() {
return spy(new TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1());
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean {
@ApolloConfigChangeListener(interestedKeyPrefixes = {"number", "logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
}
}
private static class TestApolloConfigChangeListenerWithInterestedKeyPrefixesBean1 {
static final String SPECIAL_NAMESPACE = "special-namespace-2021";
private final Queue<ConfigChangeEvent> configChangeEventQueue = new ArrayBlockingQueue<>(100);
@ApolloConfigChangeListener(value = SPECIAL_NAMESPACE, interestedKeyPrefixes = {"number",
"logging.level"})
private void onChange(ConfigChangeEvent changeEvent) {
this.configChangeEventQueue.add(changeEvent);
}
public ConfigChangeEvent getConfigChangeEvent() {
return this.configChangeEventQueue.poll();
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| 1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/Favorite.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "Favorite")
@SQLDelete(sql = "Update Favorite set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Favorite extends BaseEntity {
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "UserId", nullable = false)
private String userId;
@Column(name = "Position")
private long position;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public long getPosition() {
return position;
}
public void setPosition(long position) {
this.position = position;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.po;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "Favorite")
@SQLDelete(sql = "Update Favorite set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Favorite extends BaseEntity {
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "UserId", nullable = false)
private String userId;
@Column(name = "Position")
private long position;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public long getPosition() {
return position;
}
public void setPosition(long position) {
this.position = position;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/entity/AppNamespace.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.entity;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "AppNamespace")
@SQLDelete(sql = "Update AppNamespace set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class AppNamespace extends BaseEntity {
@NotBlank(message = "AppNamespace Name cannot be blank")
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid Namespace format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE + " & " + InputValidator.INVALID_NAMESPACE_NAMESPACE_MESSAGE
)
@Column(name = "Name", nullable = false)
private String name;
@NotBlank(message = "AppId cannot be blank")
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "Format", nullable = false)
private String format;
@Column(name = "IsPublic", columnDefinition = "Bit default '0'")
private boolean isPublic = false;
@Column(name = "Comment")
private String comment;
public String getAppId() {
return appId;
}
public String getComment() {
return comment;
}
public String getName() {
return name;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setName(String name) {
this.name = name;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public ConfigFileFormat formatAsEnum() {
return ConfigFileFormat.fromString(this.format);
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public String toString() {
return toStringHelper().add("name", name).add("appId", appId).add("comment", comment)
.add("format", format).add("isPublic", isPublic).toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.entity;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "AppNamespace")
@SQLDelete(sql = "Update AppNamespace set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class AppNamespace extends BaseEntity {
@NotBlank(message = "AppNamespace Name cannot be blank")
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid Namespace format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE + " & " + InputValidator.INVALID_NAMESPACE_NAMESPACE_MESSAGE
)
@Column(name = "Name", nullable = false)
private String name;
@NotBlank(message = "AppId cannot be blank")
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "Format", nullable = false)
private String format;
@Column(name = "IsPublic", columnDefinition = "Bit default '0'")
private boolean isPublic = false;
@Column(name = "Comment")
private String comment;
public String getAppId() {
return appId;
}
public String getComment() {
return comment;
}
public String getName() {
return name;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setComment(String comment) {
this.comment = comment;
}
public void setName(String name) {
this.name = name;
}
public boolean isPublic() {
return isPublic;
}
public void setPublic(boolean aPublic) {
isPublic = aPublic;
}
public ConfigFileFormat formatAsEnum() {
return ConfigFileFormat.fromString(this.format);
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public String toString() {
return toStringHelper().add("name", name).add("appId", appId).add("comment", comment)
.add("format", format).add("isPublic", isPublic).toString();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConsumerController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.service.ConsumerService;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
/**
* @author Jason Song([email protected])
*/
@RestController
public class ConsumerController {
private static final Date DEFAULT_EXPIRES = new GregorianCalendar(2099, Calendar.JANUARY, 1).getTime();
private final ConsumerService consumerService;
public ConsumerController(final ConsumerService consumerService) {
this.consumerService = consumerService;
}
@Transactional
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping(value = "/consumers")
public ConsumerToken createConsumer(@RequestBody Consumer consumer,
@RequestParam(value = "expires", required = false)
@DateTimeFormat(pattern = "yyyyMMddHHmmss") Date
expires) {
if (StringUtils.isContainEmpty(consumer.getAppId(), consumer.getName(),
consumer.getOwnerName(), consumer.getOrgId())) {
throw new BadRequestException("Params(appId、name、ownerName、orgId) can not be empty.");
}
Consumer createdConsumer = consumerService.createConsumer(consumer);
if (Objects.isNull(expires)) {
expires = DEFAULT_EXPIRES;
}
return consumerService.generateAndSaveConsumerToken(createdConsumer, expires);
}
@GetMapping(value = "/consumers/by-appId")
public ConsumerToken getConsumerTokenByAppId(@RequestParam String appId) {
return consumerService.getConsumerTokenByAppId(appId);
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping(value = "/consumers/{token}/assign-role")
public List<ConsumerRole> assignNamespaceRoleToConsumer(@PathVariable String token,
@RequestParam String type,
@RequestParam(required = false) String envs,
@RequestBody NamespaceDTO namespace) {
String appId = namespace.getAppId();
String namespaceName = namespace.getNamespaceName();
if (StringUtils.isEmpty(appId)) {
throw new BadRequestException("Params(AppId) can not be empty.");
}
if (Objects.equals("AppRole", type)) {
return Collections.singletonList(consumerService.assignAppRoleToConsumer(token, appId));
}
if (StringUtils.isEmpty(namespaceName)) {
throw new BadRequestException("Params(NamespaceName) can not be empty.");
}
if (null != envs){
String[] envArray = envs.split(",");
List<String> envList = Lists.newArrayList();
// validate env parameter
for (String env : envArray) {
if (Strings.isNullOrEmpty(env)) {
continue;
}
if (Env.UNKNOWN.equals(Env.transformEnv(env))) {
throw new BadRequestException(String.format("env: %s is illegal", env));
}
envList.add(env);
}
List<ConsumerRole> consumeRoles = new ArrayList<>();
for (String env : envList) {
consumeRoles.addAll(consumerService.assignNamespaceRoleToConsumer(token, appId, namespaceName, env));
}
return consumeRoles;
}
return consumerService.assignNamespaceRoleToConsumer(token, appId, namespaceName);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.service.ConsumerService;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
/**
* @author Jason Song([email protected])
*/
@RestController
public class ConsumerController {
private static final Date DEFAULT_EXPIRES = new GregorianCalendar(2099, Calendar.JANUARY, 1).getTime();
private final ConsumerService consumerService;
public ConsumerController(final ConsumerService consumerService) {
this.consumerService = consumerService;
}
@Transactional
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping(value = "/consumers")
public ConsumerToken createConsumer(@RequestBody Consumer consumer,
@RequestParam(value = "expires", required = false)
@DateTimeFormat(pattern = "yyyyMMddHHmmss") Date
expires) {
if (StringUtils.isContainEmpty(consumer.getAppId(), consumer.getName(),
consumer.getOwnerName(), consumer.getOrgId())) {
throw new BadRequestException("Params(appId、name、ownerName、orgId) can not be empty.");
}
Consumer createdConsumer = consumerService.createConsumer(consumer);
if (Objects.isNull(expires)) {
expires = DEFAULT_EXPIRES;
}
return consumerService.generateAndSaveConsumerToken(createdConsumer, expires);
}
@GetMapping(value = "/consumers/by-appId")
public ConsumerToken getConsumerTokenByAppId(@RequestParam String appId) {
return consumerService.getConsumerTokenByAppId(appId);
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@PostMapping(value = "/consumers/{token}/assign-role")
public List<ConsumerRole> assignNamespaceRoleToConsumer(@PathVariable String token,
@RequestParam String type,
@RequestParam(required = false) String envs,
@RequestBody NamespaceDTO namespace) {
String appId = namespace.getAppId();
String namespaceName = namespace.getNamespaceName();
if (StringUtils.isEmpty(appId)) {
throw new BadRequestException("Params(AppId) can not be empty.");
}
if (Objects.equals("AppRole", type)) {
return Collections.singletonList(consumerService.assignAppRoleToConsumer(token, appId));
}
if (StringUtils.isEmpty(namespaceName)) {
throw new BadRequestException("Params(NamespaceName) can not be empty.");
}
if (null != envs){
String[] envArray = envs.split(",");
List<String> envList = Lists.newArrayList();
// validate env parameter
for (String env : envArray) {
if (Strings.isNullOrEmpty(env)) {
continue;
}
if (Env.UNKNOWN.equals(Env.transformEnv(env))) {
throw new BadRequestException(String.format("env: %s is illegal", env));
}
envList.add(env);
}
List<ConsumerRole> consumeRoles = new ArrayList<>();
for (String env : envList) {
consumeRoles.addAll(consumerService.assignNamespaceRoleToConsumer(token, appId, namespaceName, env));
}
return consumeRoles;
}
return consumerService.assignNamespaceRoleToConsumer(token, appId, namespaceName);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripMQService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/RoleConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.portal.service.RoleInitializationService;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRolePermissionService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author Timothy Liu([email protected])
*/
@Configuration
public class RoleConfiguration {
@Bean
public RoleInitializationService roleInitializationService() {
return new DefaultRoleInitializationService();
}
@Bean
public RolePermissionService rolePermissionService() {
return new DefaultRolePermissionService();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.portal.service.RoleInitializationService;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRolePermissionService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author Timothy Liu([email protected])
*/
@Configuration
public class RoleConfiguration {
@Bean
public RoleInitializationService roleInitializationService() {
return new DefaultRoleInitializationService();
}
@Bean
public RolePermissionService rolePermissionService() {
return new DefaultRolePermissionService();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ItemAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.NamespaceAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseAPI;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.ConfigTextResolver;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifier;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.HttpClientErrorException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.NamespaceAPI namespaceAPI;
private final AdminServiceAPI.ItemAPI itemAPI;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
private final ConfigTextResolver fileTextResolver;
private final ConfigTextResolver propertyResolver;
public ItemService(
final UserInfoHolder userInfoHolder,
final NamespaceAPI namespaceAPI,
final ItemAPI itemAPI,
final ReleaseAPI releaseAPI,
final @Qualifier("fileTextResolver") ConfigTextResolver fileTextResolver,
final @Qualifier("propertyResolver") ConfigTextResolver propertyResolver) {
this.userInfoHolder = userInfoHolder;
this.namespaceAPI = namespaceAPI;
this.itemAPI = itemAPI;
this.releaseAPI = releaseAPI;
this.fileTextResolver = fileTextResolver;
this.propertyResolver = propertyResolver;
}
/**
* parse config text and update config items
*
* @return parse result
*/
public void updateConfigItemByText(NamespaceTextModel model) {
String appId = model.getAppId();
Env env = model.getEnv();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
String configText = model.getConfigText();
ConfigTextResolver resolver =
model.getFormat() == ConfigFileFormat.Properties ? propertyResolver : fileTextResolver;
ItemChangeSets changeSets = resolver.resolve(namespaceId, configText,
itemAPI.findItems(appId, env, clusterName, namespaceName));
if (changeSets.isEmpty()) {
return;
}
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public void updateItems(String appId, Env env, String clusterName, String namespaceName, ItemChangeSets changeSets){
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
item.setNamespaceId(namespace.getId());
ItemDTO itemDTO = itemAPI.createItem(appId, env, clusterName, namespaceName, item);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return itemDTO;
}
public void updateItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
itemAPI.updateItem(appId, env, clusterName, namespaceName, item.getId(), item);
}
public void deleteItem(Env env, long itemId, String userId) {
itemAPI.deleteItem(env, itemId, userId);
}
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findItems(appId, env, clusterName, namespaceName);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findDeletedItems(appId, env, clusterName, namespaceName);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return itemAPI.loadItem(env, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
ItemDTO item = itemAPI.loadItemById(env, itemId);
if (item == null) {
throw new BadRequestException("item not found for itemId " + itemId);
}
return item;
}
public void syncItems(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> itemDiffs = compare(comparedNamespaces, sourceItems);
for (ItemDiffs itemDiff : itemDiffs) {
NamespaceIdentifier namespaceIdentifier = itemDiff.getNamespace();
ItemChangeSets changeSets = itemDiff.getDiffs();
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
String appId = namespaceIdentifier.getAppId();
Env env = namespaceIdentifier.getEnv();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.SYNC_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
}
public void revokeItem(String appId, Env env, String clusterName, String namespaceName) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
Map<String, String> releaseItemDTOs = new HashMap<>();
ReleaseDTO latestRelease = releaseAPI.loadLatestRelease(appId,env,clusterName,namespaceName);
if (latestRelease != null) {
releaseItemDTOs = GSON.fromJson(latestRelease.getConfigurations(), GsonType.CONFIG);
}
List<ItemDTO> baseItems = itemAPI.findItems(appId, env, clusterName, namespaceName);
Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems);
Map<String, ItemDTO> deletedItemDTOs = new HashMap<>();
//deleted items for comment
findDeletedItems(appId, env, clusterName, namespaceName).forEach(item -> {
deletedItemDTOs.put(item.getKey(),item);
});
ItemChangeSets changeSets = new ItemChangeSets();
AtomicInteger lineNum = new AtomicInteger(1);
releaseItemDTOs.forEach((key,value) -> {
ItemDTO oldItem = oldKeyMapItem.get(key);
if (oldItem == null) {
ItemDTO deletedItemDto = deletedItemDTOs.computeIfAbsent(key, k -> new ItemDTO());
changeSets.addCreateItem(buildNormalItem(0L, namespaceId,key,value,deletedItemDto.getComment(),lineNum.get()));
} else if (!oldItem.getValue().equals(value) || lineNum.get() != oldItem
.getLineNum()) {
changeSets.addUpdateItem(buildNormalItem(oldItem.getId(), namespaceId, key,
value, oldItem.getComment(), lineNum.get()));
}
oldKeyMapItem.remove(key);
lineNum.set(lineNum.get() + 1);
});
oldKeyMapItem.forEach((key, value) -> changeSets.addDeleteItem(oldKeyMapItem.get(key)));
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public List<ItemDiffs> compare(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> result = new LinkedList<>();
for (NamespaceIdentifier namespace : comparedNamespaces) {
ItemDiffs itemDiffs = new ItemDiffs(namespace);
try {
itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems));
} catch (BadRequestException e) {
itemDiffs.setDiffs(new ItemChangeSets());
itemDiffs.setExtInfo("该集群下没有名为 " + namespace.getNamespaceName() + " 的namespace");
}
result.add(itemDiffs);
}
return result;
}
private long getNamespaceId(NamespaceIdentifier namespaceIdentifier) {
String appId = namespaceIdentifier.getAppId();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
Env env = namespaceIdentifier.getEnv();
NamespaceDTO namespaceDTO = null;
try {
namespaceDTO = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
} catch (HttpClientErrorException e) {
if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
throw new BadRequestException(String.format(
"namespace not exist. appId:%s, env:%s, clusterName:%s, namespaceName:%s", appId, env, clusterName,
namespaceName));
}
throw e;
}
return namespaceDTO.getId();
}
private ItemChangeSets parseChangeSets(NamespaceIdentifier namespace, List<ItemDTO> sourceItems) {
ItemChangeSets changeSets = new ItemChangeSets();
List<ItemDTO>
targetItems =
itemAPI.findItems(namespace.getAppId(), namespace.getEnv(),
namespace.getClusterName(), namespace.getNamespaceName());
long namespaceId = getNamespaceId(namespace);
if (CollectionUtils.isEmpty(targetItems)) {//all source items is added
int lineNum = 1;
for (ItemDTO sourceItem : sourceItems) {
changeSets.addCreateItem(buildItem(namespaceId, lineNum++, sourceItem));
}
} else {
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", targetItems);
String key, sourceValue, sourceComment;
ItemDTO targetItem = null;
int maxLineNum = targetItems.size();//append to last
for (ItemDTO sourceItem : sourceItems) {
key = sourceItem.getKey();
sourceValue = sourceItem.getValue();
sourceComment = sourceItem.getComment();
targetItem = targetItemMap.get(key);
if (targetItem == null) {//added items
changeSets.addCreateItem(buildItem(namespaceId, ++maxLineNum, sourceItem));
} else if (isModified(sourceValue, targetItem.getValue(), sourceComment,
targetItem.getComment())) {//modified items
targetItem.setValue(sourceValue);
targetItem.setComment(sourceComment);
changeSets.addUpdateItem(targetItem);
}
}
}
return changeSets;
}
private ItemDTO buildItem(long namespaceId, int lineNum, ItemDTO sourceItem) {
ItemDTO createdItem = new ItemDTO();
BeanUtils.copyEntityProperties(sourceItem, createdItem);
createdItem.setLineNum(lineNum);
createdItem.setNamespaceId(namespaceId);
return createdItem;
}
private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) {
ItemDTO item = new ItemDTO(key, value, comment, lineNum);
item.setId(id);
item.setNamespaceId(namespaceId);
return item;
}
private boolean isModified(String sourceValue, String targetValue, String sourceComment, String targetComment) {
if (!sourceValue.equals(targetValue)) {
return true;
}
if (sourceComment == null) {
return !StringUtils.isEmpty(targetComment);
}
if (targetComment != null) {
return !sourceComment.equals(targetComment);
}
return false;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ItemAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.NamespaceAPI;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseAPI;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.component.txtresolver.ConfigTextResolver;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceTextModel;
import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifier;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.HttpClientErrorException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.NamespaceAPI namespaceAPI;
private final AdminServiceAPI.ItemAPI itemAPI;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
private final ConfigTextResolver fileTextResolver;
private final ConfigTextResolver propertyResolver;
public ItemService(
final UserInfoHolder userInfoHolder,
final NamespaceAPI namespaceAPI,
final ItemAPI itemAPI,
final ReleaseAPI releaseAPI,
final @Qualifier("fileTextResolver") ConfigTextResolver fileTextResolver,
final @Qualifier("propertyResolver") ConfigTextResolver propertyResolver) {
this.userInfoHolder = userInfoHolder;
this.namespaceAPI = namespaceAPI;
this.itemAPI = itemAPI;
this.releaseAPI = releaseAPI;
this.fileTextResolver = fileTextResolver;
this.propertyResolver = propertyResolver;
}
/**
* parse config text and update config items
*
* @return parse result
*/
public void updateConfigItemByText(NamespaceTextModel model) {
String appId = model.getAppId();
Env env = model.getEnv();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
String configText = model.getConfigText();
ConfigTextResolver resolver =
model.getFormat() == ConfigFileFormat.Properties ? propertyResolver : fileTextResolver;
ItemChangeSets changeSets = resolver.resolve(namespaceId, configText,
itemAPI.findItems(appId, env, clusterName, namespaceName));
if (changeSets.isEmpty()) {
return;
}
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public void updateItems(String appId, Env env, String clusterName, String namespaceName, ItemChangeSets changeSets){
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
}
public ItemDTO createItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
item.setNamespaceId(namespace.getId());
ItemDTO itemDTO = itemAPI.createItem(appId, env, clusterName, namespaceName, item);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return itemDTO;
}
public void updateItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
itemAPI.updateItem(appId, env, clusterName, namespaceName, item.getId(), item);
}
public void deleteItem(Env env, long itemId, String userId) {
itemAPI.deleteItem(env, itemId, userId);
}
public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findItems(appId, env, clusterName, namespaceName);
}
public List<ItemDTO> findDeletedItems(String appId, Env env, String clusterName, String namespaceName) {
return itemAPI.findDeletedItems(appId, env, clusterName, namespaceName);
}
public ItemDTO loadItem(Env env, String appId, String clusterName, String namespaceName, String key) {
return itemAPI.loadItem(env, appId, clusterName, namespaceName, key);
}
public ItemDTO loadItemById(Env env, long itemId) {
ItemDTO item = itemAPI.loadItemById(env, itemId);
if (item == null) {
throw new BadRequestException("item not found for itemId " + itemId);
}
return item;
}
public void syncItems(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> itemDiffs = compare(comparedNamespaces, sourceItems);
for (ItemDiffs itemDiff : itemDiffs) {
NamespaceIdentifier namespaceIdentifier = itemDiff.getNamespace();
ItemChangeSets changeSets = itemDiff.getDiffs();
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
String appId = namespaceIdentifier.getAppId();
Env env = namespaceIdentifier.getEnv();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
itemAPI.updateItemsByChangeSet(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.SYNC_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
}
public void revokeItem(String appId, Env env, String clusterName, String namespaceName) {
NamespaceDTO namespace = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
if (namespace == null) {
throw new BadRequestException(
"namespace:" + namespaceName + " not exist in env:" + env + ", cluster:" + clusterName);
}
long namespaceId = namespace.getId();
Map<String, String> releaseItemDTOs = new HashMap<>();
ReleaseDTO latestRelease = releaseAPI.loadLatestRelease(appId,env,clusterName,namespaceName);
if (latestRelease != null) {
releaseItemDTOs = GSON.fromJson(latestRelease.getConfigurations(), GsonType.CONFIG);
}
List<ItemDTO> baseItems = itemAPI.findItems(appId, env, clusterName, namespaceName);
Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems);
Map<String, ItemDTO> deletedItemDTOs = new HashMap<>();
//deleted items for comment
findDeletedItems(appId, env, clusterName, namespaceName).forEach(item -> {
deletedItemDTOs.put(item.getKey(),item);
});
ItemChangeSets changeSets = new ItemChangeSets();
AtomicInteger lineNum = new AtomicInteger(1);
releaseItemDTOs.forEach((key,value) -> {
ItemDTO oldItem = oldKeyMapItem.get(key);
if (oldItem == null) {
ItemDTO deletedItemDto = deletedItemDTOs.computeIfAbsent(key, k -> new ItemDTO());
changeSets.addCreateItem(buildNormalItem(0L, namespaceId,key,value,deletedItemDto.getComment(),lineNum.get()));
} else if (!oldItem.getValue().equals(value) || lineNum.get() != oldItem
.getLineNum()) {
changeSets.addUpdateItem(buildNormalItem(oldItem.getId(), namespaceId, key,
value, oldItem.getComment(), lineNum.get()));
}
oldKeyMapItem.remove(key);
lineNum.set(lineNum.get() + 1);
});
oldKeyMapItem.forEach((key, value) -> changeSets.addDeleteItem(oldKeyMapItem.get(key)));
changeSets.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
updateItems(appId, env, clusterName, namespaceName, changeSets);
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE_BY_TEXT,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
Tracer.logEvent(TracerEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
}
public List<ItemDiffs> compare(List<NamespaceIdentifier> comparedNamespaces, List<ItemDTO> sourceItems) {
List<ItemDiffs> result = new LinkedList<>();
for (NamespaceIdentifier namespace : comparedNamespaces) {
ItemDiffs itemDiffs = new ItemDiffs(namespace);
try {
itemDiffs.setDiffs(parseChangeSets(namespace, sourceItems));
} catch (BadRequestException e) {
itemDiffs.setDiffs(new ItemChangeSets());
itemDiffs.setExtInfo("该集群下没有名为 " + namespace.getNamespaceName() + " 的namespace");
}
result.add(itemDiffs);
}
return result;
}
private long getNamespaceId(NamespaceIdentifier namespaceIdentifier) {
String appId = namespaceIdentifier.getAppId();
String clusterName = namespaceIdentifier.getClusterName();
String namespaceName = namespaceIdentifier.getNamespaceName();
Env env = namespaceIdentifier.getEnv();
NamespaceDTO namespaceDTO = null;
try {
namespaceDTO = namespaceAPI.loadNamespace(appId, env, clusterName, namespaceName);
} catch (HttpClientErrorException e) {
if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
throw new BadRequestException(String.format(
"namespace not exist. appId:%s, env:%s, clusterName:%s, namespaceName:%s", appId, env, clusterName,
namespaceName));
}
throw e;
}
return namespaceDTO.getId();
}
private ItemChangeSets parseChangeSets(NamespaceIdentifier namespace, List<ItemDTO> sourceItems) {
ItemChangeSets changeSets = new ItemChangeSets();
List<ItemDTO>
targetItems =
itemAPI.findItems(namespace.getAppId(), namespace.getEnv(),
namespace.getClusterName(), namespace.getNamespaceName());
long namespaceId = getNamespaceId(namespace);
if (CollectionUtils.isEmpty(targetItems)) {//all source items is added
int lineNum = 1;
for (ItemDTO sourceItem : sourceItems) {
changeSets.addCreateItem(buildItem(namespaceId, lineNum++, sourceItem));
}
} else {
Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", targetItems);
String key, sourceValue, sourceComment;
ItemDTO targetItem = null;
int maxLineNum = targetItems.size();//append to last
for (ItemDTO sourceItem : sourceItems) {
key = sourceItem.getKey();
sourceValue = sourceItem.getValue();
sourceComment = sourceItem.getComment();
targetItem = targetItemMap.get(key);
if (targetItem == null) {//added items
changeSets.addCreateItem(buildItem(namespaceId, ++maxLineNum, sourceItem));
} else if (isModified(sourceValue, targetItem.getValue(), sourceComment,
targetItem.getComment())) {//modified items
targetItem.setValue(sourceValue);
targetItem.setComment(sourceComment);
changeSets.addUpdateItem(targetItem);
}
}
}
return changeSets;
}
private ItemDTO buildItem(long namespaceId, int lineNum, ItemDTO sourceItem) {
ItemDTO createdItem = new ItemDTO();
BeanUtils.copyEntityProperties(sourceItem, createdItem);
createdItem.setLineNum(lineNum);
createdItem.setNamespaceId(namespaceId);
return createdItem;
}
private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) {
ItemDTO item = new ItemDTO(key, value, comment, lineNum);
item.setId(id);
item.setNamespaceId(namespaceId);
return item;
}
private boolean isModified(String sourceValue, String targetValue, String sourceComment, String targetComment) {
if (!sourceValue.equals(targetValue)) {
return true;
}
if (sourceComment == null) {
return !StringUtils.isEmpty(targetComment);
}
if (targetComment != null) {
return !sourceComment.equals(targetComment);
}
return false;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceBranchController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.v1.controller;
/**
* Created by qianjie on 8/10/17.
*/
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.RequestPrecondition;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.ctrip.framework.apollo.portal.service.NamespaceBranchService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@RestController("openapiNamespaceBranchController")
@RequestMapping("/openapi/v1/envs/{env}")
public class NamespaceBranchController {
private final ConsumerPermissionValidator consumerPermissionValidator;
private final ReleaseService releaseService;
private final NamespaceBranchService namespaceBranchService;
private final UserService userService;
public NamespaceBranchController(
final ConsumerPermissionValidator consumerPermissionValidator,
final ReleaseService releaseService,
final NamespaceBranchService namespaceBranchService,
final UserService userService) {
this.consumerPermissionValidator = consumerPermissionValidator;
this.releaseService = releaseService;
this.namespaceBranchService = namespaceBranchService;
this.userService = userService;
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public OpenNamespaceDTO findBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName) {
NamespaceBO namespaceBO = namespaceBranchService.findBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName);
if (namespaceBO == null) {
return null;
}
return OpenApiBeanUtils.transformFromNamespaceBO(namespaceBO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasCreateNamespacePermission(#request, #appId)")
@PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public OpenNamespaceDTO createBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
NamespaceDTO namespaceDTO = namespaceBranchService.createBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, operator);
if (namespaceDTO == null) {
return null;
}
return BeanUtils.transform(OpenNamespaceDTO.class, namespaceDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}")
public void deleteBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
boolean canDelete = consumerPermissionValidator.hasReleaseNamespacePermission(request, appId, namespaceName, env) ||
(consumerPermissionValidator.hasModifyNamespacePermission(request, appId, namespaceName, env) &&
releaseService.loadLatestRelease(appId, Env.valueOf(env), branchName, namespaceName) == null);
if (!canDelete) {
throw new AccessDeniedException("Forbidden operation. "
+ "Caused by: 1.you don't have release permission "
+ "or 2. you don't have modification permission "
+ "or 3. you have modification permission but branch has been released");
}
namespaceBranchService.deleteBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName, operator);
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public OpenGrayReleaseRuleDTO getBranchGrayRules(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName) {
GrayReleaseRuleDTO grayReleaseRuleDTO = namespaceBranchService.findBranchGrayRules(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName);
if (grayReleaseRuleDTO == null) {
return null;
}
return OpenApiBeanUtils.transformFromGrayReleaseRuleDTO(grayReleaseRuleDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public void updateBranchRules(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String branchName, @RequestBody OpenGrayReleaseRuleDTO rules,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
rules.setAppId(appId);
rules.setClusterName(clusterName);
rules.setNamespaceName(namespaceName);
rules.setBranchName(branchName);
GrayReleaseRuleDTO grayReleaseRuleDTO = OpenApiBeanUtils.transformToGrayReleaseRuleDTO(rules);
namespaceBranchService
.updateBranchGrayRules(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName, grayReleaseRuleDTO, operator);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.v1.controller;
/**
* Created by qianjie on 8/10/17.
*/
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleDTO;
import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.common.utils.RequestPrecondition;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator;
import com.ctrip.framework.apollo.openapi.dto.OpenGrayReleaseRuleDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenNamespaceDTO;
import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils;
import com.ctrip.framework.apollo.portal.entity.bo.NamespaceBO;
import com.ctrip.framework.apollo.portal.service.NamespaceBranchService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@RestController("openapiNamespaceBranchController")
@RequestMapping("/openapi/v1/envs/{env}")
public class NamespaceBranchController {
private final ConsumerPermissionValidator consumerPermissionValidator;
private final ReleaseService releaseService;
private final NamespaceBranchService namespaceBranchService;
private final UserService userService;
public NamespaceBranchController(
final ConsumerPermissionValidator consumerPermissionValidator,
final ReleaseService releaseService,
final NamespaceBranchService namespaceBranchService,
final UserService userService) {
this.consumerPermissionValidator = consumerPermissionValidator;
this.releaseService = releaseService;
this.namespaceBranchService = namespaceBranchService;
this.userService = userService;
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public OpenNamespaceDTO findBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName) {
NamespaceBO namespaceBO = namespaceBranchService.findBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName);
if (namespaceBO == null) {
return null;
}
return OpenApiBeanUtils.transformFromNamespaceBO(namespaceBO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasCreateNamespacePermission(#request, #appId)")
@PostMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches")
public OpenNamespaceDTO createBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
NamespaceDTO namespaceDTO = namespaceBranchService.createBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, operator);
if (namespaceDTO == null) {
return null;
}
return BeanUtils.transform(OpenNamespaceDTO.class, namespaceDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@DeleteMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}")
public void deleteBranch(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
boolean canDelete = consumerPermissionValidator.hasReleaseNamespacePermission(request, appId, namespaceName, env) ||
(consumerPermissionValidator.hasModifyNamespacePermission(request, appId, namespaceName, env) &&
releaseService.loadLatestRelease(appId, Env.valueOf(env), branchName, namespaceName) == null);
if (!canDelete) {
throw new AccessDeniedException("Forbidden operation. "
+ "Caused by: 1.you don't have release permission "
+ "or 2. you don't have modification permission "
+ "or 3. you have modification permission but branch has been released");
}
namespaceBranchService.deleteBranch(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName, operator);
}
@GetMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public OpenGrayReleaseRuleDTO getBranchGrayRules(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@PathVariable String branchName) {
GrayReleaseRuleDTO grayReleaseRuleDTO = namespaceBranchService.findBranchGrayRules(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName);
if (grayReleaseRuleDTO == null) {
return null;
}
return OpenApiBeanUtils.transformFromGrayReleaseRuleDTO(grayReleaseRuleDTO);
}
@PreAuthorize(value = "@consumerPermissionValidator.hasModifyNamespacePermission(#request, #appId, #namespaceName, #env)")
@PutMapping(value = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/branches/{branchName}/rules")
public void updateBranchRules(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName, @PathVariable String namespaceName,
@PathVariable String branchName, @RequestBody OpenGrayReleaseRuleDTO rules,
@RequestParam("operator") String operator,
HttpServletRequest request) {
RequestPrecondition.checkArguments(!StringUtils.isContainEmpty(operator),"operator can not be empty");
if (userService.findByUserId(operator) == null) {
throw new BadRequestException("operator " + operator + " not exists");
}
rules.setAppId(appId);
rules.setClusterName(clusterName);
rules.setNamespaceName(namespaceName);
rules.setBranchName(branchName);
GrayReleaseRuleDTO grayReleaseRuleDTO = OpenApiBeanUtils.transformToGrayReleaseRuleDTO(rules);
namespaceBranchService
.updateBranchGrayRules(appId, Env.valueOf(env.toUpperCase()), clusterName, namespaceName, branchName, grayReleaseRuleDTO, operator);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceBranchServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.test.context.jdbc.Sql;
public class NamespaceBranchServiceTest extends AbstractIntegrationTest {
@Autowired
private NamespaceBranchService namespaceBranchService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
private String testApp = "test";
private String testCluster = "default";
private String testNamespace = "application";
private String testBranchName = "child-cluster";
private String operator = "apollo";
private Pageable pageable = PageRequest.of(0, 10);
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindBranch() {
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNotNull(branch);
Assert.assertEquals(testBranchName, branch.getClusterName());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateOnce() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(rule.getAppId(), activeRule.getAppId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory releaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(1, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, releaseHistory.getOperation());
Assert.assertEquals(0, releaseHistory.getReleaseId());
Assert.assertEquals(0, releaseHistory.getPreviousReleaseId());
Assert.assertTrue(releaseHistory.getOperationContext().contains(rule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateTwice() {
GrayReleaseRule firstRule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, firstRule);
GrayReleaseRule secondRule = instanceGrayReleaseRule();
secondRule.setRules("[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"]}]");
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, secondRule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(secondRule);
Assert.assertEquals(secondRule.getAppId(), activeRule.getAppId());
Assert.assertEquals(secondRule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, secondReleaseHistory.getOperation());
Assert.assertTrue(firstReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertFalse(firstReleaseHistory.getOperationContext().contains(secondRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(secondRule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleNotExist() {
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNull(activeRule);
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleExist() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(Long.valueOf(latestReleaseId), activeRule.getReleaseId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(NamespaceBranchStatus.ACTIVE, activeRule.getBranchStatus());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteBranch() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName, NamespaceBranchStatus.DELETED, operator);
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNull(branch);
GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(latestRule);
Assert.assertEquals(NamespaceBranchStatus.DELETED, latestRule.getBranchStatus());
Assert.assertEquals("[]", latestRule.getRules());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.ABANDON_GRAY_RELEASE, secondReleaseHistory.getOperation());
}
private GrayReleaseRule instanceGrayReleaseRule() {
GrayReleaseRule rule = new GrayReleaseRule();
rule.setAppId(testApp);
rule.setClusterName(testCluster);
rule.setNamespaceName(testNamespace);
rule.setBranchName(testBranchName);
rule.setBranchStatus(NamespaceBranchStatus.ACTIVE);
rule.setRules("[{\"clientAppId\":\"test\",\"clientIpList\":[\"1.0.0.4\"]}]");
return rule;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.test.context.jdbc.Sql;
public class NamespaceBranchServiceTest extends AbstractIntegrationTest {
@Autowired
private NamespaceBranchService namespaceBranchService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
private String testApp = "test";
private String testCluster = "default";
private String testNamespace = "application";
private String testBranchName = "child-cluster";
private String operator = "apollo";
private Pageable pageable = PageRequest.of(0, 10);
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindBranch() {
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNotNull(branch);
Assert.assertEquals(testBranchName, branch.getClusterName());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateOnce() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(rule.getAppId(), activeRule.getAppId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory releaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(1, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, releaseHistory.getOperation());
Assert.assertEquals(0, releaseHistory.getReleaseId());
Assert.assertEquals(0, releaseHistory.getPreviousReleaseId());
Assert.assertTrue(releaseHistory.getOperationContext().contains(rule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateBranchGrayRulesWithUpdateTwice() {
GrayReleaseRule firstRule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, firstRule);
GrayReleaseRule secondRule = instanceGrayReleaseRule();
secondRule.setRules("[{\"clientAppId\":\"branch-test\",\"clientIpList\":[\"10.38.57.112\"]}]");
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, secondRule);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(secondRule);
Assert.assertEquals(secondRule.getAppId(), activeRule.getAppId());
Assert.assertEquals(secondRule.getRules(), activeRule.getRules());
Assert.assertEquals(Long.valueOf(0), activeRule.getReleaseId());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, secondReleaseHistory.getOperation());
Assert.assertTrue(firstReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertFalse(firstReleaseHistory.getOperationContext().contains(secondRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(firstRule.getRules()));
Assert.assertTrue(secondReleaseHistory.getOperationContext().contains(secondRule.getRules()));
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleNotExist() {
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNull(activeRule);
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testUpdateRulesReleaseIdWithOldRuleExist() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
long latestReleaseId = 100;
namespaceBranchService
.updateRulesReleaseId(testApp, testCluster, testNamespace, testBranchName, latestReleaseId, operator);
GrayReleaseRule
activeRule =
namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(activeRule);
Assert.assertEquals(Long.valueOf(latestReleaseId), activeRule.getReleaseId());
Assert.assertEquals(rule.getRules(), activeRule.getRules());
Assert.assertEquals(NamespaceBranchStatus.ACTIVE, activeRule.getBranchStatus());
}
@Test
@Sql(scripts = "/sql/namespace-branch-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteBranch() {
GrayReleaseRule rule = instanceGrayReleaseRule();
namespaceBranchService.updateBranchGrayRules(testApp, testCluster, testNamespace, testBranchName, rule);
namespaceBranchService.deleteBranch(testApp, testCluster, testNamespace, testBranchName, NamespaceBranchStatus.DELETED, operator);
Namespace branch = namespaceBranchService.findBranch(testApp, testCluster, testNamespace);
Assert.assertNull(branch);
GrayReleaseRule latestRule = namespaceBranchService.findBranchGrayRules(testApp, testCluster, testNamespace, testBranchName);
Assert.assertNotNull(latestRule);
Assert.assertEquals(NamespaceBranchStatus.DELETED, latestRule.getBranchStatus());
Assert.assertEquals("[]", latestRule.getRules());
Page<ReleaseHistory> releaseHistories = releaseHistoryService.findReleaseHistoriesByNamespace
(testApp, testCluster, testNamespace, pageable);
ReleaseHistory firstReleaseHistory = releaseHistories.getContent().get(1);
ReleaseHistory secondReleaseHistory = releaseHistories.getContent().get(0);
Assert.assertEquals(2, releaseHistories.getTotalElements());
Assert.assertEquals(ReleaseOperation.APPLY_GRAY_RULES, firstReleaseHistory.getOperation());
Assert.assertEquals(ReleaseOperation.ABANDON_GRAY_RELEASE, secondReleaseHistory.getOperation());
}
private GrayReleaseRule instanceGrayReleaseRule() {
GrayReleaseRule rule = new GrayReleaseRule();
rule.setAppId(testApp);
rule.setClusterName(testCluster);
rule.setNamespaceName(testNamespace);
rule.setBranchName(testBranchName);
rule.setBranchStatus(NamespaceBranchStatus.ACTIVE);
rule.setRules("[{\"clientAppId\":\"test\",\"clientIpList\":[\"1.0.0.4\"]}]");
return rule;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/NamespaceReleaseDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String releaseTitle) {
this.releaseTitle = releaseTitle;
}
public String getReleaseComment() {
return releaseComment;
}
public void setReleaseComment(String releaseComment) {
this.releaseComment = releaseComment;
}
public String getReleasedBy() {
return releasedBy;
}
public void setReleasedBy(String releasedBy) {
this.releasedBy = releasedBy;
}
public boolean isEmergencyPublish() {
return isEmergencyPublish;
}
public void setEmergencyPublish(boolean emergencyPublish) {
isEmergencyPublish = emergencyPublish;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String releaseTitle) {
this.releaseTitle = releaseTitle;
}
public String getReleaseComment() {
return releaseComment;
}
public void setReleaseComment(String releaseComment) {
this.releaseComment = releaseComment;
}
public String getReleasedBy() {
return releasedBy;
}
public void setReleasedBy(String releasedBy) {
this.releasedBy = releasedBy;
}
public boolean isEmergencyPublish() {
return isEmergencyPublish;
}
public void setEmergencyPublish(boolean emergencyPublish) {
isEmergencyPublish = emergencyPublish;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/spi/defaultImpl/RoleInitializationServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultImpl;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.collect.Sets;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Mockito.*;
public class RoleInitializationServiceTest extends AbstractUnitTest {
private final String APP_ID = "1000";
private final String APP_NAME = "app-test";
private final String CLUSTER = "cluster-test";
private final String NAMESPACE = "namespace-test";
private final String CURRENT_USER = "user";
@Mock
private RolePermissionService rolePermissionService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PortalConfig portalConfig;
@InjectMocks
private DefaultRoleInitializationService roleInitializationService;
@Test
public void testInitAppRoleHasInitBefore(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(mockRole(RoleUtils.buildAppMasterRoleName(APP_ID)));
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(1)).findRoleByRoleName(RoleUtils.buildAppMasterRoleName(APP_ID));
verify(rolePermissionService, times(0)).assignRoleToUsers(anyString(), anySet(), anyString());
}
@Test
public void testInitAppRole(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
when(portalConfig.portalSupportedEnvs()).thenReturn(mockPortalSupportedEnvs());
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(7)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).assignRoleToUsers(
RoleUtils.buildAppMasterRoleName(APP_ID), Sets.newHashSet(CURRENT_USER), CURRENT_USER);
verify(rolePermissionService, times(7)).createPermission(any());
verify(rolePermissionService, times(8)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleHasExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(mockRole(releaseNamespaceRoleName));
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(0)).createPermission(any());
verify(rolePermissionService, times(0)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleNotExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(null);
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(2)).createPermission(any());
verify(rolePermissionService, times(2)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleModifyNSExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).createPermission(any());
verify(rolePermissionService, times(1)).createRoleWithPermissions(any(), anySet());
}
private App mockApp(){
App app = new App();
app.setAppId(APP_ID);
app.setName(APP_NAME);
app.setOrgName("xx");
app.setOrgId("1");
app.setOwnerName(CURRENT_USER);
app.setDataChangeCreatedBy(CURRENT_USER);
return app;
}
private Role mockRole(String roleName){
Role role = new Role();
role.setRoleName(roleName);
return role;
}
private UserInfo mockUser(){
UserInfo userInfo = new UserInfo();
userInfo.setUserId(CURRENT_USER);
return userInfo;
}
private Permission mockPermission(){
Permission permission = new Permission();
permission.setPermissionType(PermissionType.MODIFY_NAMESPACE);
permission.setTargetId(RoleUtils.buildNamespaceTargetId(APP_ID, NAMESPACE));
return permission;
}
private List<Env> mockPortalSupportedEnvs(){
List<Env> envArray = new ArrayList<>();
envArray.add(Env.DEV);
envArray.add(Env.FAT);
return envArray;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultImpl;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.AbstractUnitTest;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Permission;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultRoleInitializationService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.collect.Sets;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Mockito.*;
public class RoleInitializationServiceTest extends AbstractUnitTest {
private final String APP_ID = "1000";
private final String APP_NAME = "app-test";
private final String CLUSTER = "cluster-test";
private final String NAMESPACE = "namespace-test";
private final String CURRENT_USER = "user";
@Mock
private RolePermissionService rolePermissionService;
@Mock
private UserInfoHolder userInfoHolder;
@Mock
private PortalConfig portalConfig;
@InjectMocks
private DefaultRoleInitializationService roleInitializationService;
@Test
public void testInitAppRoleHasInitBefore(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(mockRole(RoleUtils.buildAppMasterRoleName(APP_ID)));
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(1)).findRoleByRoleName(RoleUtils.buildAppMasterRoleName(APP_ID));
verify(rolePermissionService, times(0)).assignRoleToUsers(anyString(), anySet(), anyString());
}
@Test
public void testInitAppRole(){
when(rolePermissionService.findRoleByRoleName(anyString())).thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
when(portalConfig.portalSupportedEnvs()).thenReturn(mockPortalSupportedEnvs());
roleInitializationService.initAppRoles(mockApp());
verify(rolePermissionService, times(7)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).assignRoleToUsers(
RoleUtils.buildAppMasterRoleName(APP_ID), Sets.newHashSet(CURRENT_USER), CURRENT_USER);
verify(rolePermissionService, times(7)).createPermission(any());
verify(rolePermissionService, times(8)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleHasExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(mockRole(releaseNamespaceRoleName));
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(0)).createPermission(any());
verify(rolePermissionService, times(0)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleNotExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(null);
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(2)).createPermission(any());
verify(rolePermissionService, times(2)).createRoleWithPermissions(any(), anySet());
}
@Test
public void testInitNamespaceRoleModifyNSExisted(){
String modifyNamespaceRoleName = RoleUtils.buildModifyNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(modifyNamespaceRoleName)).
thenReturn(mockRole(modifyNamespaceRoleName));
String releaseNamespaceRoleName = RoleUtils.buildReleaseNamespaceRoleName(APP_ID, NAMESPACE);
when(rolePermissionService.findRoleByRoleName(releaseNamespaceRoleName)).
thenReturn(null);
when(userInfoHolder.getUser()).thenReturn(mockUser());
when(rolePermissionService.createPermission(any())).thenReturn(mockPermission());
roleInitializationService.initNamespaceRoles(APP_ID, NAMESPACE, CURRENT_USER);
verify(rolePermissionService, times(2)).findRoleByRoleName(anyString());
verify(rolePermissionService, times(1)).createPermission(any());
verify(rolePermissionService, times(1)).createRoleWithPermissions(any(), anySet());
}
private App mockApp(){
App app = new App();
app.setAppId(APP_ID);
app.setName(APP_NAME);
app.setOrgName("xx");
app.setOrgId("1");
app.setOwnerName(CURRENT_USER);
app.setDataChangeCreatedBy(CURRENT_USER);
return app;
}
private Role mockRole(String roleName){
Role role = new Role();
role.setRoleName(roleName);
return role;
}
private UserInfo mockUser(){
UserInfo userInfo = new UserInfo();
userInfo.setUserId(CURRENT_USER);
return userInfo;
}
private Permission mockPermission(){
Permission permission = new Permission();
permission.setPermissionType(PermissionType.MODIFY_NAMESPACE);
permission.setTargetId(RoleUtils.buildNamespaceTargetId(APP_ID, NAMESPACE));
return permission;
}
private List<Env> mockPortalSupportedEnvs(){
List<Env> envArray = new ArrayList<>();
envArray.add(Env.DEV);
envArray.add(Env.FAT);
return envArray;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ClusterRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface ClusterRepository extends PagingAndSortingRepository<Cluster, Long> {
List<Cluster> findByAppIdAndParentClusterId(String appId, Long parentClusterId);
List<Cluster> findByAppId(String appId);
Cluster findByAppIdAndName(String appId, String name);
List<Cluster> findByParentClusterId(Long parentClusterId);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface ClusterRepository extends PagingAndSortingRepository<Cluster, Long> {
List<Cluster> findByAppIdAndParentClusterId(String appId, Long parentClusterId);
List<Cluster> findByAppId(String appId);
Cluster findByAppIdAndName(String appId, String name);
List<Cluster> findByParentClusterId(Long parentClusterId);
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/faq/common-issues-in-deployment-and-development-phase.md | ### 1. windows怎么执行build.sh?
安装[Git Bash](https://git-for-windows.github.io/)，然后运行 “./build.sh” 注意前面 “./”
### 2. 本地运行时Portal一直报Env is down.
默认config service启动在8080端口，admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。
如果还伴有异常信息：org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed，一般是由于本地启动了`ShadowSocks`，因为`ShadowSocks`默认会占用8090端口。
1.1.0版本增加了**系统信息**页面，可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息，有助于排查问题。
### 3. admin server 或者 config server 注册了内网IP，导致portal或者client访问不了admin server或config server
请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
### 4. Portal如何增加环境？
#### 4.1 1.6.0及以上的版本
1.6.0版本增加了自定义环境的功能，可以在不修改代码的情况增加环境
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
#### 4.2 1.5.1及之前的版本
##### 4.2.1 添加Apollo预先定义好的环境
如果需要添加的环境是Apollo预先定义的环境（DEV, FAT, UAT, PRO），需要两步操作：
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
##### 4.2.2 添加自定义的环境
如果需要添加的环境不是Apollo预先定义的环境，请参照如下步骤操作：
1. 假设需要添加的环境名称叫beta
2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类，在其中加入`BETA`枚举：
```java
public enum Env{
LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
...
}
```
3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类，在其中加入`BETA`枚举的转换逻辑：
```java
public final class EnvUtils {
public static Env transformEnv(String envName) {
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
...
case "BETA":
return Env.BETA;
...
default:
return Env.UNKNOWN;
}
}
}
```
4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties)，增加`beta.meta`占位符：
```properties
local.meta=http://localhost:8080
dev.meta=${dev_meta}
fat.meta=${fat_meta}
beta.meta=${beta_meta}
uat.meta=${uat_meta}
lpt.meta=${lpt_meta}
pro.meta=${pro_meta}
```
5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类，增加读取`BETA`环境的meta server地址逻辑：
```java
public class LegacyMetaServerProvider {
...
domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta"));
...
}
```
6. protaldb增加`BETA`环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
7. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
### 5. 如何删除应用、集群、Namespace？
0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面，建议使用该页面进行删除。
页面入口：
页面详情：
### 6. 客户端多块网卡造成获取IP不准，如何解决？
获取客户端网卡逻辑在1.4.0版本有所调整，所以需要根据客户端版本区分
#### 6.1 apollo-client为1.3.0及之前的版本
如果有多网卡，且都是普通网卡的话，需要在/etc/hosts里面加一条映射关系来提升权重。
格式：`ip ${hostname}`
这里的${hostname}就是你在机器上执行hostname的结果。
比如正确IP为：192.168.1.50，hostname执行结果为：jim-ubuntu-pc
那么最终在hosts文件映射的记录为：
```
192.168.1.50 jim-ubuntu-pc
```
#### 6.2 apollo-client为1.4.0及之后的版本
如果有多网卡，且都是普通网卡的话，可以通过调整它们在系统中的顺序来改变优先级，顺序在前的优先级更高。
### 7. 通过Apollo动态调整Spring Boot的Logging level
可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。
### 8. 将Config Service和Admin Service注册到单独的Eureka Server上
Apollo默认自带了Eureka作为内部的注册中心实现，一般情况下不需要考虑为Apollo单独部署注册中心。
不过有些公司自己已经有了一套Eureka，如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话，可以按照如下步骤操作：
#### 1. 配置Config Service不启动内置Eureka Server
##### 1.1 1.5.0及以上版本
为apollo-configservice配置`apollo.eureka.server.enabled=false`即可，通过bootstrap.yml或-D参数等方式皆可。
##### 1.2 1.5.0之前的版本
修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java)，把`@EnableEurekaServer`改为`@EnableEurekaClient`
```java
@EnableEurekaClient
@EnableAspectJAutoProxy
@EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class)
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
...
}
```
#### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`，指向自己的Eureka地址
比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761，那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为：
```
http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/
```
需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可，不需要修改meta server地址。
> 默认情况下，meta service和config service是部署在同一个JVM进程，所以meta service的地址就是config service的地址，修改Eureka地址时不需要修改meta server地址。
### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置
`@ConditionalOnProperty`功能从0.10.0版本开始支持，具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式（推荐）)
### 10. 多机房如何实现A机房的客户端就近读取A机房的config service，B机房的客户端就近读取B机房的config service？
请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294)，该案例中由于中美机房相距甚远，所以需要config db两地部署，如果是同城多机房的话，两个机房的config service可以连同一个config db。
### 11. apollo是否有支持HEAD请求的页面？阿里云slb配置健康检查只支持HEAD请求
apollo的每个服务都有`/health`页面的，该页面是apollo用来做健康检测的，支持各种请求方法，如GET, POST, HEAD等。
### 12. apollo如何配置查看权限?
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
### 13. apollo如何放在独立的tomcat中跑？
有些公司的运维策略可能会要求必须使用独立的tomcat跑应用，不允许apollo默认的startup.sh方式运行，下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中：
1. 获取apollo代码（生产部署建议用release的版本）
2. 修改apollo-configservice的pom.xml，增加`<packaging>war</packaging>`
3. 按照分布式部署文档配置build.sh，然后打包
4. 把apollo-configservice的war包放到tomcat下
* cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war
运行tomcat的startup.sh
5. 运行tomcat的startup.sh
另外，apollo还有一些调优参数建议在tomcat的server.xml中配置一下，可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12)
### 14. 注册中心Eureka如何替换为zookeeper？
许多公司微服务项目已经在使用zookeeper，如果出于方便服务管理的目的，希望Eureka替换为zookeeper的情况，可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤：[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535)
### 15. 本地多人同时开发，如何实现配置不一样且互不影响？
参考[#1560](https://github.com/ctripcorp/apollo/issues/1560)
### 16. Portal挂载到nginx/slb后如何设置相对路径？
一般情况下建议直接使用根目录来挂载portal，不过如果有些情况希望和其它应用共用nginx/slb，需要加上相对路径（如/apollo），那么可以按照下面的方式配置。
#### 16.1 Portal为1.7.0及以上版本
首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/apollo/;
}
```
#### 16.2 Portal为1.6.0及以上版本
首先为portal加上`prefix.path=/apollo`配置参数，配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/;
}
``` | ### 1. windows怎么执行build.sh?
安装[Git Bash](https://git-for-windows.github.io/)，然后运行 “./build.sh” 注意前面 “./”
### 2. 本地运行时Portal一直报Env is down.
默认config service启动在8080端口，admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。
如果还伴有异常信息：org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed，一般是由于本地启动了`ShadowSocks`，因为`ShadowSocks`默认会占用8090端口。
1.1.0版本增加了**系统信息**页面，可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息，有助于排查问题。
### 3. admin server 或者 config server 注册了内网IP，导致portal或者client访问不了admin server或config server
请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
### 4. Portal如何增加环境？
#### 4.1 1.6.0及以上的版本
1.6.0版本增加了自定义环境的功能，可以在不修改代码的情况增加环境
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
#### 4.2 1.5.1及之前的版本
##### 4.2.1 添加Apollo预先定义好的环境
如果需要添加的环境是Apollo预先定义的环境（DEV, FAT, UAT, PRO），需要两步操作：
1. protaldb增加环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
2. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
##### 4.2.2 添加自定义的环境
如果需要添加的环境不是Apollo预先定义的环境，请参照如下步骤操作：
1. 假设需要添加的环境名称叫beta
2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类，在其中加入`BETA`枚举：
```java
public enum Env{
LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN;
...
}
```
3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类，在其中加入`BETA`枚举的转换逻辑：
```java
public final class EnvUtils {
public static Env transformEnv(String envName) {
if (StringUtils.isBlank(envName)) {
return Env.UNKNOWN;
}
switch (envName.trim().toUpperCase()) {
...
case "BETA":
return Env.BETA;
...
default:
return Env.UNKNOWN;
}
}
}
```
4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties)，增加`beta.meta`占位符：
```properties
local.meta=http://localhost:8080
dev.meta=${dev_meta}
fat.meta=${fat_meta}
beta.meta=${beta_meta}
uat.meta=${uat_meta}
lpt.meta=${lpt_meta}
pro.meta=${pro_meta}
```
5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类，增加读取`BETA`环境的meta server地址逻辑：
```java
public class LegacyMetaServerProvider {
...
domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta"));
...
}
```
6. protaldb增加`BETA`环境，参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置)
7. 为apollo-portal添加新增环境对应的meta server地址，具体参考：[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置，具体参考：[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。
>注1：一套Portal可以管理多个环境，但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB，具体请参考：[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb)，[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置)，[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息)
> 注2：如果是为已经运行了一段时间的Apollo配置中心增加环境，别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化
### 5. 如何删除应用、集群、Namespace？
0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面，建议使用该页面进行删除。
页面入口：
页面详情：
### 6. 客户端多块网卡造成获取IP不准，如何解决？
获取客户端网卡逻辑在1.4.0版本有所调整，所以需要根据客户端版本区分
#### 6.1 apollo-client为1.3.0及之前的版本
如果有多网卡，且都是普通网卡的话，需要在/etc/hosts里面加一条映射关系来提升权重。
格式：`ip ${hostname}`
这里的${hostname}就是你在机器上执行hostname的结果。
比如正确IP为：192.168.1.50，hostname执行结果为：jim-ubuntu-pc
那么最终在hosts文件映射的记录为：
```
192.168.1.50 jim-ubuntu-pc
```
#### 6.2 apollo-client为1.4.0及之后的版本
如果有多网卡，且都是普通网卡的话，可以通过调整它们在系统中的顺序来改变优先级，顺序在前的优先级更高。
### 7. 通过Apollo动态调整Spring Boot的Logging level
可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。
### 8. 将Config Service和Admin Service注册到单独的Eureka Server上
Apollo默认自带了Eureka作为内部的注册中心实现，一般情况下不需要考虑为Apollo单独部署注册中心。
不过有些公司自己已经有了一套Eureka，如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话，可以按照如下步骤操作：
#### 1. 配置Config Service不启动内置Eureka Server
##### 1.1 1.5.0及以上版本
为apollo-configservice配置`apollo.eureka.server.enabled=false`即可，通过bootstrap.yml或-D参数等方式皆可。
##### 1.2 1.5.0之前的版本
修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java)，把`@EnableEurekaServer`改为`@EnableEurekaClient`
```java
@EnableEurekaClient
@EnableAspectJAutoProxy
@EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class)
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
...
}
```
#### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`，指向自己的Eureka地址
比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761，那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为：
```
http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/
```
需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可，不需要修改meta server地址。
> 默认情况下，meta service和config service是部署在同一个JVM进程，所以meta service的地址就是config service的地址，修改Eureka地址时不需要修改meta server地址。
### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置
`@ConditionalOnProperty`功能从0.10.0版本开始支持，具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式（推荐）)
### 10. 多机房如何实现A机房的客户端就近读取A机房的config service，B机房的客户端就近读取B机房的config service？
请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294)，该案例中由于中美机房相距甚远，所以需要config db两地部署，如果是同城多机房的话，两个机房的config service可以连同一个config db。
### 11. apollo是否有支持HEAD请求的页面？阿里云slb配置健康检查只支持HEAD请求
apollo的每个服务都有`/health`页面的，该页面是apollo用来做健康检测的，支持各种请求方法，如GET, POST, HEAD等。
### 12. apollo如何配置查看权限?
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
### 13. apollo如何放在独立的tomcat中跑？
有些公司的运维策略可能会要求必须使用独立的tomcat跑应用，不允许apollo默认的startup.sh方式运行，下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中：
1. 获取apollo代码（生产部署建议用release的版本）
2. 修改apollo-configservice的pom.xml，增加`<packaging>war</packaging>`
3. 按照分布式部署文档配置build.sh，然后打包
4. 把apollo-configservice的war包放到tomcat下
* cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war
运行tomcat的startup.sh
5. 运行tomcat的startup.sh
另外，apollo还有一些调优参数建议在tomcat的server.xml中配置一下，可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12)
### 14. 注册中心Eureka如何替换为zookeeper？
许多公司微服务项目已经在使用zookeeper，如果出于方便服务管理的目的，希望Eureka替换为zookeeper的情况，可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤：[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535)
### 15. 本地多人同时开发，如何实现配置不一样且互不影响？
参考[#1560](https://github.com/ctripcorp/apollo/issues/1560)
### 16. Portal挂载到nginx/slb后如何设置相对路径？
一般情况下建议直接使用根目录来挂载portal，不过如果有些情况希望和其它应用共用nginx/slb，需要加上相对路径（如/apollo），那么可以按照下面的方式配置。
#### 16.1 Portal为1.7.0及以上版本
首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/apollo/;
}
```
#### 16.2 Portal为1.6.0及以上版本
首先为portal加上`prefix.path=/apollo`配置参数，配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。
然后在nginx/slb上配置转发即可，以nginx为例：
```
location /apollo/ {
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8070/;
}
``` | -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/signature/Signature.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
/**
* @author nisiyong
*/
public class Signature {
/**
* Authorization=Apollo {appId}:{sign}
*/
private static final String AUTHORIZATION_FORMAT = "Apollo %s:%s";
private static final String DELIMITER = "\n";
public static final String HTTP_HEADER_TIMESTAMP = "Timestamp";
public static String signature(String timestamp, String pathWithQuery, String secret) {
String stringToSign = timestamp + DELIMITER + pathWithQuery;
return HmacSha1Utils.signString(stringToSign, secret);
}
public static Map<String, String> buildHttpHeaders(String url, String appId, String secret) {
long currentTimeMillis = System.currentTimeMillis();
String timestamp = String.valueOf(currentTimeMillis);
String pathWithQuery = url2PathWithQuery(url);
String signature = signature(timestamp, pathWithQuery, secret);
Map<String, String> headers = Maps.newHashMap();
headers.put(HttpHeaders.AUTHORIZATION, String.format(AUTHORIZATION_FORMAT, appId, signature));
headers.put(HTTP_HEADER_TIMESTAMP, timestamp);
return headers;
}
private static String url2PathWithQuery(String urlString) {
try {
URL url = new URL(urlString);
String path = url.getPath();
String query = url.getQuery();
String pathWithQuery = path;
if (query != null && query.length() > 0) {
pathWithQuery += "?" + query;
}
return pathWithQuery;
} catch (MalformedURLException e) {
throw new IllegalArgumentException("Invalid url pattern: " + urlString, e);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
/**
* @author nisiyong
*/
public class Signature {
/**
* Authorization=Apollo {appId}:{sign}
*/
private static final String AUTHORIZATION_FORMAT = "Apollo %s:%s";
private static final String DELIMITER = "\n";
public static final String HTTP_HEADER_TIMESTAMP = "Timestamp";
public static String signature(String timestamp, String pathWithQuery, String secret) {
String stringToSign = timestamp + DELIMITER + pathWithQuery;
return HmacSha1Utils.signString(stringToSign, secret);
}
public static Map<String, String> buildHttpHeaders(String url, String appId, String secret) {
long currentTimeMillis = System.currentTimeMillis();
String timestamp = String.valueOf(currentTimeMillis);
String pathWithQuery = url2PathWithQuery(url);
String signature = signature(timestamp, pathWithQuery, secret);
Map<String, String> headers = Maps.newHashMap();
headers.put(HttpHeaders.AUTHORIZATION, String.format(AUTHORIZATION_FORMAT, appId, signature));
headers.put(HTTP_HEADER_TIMESTAMP, timestamp);
return headers;
}
private static String url2PathWithQuery(String urlString) {
try {
URL url = new URL(urlString);
String path = url.getPath();
String query = url.getQuery();
String pathWithQuery = path;
if (query != null && query.length() > 0) {
pathWithQuery += "?" + query;
}
return pathWithQuery;
} catch (MalformedURLException e) {
throw new IllegalArgumentException("Invalid url pattern: " + urlString, e);
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/InstanceConfigRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
import java.util.Set;
public interface InstanceConfigRepository extends PagingAndSortingRepository<InstanceConfig, Long> {
InstanceConfig findByInstanceIdAndConfigAppIdAndConfigNamespaceName(long instanceId, String
configAppId, String configNamespaceName);
Page<InstanceConfig> findByReleaseKeyAndDataChangeLastModifiedTimeAfter(String releaseKey, Date
validDate, Pageable pageable);
Page<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfter(
String appId, String clusterName, String namespaceName, Date validDate, Pageable pageable);
List<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfterAndReleaseKeyNotIn(
String appId, String clusterName, String namespaceName, Date validDate, Set<String> releaseKey);
@Modifying
@Query("delete from InstanceConfig where ConfigAppId=?1 and ConfigClusterName=?2 and ConfigNamespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName);
@Query(
value = "select b.Id from `InstanceConfig` a inner join `Instance` b on b.Id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
countQuery = "select count(1) from `InstanceConfig` a inner join `Instance` b on b.id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
nativeQuery = true)
Page<Object> findInstanceIdsByNamespaceAndInstanceAppId(
@Param("instanceAppId") String instanceAppId, @Param("configAppId") String configAppId,
@Param("clusterName") String clusterName, @Param("namespaceName") String namespaceName,
@Param("validDate") Date validDate, Pageable pageable);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
import java.util.Set;
public interface InstanceConfigRepository extends PagingAndSortingRepository<InstanceConfig, Long> {
InstanceConfig findByInstanceIdAndConfigAppIdAndConfigNamespaceName(long instanceId, String
configAppId, String configNamespaceName);
Page<InstanceConfig> findByReleaseKeyAndDataChangeLastModifiedTimeAfter(String releaseKey, Date
validDate, Pageable pageable);
Page<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfter(
String appId, String clusterName, String namespaceName, Date validDate, Pageable pageable);
List<InstanceConfig> findByConfigAppIdAndConfigClusterNameAndConfigNamespaceNameAndDataChangeLastModifiedTimeAfterAndReleaseKeyNotIn(
String appId, String clusterName, String namespaceName, Date validDate, Set<String> releaseKey);
@Modifying
@Query("delete from InstanceConfig where ConfigAppId=?1 and ConfigClusterName=?2 and ConfigNamespaceName = ?3")
int batchDelete(String appId, String clusterName, String namespaceName);
@Query(
value = "select b.Id from `InstanceConfig` a inner join `Instance` b on b.Id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
countQuery = "select count(1) from `InstanceConfig` a inner join `Instance` b on b.id =" +
" a.`InstanceId` where a.`ConfigAppId` = :configAppId and a.`ConfigClusterName` = " +
":clusterName and a.`ConfigNamespaceName` = :namespaceName and a.`DataChange_LastTime` " +
"> :validDate and b.`AppId` = :instanceAppId",
nativeQuery = true)
Page<Object> findInstanceIdsByNamespaceAndInstanceAppId(
@Param("instanceAppId") String instanceAppId, @Param("configAppId") String configAppId,
@Param("clusterName") String clusterName, @Param("namespaceName") String namespaceName,
@Param("validDate") Date validDate, Pageable pageable);
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/function/Functions.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.function;
import java.util.Date;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.util.parser.ParserException;
import com.ctrip.framework.apollo.util.parser.Parsers;
import com.google.common.base.Function;
/**
* @author Jason Song([email protected])
*/
public interface Functions {
Function<String, Integer> TO_INT_FUNCTION = new Function<String, Integer>() {
@Override
public Integer apply(String input) {
return Integer.parseInt(input);
}
};
Function<String, Long> TO_LONG_FUNCTION = new Function<String, Long>() {
@Override
public Long apply(String input) {
return Long.parseLong(input);
}
};
Function<String, Short> TO_SHORT_FUNCTION = new Function<String, Short>() {
@Override
public Short apply(String input) {
return Short.parseShort(input);
}
};
Function<String, Float> TO_FLOAT_FUNCTION = new Function<String, Float>() {
@Override
public Float apply(String input) {
return Float.parseFloat(input);
}
};
Function<String, Double> TO_DOUBLE_FUNCTION = new Function<String, Double>() {
@Override
public Double apply(String input) {
return Double.parseDouble(input);
}
};
Function<String, Byte> TO_BYTE_FUNCTION = new Function<String, Byte>() {
@Override
public Byte apply(String input) {
return Byte.parseByte(input);
}
};
Function<String, Boolean> TO_BOOLEAN_FUNCTION = new Function<String, Boolean>() {
@Override
public Boolean apply(String input) {
return Boolean.parseBoolean(input);
}
};
Function<String, Date> TO_DATE_FUNCTION = new Function<String, Date>() {
@Override
public Date apply(String input) {
try {
return Parsers.forDate().parse(input);
} catch (ParserException ex) {
throw new ApolloConfigException("Parse date failed", ex);
}
}
};
Function<String, Long> TO_DURATION_FUNCTION = new Function<String, Long>() {
@Override
public Long apply(String input) {
try {
return Parsers.forDuration().parseToMillis(input);
} catch (ParserException ex) {
throw new ApolloConfigException("Parse duration failed", ex);
}
}
};
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.function;
import java.util.Date;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.util.parser.ParserException;
import com.ctrip.framework.apollo.util.parser.Parsers;
import com.google.common.base.Function;
/**
* @author Jason Song([email protected])
*/
public interface Functions {
Function<String, Integer> TO_INT_FUNCTION = new Function<String, Integer>() {
@Override
public Integer apply(String input) {
return Integer.parseInt(input);
}
};
Function<String, Long> TO_LONG_FUNCTION = new Function<String, Long>() {
@Override
public Long apply(String input) {
return Long.parseLong(input);
}
};
Function<String, Short> TO_SHORT_FUNCTION = new Function<String, Short>() {
@Override
public Short apply(String input) {
return Short.parseShort(input);
}
};
Function<String, Float> TO_FLOAT_FUNCTION = new Function<String, Float>() {
@Override
public Float apply(String input) {
return Float.parseFloat(input);
}
};
Function<String, Double> TO_DOUBLE_FUNCTION = new Function<String, Double>() {
@Override
public Double apply(String input) {
return Double.parseDouble(input);
}
};
Function<String, Byte> TO_BYTE_FUNCTION = new Function<String, Byte>() {
@Override
public Byte apply(String input) {
return Byte.parseByte(input);
}
};
Function<String, Boolean> TO_BOOLEAN_FUNCTION = new Function<String, Boolean>() {
@Override
public Boolean apply(String input) {
return Boolean.parseBoolean(input);
}
};
Function<String, Date> TO_DATE_FUNCTION = new Function<String, Date>() {
@Override
public Date apply(String input) {
try {
return Parsers.forDate().parse(input);
} catch (ParserException ex) {
throw new ApolloConfigException("Parse date failed", ex);
}
}
};
Function<String, Long> TO_DURATION_FUNCTION = new Function<String, Long>() {
@Override
public Long apply(String input) {
try {
return Parsers.forDuration().parseToMillis(input);
} catch (ParserException ex) {
throw new ApolloConfigException("Parse duration failed", ex);
}
}
};
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/DefaultConfigPropertySourcesProcessorHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
public class DefaultConfigPropertySourcesProcessorHelper implements ConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
processSpringValueDefinition(registry);
}
/**
* For Spring 3.x versions, the BeanDefinitionRegistryPostProcessor would not be instantiated if
* it is added in postProcessBeanDefinitionRegistry phase, so we have to manually call the
* postProcessBeanDefinitionRegistry method of SpringValueDefinitionProcessor here...
*/
private void processSpringValueDefinition(BeanDefinitionRegistry registry) {
SpringValueDefinitionProcessor springValueDefinitionProcessor = new SpringValueDefinitionProcessor();
springValueDefinitionProcessor.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
public class DefaultConfigPropertySourcesProcessorHelper implements ConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
processSpringValueDefinition(registry);
}
/**
* For Spring 3.x versions, the BeanDefinitionRegistryPostProcessor would not be instantiated if
* it is added in postProcessBeanDefinitionRegistry phase, so we have to manually call the
* postProcessBeanDefinitionRegistry method of SpringValueDefinitionProcessor here...
*/
private void processSpringValueDefinition(BeanDefinitionRegistry registry) {
SpringValueDefinitionProcessor springValueDefinitionProcessor = new SpringValueDefinitionProcessor();
springValueDefinitionProcessor.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/ExceptionUtil.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util;
import java.util.List;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
/**
* @author Jason Song([email protected])
*/
public class ExceptionUtil {
/**
* Assemble the detail message for the throwable with all of its cause included (at most 10 causes).
* @param ex the exception
* @return the message along with its causes
*/
public static String getDetailMessage(Throwable ex) {
if (ex == null || Strings.isNullOrEmpty(ex.getMessage())) {
return "";
}
StringBuilder builder = new StringBuilder(ex.getMessage());
List<Throwable> causes = Lists.newLinkedList();
int counter = 0;
Throwable current = ex;
//retrieve up to 10 causes
while (current.getCause() != null && counter < 10) {
Throwable next = current.getCause();
causes.add(next);
current = next;
counter++;
}
for (Throwable cause : causes) {
if (Strings.isNullOrEmpty(cause.getMessage())) {
counter--;
continue;
}
builder.append(" [Cause: ").append(cause.getMessage());
}
builder.append(Strings.repeat("]", counter));
return builder.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util;
import java.util.List;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
/**
* @author Jason Song([email protected])
*/
public class ExceptionUtil {
/**
* Assemble the detail message for the throwable with all of its cause included (at most 10 causes).
* @param ex the exception
* @return the message along with its causes
*/
public static String getDetailMessage(Throwable ex) {
if (ex == null || Strings.isNullOrEmpty(ex.getMessage())) {
return "";
}
StringBuilder builder = new StringBuilder(ex.getMessage());
List<Throwable> causes = Lists.newLinkedList();
int counter = 0;
Throwable current = ex;
//retrieve up to 10 causes
while (current.getCause() != null && counter < 10) {
Throwable next = current.getCause();
causes.add(next);
current = next;
counter++;
}
for (Throwable cause : causes) {
if (Strings.isNullOrEmpty(cause.getMessage())) {
counter--;
continue;
}
builder.append(" [Cause: ").append(cause.getMessage());
}
builder.append(Strings.repeat("]", counter));
return builder.toString();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/spi/ApolloConfigRegistrarHelperTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigRegistrar;
import java.lang.reflect.Field;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
public class ApolloConfigRegistrarHelperTest {
@Test
public void testHelperLoadingOrder() {
ApolloConfigRegistrar apolloConfigRegistrar = new ApolloConfigRegistrar();
Field field = ReflectionUtils.findField(ApolloConfigRegistrar.class, "helper");
ReflectionUtils.makeAccessible(field);
Object helper = ReflectionUtils.getField(field, apolloConfigRegistrar);
assertEquals("helper is not TestRegistrarHelper instance", TestRegistrarHelper.class, helper.getClass());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigRegistrar;
import java.lang.reflect.Field;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
public class ApolloConfigRegistrarHelperTest {
@Test
public void testHelperLoadingOrder() {
ApolloConfigRegistrar apolloConfigRegistrar = new ApolloConfigRegistrar();
Field field = ReflectionUtils.findField(ApolloConfigRegistrar.class, "helper");
ReflectionUtils.makeAccessible(field);
Object helper = ReflectionUtils.getField(field, apolloConfigRegistrar);
assertEquals("helper is not TestRegistrarHelper instance", TestRegistrarHelper.class, helper.getClass());
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/model/AppModel.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.model;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import java.util.Set;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
public class AppModel {
@NotBlank(message = "name cannot be blank")
private String name;
@NotBlank(message = "appId cannot be blank")
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
@NotBlank(message = "orgId cannot be blank")
private String orgId;
@NotBlank(message = "orgName cannot be blank")
private String orgName;
@NotBlank(message = "ownerName cannot be blank")
private String ownerName;
private Set<String> admins;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public Set<String> getAdmins() {
return admins;
}
public void setAdmins(Set<String> admins) {
this.admins = admins;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.model;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import java.util.Set;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
public class AppModel {
@NotBlank(message = "name cannot be blank")
private String name;
@NotBlank(message = "appId cannot be blank")
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
@NotBlank(message = "orgId cannot be blank")
private String orgId;
@NotBlank(message = "orgName cannot be blank")
private String orgName;
@NotBlank(message = "ownerName cannot be blank")
private String ownerName;
private Set<String> admins;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public Set<String> getAdmins() {
return admins;
}
public void setAdmins(Set<String> admins) {
this.admins = admins;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceGrayDelReleaseModel;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Objects;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Service
public class ReleaseService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
public ReleaseService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ReleaseAPI releaseAPI) {
this.userInfoHolder = userInfoHolder;
this.releaseAPI = releaseAPI;
}
public ReleaseDTO publish(NamespaceReleaseModel model) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
String releaseBy = StringUtils.isEmpty(model.getReleasedBy()) ?
userInfoHolder.getUser().getUserId() : model.getReleasedBy();
ReleaseDTO releaseDTO = releaseAPI.createRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish);
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
//gray deletion release
public ReleaseDTO publish(NamespaceGrayDelReleaseModel model, String releaseBy) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
ReleaseDTO releaseDTO = releaseAPI.createGrayDeletionRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish, model.getGrayDelKeys());
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespaceName,
String releaseTitle, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return releaseAPI.updateAndPublish(appId, env, clusterName, namespaceName, releaseTitle, releaseComment, branchName,
isEmergencyPublish, deleteBranch, changeSets);
}
public List<ReleaseBO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
List<ReleaseDTO> releaseDTOs = releaseAPI.findAllReleases(appId, env, clusterName, namespaceName, page, size);
if (CollectionUtils.isEmpty(releaseDTOs)) {
return Collections.emptyList();
}
List<ReleaseBO> releases = new LinkedList<>();
for (ReleaseDTO releaseDTO : releaseDTOs) {
ReleaseBO release = new ReleaseBO();
release.setBaseInfo(releaseDTO);
Set<KVEntity> kvEntities = new LinkedHashSet<>();
Map<String, String> configurations = GSON.fromJson(releaseDTO.getConfigurations(), GsonType.CONFIG);
Set<Map.Entry<String, String>> entries = configurations.entrySet();
for (Map.Entry<String, String> entry : entries) {
kvEntities.add(new KVEntity(entry.getKey(), entry.getValue()));
}
release.setItems(kvEntities);
//为了减少数据量
releaseDTO.setConfigurations("");
releases.add(release);
}
return releases;
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
return releaseAPI.findActiveReleases(appId, env, clusterName, namespaceName, page, size);
}
public ReleaseDTO findReleaseById(Env env, long releaseId) {
Set<Long> releaseIds = new HashSet<>(1);
releaseIds.add(releaseId);
List<ReleaseDTO> releases = findReleaseByIds(env, releaseIds);
if (CollectionUtils.isEmpty(releases)) {
return null;
}
return releases.get(0);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
return releaseAPI.findReleaseByIds(env, releaseIds);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespaceName) {
return releaseAPI.loadLatestRelease(appId, env, clusterName, namespaceName);
}
public void rollback(Env env, long releaseId, String operator) {
releaseAPI.rollback(env, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
releaseAPI.rollbackTo(env, releaseId, toReleaseId, operator);
}
public ReleaseCompareResult compare(Env env, long baseReleaseId, long toCompareReleaseId) {
ReleaseDTO baseRelease = null;
ReleaseDTO toCompareRelease = null;
if (baseReleaseId != 0) {
baseRelease = releaseAPI.loadRelease(env, baseReleaseId);
}
if (toCompareReleaseId != 0) {
toCompareRelease = releaseAPI.loadRelease(env, toCompareReleaseId);
}
return compare(baseRelease, toCompareRelease);
}
public ReleaseCompareResult compare(ReleaseDTO baseRelease, ReleaseDTO toCompareRelease) {
Map<String, String> baseReleaseConfiguration = baseRelease == null ? new HashMap<>() :
GSON.fromJson(baseRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String> toCompareReleaseConfiguration = toCompareRelease == null ? new HashMap<>() :
GSON.fromJson(toCompareRelease.getConfigurations(),
GsonType.CONFIG);
ReleaseCompareResult compareResult = new ReleaseCompareResult();
//added and modified in firstRelease
for (Map.Entry<String, String> entry : baseReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String firstValue = entry.getValue();
String secondValue = toCompareReleaseConfiguration.get(key);
//added
if (secondValue == null) {
compareResult.addEntityPair(ChangeType.DELETED, new KVEntity(key, firstValue),
new KVEntity(key, null));
} else if (!Objects.equal(firstValue, secondValue)) {
compareResult.addEntityPair(ChangeType.MODIFIED, new KVEntity(key, firstValue),
new KVEntity(key, secondValue));
}
}
//deleted in firstRelease
for (Map.Entry<String, String> entry : toCompareReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (baseReleaseConfiguration.get(key) == null) {
compareResult
.addEntityPair(ChangeType.ADDED, new KVEntity(key, ""), new KVEntity(key, value));
}
}
return compareResult;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceGrayDelReleaseModel;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Objects;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Service
public class ReleaseService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
public ReleaseService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ReleaseAPI releaseAPI) {
this.userInfoHolder = userInfoHolder;
this.releaseAPI = releaseAPI;
}
public ReleaseDTO publish(NamespaceReleaseModel model) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
String releaseBy = StringUtils.isEmpty(model.getReleasedBy()) ?
userInfoHolder.getUser().getUserId() : model.getReleasedBy();
ReleaseDTO releaseDTO = releaseAPI.createRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish);
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
//gray deletion release
public ReleaseDTO publish(NamespaceGrayDelReleaseModel model, String releaseBy) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
ReleaseDTO releaseDTO = releaseAPI.createGrayDeletionRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish, model.getGrayDelKeys());
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespaceName,
String releaseTitle, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return releaseAPI.updateAndPublish(appId, env, clusterName, namespaceName, releaseTitle, releaseComment, branchName,
isEmergencyPublish, deleteBranch, changeSets);
}
public List<ReleaseBO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
List<ReleaseDTO> releaseDTOs = releaseAPI.findAllReleases(appId, env, clusterName, namespaceName, page, size);
if (CollectionUtils.isEmpty(releaseDTOs)) {
return Collections.emptyList();
}
List<ReleaseBO> releases = new LinkedList<>();
for (ReleaseDTO releaseDTO : releaseDTOs) {
ReleaseBO release = new ReleaseBO();
release.setBaseInfo(releaseDTO);
Set<KVEntity> kvEntities = new LinkedHashSet<>();
Map<String, String> configurations = GSON.fromJson(releaseDTO.getConfigurations(), GsonType.CONFIG);
Set<Map.Entry<String, String>> entries = configurations.entrySet();
for (Map.Entry<String, String> entry : entries) {
kvEntities.add(new KVEntity(entry.getKey(), entry.getValue()));
}
release.setItems(kvEntities);
//为了减少数据量
releaseDTO.setConfigurations("");
releases.add(release);
}
return releases;
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
return releaseAPI.findActiveReleases(appId, env, clusterName, namespaceName, page, size);
}
public ReleaseDTO findReleaseById(Env env, long releaseId) {
Set<Long> releaseIds = new HashSet<>(1);
releaseIds.add(releaseId);
List<ReleaseDTO> releases = findReleaseByIds(env, releaseIds);
if (CollectionUtils.isEmpty(releases)) {
return null;
}
return releases.get(0);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
return releaseAPI.findReleaseByIds(env, releaseIds);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespaceName) {
return releaseAPI.loadLatestRelease(appId, env, clusterName, namespaceName);
}
public void rollback(Env env, long releaseId, String operator) {
releaseAPI.rollback(env, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
releaseAPI.rollbackTo(env, releaseId, toReleaseId, operator);
}
public ReleaseCompareResult compare(Env env, long baseReleaseId, long toCompareReleaseId) {
ReleaseDTO baseRelease = null;
ReleaseDTO toCompareRelease = null;
if (baseReleaseId != 0) {
baseRelease = releaseAPI.loadRelease(env, baseReleaseId);
}
if (toCompareReleaseId != 0) {
toCompareRelease = releaseAPI.loadRelease(env, toCompareReleaseId);
}
return compare(baseRelease, toCompareRelease);
}
public ReleaseCompareResult compare(ReleaseDTO baseRelease, ReleaseDTO toCompareRelease) {
Map<String, String> baseReleaseConfiguration = baseRelease == null ? new HashMap<>() :
GSON.fromJson(baseRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String> toCompareReleaseConfiguration = toCompareRelease == null ? new HashMap<>() :
GSON.fromJson(toCompareRelease.getConfigurations(),
GsonType.CONFIG);
ReleaseCompareResult compareResult = new ReleaseCompareResult();
//added and modified in firstRelease
for (Map.Entry<String, String> entry : baseReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String firstValue = entry.getValue();
String secondValue = toCompareReleaseConfiguration.get(key);
//added
if (secondValue == null) {
compareResult.addEntityPair(ChangeType.DELETED, new KVEntity(key, firstValue),
new KVEntity(key, null));
} else if (!Objects.equal(firstValue, secondValue)) {
compareResult.addEntityPair(ChangeType.MODIFIED, new KVEntity(key, firstValue),
new KVEntity(key, secondValue));
}
}
//deleted in firstRelease
for (Map.Entry<String, String> entry : toCompareReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (baseReleaseConfiguration.get(key) == null) {
compareResult
.addEntityPair(ChangeType.ADDED, new KVEntity(key, ""), new KVEntity(key, value));
}
}
return compareResult;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/InstanceConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.entity;
import com.google.common.base.MoreObjects;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
import javax.persistence.Table;
/**
* @author Jason Song([email protected])
*/
@Entity
@Table(name = "InstanceConfig")
public class InstanceConfig {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "Id")
private long id;
@Column(name = "InstanceId")
private long instanceId;
@Column(name = "ConfigAppId", nullable = false)
private String configAppId;
@Column(name = "ConfigClusterName", nullable = false)
private String configClusterName;
@Column(name = "ConfigNamespaceName", nullable = false)
private String configNamespaceName;
@Column(name = "ReleaseKey", nullable = false)
private String releaseKey;
@Column(name = "ReleaseDeliveryTime", nullable = false)
private Date releaseDeliveryTime;
@Column(name = "DataChange_CreatedTime", nullable = false)
private Date dataChangeCreatedTime;
@Column(name = "DataChange_LastTime")
private Date dataChangeLastModifiedTime;
@PrePersist
protected void prePersist() {
if (this.dataChangeCreatedTime == null) {
dataChangeCreatedTime = new Date();
}
if (this.dataChangeLastModifiedTime == null) {
dataChangeLastModifiedTime = dataChangeCreatedTime;
}
}
@PreUpdate
protected void preUpdate() {
this.dataChangeLastModifiedTime = new Date();
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public long getInstanceId() {
return instanceId;
}
public void setInstanceId(long instanceId) {
this.instanceId = instanceId;
}
public String getConfigAppId() {
return configAppId;
}
public void setConfigAppId(String configAppId) {
this.configAppId = configAppId;
}
public String getConfigNamespaceName() {
return configNamespaceName;
}
public void setConfigNamespaceName(String configNamespaceName) {
this.configNamespaceName = configNamespaceName;
}
public String getReleaseKey() {
return releaseKey;
}
public void setReleaseKey(String releaseKey) {
this.releaseKey = releaseKey;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
public String getConfigClusterName() {
return configClusterName;
}
public void setConfigClusterName(String configClusterName) {
this.configClusterName = configClusterName;
}
public Date getReleaseDeliveryTime() {
return releaseDeliveryTime;
}
public void setReleaseDeliveryTime(Date releaseDeliveryTime) {
this.releaseDeliveryTime = releaseDeliveryTime;
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.omitNullValues()
.add("id", id)
.add("configAppId", configAppId)
.add("configClusterName", configClusterName)
.add("configNamespaceName", configNamespaceName)
.add("releaseKey", releaseKey)
.add("dataChangeCreatedTime", dataChangeCreatedTime)
.add("dataChangeLastModifiedTime", dataChangeLastModifiedTime)
.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.entity;
import com.google.common.base.MoreObjects;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
import javax.persistence.Table;
/**
* @author Jason Song([email protected])
*/
@Entity
@Table(name = "InstanceConfig")
public class InstanceConfig {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "Id")
private long id;
@Column(name = "InstanceId")
private long instanceId;
@Column(name = "ConfigAppId", nullable = false)
private String configAppId;
@Column(name = "ConfigClusterName", nullable = false)
private String configClusterName;
@Column(name = "ConfigNamespaceName", nullable = false)
private String configNamespaceName;
@Column(name = "ReleaseKey", nullable = false)
private String releaseKey;
@Column(name = "ReleaseDeliveryTime", nullable = false)
private Date releaseDeliveryTime;
@Column(name = "DataChange_CreatedTime", nullable = false)
private Date dataChangeCreatedTime;
@Column(name = "DataChange_LastTime")
private Date dataChangeLastModifiedTime;
@PrePersist
protected void prePersist() {
if (this.dataChangeCreatedTime == null) {
dataChangeCreatedTime = new Date();
}
if (this.dataChangeLastModifiedTime == null) {
dataChangeLastModifiedTime = dataChangeCreatedTime;
}
}
@PreUpdate
protected void preUpdate() {
this.dataChangeLastModifiedTime = new Date();
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public long getInstanceId() {
return instanceId;
}
public void setInstanceId(long instanceId) {
this.instanceId = instanceId;
}
public String getConfigAppId() {
return configAppId;
}
public void setConfigAppId(String configAppId) {
this.configAppId = configAppId;
}
public String getConfigNamespaceName() {
return configNamespaceName;
}
public void setConfigNamespaceName(String configNamespaceName) {
this.configNamespaceName = configNamespaceName;
}
public String getReleaseKey() {
return releaseKey;
}
public void setReleaseKey(String releaseKey) {
this.releaseKey = releaseKey;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
public Date getDataChangeLastModifiedTime() {
return dataChangeLastModifiedTime;
}
public void setDataChangeLastModifiedTime(Date dataChangeLastModifiedTime) {
this.dataChangeLastModifiedTime = dataChangeLastModifiedTime;
}
public String getConfigClusterName() {
return configClusterName;
}
public void setConfigClusterName(String configClusterName) {
this.configClusterName = configClusterName;
}
public Date getReleaseDeliveryTime() {
return releaseDeliveryTime;
}
public void setReleaseDeliveryTime(Date releaseDeliveryTime) {
this.releaseDeliveryTime = releaseDeliveryTime;
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.omitNullValues()
.add("id", id)
.add("configAppId", configAppId)
.add("configClusterName", configClusterName)
.add("configNamespaceName", configNamespaceName)
.add("releaseKey", releaseKey)
.add("dataChangeCreatedTime", dataChangeCreatedTime)
.add("dataChangeLastModifiedTime", dataChangeLastModifiedTime)
.toString();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/NamespaceOpenApiServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class NamespaceOpenApiServiceTest extends AbstractOpenApiServiceTest {
private NamespaceOpenApiService namespaceOpenApiService;
private String someAppId;
private String someEnv;
private String someCluster;
private String someNamespace;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
someCluster = "someCluster";
someNamespace = "someNamespace";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
namespaceOpenApiService = new NamespaceOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetNamespace() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespaceWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace);
}
@Test
public void testGetNamespaces() throws Exception {
StringEntity responseEntity = new StringEntity("[]");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces", someBaseUrl, someEnv, someAppId, someCluster),
get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespacesWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster);
}
@Test
public void testCreateAppNamespace() throws Exception {
String someName = "someName";
String someCreatedBy = "someCreatedBy";
OpenAppNamespaceDTO appNamespaceDTO = new OpenAppNamespaceDTO();
appNamespaceDTO.setAppId(someAppId);
appNamespaceDTO.setName(someName);
appNamespaceDTO.setDataChangeCreatedBy(someCreatedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
namespaceOpenApiService.createAppNamespace(appNamespaceDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String.format("%s/apps/%s/appnamespaces", someBaseUrl, someAppId), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testCreateAppNamespaceWithError() throws Exception {
String someName = "someName";
String someCreatedBy = "someCreatedBy";
OpenAppNamespaceDTO appNamespaceDTO = new OpenAppNamespaceDTO();
appNamespaceDTO.setAppId(someAppId);
appNamespaceDTO.setName(someName);
appNamespaceDTO.setDataChangeCreatedBy(someCreatedBy);
when(statusLine.getStatusCode()).thenReturn(400);
namespaceOpenApiService.createAppNamespace(appNamespaceDTO);
}
@Test
public void testGetNamespaceLock() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespaceLock(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/lock", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespaceLockWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespaceLock(someAppId, someEnv, someCluster, someNamespace);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.OpenAppNamespaceDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class NamespaceOpenApiServiceTest extends AbstractOpenApiServiceTest {
private NamespaceOpenApiService namespaceOpenApiService;
private String someAppId;
private String someEnv;
private String someCluster;
private String someNamespace;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
someCluster = "someCluster";
someNamespace = "someNamespace";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
namespaceOpenApiService = new NamespaceOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetNamespace() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespaceWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespace(someAppId, someEnv, someCluster, someNamespace);
}
@Test
public void testGetNamespaces() throws Exception {
StringEntity responseEntity = new StringEntity("[]");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces", someBaseUrl, someEnv, someAppId, someCluster),
get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespacesWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespaces(someAppId, someEnv, someCluster);
}
@Test
public void testCreateAppNamespace() throws Exception {
String someName = "someName";
String someCreatedBy = "someCreatedBy";
OpenAppNamespaceDTO appNamespaceDTO = new OpenAppNamespaceDTO();
appNamespaceDTO.setAppId(someAppId);
appNamespaceDTO.setName(someName);
appNamespaceDTO.setDataChangeCreatedBy(someCreatedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
namespaceOpenApiService.createAppNamespace(appNamespaceDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String.format("%s/apps/%s/appnamespaces", someBaseUrl, someAppId), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testCreateAppNamespaceWithError() throws Exception {
String someName = "someName";
String someCreatedBy = "someCreatedBy";
OpenAppNamespaceDTO appNamespaceDTO = new OpenAppNamespaceDTO();
appNamespaceDTO.setAppId(someAppId);
appNamespaceDTO.setName(someName);
appNamespaceDTO.setDataChangeCreatedBy(someCreatedBy);
when(statusLine.getStatusCode()).thenReturn(400);
namespaceOpenApiService.createAppNamespace(appNamespaceDTO);
}
@Test
public void testGetNamespaceLock() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
namespaceOpenApiService.getNamespaceLock(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/lock", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetNamespaceLockWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(404);
namespaceOpenApiService.getNamespaceLock(someAppId, someEnv, someCluster, someNamespace);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/NamespaceLockDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/enricher/AdditionalUserInfoEnricher.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.enricher;
import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.Map;
/**
* @author vdisk <[email protected]>
*/
public interface AdditionalUserInfoEnricher {
/**
* enrich an additional user info for the dto list
*
* @param adapter enrich adapter
* @param userInfoMap userInfo map
*/
void enrichAdditionalUserInfo(UserInfoEnrichedAdapter adapter, Map<String, UserInfo> userInfoMap);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.enricher;
import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.Map;
/**
* @author vdisk <[email protected]>
*/
public interface AdditionalUserInfoEnricher {
/**
* enrich an additional user info for the dto list
*
* @param adapter enrich adapter
* @param userInfoMap userInfo map
*/
void enrichAdditionalUserInfo(UserInfoEnrichedAdapter adapter, Map<String, UserInfo> userInfoMap);
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.repository.ConsumerAuditRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRoleRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerTokenRepository;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.hash.Hashing;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
@Service
public class ConsumerService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Joiner KEY_JOINER = Joiner.on("|");
private final UserInfoHolder userInfoHolder;
private final ConsumerTokenRepository consumerTokenRepository;
private final ConsumerRepository consumerRepository;
private final ConsumerAuditRepository consumerAuditRepository;
private final ConsumerRoleRepository consumerRoleRepository;
private final PortalConfig portalConfig;
private final RolePermissionService rolePermissionService;
private final UserService userService;
public ConsumerService(
final UserInfoHolder userInfoHolder,
final ConsumerTokenRepository consumerTokenRepository,
final ConsumerRepository consumerRepository,
final ConsumerAuditRepository consumerAuditRepository,
final ConsumerRoleRepository consumerRoleRepository,
final PortalConfig portalConfig,
final RolePermissionService rolePermissionService,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.consumerTokenRepository = consumerTokenRepository;
this.consumerRepository = consumerRepository;
this.consumerAuditRepository = consumerAuditRepository;
this.consumerRoleRepository = consumerRoleRepository;
this.portalConfig = portalConfig;
this.rolePermissionService = rolePermissionService;
this.userService = userService;
}
public Consumer createConsumer(Consumer consumer) {
String appId = consumer.getAppId();
Consumer managedConsumer = consumerRepository.findByAppId(appId);
if (managedConsumer != null) {
throw new BadRequestException("Consumer already exist");
}
String ownerName = consumer.getOwnerName();
UserInfo owner = userService.findByUserId(ownerName);
if (owner == null) {
throw new BadRequestException(String.format("User does not exist. UserId = %s", ownerName));
}
consumer.setOwnerEmail(owner.getEmail());
String operator = userInfoHolder.getUser().getUserId();
consumer.setDataChangeCreatedBy(operator);
consumer.setDataChangeLastModifiedBy(operator);
return consumerRepository.save(consumer);
}
public ConsumerToken generateAndSaveConsumerToken(Consumer consumer, Date expires) {
Preconditions.checkArgument(consumer != null, "Consumer can not be null");
ConsumerToken consumerToken = generateConsumerToken(consumer, expires);
consumerToken.setId(0);
return consumerTokenRepository.save(consumerToken);
}
public ConsumerToken getConsumerTokenByAppId(String appId) {
Consumer consumer = consumerRepository.findByAppId(appId);
if (consumer == null) {
return null;
}
return consumerTokenRepository.findByConsumerId(consumer.getId());
}
public Long getConsumerIdByToken(String token) {
if (Strings.isNullOrEmpty(token)) {
return null;
}
ConsumerToken consumerToken = consumerTokenRepository.findTopByTokenAndExpiresAfter(token,
new Date());
return consumerToken == null ? null : consumerToken.getConsumerId();
}
public Consumer getConsumerByConsumerId(long consumerId) {
return consumerRepository.findById(consumerId).orElse(null);
}
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) {
return assignNamespaceRoleToConsumer(token, appId, namespaceName, null);
}
@Transactional
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role namespaceModifyRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildModifyNamespaceRoleName(appId, namespaceName, env));
Role namespaceReleaseRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildReleaseNamespaceRoleName(appId, namespaceName, env));
if (namespaceModifyRole == null || namespaceReleaseRole == null) {
throw new BadRequestException("Namespace's role does not exist. Please check whether namespace has created.");
}
long namespaceModifyRoleId = namespaceModifyRole.getId();
long namespaceReleaseRoleId = namespaceReleaseRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceModifyRoleId);
ConsumerRole managedReleaseRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceReleaseRoleId);
if (managedModifyRole != null && managedReleaseRole != null) {
return Arrays.asList(managedModifyRole, managedReleaseRole);
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole namespaceModifyConsumerRole = createConsumerRole(consumerId, namespaceModifyRoleId, operator);
ConsumerRole namespaceReleaseConsumerRole = createConsumerRole(consumerId, namespaceReleaseRoleId, operator);
ConsumerRole createdModifyConsumerRole = consumerRoleRepository.save(namespaceModifyConsumerRole);
ConsumerRole createdReleaseConsumerRole = consumerRoleRepository.save(namespaceReleaseConsumerRole);
return Arrays.asList(createdModifyConsumerRole, createdReleaseConsumerRole);
}
@Transactional
public ConsumerRole assignAppRoleToConsumer(String token, String appId) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role masterRole = rolePermissionService.findRoleByRoleName(RoleUtils.buildAppMasterRoleName(appId));
if (masterRole == null) {
throw new BadRequestException("App's role does not exist. Please check whether app has created.");
}
long roleId = masterRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, roleId);
if (managedModifyRole != null) {
return managedModifyRole;
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole consumerRole = createConsumerRole(consumerId, roleId, operator);
return consumerRoleRepository.save(consumerRole);
}
@Transactional
public void createConsumerAudits(Iterable<ConsumerAudit> consumerAudits) {
consumerAuditRepository.saveAll(consumerAudits);
}
@Transactional
public ConsumerToken createConsumerToken(ConsumerToken entity) {
entity.setId(0); //for protection
return consumerTokenRepository.save(entity);
}
private ConsumerToken generateConsumerToken(Consumer consumer, Date expires) {
long consumerId = consumer.getId();
String createdBy = userInfoHolder.getUser().getUserId();
Date createdTime = new Date();
ConsumerToken consumerToken = new ConsumerToken();
consumerToken.setConsumerId(consumerId);
consumerToken.setExpires(expires);
consumerToken.setDataChangeCreatedBy(createdBy);
consumerToken.setDataChangeCreatedTime(createdTime);
consumerToken.setDataChangeLastModifiedBy(createdBy);
consumerToken.setDataChangeLastModifiedTime(createdTime);
generateAndEnrichToken(consumer, consumerToken);
return consumerToken;
}
void generateAndEnrichToken(Consumer consumer, ConsumerToken consumerToken) {
Preconditions.checkArgument(consumer != null);
if (consumerToken.getDataChangeCreatedTime() == null) {
consumerToken.setDataChangeCreatedTime(new Date());
}
consumerToken.setToken(generateToken(consumer.getAppId(), consumerToken
.getDataChangeCreatedTime(), portalConfig.consumerTokenSalt()));
}
String generateToken(String consumerAppId, Date generationTime, String
consumerTokenSalt) {
return Hashing.sha1().hashString(KEY_JOINER.join(consumerAppId, TIMESTAMP_FORMAT.format
(generationTime), consumerTokenSalt), Charsets.UTF_8).toString();
}
ConsumerRole createConsumerRole(Long consumerId, Long roleId, String operator) {
ConsumerRole consumerRole = new ConsumerRole();
consumerRole.setConsumerId(consumerId);
consumerRole.setRoleId(roleId);
consumerRole.setDataChangeCreatedBy(operator);
consumerRole.setDataChangeLastModifiedBy(operator);
return consumerRole;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import com.ctrip.framework.apollo.openapi.repository.ConsumerAuditRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerRoleRepository;
import com.ctrip.framework.apollo.openapi.repository.ConsumerTokenRepository;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Role;
import com.ctrip.framework.apollo.portal.service.RolePermissionService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.hash.Hashing;
import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
@Service
public class ConsumerService {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final Joiner KEY_JOINER = Joiner.on("|");
private final UserInfoHolder userInfoHolder;
private final ConsumerTokenRepository consumerTokenRepository;
private final ConsumerRepository consumerRepository;
private final ConsumerAuditRepository consumerAuditRepository;
private final ConsumerRoleRepository consumerRoleRepository;
private final PortalConfig portalConfig;
private final RolePermissionService rolePermissionService;
private final UserService userService;
public ConsumerService(
final UserInfoHolder userInfoHolder,
final ConsumerTokenRepository consumerTokenRepository,
final ConsumerRepository consumerRepository,
final ConsumerAuditRepository consumerAuditRepository,
final ConsumerRoleRepository consumerRoleRepository,
final PortalConfig portalConfig,
final RolePermissionService rolePermissionService,
final UserService userService) {
this.userInfoHolder = userInfoHolder;
this.consumerTokenRepository = consumerTokenRepository;
this.consumerRepository = consumerRepository;
this.consumerAuditRepository = consumerAuditRepository;
this.consumerRoleRepository = consumerRoleRepository;
this.portalConfig = portalConfig;
this.rolePermissionService = rolePermissionService;
this.userService = userService;
}
public Consumer createConsumer(Consumer consumer) {
String appId = consumer.getAppId();
Consumer managedConsumer = consumerRepository.findByAppId(appId);
if (managedConsumer != null) {
throw new BadRequestException("Consumer already exist");
}
String ownerName = consumer.getOwnerName();
UserInfo owner = userService.findByUserId(ownerName);
if (owner == null) {
throw new BadRequestException(String.format("User does not exist. UserId = %s", ownerName));
}
consumer.setOwnerEmail(owner.getEmail());
String operator = userInfoHolder.getUser().getUserId();
consumer.setDataChangeCreatedBy(operator);
consumer.setDataChangeLastModifiedBy(operator);
return consumerRepository.save(consumer);
}
public ConsumerToken generateAndSaveConsumerToken(Consumer consumer, Date expires) {
Preconditions.checkArgument(consumer != null, "Consumer can not be null");
ConsumerToken consumerToken = generateConsumerToken(consumer, expires);
consumerToken.setId(0);
return consumerTokenRepository.save(consumerToken);
}
public ConsumerToken getConsumerTokenByAppId(String appId) {
Consumer consumer = consumerRepository.findByAppId(appId);
if (consumer == null) {
return null;
}
return consumerTokenRepository.findByConsumerId(consumer.getId());
}
public Long getConsumerIdByToken(String token) {
if (Strings.isNullOrEmpty(token)) {
return null;
}
ConsumerToken consumerToken = consumerTokenRepository.findTopByTokenAndExpiresAfter(token,
new Date());
return consumerToken == null ? null : consumerToken.getConsumerId();
}
public Consumer getConsumerByConsumerId(long consumerId) {
return consumerRepository.findById(consumerId).orElse(null);
}
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName) {
return assignNamespaceRoleToConsumer(token, appId, namespaceName, null);
}
@Transactional
public List<ConsumerRole> assignNamespaceRoleToConsumer(String token, String appId, String namespaceName, String env) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role namespaceModifyRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildModifyNamespaceRoleName(appId, namespaceName, env));
Role namespaceReleaseRole =
rolePermissionService.findRoleByRoleName(RoleUtils.buildReleaseNamespaceRoleName(appId, namespaceName, env));
if (namespaceModifyRole == null || namespaceReleaseRole == null) {
throw new BadRequestException("Namespace's role does not exist. Please check whether namespace has created.");
}
long namespaceModifyRoleId = namespaceModifyRole.getId();
long namespaceReleaseRoleId = namespaceReleaseRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceModifyRoleId);
ConsumerRole managedReleaseRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, namespaceReleaseRoleId);
if (managedModifyRole != null && managedReleaseRole != null) {
return Arrays.asList(managedModifyRole, managedReleaseRole);
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole namespaceModifyConsumerRole = createConsumerRole(consumerId, namespaceModifyRoleId, operator);
ConsumerRole namespaceReleaseConsumerRole = createConsumerRole(consumerId, namespaceReleaseRoleId, operator);
ConsumerRole createdModifyConsumerRole = consumerRoleRepository.save(namespaceModifyConsumerRole);
ConsumerRole createdReleaseConsumerRole = consumerRoleRepository.save(namespaceReleaseConsumerRole);
return Arrays.asList(createdModifyConsumerRole, createdReleaseConsumerRole);
}
@Transactional
public ConsumerRole assignAppRoleToConsumer(String token, String appId) {
Long consumerId = getConsumerIdByToken(token);
if (consumerId == null) {
throw new BadRequestException("Token is Illegal");
}
Role masterRole = rolePermissionService.findRoleByRoleName(RoleUtils.buildAppMasterRoleName(appId));
if (masterRole == null) {
throw new BadRequestException("App's role does not exist. Please check whether app has created.");
}
long roleId = masterRole.getId();
ConsumerRole managedModifyRole = consumerRoleRepository.findByConsumerIdAndRoleId(consumerId, roleId);
if (managedModifyRole != null) {
return managedModifyRole;
}
String operator = userInfoHolder.getUser().getUserId();
ConsumerRole consumerRole = createConsumerRole(consumerId, roleId, operator);
return consumerRoleRepository.save(consumerRole);
}
@Transactional
public void createConsumerAudits(Iterable<ConsumerAudit> consumerAudits) {
consumerAuditRepository.saveAll(consumerAudits);
}
@Transactional
public ConsumerToken createConsumerToken(ConsumerToken entity) {
entity.setId(0); //for protection
return consumerTokenRepository.save(entity);
}
private ConsumerToken generateConsumerToken(Consumer consumer, Date expires) {
long consumerId = consumer.getId();
String createdBy = userInfoHolder.getUser().getUserId();
Date createdTime = new Date();
ConsumerToken consumerToken = new ConsumerToken();
consumerToken.setConsumerId(consumerId);
consumerToken.setExpires(expires);
consumerToken.setDataChangeCreatedBy(createdBy);
consumerToken.setDataChangeCreatedTime(createdTime);
consumerToken.setDataChangeLastModifiedBy(createdBy);
consumerToken.setDataChangeLastModifiedTime(createdTime);
generateAndEnrichToken(consumer, consumerToken);
return consumerToken;
}
void generateAndEnrichToken(Consumer consumer, ConsumerToken consumerToken) {
Preconditions.checkArgument(consumer != null);
if (consumerToken.getDataChangeCreatedTime() == null) {
consumerToken.setDataChangeCreatedTime(new Date());
}
consumerToken.setToken(generateToken(consumer.getAppId(), consumerToken
.getDataChangeCreatedTime(), portalConfig.consumerTokenSalt()));
}
String generateToken(String consumerAppId, Date generationTime, String
consumerTokenSalt) {
return Hashing.sha1().hashString(KEY_JOINER.join(consumerAppId, TIMESTAMP_FORMAT.format
(generationTime), consumerTokenSalt), Charsets.UTF_8).toString();
}
ConsumerRole createConsumerRole(Long consumerId, Long roleId, String operator) {
ConsumerRole consumerRole = new ConsumerRole();
consumerRole.setConsumerId(consumerId);
consumerRole.setRoleId(roleId);
consumerRole.setDataChangeCreatedBy(operator);
consumerRole.setDataChangeLastModifiedBy(operator);
return consumerRole;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/AdminServiceAddressLocator.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.portal.environment.PortalMetaDomainService;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@Component
public class AdminServiceAddressLocator {
private static final long NORMAL_REFRESH_INTERVAL = 5 * 60 * 1000;
private static final long OFFLINE_REFRESH_INTERVAL = 10 * 1000;
private static final int RETRY_TIMES = 3;
private static final String ADMIN_SERVICE_URL_PATH = "/services/admin";
private static final Logger logger = LoggerFactory.getLogger(AdminServiceAddressLocator.class);
private ScheduledExecutorService refreshServiceAddressService;
private RestTemplate restTemplate;
private List<Env> allEnvs;
private Map<Env, List<ServiceDTO>> cache = new ConcurrentHashMap<>();
private final PortalSettings portalSettings;
private final RestTemplateFactory restTemplateFactory;
private final PortalMetaDomainService portalMetaDomainService;
public AdminServiceAddressLocator(
final HttpMessageConverters httpMessageConverters,
final PortalSettings portalSettings,
final RestTemplateFactory restTemplateFactory,
final PortalMetaDomainService portalMetaDomainService
) {
this.portalSettings = portalSettings;
this.restTemplateFactory = restTemplateFactory;
this.portalMetaDomainService = portalMetaDomainService;
}
@PostConstruct
public void init() {
allEnvs = portalSettings.getAllEnvs();
//init restTemplate
restTemplate = restTemplateFactory.getObject();
refreshServiceAddressService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("ServiceLocator", true));
refreshServiceAddressService.schedule(new RefreshAdminServerAddressTask(), 1, TimeUnit.MILLISECONDS);
}
public List<ServiceDTO> getServiceList(Env env) {
List<ServiceDTO> services = cache.get(env);
if (CollectionUtils.isEmpty(services)) {
return Collections.emptyList();
}
List<ServiceDTO> randomConfigServices = Lists.newArrayList(services);
Collections.shuffle(randomConfigServices);
return randomConfigServices;
}
//maintain admin server address
private class RefreshAdminServerAddressTask implements Runnable {
@Override
public void run() {
boolean refreshSuccess = true;
//refresh fail if get any env address fail
for (Env env : allEnvs) {
boolean currentEnvRefreshResult = refreshServerAddressCache(env);
refreshSuccess = refreshSuccess && currentEnvRefreshResult;
}
if (refreshSuccess) {
refreshServiceAddressService
.schedule(new RefreshAdminServerAddressTask(), NORMAL_REFRESH_INTERVAL, TimeUnit.MILLISECONDS);
} else {
refreshServiceAddressService
.schedule(new RefreshAdminServerAddressTask(), OFFLINE_REFRESH_INTERVAL, TimeUnit.MILLISECONDS);
}
}
}
private boolean refreshServerAddressCache(Env env) {
for (int i = 0; i < RETRY_TIMES; i++) {
try {
ServiceDTO[] services = getAdminServerAddress(env);
if (services == null || services.length == 0) {
continue;
}
cache.put(env, Arrays.asList(services));
return true;
} catch (Throwable e) {
logger.error(String.format("Get admin server address from meta server failed. env: %s, meta server address:%s",
env, portalMetaDomainService.getDomain(env)), e);
Tracer
.logError(String.format("Get admin server address from meta server failed. env: %s, meta server address:%s",
env, portalMetaDomainService.getDomain(env)), e);
}
}
return false;
}
private ServiceDTO[] getAdminServerAddress(Env env) {
String domainName = portalMetaDomainService.getDomain(env);
String url = domainName + ADMIN_SERVICE_URL_PATH;
return restTemplate.getForObject(url, ServiceDTO[].class);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.portal.environment.PortalMetaDomainService;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@Component
public class AdminServiceAddressLocator {
private static final long NORMAL_REFRESH_INTERVAL = 5 * 60 * 1000;
private static final long OFFLINE_REFRESH_INTERVAL = 10 * 1000;
private static final int RETRY_TIMES = 3;
private static final String ADMIN_SERVICE_URL_PATH = "/services/admin";
private static final Logger logger = LoggerFactory.getLogger(AdminServiceAddressLocator.class);
private ScheduledExecutorService refreshServiceAddressService;
private RestTemplate restTemplate;
private List<Env> allEnvs;
private Map<Env, List<ServiceDTO>> cache = new ConcurrentHashMap<>();
private final PortalSettings portalSettings;
private final RestTemplateFactory restTemplateFactory;
private final PortalMetaDomainService portalMetaDomainService;
public AdminServiceAddressLocator(
final HttpMessageConverters httpMessageConverters,
final PortalSettings portalSettings,
final RestTemplateFactory restTemplateFactory,
final PortalMetaDomainService portalMetaDomainService
) {
this.portalSettings = portalSettings;
this.restTemplateFactory = restTemplateFactory;
this.portalMetaDomainService = portalMetaDomainService;
}
@PostConstruct
public void init() {
allEnvs = portalSettings.getAllEnvs();
//init restTemplate
restTemplate = restTemplateFactory.getObject();
refreshServiceAddressService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("ServiceLocator", true));
refreshServiceAddressService.schedule(new RefreshAdminServerAddressTask(), 1, TimeUnit.MILLISECONDS);
}
public List<ServiceDTO> getServiceList(Env env) {
List<ServiceDTO> services = cache.get(env);
if (CollectionUtils.isEmpty(services)) {
return Collections.emptyList();
}
List<ServiceDTO> randomConfigServices = Lists.newArrayList(services);
Collections.shuffle(randomConfigServices);
return randomConfigServices;
}
//maintain admin server address
private class RefreshAdminServerAddressTask implements Runnable {
@Override
public void run() {
boolean refreshSuccess = true;
//refresh fail if get any env address fail
for (Env env : allEnvs) {
boolean currentEnvRefreshResult = refreshServerAddressCache(env);
refreshSuccess = refreshSuccess && currentEnvRefreshResult;
}
if (refreshSuccess) {
refreshServiceAddressService
.schedule(new RefreshAdminServerAddressTask(), NORMAL_REFRESH_INTERVAL, TimeUnit.MILLISECONDS);
} else {
refreshServiceAddressService
.schedule(new RefreshAdminServerAddressTask(), OFFLINE_REFRESH_INTERVAL, TimeUnit.MILLISECONDS);
}
}
}
private boolean refreshServerAddressCache(Env env) {
for (int i = 0; i < RETRY_TIMES; i++) {
try {
ServiceDTO[] services = getAdminServerAddress(env);
if (services == null || services.length == 0) {
continue;
}
cache.put(env, Arrays.asList(services));
return true;
} catch (Throwable e) {
logger.error(String.format("Get admin server address from meta server failed. env: %s, meta server address:%s",
env, portalMetaDomainService.getDomain(env)), e);
Tracer
.logError(String.format("Get admin server address from meta server failed. env: %s, meta server address:%s",
env, portalMetaDomainService.getDomain(env)), e);
}
}
return false;
}
private ServiceDTO[] getAdminServerAddress(Env env) {
String domainName = portalMetaDomainService.getDomain(env);
String url = domainName + ADMIN_SERVICE_URL_PATH;
return restTemplate.getForObject(url, ServiceDTO[].class);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/StringUtils.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import java.util.Collection;
import java.util.Iterator;
public class StringUtils {
public static final String EMPTY = "";
/**
* <p>
* Checks if a String is empty ("") or null.
* </p>
*
* <pre>
* StringUtils.isEmpty(null) = true
* StringUtils.isEmpty("") = true
* StringUtils.isEmpty(" ") = false
* StringUtils.isEmpty("bob") = false
* StringUtils.isEmpty(" bob ") = false
* </pre>
*
* <p>
* NOTE: This method changed in Lang version 2.0. It no longer trims the String. That functionality is available in isBlank().
* </p>
*
* @param str the String to check, may be null
* @return <code>true</code> if the String is empty or null
*/
public static boolean isEmpty(String str) {
return str == null || str.length() == 0;
}
public static boolean isContainEmpty(String... args){
if (args == null){
return false;
}
for (String arg: args){
if (arg == null || "".equals(arg)){
return true;
}
}
return false;
}
/**
* <p>
* Checks if a String is whitespace, empty ("") or null.
* </p>
*
* <pre>
* StringUtils.isBlank(null) = true
* StringUtils.isBlank("") = true
* StringUtils.isBlank(" ") = true
* StringUtils.isBlank("bob") = false
* StringUtils.isBlank(" bob ") = false
* </pre>
*
* @param str the String to check, may be null
* @return <code>true</code> if the String is null, empty or whitespace
*/
public static boolean isBlank(String str) {
int strLen;
if (str == null || (strLen = str.length()) == 0) {
return true;
}
for (int i = 0; i < strLen; i++) {
if (!Character.isWhitespace(str.charAt(i))) {
return false;
}
}
return true;
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String returning <code>null</code> if the String is empty
* ("") after the trim or if it is <code>null</code>.
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #stripToNull(String)}.
* </p>
*
* <pre>
* StringUtils.trimToNull(null) = null
* StringUtils.trimToNull("") = null
* StringUtils.trimToNull(" ") = null
* StringUtils.trimToNull("abc") = "abc"
* StringUtils.trimToNull(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed String, <code>null</code> if only chars <= 32, empty or null String input
* @since 2.0
*/
public static String trimToNull(String str) {
String ts = trim(str);
return isEmpty(ts) ? null : ts;
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String returning an empty String ("") if the String is empty
* ("") after the trim or if it is <code>null</code>.
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #stripToEmpty(String)}.
* </p>
*
* <pre>
* StringUtils.trimToEmpty(null) = ""
* StringUtils.trimToEmpty("") = ""
* StringUtils.trimToEmpty(" ") = ""
* StringUtils.trimToEmpty("abc") = "abc"
* StringUtils.trimToEmpty(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed String, or an empty String if <code>null</code> input
* @since 2.0
*/
public static String trimToEmpty(String str) {
return str == null ? EMPTY : str.trim();
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String, handling <code>null</code> by returning
* <code>null</code>.
* </p>
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #strip(String)}.
* </p>
*
* <p>
* To trim your choice of characters, use the {@link #strip(String, String)} methods.
* </p>
*
* <pre>
* StringUtils.trim(null) = null
* StringUtils.trim("") = ""
* StringUtils.trim(" ") = ""
* StringUtils.trim("abc") = "abc"
* StringUtils.trim(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed string, <code>null</code> if null String input
*/
public static String trim(String str) {
return str == null ? null : str.trim();
}
/**
* <p>
* Compares two Strings, returning <code>true</code> if they are equal.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case sensitive.
* </p>
*
* <pre>
* StringUtils.equals(null, null) = true
* StringUtils.equals(null, "abc") = false
* StringUtils.equals("abc", null) = false
* StringUtils.equals("abc", "abc") = true
* StringUtils.equals("abc", "ABC") = false
* </pre>
*
* @param str1 the first String, may be null
* @param str2 the second String, may be null
* @return <code>true</code> if the Strings are equal, case sensitive, or both <code>null</code>
* @see java.lang.String#equals(Object)
*/
public static boolean equals(String str1, String str2) {
return str1 == null ? str2 == null : str1.equals(str2);
}
/**
* <p>
* Compares two Strings, returning <code>true</code> if they are equal ignoring the case.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered equal. Comparison is case
* insensitive.
* </p>
*
* <pre>
* StringUtils.equalsIgnoreCase(null, null) = true
* StringUtils.equalsIgnoreCase(null, "abc") = false
* StringUtils.equalsIgnoreCase("abc", null) = false
* StringUtils.equalsIgnoreCase("abc", "abc") = true
* StringUtils.equalsIgnoreCase("abc", "ABC") = true
* </pre>
*
* @param str1 the first String, may be null
* @param str2 the second String, may be null
* @return <code>true</code> if the Strings are equal, case insensitive, or both <code>null</code>
* @see java.lang.String#equalsIgnoreCase(String)
*/
public static boolean equalsIgnoreCase(String str1, String str2) {
return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
}
/**
* <p>
* Check if a String starts with a specified prefix.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case sensitive.
* </p>
*
* <pre>
* StringUtils.startsWith(null, null) = true
* StringUtils.startsWith(null, "abc") = false
* StringUtils.startsWith("abcdef", null) = false
* StringUtils.startsWith("abcdef", "abc") = true
* StringUtils.startsWith("ABCDEF", "abc") = false
* </pre>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @return <code>true</code> if the String starts with the prefix, case sensitive, or both <code>null</code>
* @see java.lang.String#startsWith(String)
* @since 2.4
*/
public static boolean startsWith(String str, String prefix) {
return startsWith(str, prefix, false);
}
/**
* <p>
* Check if a String starts with a specified prefix (optionally case insensitive).
* </p>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @param ignoreCase inidicates whether the compare should ignore case (case insensitive) or not.
* @return <code>true</code> if the String starts with the prefix or both <code>null</code>
* @see java.lang.String#startsWith(String)
*/
private static boolean startsWith(String str, String prefix, boolean ignoreCase) {
if (str == null || prefix == null) {
return str == null && prefix == null;
}
if (prefix.length() > str.length()) {
return false;
}
return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length());
}
/**
* <p>
* Case insensitive check if a String starts with a specified prefix.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case insensitive.
* </p>
*
* <pre>
* StringUtils.startsWithIgnoreCase(null, null) = true
* StringUtils.startsWithIgnoreCase(null, "abc") = false
* StringUtils.startsWithIgnoreCase("abcdef", null) = false
* StringUtils.startsWithIgnoreCase("abcdef", "abc") = true
* StringUtils.startsWithIgnoreCase("ABCDEF", "abc") = true
* </pre>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @return <code>true</code> if the String starts with the prefix, case insensitive, or both <code>null</code>
* @see java.lang.String#startsWith(String)
* @since 2.4
*/
public static boolean startsWithIgnoreCase(String str, String prefix) {
return startsWith(str, prefix, true);
}
/**
* <p>
* Checks if the String contains only unicode digits. A decimal point is not a unicode digit and returns false.
* </p>
*
* <p>
* <code>null</code> will return <code>false</code>. An empty String (length()=0) will return <code>true</code>.
* </p>
*
* <pre>
* StringUtils.isNumeric(null) = false
* StringUtils.isNumeric("") = true
* StringUtils.isNumeric(" ") = false
* StringUtils.isNumeric("123") = true
* StringUtils.isNumeric("12 3") = false
* StringUtils.isNumeric("ab2c") = false
* StringUtils.isNumeric("12-3") = false
* StringUtils.isNumeric("12.3") = false
* </pre>
*
* @param str the String to check, may be null
* @return <code>true</code> if only contains digits, and is non-null
*/
public static boolean isNumeric(String str) {
if (str == null) {
return false;
}
int sz = str.length();
for (int i = 0; i < sz; i++) {
if (!Character.isDigit(str.charAt(i))) {
return false;
}
}
return true;
}
public interface StringFormatter<T> {
String format(T obj);
}
public static <T> String join(Collection<T> collection, String separator) {
return join(collection, separator, new StringFormatter<T>() {
@Override
public String format(T obj) {
return obj.toString();
}
});
}
public static <T> String join(Collection<T> collection, String separator,
StringFormatter<T> formatter) {
Iterator<T> iterator = collection.iterator();
// handle null, zero and one elements before building a buffer
if (iterator == null) {
return null;
}
if (!iterator.hasNext()) {
return EMPTY;
}
T first = iterator.next();
if (!iterator.hasNext()) {
return first == null ? "" : formatter.format(first);
}
// two or more elements
StringBuilder buf = new StringBuilder(256); // Java default is 16, probably too small
if (first != null) {
buf.append(formatter.format(first));
}
while (iterator.hasNext()) {
buf.append(separator);
T obj = iterator.next();
if (obj != null) {
buf.append(formatter.format(obj));
}
}
return buf.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import java.util.Collection;
import java.util.Iterator;
public class StringUtils {
public static final String EMPTY = "";
/**
* <p>
* Checks if a String is empty ("") or null.
* </p>
*
* <pre>
* StringUtils.isEmpty(null) = true
* StringUtils.isEmpty("") = true
* StringUtils.isEmpty(" ") = false
* StringUtils.isEmpty("bob") = false
* StringUtils.isEmpty(" bob ") = false
* </pre>
*
* <p>
* NOTE: This method changed in Lang version 2.0. It no longer trims the String. That functionality is available in isBlank().
* </p>
*
* @param str the String to check, may be null
* @return <code>true</code> if the String is empty or null
*/
public static boolean isEmpty(String str) {
return str == null || str.length() == 0;
}
public static boolean isContainEmpty(String... args){
if (args == null){
return false;
}
for (String arg: args){
if (arg == null || "".equals(arg)){
return true;
}
}
return false;
}
/**
* <p>
* Checks if a String is whitespace, empty ("") or null.
* </p>
*
* <pre>
* StringUtils.isBlank(null) = true
* StringUtils.isBlank("") = true
* StringUtils.isBlank(" ") = true
* StringUtils.isBlank("bob") = false
* StringUtils.isBlank(" bob ") = false
* </pre>
*
* @param str the String to check, may be null
* @return <code>true</code> if the String is null, empty or whitespace
*/
public static boolean isBlank(String str) {
int strLen;
if (str == null || (strLen = str.length()) == 0) {
return true;
}
for (int i = 0; i < strLen; i++) {
if (!Character.isWhitespace(str.charAt(i))) {
return false;
}
}
return true;
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String returning <code>null</code> if the String is empty
* ("") after the trim or if it is <code>null</code>.
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #stripToNull(String)}.
* </p>
*
* <pre>
* StringUtils.trimToNull(null) = null
* StringUtils.trimToNull("") = null
* StringUtils.trimToNull(" ") = null
* StringUtils.trimToNull("abc") = "abc"
* StringUtils.trimToNull(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed String, <code>null</code> if only chars <= 32, empty or null String input
* @since 2.0
*/
public static String trimToNull(String str) {
String ts = trim(str);
return isEmpty(ts) ? null : ts;
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String returning an empty String ("") if the String is empty
* ("") after the trim or if it is <code>null</code>.
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #stripToEmpty(String)}.
* </p>
*
* <pre>
* StringUtils.trimToEmpty(null) = ""
* StringUtils.trimToEmpty("") = ""
* StringUtils.trimToEmpty(" ") = ""
* StringUtils.trimToEmpty("abc") = "abc"
* StringUtils.trimToEmpty(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed String, or an empty String if <code>null</code> input
* @since 2.0
*/
public static String trimToEmpty(String str) {
return str == null ? EMPTY : str.trim();
}
/**
* <p>
* Removes control characters (char <= 32) from both ends of this String, handling <code>null</code> by returning
* <code>null</code>.
* </p>
*
* <p>
* The String is trimmed using {@link String#trim()}. Trim removes start and end characters <= 32. To strip whitespace use
* {@link #strip(String)}.
* </p>
*
* <p>
* To trim your choice of characters, use the {@link #strip(String, String)} methods.
* </p>
*
* <pre>
* StringUtils.trim(null) = null
* StringUtils.trim("") = ""
* StringUtils.trim(" ") = ""
* StringUtils.trim("abc") = "abc"
* StringUtils.trim(" abc ") = "abc"
* </pre>
*
* @param str the String to be trimmed, may be null
* @return the trimmed string, <code>null</code> if null String input
*/
public static String trim(String str) {
return str == null ? null : str.trim();
}
/**
* <p>
* Compares two Strings, returning <code>true</code> if they are equal.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case sensitive.
* </p>
*
* <pre>
* StringUtils.equals(null, null) = true
* StringUtils.equals(null, "abc") = false
* StringUtils.equals("abc", null) = false
* StringUtils.equals("abc", "abc") = true
* StringUtils.equals("abc", "ABC") = false
* </pre>
*
* @param str1 the first String, may be null
* @param str2 the second String, may be null
* @return <code>true</code> if the Strings are equal, case sensitive, or both <code>null</code>
* @see java.lang.String#equals(Object)
*/
public static boolean equals(String str1, String str2) {
return str1 == null ? str2 == null : str1.equals(str2);
}
/**
* <p>
* Compares two Strings, returning <code>true</code> if they are equal ignoring the case.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered equal. Comparison is case
* insensitive.
* </p>
*
* <pre>
* StringUtils.equalsIgnoreCase(null, null) = true
* StringUtils.equalsIgnoreCase(null, "abc") = false
* StringUtils.equalsIgnoreCase("abc", null) = false
* StringUtils.equalsIgnoreCase("abc", "abc") = true
* StringUtils.equalsIgnoreCase("abc", "ABC") = true
* </pre>
*
* @param str1 the first String, may be null
* @param str2 the second String, may be null
* @return <code>true</code> if the Strings are equal, case insensitive, or both <code>null</code>
* @see java.lang.String#equalsIgnoreCase(String)
*/
public static boolean equalsIgnoreCase(String str1, String str2) {
return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
}
/**
* <p>
* Check if a String starts with a specified prefix.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case sensitive.
* </p>
*
* <pre>
* StringUtils.startsWith(null, null) = true
* StringUtils.startsWith(null, "abc") = false
* StringUtils.startsWith("abcdef", null) = false
* StringUtils.startsWith("abcdef", "abc") = true
* StringUtils.startsWith("ABCDEF", "abc") = false
* </pre>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @return <code>true</code> if the String starts with the prefix, case sensitive, or both <code>null</code>
* @see java.lang.String#startsWith(String)
* @since 2.4
*/
public static boolean startsWith(String str, String prefix) {
return startsWith(str, prefix, false);
}
/**
* <p>
* Check if a String starts with a specified prefix (optionally case insensitive).
* </p>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @param ignoreCase inidicates whether the compare should ignore case (case insensitive) or not.
* @return <code>true</code> if the String starts with the prefix or both <code>null</code>
* @see java.lang.String#startsWith(String)
*/
private static boolean startsWith(String str, String prefix, boolean ignoreCase) {
if (str == null || prefix == null) {
return str == null && prefix == null;
}
if (prefix.length() > str.length()) {
return false;
}
return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length());
}
/**
* <p>
* Case insensitive check if a String starts with a specified prefix.
* </p>
*
* <p>
* <code>null</code>s are handled without exceptions. Two <code>null</code> references are considered to be equal. The comparison
* is case insensitive.
* </p>
*
* <pre>
* StringUtils.startsWithIgnoreCase(null, null) = true
* StringUtils.startsWithIgnoreCase(null, "abc") = false
* StringUtils.startsWithIgnoreCase("abcdef", null) = false
* StringUtils.startsWithIgnoreCase("abcdef", "abc") = true
* StringUtils.startsWithIgnoreCase("ABCDEF", "abc") = true
* </pre>
*
* @param str the String to check, may be null
* @param prefix the prefix to find, may be null
* @return <code>true</code> if the String starts with the prefix, case insensitive, or both <code>null</code>
* @see java.lang.String#startsWith(String)
* @since 2.4
*/
public static boolean startsWithIgnoreCase(String str, String prefix) {
return startsWith(str, prefix, true);
}
/**
* <p>
* Checks if the String contains only unicode digits. A decimal point is not a unicode digit and returns false.
* </p>
*
* <p>
* <code>null</code> will return <code>false</code>. An empty String (length()=0) will return <code>true</code>.
* </p>
*
* <pre>
* StringUtils.isNumeric(null) = false
* StringUtils.isNumeric("") = true
* StringUtils.isNumeric(" ") = false
* StringUtils.isNumeric("123") = true
* StringUtils.isNumeric("12 3") = false
* StringUtils.isNumeric("ab2c") = false
* StringUtils.isNumeric("12-3") = false
* StringUtils.isNumeric("12.3") = false
* </pre>
*
* @param str the String to check, may be null
* @return <code>true</code> if only contains digits, and is non-null
*/
public static boolean isNumeric(String str) {
if (str == null) {
return false;
}
int sz = str.length();
for (int i = 0; i < sz; i++) {
if (!Character.isDigit(str.charAt(i))) {
return false;
}
}
return true;
}
public interface StringFormatter<T> {
String format(T obj);
}
public static <T> String join(Collection<T> collection, String separator) {
return join(collection, separator, new StringFormatter<T>() {
@Override
public String format(T obj) {
return obj.toString();
}
});
}
public static <T> String join(Collection<T> collection, String separator,
StringFormatter<T> formatter) {
Iterator<T> iterator = collection.iterator();
// handle null, zero and one elements before building a buffer
if (iterator == null) {
return null;
}
if (!iterator.hasNext()) {
return EMPTY;
}
T first = iterator.next();
if (!iterator.hasNext()) {
return first == null ? "" : formatter.format(first);
}
// two or more elements
StringBuilder buf = new StringBuilder(256); // Java default is 16, probably too small
if (first != null) {
buf.append(formatter.format(first));
}
while (iterator.hasNext()) {
buf.append(separator);
T obj = iterator.next();
if (obj != null) {
buf.append(formatter.format(obj));
}
}
return buf.toString();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./.github/ISSUE_TEMPLATE/feature_request_zh.md | ---
name: 请求特性
about: 给这个项目提一些建议、想法
title: ''
labels: ''
assignees: ''
---
**你的特性请求和某个问题有关吗？请描述**
清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
**清晰简洁地描述一下你希望的解决方案**
**清晰简洁地描述一下这个特性的备选方案**
**其它背景**
在这里添加和这个特性请求有关的背景说明、截图 | ---
name: 请求特性
about: 给这个项目提一些建议、想法
title: ''
labels: ''
assignees: ''
---
**你的特性请求和某个问题有关吗？请描述**
清晰简洁地描述这个问题是什么。即，当碰到xxx时，总是感觉很麻烦
**清晰简洁地描述一下你希望的解决方案**
**清晰简洁地描述一下这个特性的备选方案**
**其它背景**
在这里添加和这个特性请求有关的背景说明、截图 | -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/NamespaceDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class NamespaceDTO extends BaseDTO{
private long id;
private String appId;
private String clusterName;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid Namespace format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String namespaceName;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class NamespaceDTO extends BaseDTO{
private long id;
private String appId;
private String clusterName;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid Namespace format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String namespaceName;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/spi/TestProcessorHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesConstants.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED = "apollo.bootstrap.eagerLoad.enabled";
String APOLLO_BOOTSTRAP_NAMESPACES = "apollo.bootstrap.namespaces";
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED = "apollo.bootstrap.eagerLoad.enabled";
String APOLLO_BOOTSTRAP_NAMESPACES = "apollo.bootstrap.namespaces";
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenAppDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
public class OpenAppDTO extends BaseDTO {
private String name;
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerEmail;
public String getAppId() {
return appId;
}
public String getName() {
return name;
}
public String getOrgId() {
return orgId;
}
public String getOrgName() {
return orgName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public String getOwnerName() {
return ownerName;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setName(String name) {
this.name = name;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("OpenAppDTO{");
sb.append("name='").append(name).append('\'');
sb.append(", appId='").append(appId).append('\'');
sb.append(", orgId='").append(orgId).append('\'');
sb.append(", orgName='").append(orgName).append('\'');
sb.append(", ownerName='").append(ownerName).append('\'');
sb.append(", ownerEmail='").append(ownerEmail).append('\'');
sb.append(", dataChangeCreatedBy='").append(dataChangeCreatedBy).append('\'');
sb.append(", dataChangeLastModifiedBy='").append(dataChangeLastModifiedBy).append('\'');
sb.append(", dataChangeCreatedTime=").append(dataChangeCreatedTime);
sb.append(", dataChangeLastModifiedTime=").append(dataChangeLastModifiedTime);
sb.append('}');
return sb.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
public class OpenAppDTO extends BaseDTO {
private String name;
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerEmail;
public String getAppId() {
return appId;
}
public String getName() {
return name;
}
public String getOrgId() {
return orgId;
}
public String getOrgName() {
return orgName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public String getOwnerName() {
return ownerName;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setName(String name) {
this.name = name;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("OpenAppDTO{");
sb.append("name='").append(name).append('\'');
sb.append(", appId='").append(appId).append('\'');
sb.append(", orgId='").append(orgId).append('\'');
sb.append(", orgName='").append(orgName).append('\'');
sb.append(", ownerName='").append(ownerName).append('\'');
sb.append(", ownerEmail='").append(ownerEmail).append('\'');
sb.append(", dataChangeCreatedBy='").append(dataChangeCreatedBy).append('\'');
sb.append(", dataChangeLastModifiedBy='").append(dataChangeLastModifiedBy).append('\'');
sb.append(", dataChangeCreatedTime=").append(dataChangeCreatedTime);
sb.append(", dataChangeLastModifiedTime=").append(dataChangeLastModifiedTime);
sb.append('}');
return sb.toString();
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/util/RoleUtilsTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.util;
import static org.junit.Assert.*;
import org.junit.Test;
public class RoleUtilsTest {
@Test
public void testExtractAppIdFromMasterRoleName() throws Exception {
assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp"));
assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp+xx"));
assertNull(RoleUtils.extractAppIdFromMasterRoleName("ReleaseNamespace+app1+application"));
}
@Test
public void testExtractAppIdFromRoleName() throws Exception {
assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("Master+someApp"));
assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("ModifyNamespace+someApp+xx"));
assertEquals("app1", RoleUtils.extractAppIdFromRoleName("ReleaseNamespace+app1+application"));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.util;
import static org.junit.Assert.*;
import org.junit.Test;
public class RoleUtilsTest {
@Test
public void testExtractAppIdFromMasterRoleName() throws Exception {
assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp"));
assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp+xx"));
assertNull(RoleUtils.extractAppIdFromMasterRoleName("ReleaseNamespace+app1+application"));
}
@Test
public void testExtractAppIdFromRoleName() throws Exception {
assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("Master+someApp"));
assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("ModifyNamespace+someApp+xx"));
assertEquals("app1", RoleUtils.extractAppIdFromRoleName("ReleaseNamespace+app1+application"));
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/NetUtil.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.google.common.io.CharStreams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
/**
* Created by gl49 on 2018/6/8.
*/
public class NetUtil {
private static final int DEFAULT_TIMEOUT_IN_SECONDS = 5000;
/**
* ping the url, return true if ping ok, false otherwise
*/
public static boolean pingUrl(String address) {
try {
URL urlObj = new URL(address);
HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
connection.setRequestMethod("GET");
connection.setUseCaches(false);
connection.setConnectTimeout(DEFAULT_TIMEOUT_IN_SECONDS);
connection.setReadTimeout(DEFAULT_TIMEOUT_IN_SECONDS);
int statusCode = connection.getResponseCode();
cleanUpConnection(connection);
return (200 <= statusCode && statusCode <= 399);
} catch (Throwable ignore) {
}
return false;
}
/**
* according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html, we should clean up the
* connection by reading the response body so that the connection could be reused.
*/
private static void cleanUpConnection(HttpURLConnection conn) {
InputStreamReader isr = null;
InputStreamReader esr = null;
try {
isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8);
CharStreams.toString(isr);
} catch (IOException e) {
InputStream errorStream = conn.getErrorStream();
if (errorStream != null) {
esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8);
try {
CharStreams.toString(esr);
} catch (IOException ioe) {
//ignore
}
}
} finally {
if (isr != null) {
try {
isr.close();
} catch (IOException ex) {
// ignore
}
}
if (esr != null) {
try {
esr.close();
} catch (IOException ex) {
// ignore
}
}
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.google.common.io.CharStreams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
/**
* Created by gl49 on 2018/6/8.
*/
public class NetUtil {
private static final int DEFAULT_TIMEOUT_IN_SECONDS = 5000;
/**
* ping the url, return true if ping ok, false otherwise
*/
public static boolean pingUrl(String address) {
try {
URL urlObj = new URL(address);
HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
connection.setRequestMethod("GET");
connection.setUseCaches(false);
connection.setConnectTimeout(DEFAULT_TIMEOUT_IN_SECONDS);
connection.setReadTimeout(DEFAULT_TIMEOUT_IN_SECONDS);
int statusCode = connection.getResponseCode();
cleanUpConnection(connection);
return (200 <= statusCode && statusCode <= 399);
} catch (Throwable ignore) {
}
return false;
}
/**
* according to https://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html, we should clean up the
* connection by reading the response body so that the connection could be reused.
*/
private static void cleanUpConnection(HttpURLConnection conn) {
InputStreamReader isr = null;
InputStreamReader esr = null;
try {
isr = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8);
CharStreams.toString(isr);
} catch (IOException e) {
InputStream errorStream = conn.getErrorStream();
if (errorStream != null) {
esr = new InputStreamReader(errorStream, StandardCharsets.UTF_8);
try {
CharStreams.toString(esr);
} catch (IOException ioe) {
//ignore
}
}
} finally {
if (isr != null) {
try {
isr.close();
} catch (IOException ex) {
// ignore
}
}
if (esr != null) {
try {
esr.close();
} catch (IOException ex) {
// ignore
}
}
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AppDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class AppDTO extends BaseDTO{
private long id;
private String name;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerDisplayName;
private String ownerEmail;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public String getOwnerDisplayName() {
return ownerDisplayName;
}
public void setOwnerDisplayName(String ownerDisplayName) {
this.ownerDisplayName = ownerDisplayName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class AppDTO extends BaseDTO{
private long id;
private String name;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerDisplayName;
private String ownerEmail;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public String getOwnerDisplayName() {
return ownerDisplayName;
}
public void setOwnerDisplayName(String ownerDisplayName) {
this.ownerDisplayName = ownerDisplayName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseHistoryService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseHistoryAPI;
import com.ctrip.framework.apollo.portal.enricher.adapter.BaseDtoUserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.util.RelativeDateFormat;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.util.CollectionUtils;
@Service
public class ReleaseHistoryService {
private final static Gson GSON = new Gson();
private final AdminServiceAPI.ReleaseHistoryAPI releaseHistoryAPI;
private final ReleaseService releaseService;
private final AdditionalUserInfoEnrichService additionalUserInfoEnrichService;
public ReleaseHistoryService(final ReleaseHistoryAPI releaseHistoryAPI,
final ReleaseService releaseService,
AdditionalUserInfoEnrichService additionalUserInfoEnrichService) {
this.releaseHistoryAPI = releaseHistoryAPI;
this.releaseService = releaseService;
this.additionalUserInfoEnrichService = additionalUserInfoEnrichService;
}
public ReleaseHistoryBO findLatestByReleaseIdAndOperation(Env env, long releaseId, int operation){
PageDTO<ReleaseHistoryDTO> pageDTO = releaseHistoryAPI.findByReleaseIdAndOperation(env, releaseId, operation, 0, 1);
if (pageDTO != null && pageDTO.hasContent()){
ReleaseHistoryDTO releaseHistory = pageDTO.getContent().get(0);
ReleaseDTO release = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return transformReleaseHistoryDTO2BO(releaseHistory, release);
}
return null;
}
public ReleaseHistoryBO findLatestByPreviousReleaseIdAndOperation(Env env, long previousReleaseId, int operation){
PageDTO<ReleaseHistoryDTO> pageDTO = releaseHistoryAPI.findByPreviousReleaseIdAndOperation(env, previousReleaseId, operation, 0, 1);
if (pageDTO != null && pageDTO.hasContent()){
ReleaseHistoryDTO releaseHistory = pageDTO.getContent().get(0);
ReleaseDTO release = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return transformReleaseHistoryDTO2BO(releaseHistory, release);
}
return null;
}
public List<ReleaseHistoryBO> findNamespaceReleaseHistory(String appId, Env env, String clusterName,
String namespaceName, int page, int size) {
PageDTO<ReleaseHistoryDTO> result = releaseHistoryAPI.findReleaseHistoriesByNamespace(appId, env, clusterName,
namespaceName, page, size);
if (result == null || !result.hasContent()) {
return Collections.emptyList();
}
List<ReleaseHistoryDTO> content = result.getContent();
Set<Long> releaseIds = new HashSet<>();
for (ReleaseHistoryDTO releaseHistoryDTO : content) {
long releaseId = releaseHistoryDTO.getReleaseId();
if (releaseId != 0) {
releaseIds.add(releaseId);
}
}
List<ReleaseDTO> releases = releaseService.findReleaseByIds(env, releaseIds);
return transformReleaseHistoryDTO2BO(content, releases);
}
private List<ReleaseHistoryBO> transformReleaseHistoryDTO2BO(List<ReleaseHistoryDTO> source,
List<ReleaseDTO> releases) {
if (CollectionUtils.isEmpty(source)) {
return Collections.emptyList();
}
this.additionalUserInfoEnrichService.enrichAdditionalUserInfo(source, BaseDtoUserInfoEnrichedAdapter::new);
Map<Long, ReleaseDTO> releasesMap = BeanUtils.mapByKey("id", releases);
List<ReleaseHistoryBO> bos = new ArrayList<>(source.size());
for (ReleaseHistoryDTO dto : source) {
ReleaseDTO release = releasesMap.get(dto.getReleaseId());
bos.add(transformReleaseHistoryDTO2BO(dto, release));
}
return bos;
}
private ReleaseHistoryBO transformReleaseHistoryDTO2BO(ReleaseHistoryDTO dto, ReleaseDTO release){
ReleaseHistoryBO bo = new ReleaseHistoryBO();
bo.setId(dto.getId());
bo.setAppId(dto.getAppId());
bo.setClusterName(dto.getClusterName());
bo.setNamespaceName(dto.getNamespaceName());
bo.setBranchName(dto.getBranchName());
bo.setReleaseId(dto.getReleaseId());
bo.setPreviousReleaseId(dto.getPreviousReleaseId());
bo.setOperator(dto.getDataChangeCreatedBy());
bo.setOperatorDisplayName(dto.getDataChangeCreatedByDisplayName());
bo.setOperation(dto.getOperation());
Date releaseTime = dto.getDataChangeLastModifiedTime();
bo.setReleaseTime(releaseTime);
bo.setReleaseTimeFormatted(RelativeDateFormat.format(releaseTime));
bo.setOperationContext(dto.getOperationContext());
//set release info
setReleaseInfoToReleaseHistoryBO(bo, release);
return bo;
}
private void setReleaseInfoToReleaseHistoryBO(ReleaseHistoryBO bo, ReleaseDTO release) {
if (release != null) {
bo.setReleaseTitle(release.getName());
bo.setReleaseComment(release.getComment());
bo.setReleaseAbandoned(release.isAbandoned());
Map<String, String> configuration = GSON.fromJson(release.getConfigurations(), GsonType.CONFIG);
List<EntityPair<String>> items = new ArrayList<>(configuration.size());
for (Map.Entry<String, String> entry : configuration.entrySet()) {
EntityPair<String> entityPair = new EntityPair<>(entry.getKey(), entry.getValue());
items.add(entityPair);
}
bo.setConfiguration(items);
} else {
bo.setReleaseTitle("no release information");
bo.setConfiguration(null);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.constants.GsonType;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.entity.EntityPair;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI.ReleaseHistoryAPI;
import com.ctrip.framework.apollo.portal.enricher.adapter.BaseDtoUserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.util.RelativeDateFormat;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.util.CollectionUtils;
@Service
public class ReleaseHistoryService {
private final static Gson GSON = new Gson();
private final AdminServiceAPI.ReleaseHistoryAPI releaseHistoryAPI;
private final ReleaseService releaseService;
private final AdditionalUserInfoEnrichService additionalUserInfoEnrichService;
public ReleaseHistoryService(final ReleaseHistoryAPI releaseHistoryAPI,
final ReleaseService releaseService,
AdditionalUserInfoEnrichService additionalUserInfoEnrichService) {
this.releaseHistoryAPI = releaseHistoryAPI;
this.releaseService = releaseService;
this.additionalUserInfoEnrichService = additionalUserInfoEnrichService;
}
public ReleaseHistoryBO findLatestByReleaseIdAndOperation(Env env, long releaseId, int operation){
PageDTO<ReleaseHistoryDTO> pageDTO = releaseHistoryAPI.findByReleaseIdAndOperation(env, releaseId, operation, 0, 1);
if (pageDTO != null && pageDTO.hasContent()){
ReleaseHistoryDTO releaseHistory = pageDTO.getContent().get(0);
ReleaseDTO release = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return transformReleaseHistoryDTO2BO(releaseHistory, release);
}
return null;
}
public ReleaseHistoryBO findLatestByPreviousReleaseIdAndOperation(Env env, long previousReleaseId, int operation){
PageDTO<ReleaseHistoryDTO> pageDTO = releaseHistoryAPI.findByPreviousReleaseIdAndOperation(env, previousReleaseId, operation, 0, 1);
if (pageDTO != null && pageDTO.hasContent()){
ReleaseHistoryDTO releaseHistory = pageDTO.getContent().get(0);
ReleaseDTO release = releaseService.findReleaseById(env, releaseHistory.getReleaseId());
return transformReleaseHistoryDTO2BO(releaseHistory, release);
}
return null;
}
public List<ReleaseHistoryBO> findNamespaceReleaseHistory(String appId, Env env, String clusterName,
String namespaceName, int page, int size) {
PageDTO<ReleaseHistoryDTO> result = releaseHistoryAPI.findReleaseHistoriesByNamespace(appId, env, clusterName,
namespaceName, page, size);
if (result == null || !result.hasContent()) {
return Collections.emptyList();
}
List<ReleaseHistoryDTO> content = result.getContent();
Set<Long> releaseIds = new HashSet<>();
for (ReleaseHistoryDTO releaseHistoryDTO : content) {
long releaseId = releaseHistoryDTO.getReleaseId();
if (releaseId != 0) {
releaseIds.add(releaseId);
}
}
List<ReleaseDTO> releases = releaseService.findReleaseByIds(env, releaseIds);
return transformReleaseHistoryDTO2BO(content, releases);
}
private List<ReleaseHistoryBO> transformReleaseHistoryDTO2BO(List<ReleaseHistoryDTO> source,
List<ReleaseDTO> releases) {
if (CollectionUtils.isEmpty(source)) {
return Collections.emptyList();
}
this.additionalUserInfoEnrichService.enrichAdditionalUserInfo(source, BaseDtoUserInfoEnrichedAdapter::new);
Map<Long, ReleaseDTO> releasesMap = BeanUtils.mapByKey("id", releases);
List<ReleaseHistoryBO> bos = new ArrayList<>(source.size());
for (ReleaseHistoryDTO dto : source) {
ReleaseDTO release = releasesMap.get(dto.getReleaseId());
bos.add(transformReleaseHistoryDTO2BO(dto, release));
}
return bos;
}
private ReleaseHistoryBO transformReleaseHistoryDTO2BO(ReleaseHistoryDTO dto, ReleaseDTO release){
ReleaseHistoryBO bo = new ReleaseHistoryBO();
bo.setId(dto.getId());
bo.setAppId(dto.getAppId());
bo.setClusterName(dto.getClusterName());
bo.setNamespaceName(dto.getNamespaceName());
bo.setBranchName(dto.getBranchName());
bo.setReleaseId(dto.getReleaseId());
bo.setPreviousReleaseId(dto.getPreviousReleaseId());
bo.setOperator(dto.getDataChangeCreatedBy());
bo.setOperatorDisplayName(dto.getDataChangeCreatedByDisplayName());
bo.setOperation(dto.getOperation());
Date releaseTime = dto.getDataChangeLastModifiedTime();
bo.setReleaseTime(releaseTime);
bo.setReleaseTimeFormatted(RelativeDateFormat.format(releaseTime));
bo.setOperationContext(dto.getOperationContext());
//set release info
setReleaseInfoToReleaseHistoryBO(bo, release);
return bo;
}
private void setReleaseInfoToReleaseHistoryBO(ReleaseHistoryBO bo, ReleaseDTO release) {
if (release != null) {
bo.setReleaseTitle(release.getName());
bo.setReleaseComment(release.getComment());
bo.setReleaseAbandoned(release.isAbandoned());
Map<String, String> configuration = GSON.fromJson(release.getConfigurations(), GsonType.CONFIG);
List<EntityPair<String>> items = new ArrayList<>(configuration.size());
for (Map.Entry<String, String> entry : configuration.entrySet()) {
EntityPair<String> entityPair = new EntityPair<>(entry.getKey(), entry.getValue());
items.add(entityPair);
}
bo.setConfiguration(items);
} else {
bo.setReleaseTitle("no release information");
bo.setConfiguration(null);
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AccessKeyDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
return secret;
}
public void setSecret(String secret) {
this.secret = secret;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
return secret;
}
public void setSecret(String secret) {
this.secret = secret;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCacheTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class AppNamespaceServiceWithCacheTest {
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Mock
private AppNamespaceRepository appNamespaceRepository;
@Mock
private BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
private Comparator<AppNamespace> appNamespaceComparator = (o1, o2) -> (int) (o1.getId() -
o2.getId());
@Before
public void setUp() throws Exception {
appNamespaceServiceWithCache = new AppNamespaceServiceWithCache(appNamespaceRepository, bizConfig);
scanInterval = 50;
scanIntervalTimeUnit = TimeUnit.MILLISECONDS;
when(bizConfig.appNamespaceCacheRebuildInterval()).thenReturn(scanInterval);
when(bizConfig.appNamespaceCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
when(bizConfig.appNamespaceCacheScanInterval()).thenReturn(scanInterval);
when(bizConfig.appNamespaceCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
Awaitility.reset();
Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit);
Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit);
}
@Test
public void testAppNamespace() throws Exception {
String someAppId = "someAppId";
String somePrivateNamespace = "somePrivateNamespace";
String somePrivateNamespaceWithIncorrectCase = somePrivateNamespace.toUpperCase();
long somePrivateNamespaceId = 1;
String yetAnotherPrivateNamespace = "anotherPrivateNamespace";
long yetAnotherPrivateNamespaceId = 4;
String anotherPublicNamespace = "anotherPublicNamespace";
long anotherPublicNamespaceId = 5;
String somePublicAppId = "somePublicAppId";
String somePublicNamespace = "somePublicNamespace";
String somePublicNamespaceWithIncorrectCase = somePublicNamespace.toUpperCase();
long somePublicNamespaceId = 2;
String anotherPrivateNamespace = "anotherPrivateNamespace";
long anotherPrivateNamespaceId = 3;
AppNamespace somePrivateAppNamespace = assembleAppNamespace(somePrivateNamespaceId,
someAppId, somePrivateNamespace, false);
AppNamespace somePublicAppNamespace = assembleAppNamespace(somePublicNamespaceId,
somePublicAppId, somePublicNamespace, true);
AppNamespace anotherPrivateAppNamespace = assembleAppNamespace(anotherPrivateNamespaceId,
somePublicAppId, anotherPrivateNamespace, false);
AppNamespace yetAnotherPrivateAppNamespace = assembleAppNamespace
(yetAnotherPrivateNamespaceId, someAppId, yetAnotherPrivateNamespace, false);
AppNamespace anotherPublicAppNamespace = assembleAppNamespace(anotherPublicNamespaceId,
someAppId, anotherPublicNamespace, true);
Set<String> someAppIdNamespaces = Sets.newHashSet
(somePrivateNamespace, yetAnotherPrivateNamespace, anotherPublicNamespace);
Set<String> someAppIdNamespacesWithIncorrectCase = Sets.newHashSet
(somePrivateNamespaceWithIncorrectCase, yetAnotherPrivateNamespace, anotherPublicNamespace);
Set<String> somePublicAppIdNamespaces = Sets.newHashSet(somePublicNamespace,
anotherPrivateNamespace);
Set<String> publicNamespaces = Sets.newHashSet(somePublicNamespace, anotherPublicNamespace);
Set<String> publicNamespacesWithIncorrectCase = Sets.newHashSet(somePublicNamespaceWithIncorrectCase,
anotherPublicNamespace);
List<Long> appNamespaceIds = Lists.newArrayList(somePrivateNamespaceId,
somePublicNamespaceId, anotherPrivateNamespaceId, yetAnotherPrivateNamespaceId,
anotherPublicNamespaceId);
List<AppNamespace> allAppNamespaces = Lists.newArrayList(somePrivateAppNamespace,
somePublicAppNamespace, anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace);
// Test init
appNamespaceServiceWithCache.afterPropertiesSet();
// Should have no record now
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace));
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces).isEmpty());
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase)
.isEmpty());
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace));
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces).isEmpty());
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace));
assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces).isEmpty());
assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespacesWithIncorrectCase).isEmpty());
// Add 1 private namespace and 1 public namespace
when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0)).thenReturn(Lists
.newArrayList(somePrivateAppNamespace, somePublicAppNamespace));
when(appNamespaceRepository.findAllById(Lists.newArrayList(somePrivateNamespaceId,
somePublicNamespaceId))).thenReturn(Lists.newArrayList(somePrivateAppNamespace,
somePublicAppNamespace));
await().untilAsserted(() -> {
assertEquals(somePrivateAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertEquals(somePrivateAppNamespace,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespace));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName
(somePublicNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames
(publicNamespaces));
check(Lists.newArrayList(somePublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames
(publicNamespacesWithIncorrectCase));
});
// Add 2 private namespaces and 1 public namespace
when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(somePublicNamespaceId))
.thenReturn(Lists.newArrayList(anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace));
when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(allAppNamespaces);
await().untilAsserted(() -> {
check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace), Lists
.newArrayList(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)));
check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces
(someAppId, someAppIdNamespaces));
check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace),
Lists.newArrayList(appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace)));
check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace),
appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces));
check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace),
Lists.newArrayList(
appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace),
appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)));
check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces));
});
// Update name
String somePrivateNamespaceNew = "somePrivateNamespaceNew";
AppNamespace somePrivateAppNamespaceNew = assembleAppNamespace(somePrivateAppNamespace.getId
(), somePrivateAppNamespace.getAppId(), somePrivateNamespaceNew, somePrivateAppNamespace
.isPublic());
somePrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(somePrivateAppNamespace.getDataChangeLastModifiedTime(), 1));
// Update appId
String someAppIdNew = "someAppIdNew";
AppNamespace yetAnotherPrivateAppNamespaceNew = assembleAppNamespace
(yetAnotherPrivateAppNamespace.getId(), someAppIdNew, yetAnotherPrivateAppNamespace
.getName(), false);
yetAnotherPrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(yetAnotherPrivateAppNamespace.getDataChangeLastModifiedTime(), 1));
// Update isPublic
AppNamespace somePublicAppNamespaceNew = assembleAppNamespace(somePublicAppNamespace
.getId(), somePublicAppNamespace.getAppId(), somePublicAppNamespace.getName(),
!somePublicAppNamespace.isPublic());
somePublicAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(somePublicAppNamespace.getDataChangeLastModifiedTime(), 1));
// Delete 1 private and 1 public
// should prepare for the case after deleted first, or in 2 rebuild intervals, all will be deleted
List<Long> appNamespaceIdsAfterDelete = Lists
.newArrayList(somePrivateNamespaceId, somePublicNamespaceId, yetAnotherPrivateNamespaceId);
when(appNamespaceRepository.findAllById(appNamespaceIdsAfterDelete)).thenReturn(Lists.newArrayList
(somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew));
// do delete
when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(Lists.newArrayList
(somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew));
await().untilAsserted(() -> {
assertNull(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertNull(appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace));
assertNull(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace));
check(Collections.emptyList(), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
assertEquals(somePublicAppNamespaceNew,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace));
check(Lists.newArrayList(somePublicAppNamespaceNew),
appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace));
check(Collections.emptyList(),
appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces));
assertEquals(somePrivateAppNamespaceNew,
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceNew));
check(Lists.newArrayList(somePrivateAppNamespaceNew), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, Sets.newHashSet(somePrivateNamespaceNew)));
assertEquals(yetAnotherPrivateAppNamespaceNew,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppIdNew, yetAnotherPrivateNamespace));
check(Lists.newArrayList(yetAnotherPrivateAppNamespaceNew), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppIdNew, Sets.newHashSet(yetAnotherPrivateNamespace)));
});
}
private void check(List<AppNamespace> someList, List<AppNamespace> anotherList) {
someList.sort(appNamespaceComparator);
anotherList.sort(appNamespaceComparator);
assertEquals(someList, anotherList);
}
private Date newDateWithDelta(Date date, int deltaInSeconds) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.SECOND, deltaInSeconds);
return calendar.getTime();
}
private AppNamespace assembleAppNamespace(long id, String appId, String name, boolean isPublic) {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setId(id);
appNamespace.setAppId(appId);
appNamespace.setName(name);
appNamespace.setPublic(isPublic);
appNamespace.setDataChangeLastModifiedTime(new Date());
return appNamespace;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class AppNamespaceServiceWithCacheTest {
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Mock
private AppNamespaceRepository appNamespaceRepository;
@Mock
private BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
private Comparator<AppNamespace> appNamespaceComparator = (o1, o2) -> (int) (o1.getId() -
o2.getId());
@Before
public void setUp() throws Exception {
appNamespaceServiceWithCache = new AppNamespaceServiceWithCache(appNamespaceRepository, bizConfig);
scanInterval = 50;
scanIntervalTimeUnit = TimeUnit.MILLISECONDS;
when(bizConfig.appNamespaceCacheRebuildInterval()).thenReturn(scanInterval);
when(bizConfig.appNamespaceCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
when(bizConfig.appNamespaceCacheScanInterval()).thenReturn(scanInterval);
when(bizConfig.appNamespaceCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit);
Awaitility.reset();
Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit);
Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit);
}
@Test
public void testAppNamespace() throws Exception {
String someAppId = "someAppId";
String somePrivateNamespace = "somePrivateNamespace";
String somePrivateNamespaceWithIncorrectCase = somePrivateNamespace.toUpperCase();
long somePrivateNamespaceId = 1;
String yetAnotherPrivateNamespace = "anotherPrivateNamespace";
long yetAnotherPrivateNamespaceId = 4;
String anotherPublicNamespace = "anotherPublicNamespace";
long anotherPublicNamespaceId = 5;
String somePublicAppId = "somePublicAppId";
String somePublicNamespace = "somePublicNamespace";
String somePublicNamespaceWithIncorrectCase = somePublicNamespace.toUpperCase();
long somePublicNamespaceId = 2;
String anotherPrivateNamespace = "anotherPrivateNamespace";
long anotherPrivateNamespaceId = 3;
AppNamespace somePrivateAppNamespace = assembleAppNamespace(somePrivateNamespaceId,
someAppId, somePrivateNamespace, false);
AppNamespace somePublicAppNamespace = assembleAppNamespace(somePublicNamespaceId,
somePublicAppId, somePublicNamespace, true);
AppNamespace anotherPrivateAppNamespace = assembleAppNamespace(anotherPrivateNamespaceId,
somePublicAppId, anotherPrivateNamespace, false);
AppNamespace yetAnotherPrivateAppNamespace = assembleAppNamespace
(yetAnotherPrivateNamespaceId, someAppId, yetAnotherPrivateNamespace, false);
AppNamespace anotherPublicAppNamespace = assembleAppNamespace(anotherPublicNamespaceId,
someAppId, anotherPublicNamespace, true);
Set<String> someAppIdNamespaces = Sets.newHashSet
(somePrivateNamespace, yetAnotherPrivateNamespace, anotherPublicNamespace);
Set<String> someAppIdNamespacesWithIncorrectCase = Sets.newHashSet
(somePrivateNamespaceWithIncorrectCase, yetAnotherPrivateNamespace, anotherPublicNamespace);
Set<String> somePublicAppIdNamespaces = Sets.newHashSet(somePublicNamespace,
anotherPrivateNamespace);
Set<String> publicNamespaces = Sets.newHashSet(somePublicNamespace, anotherPublicNamespace);
Set<String> publicNamespacesWithIncorrectCase = Sets.newHashSet(somePublicNamespaceWithIncorrectCase,
anotherPublicNamespace);
List<Long> appNamespaceIds = Lists.newArrayList(somePrivateNamespaceId,
somePublicNamespaceId, anotherPrivateNamespaceId, yetAnotherPrivateNamespaceId,
anotherPublicNamespaceId);
List<AppNamespace> allAppNamespaces = Lists.newArrayList(somePrivateAppNamespace,
somePublicAppNamespace, anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace);
// Test init
appNamespaceServiceWithCache.afterPropertiesSet();
// Should have no record now
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace));
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces).isEmpty());
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase)
.isEmpty());
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace));
assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces).isEmpty());
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespaceWithIncorrectCase));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace));
assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces).isEmpty());
assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespacesWithIncorrectCase).isEmpty());
// Add 1 private namespace and 1 public namespace
when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0)).thenReturn(Lists
.newArrayList(somePrivateAppNamespace, somePublicAppNamespace));
when(appNamespaceRepository.findAllById(Lists.newArrayList(somePrivateNamespaceId,
somePublicNamespaceId))).thenReturn(Lists.newArrayList(somePrivateAppNamespace,
somePublicAppNamespace));
await().untilAsserted(() -> {
assertEquals(somePrivateAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertEquals(somePrivateAppNamespace,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespace));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId,
somePublicNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces));
assertEquals(somePublicAppNamespace,
appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName
(somePublicNamespaceWithIncorrectCase));
check(Lists.newArrayList(somePublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames
(publicNamespaces));
check(Lists.newArrayList(somePublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames
(publicNamespacesWithIncorrectCase));
});
// Add 2 private namespaces and 1 public namespace
when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(somePublicNamespaceId))
.thenReturn(Lists.newArrayList(anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace));
when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(allAppNamespaces);
await().untilAsserted(() -> {
check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace), Lists
.newArrayList(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)));
check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace,
anotherPublicAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces
(someAppId, someAppIdNamespaces));
check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace),
Lists.newArrayList(appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace),
appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace)));
check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace),
appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces));
check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace),
Lists.newArrayList(
appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace),
appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)));
check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace),
appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces));
});
// Update name
String somePrivateNamespaceNew = "somePrivateNamespaceNew";
AppNamespace somePrivateAppNamespaceNew = assembleAppNamespace(somePrivateAppNamespace.getId
(), somePrivateAppNamespace.getAppId(), somePrivateNamespaceNew, somePrivateAppNamespace
.isPublic());
somePrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(somePrivateAppNamespace.getDataChangeLastModifiedTime(), 1));
// Update appId
String someAppIdNew = "someAppIdNew";
AppNamespace yetAnotherPrivateAppNamespaceNew = assembleAppNamespace
(yetAnotherPrivateAppNamespace.getId(), someAppIdNew, yetAnotherPrivateAppNamespace
.getName(), false);
yetAnotherPrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(yetAnotherPrivateAppNamespace.getDataChangeLastModifiedTime(), 1));
// Update isPublic
AppNamespace somePublicAppNamespaceNew = assembleAppNamespace(somePublicAppNamespace
.getId(), somePublicAppNamespace.getAppId(), somePublicAppNamespace.getName(),
!somePublicAppNamespace.isPublic());
somePublicAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta
(somePublicAppNamespace.getDataChangeLastModifiedTime(), 1));
// Delete 1 private and 1 public
// should prepare for the case after deleted first, or in 2 rebuild intervals, all will be deleted
List<Long> appNamespaceIdsAfterDelete = Lists
.newArrayList(somePrivateNamespaceId, somePublicNamespaceId, yetAnotherPrivateNamespaceId);
when(appNamespaceRepository.findAllById(appNamespaceIdsAfterDelete)).thenReturn(Lists.newArrayList
(somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew));
// do delete
when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(Lists.newArrayList
(somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew));
await().untilAsserted(() -> {
assertNull(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace));
assertNull(appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace));
assertNull(
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace));
check(Collections.emptyList(), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces));
assertEquals(somePublicAppNamespaceNew,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace));
check(Lists.newArrayList(somePublicAppNamespaceNew),
appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId,
somePublicAppIdNamespaces));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace));
assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace));
check(Collections.emptyList(),
appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces));
assertEquals(somePrivateAppNamespaceNew,
appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceNew));
check(Lists.newArrayList(somePrivateAppNamespaceNew), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppId, Sets.newHashSet(somePrivateNamespaceNew)));
assertEquals(yetAnotherPrivateAppNamespaceNew,
appNamespaceServiceWithCache
.findByAppIdAndNamespace(someAppIdNew, yetAnotherPrivateNamespace));
check(Lists.newArrayList(yetAnotherPrivateAppNamespaceNew), appNamespaceServiceWithCache
.findByAppIdAndNamespaces(someAppIdNew, Sets.newHashSet(yetAnotherPrivateNamespace)));
});
}
private void check(List<AppNamespace> someList, List<AppNamespace> anotherList) {
someList.sort(appNamespaceComparator);
anotherList.sort(appNamespaceComparator);
assertEquals(someList, anotherList);
}
private Date newDateWithDelta(Date date, int deltaInSeconds) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.SECOND, deltaInSeconds);
return calendar.getTime();
}
private AppNamespace assembleAppNamespace(long id, String appId, String name, boolean isPublic) {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setId(id);
appNamespace.setAppId(appId);
appNamespace.setName(name);
appNamespace.setPublic(isPublic);
appNamespace.setDataChangeLastModifiedTime(new Date());
return appNamespace;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/signature/HmacSha1UtilsTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author nisiyong
*/
public class HmacSha1UtilsTest {
@Test
public void testSignString() {
String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1";
String accessKeySecret = "df23df3f59884980844ff3dada30fa97";
String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret);
String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE=";
assertEquals(expectedSignature, actualSignature);
}
} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.signature;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author nisiyong
*/
public class HmacSha1UtilsTest {
@Test
public void testSignString() {
String stringToSign = "1576478257344\n/configs/100004458/default/application?ip=10.0.0.1";
String accessKeySecret = "df23df3f59884980844ff3dada30fa97";
String actualSignature = HmacSha1Utils.signString(stringToSign, accessKeySecret);
String expectedSignature = "EoKyziXvKqzHgwx+ijDJwgVTDgE=";
assertEquals(expectedSignature, actualSignature);
}
} | -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/UserService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
public interface UserService {
List<UserInfo> searchUsers(String keyword, int offset, int limit);
UserInfo findByUserId(String userId);
List<UserInfo> findByUserIds(List<String> userIds);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.List;
/**
* @author Jason Song([email protected])
*/
public interface UserService {
List<UserInfo> searchUsers(String keyword, int offset, int limit);
UserInfo findByUserId(String userId);
List<UserInfo> findByUserIds(List<String> userIds);
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/tracer/internals/MockMessageProducerManager.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.MessageProducerManager;
/**
* @author Jason Song([email protected])
*/
public class MockMessageProducerManager implements MessageProducerManager {
private static MessageProducer s_producer;
@Override
public MessageProducer getProducer() {
return s_producer;
}
public static void setProducer(MessageProducer producer) {
s_producer = producer;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.MessageProducerManager;
/**
* @author Jason Song([email protected])
*/
public class MockMessageProducerManager implements MessageProducerManager {
private static MessageProducer s_producer;
@Override
public MessageProducer getProducer() {
return s_producer;
}
public static void setProducer(MessageProducer producer) {
s_producer = producer;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/InstanceConfigControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.common.dto.InstanceDTO;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigControllerTest {
private InstanceConfigController instanceConfigController;
@Mock
private ReleaseService releaseService;
@Mock
private InstanceService instanceService;
private Pageable pageable;
@Before
public void setUp() throws Exception {
instanceConfigController = new InstanceConfigController(releaseService, instanceService);
pageable = PageRequest.of(0, 2);
}
@Test
public void getByRelease() throws Exception {
long someReleaseId = 1;
long someInstanceId = 1;
long anotherInstanceId = 2;
String someReleaseKey = "someKey";
Release someRelease = new Release();
someRelease.setReleaseKey(someReleaseKey);
String someAppId = "someAppId";
String anotherAppId = "anotherAppId";
String someCluster = "someCluster";
String someDataCenter = "someDC";
String someConfigAppId = "someConfigAppId";
String someConfigNamespace = "someNamespace";
String someIp = "someIp";
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
when(releaseService.findOne(someReleaseId)).thenReturn(someRelease);
InstanceConfig someInstanceConfig = assembleInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace, someReleaseKey, someReleaseDeliveryTime);
InstanceConfig anotherInstanceConfig = assembleInstanceConfig(anotherInstanceId,
someConfigAppId, someConfigNamespace, someReleaseKey, anotherReleaseDeliveryTime);
List<InstanceConfig> instanceConfigs = Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig);
Page<InstanceConfig> instanceConfigPage = new PageImpl<>(instanceConfigs, pageable,
instanceConfigs.size());
when(instanceService.findActiveInstanceConfigsByReleaseKey(someReleaseKey, pageable))
.thenReturn(instanceConfigPage);
Instance someInstance = assembleInstance(someInstanceId, someAppId,
someCluster, someDataCenter, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, anotherAppId,
someCluster, someDataCenter, someIp);
List<Instance> instances = Lists.newArrayList(someInstance, anotherInstance);
Set<Long> instanceIds = Sets.newHashSet(someInstanceId, anotherInstanceId);
when(instanceService.findInstancesByIds(instanceIds))
.thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getByRelease(someReleaseId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(1, someInstanceDto.getConfigs().size());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(1, anotherInstanceDto.getConfigs().size());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
}
@Test(expected = NotFoundException.class)
public void testGetByReleaseWhenReleaseIsNotFound() throws Exception {
long someReleaseIdNotExists = 1;
when(releaseService.findOne(someReleaseIdNotExists)).thenReturn(null);
instanceConfigController.getByRelease(someReleaseIdNotExists, pageable);
}
@Test
public void testGetByReleasesNotIn() throws Exception {
String someConfigAppId = "someConfigAppId";
String someConfigClusterName = "someConfigClusterName";
String someConfigNamespaceName = "someConfigNamespaceName";
long someReleaseId = 1;
long anotherReleaseId = 2;
String releaseIds = Joiner.on(",").join(someReleaseId, anotherReleaseId);
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
Release someRelease = mock(Release.class);
Release anotherRelease = mock(Release.class);
String someReleaseKey = "someReleaseKey";
String anotherReleaseKey = "anotherReleaseKey";
when(someRelease.getReleaseKey()).thenReturn(someReleaseKey);
when(anotherRelease.getReleaseKey()).thenReturn(anotherReleaseKey);
when(releaseService.findByReleaseIds(Sets.newHashSet(someReleaseId, anotherReleaseId)))
.thenReturn(Lists.newArrayList(someRelease, anotherRelease));
long someInstanceId = 1;
long anotherInstanceId = 2;
String someInstanceConfigReleaseKey = "someInstanceConfigReleaseKey";
String anotherInstanceConfigReleaseKey = "anotherInstanceConfigReleaseKey";
InstanceConfig someInstanceConfig = mock(InstanceConfig.class);
InstanceConfig anotherInstanceConfig = mock(InstanceConfig.class);
when(someInstanceConfig.getInstanceId()).thenReturn(someInstanceId);
when(anotherInstanceConfig.getInstanceId()).thenReturn(anotherInstanceId);
when(someInstanceConfig.getReleaseKey()).thenReturn(someInstanceConfigReleaseKey);
when(anotherInstanceConfig.getReleaseKey()).thenReturn(anotherInstanceConfigReleaseKey);
when(someInstanceConfig.getReleaseDeliveryTime()).thenReturn(someReleaseDeliveryTime);
when(anotherInstanceConfig.getReleaseDeliveryTime()).thenReturn(anotherReleaseDeliveryTime);
when(instanceService.findInstanceConfigsByNamespaceWithReleaseKeysNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, Sets.newHashSet(someReleaseKey,
anotherReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig));
String someInstanceAppId = "someInstanceAppId";
String someInstanceClusterName = "someInstanceClusterName";
String someInstanceNamespaceName = "someInstanceNamespaceName";
String someIp = "someIp";
String anotherIp = "anotherIp";
Instance someInstance = assembleInstance(someInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, anotherIp);
when(instanceService.findInstancesByIds(Sets.newHashSet(someInstanceId, anotherInstanceId)))
.thenReturn(Lists.newArrayList(someInstance, anotherInstance));
Release someInstanceConfigRelease = new Release();
someInstanceConfigRelease.setReleaseKey(someInstanceConfigReleaseKey);
Release anotherInstanceConfigRelease = new Release();
anotherInstanceConfigRelease.setReleaseKey(anotherInstanceConfigReleaseKey);
when(releaseService.findByReleaseKeys(Sets.newHashSet(someInstanceConfigReleaseKey,
anotherInstanceConfigReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfigRelease,
anotherInstanceConfigRelease));
List<InstanceDTO> result = instanceConfigController.getByReleasesNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, releaseIds);
assertEquals(2, result.size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(someInstanceConfigReleaseKey, someInstanceDto.getConfigs().get(0).getRelease()
.getReleaseKey());
assertEquals(anotherInstanceConfigReleaseKey, anotherInstanceDto.getConfigs().get(0)
.getRelease()
.getReleaseKey());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0)
.getReleaseDeliveryTime());
}
@Test
public void testGetInstancesByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespace(someAppId, someClusterName, someNamespaceName,
pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, null, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesByNamespaceAndInstanceAppId() throws Exception {
String someInstanceAppId = "someInstanceAppId";
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespaceAndInstanceAppId(someInstanceAppId, someAppId,
someClusterName, someNamespaceName, pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, someInstanceAppId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesCountByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
Page<Instance> instances = new PageImpl<>(Collections.emptyList(), pageable, 2);
when(instanceService.findInstancesByNamespace(eq(someAppId), eq(someClusterName),
eq(someNamespaceName), any(Pageable.class))).thenReturn(instances);
long result = instanceConfigController.getInstancesCountByNamespace(someAppId,
someClusterName, someNamespaceName);
assertEquals(2, result);
}
private void verifyInstance(Instance instance, InstanceDTO instanceDTO) {
assertEquals(instance.getId(), instanceDTO.getId());
assertEquals(instance.getAppId(), instanceDTO.getAppId());
assertEquals(instance.getClusterName(), instanceDTO.getClusterName());
assertEquals(instance.getDataCenter(), instanceDTO.getDataCenter());
assertEquals(instance.getIp(), instanceDTO.getIp());
assertEquals(instance.getDataChangeCreatedTime(), instanceDTO.getDataChangeCreatedTime());
}
private Instance assembleInstance(long instanceId, String appId, String clusterName, String
dataCenter, String ip) {
Instance instance = new Instance();
instance.setId(instanceId);
instance.setAppId(appId);
instance.setIp(ip);
instance.setClusterName(clusterName);
instance.setDataCenter(dataCenter);
instance.setDataChangeCreatedTime(new Date());
return instance;
}
private InstanceConfig assembleInstanceConfig(long instanceId, String configAppId, String
configNamespaceName, String releaseKey, Date releaseDeliveryTime) {
InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setInstanceId(instanceId);
instanceConfig.setConfigAppId(configAppId);
instanceConfig.setConfigNamespaceName(configNamespaceName);
instanceConfig.setReleaseKey(releaseKey);
instanceConfig.setDataChangeLastModifiedTime(new Date());
instanceConfig.setReleaseDeliveryTime(releaseDeliveryTime);
return instanceConfig;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import com.ctrip.framework.apollo.biz.service.ReleaseService;
import com.ctrip.framework.apollo.common.dto.InstanceDTO;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author Jason Song([email protected])
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigControllerTest {
private InstanceConfigController instanceConfigController;
@Mock
private ReleaseService releaseService;
@Mock
private InstanceService instanceService;
private Pageable pageable;
@Before
public void setUp() throws Exception {
instanceConfigController = new InstanceConfigController(releaseService, instanceService);
pageable = PageRequest.of(0, 2);
}
@Test
public void getByRelease() throws Exception {
long someReleaseId = 1;
long someInstanceId = 1;
long anotherInstanceId = 2;
String someReleaseKey = "someKey";
Release someRelease = new Release();
someRelease.setReleaseKey(someReleaseKey);
String someAppId = "someAppId";
String anotherAppId = "anotherAppId";
String someCluster = "someCluster";
String someDataCenter = "someDC";
String someConfigAppId = "someConfigAppId";
String someConfigNamespace = "someNamespace";
String someIp = "someIp";
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
when(releaseService.findOne(someReleaseId)).thenReturn(someRelease);
InstanceConfig someInstanceConfig = assembleInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace, someReleaseKey, someReleaseDeliveryTime);
InstanceConfig anotherInstanceConfig = assembleInstanceConfig(anotherInstanceId,
someConfigAppId, someConfigNamespace, someReleaseKey, anotherReleaseDeliveryTime);
List<InstanceConfig> instanceConfigs = Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig);
Page<InstanceConfig> instanceConfigPage = new PageImpl<>(instanceConfigs, pageable,
instanceConfigs.size());
when(instanceService.findActiveInstanceConfigsByReleaseKey(someReleaseKey, pageable))
.thenReturn(instanceConfigPage);
Instance someInstance = assembleInstance(someInstanceId, someAppId,
someCluster, someDataCenter, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, anotherAppId,
someCluster, someDataCenter, someIp);
List<Instance> instances = Lists.newArrayList(someInstance, anotherInstance);
Set<Long> instanceIds = Sets.newHashSet(someInstanceId, anotherInstanceId);
when(instanceService.findInstancesByIds(instanceIds))
.thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getByRelease(someReleaseId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(1, someInstanceDto.getConfigs().size());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(1, anotherInstanceDto.getConfigs().size());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
}
@Test(expected = NotFoundException.class)
public void testGetByReleaseWhenReleaseIsNotFound() throws Exception {
long someReleaseIdNotExists = 1;
when(releaseService.findOne(someReleaseIdNotExists)).thenReturn(null);
instanceConfigController.getByRelease(someReleaseIdNotExists, pageable);
}
@Test
public void testGetByReleasesNotIn() throws Exception {
String someConfigAppId = "someConfigAppId";
String someConfigClusterName = "someConfigClusterName";
String someConfigNamespaceName = "someConfigNamespaceName";
long someReleaseId = 1;
long anotherReleaseId = 2;
String releaseIds = Joiner.on(",").join(someReleaseId, anotherReleaseId);
Date someReleaseDeliveryTime = new Date();
Date anotherReleaseDeliveryTime = new Date();
Release someRelease = mock(Release.class);
Release anotherRelease = mock(Release.class);
String someReleaseKey = "someReleaseKey";
String anotherReleaseKey = "anotherReleaseKey";
when(someRelease.getReleaseKey()).thenReturn(someReleaseKey);
when(anotherRelease.getReleaseKey()).thenReturn(anotherReleaseKey);
when(releaseService.findByReleaseIds(Sets.newHashSet(someReleaseId, anotherReleaseId)))
.thenReturn(Lists.newArrayList(someRelease, anotherRelease));
long someInstanceId = 1;
long anotherInstanceId = 2;
String someInstanceConfigReleaseKey = "someInstanceConfigReleaseKey";
String anotherInstanceConfigReleaseKey = "anotherInstanceConfigReleaseKey";
InstanceConfig someInstanceConfig = mock(InstanceConfig.class);
InstanceConfig anotherInstanceConfig = mock(InstanceConfig.class);
when(someInstanceConfig.getInstanceId()).thenReturn(someInstanceId);
when(anotherInstanceConfig.getInstanceId()).thenReturn(anotherInstanceId);
when(someInstanceConfig.getReleaseKey()).thenReturn(someInstanceConfigReleaseKey);
when(anotherInstanceConfig.getReleaseKey()).thenReturn(anotherInstanceConfigReleaseKey);
when(someInstanceConfig.getReleaseDeliveryTime()).thenReturn(someReleaseDeliveryTime);
when(anotherInstanceConfig.getReleaseDeliveryTime()).thenReturn(anotherReleaseDeliveryTime);
when(instanceService.findInstanceConfigsByNamespaceWithReleaseKeysNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, Sets.newHashSet(someReleaseKey,
anotherReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfig,
anotherInstanceConfig));
String someInstanceAppId = "someInstanceAppId";
String someInstanceClusterName = "someInstanceClusterName";
String someInstanceNamespaceName = "someInstanceNamespaceName";
String someIp = "someIp";
String anotherIp = "anotherIp";
Instance someInstance = assembleInstance(someInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someInstanceAppId,
someInstanceClusterName,
someInstanceNamespaceName, anotherIp);
when(instanceService.findInstancesByIds(Sets.newHashSet(someInstanceId, anotherInstanceId)))
.thenReturn(Lists.newArrayList(someInstance, anotherInstance));
Release someInstanceConfigRelease = new Release();
someInstanceConfigRelease.setReleaseKey(someInstanceConfigReleaseKey);
Release anotherInstanceConfigRelease = new Release();
anotherInstanceConfigRelease.setReleaseKey(anotherInstanceConfigReleaseKey);
when(releaseService.findByReleaseKeys(Sets.newHashSet(someInstanceConfigReleaseKey,
anotherInstanceConfigReleaseKey))).thenReturn(Lists.newArrayList(someInstanceConfigRelease,
anotherInstanceConfigRelease));
List<InstanceDTO> result = instanceConfigController.getByReleasesNotIn(someConfigAppId,
someConfigClusterName, someConfigNamespaceName, releaseIds);
assertEquals(2, result.size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
assertEquals(someInstanceConfigReleaseKey, someInstanceDto.getConfigs().get(0).getRelease()
.getReleaseKey());
assertEquals(anotherInstanceConfigReleaseKey, anotherInstanceDto.getConfigs().get(0)
.getRelease()
.getReleaseKey());
assertEquals(someReleaseDeliveryTime, someInstanceDto.getConfigs().get(0).getReleaseDeliveryTime());
assertEquals(anotherReleaseDeliveryTime, anotherInstanceDto.getConfigs().get(0)
.getReleaseDeliveryTime());
}
@Test
public void testGetInstancesByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespace(someAppId, someClusterName, someNamespaceName,
pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, null, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesByNamespaceAndInstanceAppId() throws Exception {
String someInstanceAppId = "someInstanceAppId";
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
String someIp = "someIp";
long someInstanceId = 1;
long anotherInstanceId = 2;
Instance someInstance = assembleInstance(someInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Instance anotherInstance = assembleInstance(anotherInstanceId, someAppId, someClusterName,
someNamespaceName, someIp);
Page<Instance> instances = new PageImpl<>(Lists.newArrayList(someInstance, anotherInstance),
pageable, 2);
when(instanceService.findInstancesByNamespaceAndInstanceAppId(someInstanceAppId, someAppId,
someClusterName, someNamespaceName, pageable)).thenReturn(instances);
PageDTO<InstanceDTO> result = instanceConfigController.getInstancesByNamespace(someAppId,
someClusterName, someNamespaceName, someInstanceAppId, pageable);
assertEquals(2, result.getContent().size());
InstanceDTO someInstanceDto = null;
InstanceDTO anotherInstanceDto = null;
for (InstanceDTO instanceDTO : result.getContent()) {
if (instanceDTO.getId() == someInstanceId) {
someInstanceDto = instanceDTO;
} else if (instanceDTO.getId() == anotherInstanceId) {
anotherInstanceDto = instanceDTO;
}
}
verifyInstance(someInstance, someInstanceDto);
verifyInstance(anotherInstance, anotherInstanceDto);
}
@Test
public void testGetInstancesCountByNamespace() throws Exception {
String someAppId = "someAppId";
String someClusterName = "someClusterName";
String someNamespaceName = "someNamespaceName";
Page<Instance> instances = new PageImpl<>(Collections.emptyList(), pageable, 2);
when(instanceService.findInstancesByNamespace(eq(someAppId), eq(someClusterName),
eq(someNamespaceName), any(Pageable.class))).thenReturn(instances);
long result = instanceConfigController.getInstancesCountByNamespace(someAppId,
someClusterName, someNamespaceName);
assertEquals(2, result);
}
private void verifyInstance(Instance instance, InstanceDTO instanceDTO) {
assertEquals(instance.getId(), instanceDTO.getId());
assertEquals(instance.getAppId(), instanceDTO.getAppId());
assertEquals(instance.getClusterName(), instanceDTO.getClusterName());
assertEquals(instance.getDataCenter(), instanceDTO.getDataCenter());
assertEquals(instance.getIp(), instanceDTO.getIp());
assertEquals(instance.getDataChangeCreatedTime(), instanceDTO.getDataChangeCreatedTime());
}
private Instance assembleInstance(long instanceId, String appId, String clusterName, String
dataCenter, String ip) {
Instance instance = new Instance();
instance.setId(instanceId);
instance.setAppId(appId);
instance.setIp(ip);
instance.setClusterName(clusterName);
instance.setDataCenter(dataCenter);
instance.setDataChangeCreatedTime(new Date());
return instance;
}
private InstanceConfig assembleInstanceConfig(long instanceId, String configAppId, String
configNamespaceName, String releaseKey, Date releaseDeliveryTime) {
InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setInstanceId(instanceId);
instanceConfig.setConfigAppId(configAppId);
instanceConfig.setConfigNamespaceName(configNamespaceName);
instanceConfig.setReleaseKey(releaseKey);
instanceConfig.setDataChangeLastModifiedTime(new Date());
instanceConfig.setReleaseDeliveryTime(releaseDeliveryTime);
return instanceConfig;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/SpringSecurityUserInfoHolder.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.security.Principal;
public class SpringSecurityUserInfoHolder implements UserInfoHolder {
private final UserService userService;
public SpringSecurityUserInfoHolder(UserService userService) {
this.userService = userService;
}
@Override
public UserInfo getUser() {
String userId = this.getCurrentUsername();
UserInfo userInfoFound = this.userService.findByUserId(userId);
if (userInfoFound != null) {
return userInfoFound;
}
UserInfo userInfo = new UserInfo();
userInfo.setUserId(userId);
return userInfo;
}
private String getCurrentUsername() {
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
if (principal instanceof UserDetails) {
return ((UserDetails) principal).getUsername();
}
if (principal instanceof Principal) {
return ((Principal) principal).getName();
}
return String.valueOf(principal);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.spi.UserService;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import java.security.Principal;
public class SpringSecurityUserInfoHolder implements UserInfoHolder {
private final UserService userService;
public SpringSecurityUserInfoHolder(UserService userService) {
this.userService = userService;
}
@Override
public UserInfo getUser() {
String userId = this.getCurrentUsername();
UserInfo userInfoFound = this.userService.findByUserId(userId);
if (userInfoFound != null) {
return userInfoFound;
}
UserInfo userInfo = new UserInfo();
userInfo.setUserId(userId);
return userInfo;
}
private String getCurrentUsername() {
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
if (principal instanceof UserDetails) {
return ((UserDetails) principal).getUsername();
}
if (principal instanceof Principal) {
return ((Principal) principal).getName();
}
return String.valueOf(principal);
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/PermissionCondition.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
public class PermissionCondition {
private boolean hasPermission;
public boolean hasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
public class PermissionCondition {
private boolean hasPermission;
public boolean hasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/parser/Parsers.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo;
import com.google.common.base.Strings;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean;
import com.google.common.base.Charsets;
/**
* @author Jason Song([email protected])
*/
public class XmlApplication {
public static void main(String[] args) throws IOException {
ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
XmlBean xmlBean = context.getBean(XmlBean.class);
System.out.println("XmlApplication Demo. Input any key except quit to print the values. Input quit to exit.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (!Strings.isNullOrEmpty(input) && input.trim().equalsIgnoreCase("quit")) {
System.exit(0);
}
System.out.println(xmlBean.toString());
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.xmlConfigDemo;
import com.google.common.base.Strings;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean;
import com.google.common.base.Charsets;
/**
* @author Jason Song([email protected])
*/
public class XmlApplication {
public static void main(String[] args) throws IOException {
ApplicationContext context = new ClassPathXmlApplicationContext("spring.xml");
XmlBean xmlBean = context.getBean(XmlBean.class);
System.out.println("XmlApplication Demo. Input any key except quit to print the values. Input quit to exit.");
while (true) {
System.out.print("> ");
String input = new BufferedReader(new InputStreamReader(System.in, Charsets.UTF_8)).readLine();
if (!Strings.isNullOrEmpty(input) && input.trim().equalsIgnoreCase("quit")) {
System.exit(0);
}
System.out.println(xmlBean.toString());
}
}
}
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/apollo-portal-server/Dockerfile | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash tzdata && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
mkdir -p /apollo-portal-server
ADD . /apollo-portal-server/
ENV APOLLO_PORTAL_SERVICE_NAME="service-apollo-portal-server.sre"
EXPOSE 8070
CMD ["/apollo-portal-server/scripts/startup-kubernetes.sh"]
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash tzdata && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
mkdir -p /apollo-portal-server
ADD . /apollo-portal-server/
ENV APOLLO_PORTAL_SERVICE_NAME="service-apollo-portal-server.sre"
EXPOSE 8070
CMD ["/apollo-portal-server/scripts/startup-kubernetes.sh"]
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/en/images/community/jetbrains.svg | <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
>
<g>
<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
<stop offset="0" style="stop-color:#FCEE39"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.57" style="stop-color:#F26F4E"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
<stop offset="0" style="stop-color:#7C59A4"/>
<stop offset="0.3852" style="stop-color:#AF4C92"/>
<stop offset="0.7654" style="stop-color:#DC4183"/>
<stop offset="0.957" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.364" style="stop-color:#EE4E72"/>
<stop offset="1" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
<g id="XMLID_3008_">
<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
<g id="XMLID_3009_">
<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
L45.3,43.8z"/>
<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
l-1.5,0v2H50.6z"/>
<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
/>
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
C76.1,62.5,74.7,62,73.7,61.1z"/>
</g>
</g>
</g>
</svg>
| <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
>
<g>
<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
<stop offset="0" style="stop-color:#FCEE39"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.57" style="stop-color:#F26F4E"/>
<stop offset="1" style="stop-color:#F37B3D"/>
</linearGradient>
<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
<stop offset="0" style="stop-color:#7C59A4"/>
<stop offset="0.3852" style="stop-color:#AF4C92"/>
<stop offset="0.7654" style="stop-color:#DC4183"/>
<stop offset="0.957" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
<stop offset="0" style="stop-color:#EF5A6B"/>
<stop offset="0.364" style="stop-color:#EE4E72"/>
<stop offset="1" style="stop-color:#ED3D7D"/>
</linearGradient>
<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
<g id="XMLID_3008_">
<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
<g id="XMLID_3009_">
<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
L45.3,43.8z"/>
<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
l-1.5,0v2H50.6z"/>
<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
/>
<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
C76.1,62.5,74.7,62,73.7,61.1z"/>
</g>
</g>
</g>
</svg>
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/resources/META-INF/spring.schemas | http\://www.ctrip.com/schema/apollo-1.0.0.xsd=/META-INF/apollo-1.0.0.xsd
http\://www.ctrip.com/schema/apollo.xsd=/META-INF/apollo-1.0.0.xsd
| http\://www.ctrip.com/schema/apollo-1.0.0.xsd=/META-INF/apollo-1.0.0.xsd
http\://www.ctrip.com/schema/apollo.xsd=/META-INF/apollo-1.0.0.xsd
| -1 |
apolloconfig/apollo | 3,666 | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent | ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| Anilople | 2021-05-08T11:52:42Z | 2021-06-11T00:09:40Z | ff38fe06208a3a1e07ce59f8699703cb33bcee2e | 44cf586c4b5b1b9df8c63a49f4b1d3b9d4d01baa | feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent. ## What's the purpose of this PR
Let user can get interestedChangedKeys through ConfigChangeEvent
## Which issue(s) this PR fixes:
Fixes #3664
## Brief changelog
resolve interestedChangedKeys in class AbstractConfig
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-demo/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-demo</artifactId>
<name>Apollo Demo</name>
<packaging>jar</packaging>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<!-- for spring demo -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<!-- for spring boot demo -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<!-- for refresh scope demo -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<!-- take over jcl -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apollo</artifactId>
<groupId>com.ctrip.framework.apollo</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-demo</artifactId>
<name>Apollo Demo</name>
<packaging>jar</packaging>
<properties>
<java.version>1.7</java.version>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<!-- for spring demo -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<!-- for spring boot demo -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<!-- for refresh scope demo -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<!-- take over jcl -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
</project>
| -1 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.