From 5ac63a78f56d21cc87613684e62e567b4c1316fb Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 16 Nov 2019 14:52:17 -0500 Subject: [PATCH] better state validation --- java_tools/ConfigDefinition.jar | Bin 115441 -> 115515 bytes .../rusefi/board_generator/BoardReader.java | 3 +++ 2 files changed, 3 insertions(+) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b937768f747ec185533abd5fb25a628e944e6acc..5a67e3b0f77b9c271483e23aa1b400b3cf5873a8 100644 GIT binary patch delta 6447 zcmeHL`8(9>8=iNFWZ&29vQPGyNVdqX#hfCgq;rTYk?j}?5m81yCyXtogt0Fn*$tI_ zjj^RHp%I~@@|{Ij*Y{62*JXaXpZmF=`~58M%yrMZ8p&82#mH)FK}UZ82HOvV-Sqc* z$SOzY>+e;folH+B;pbJ>OP|F-1#do@Fj2uvQ53D^xsGC`GTtifH0G%0O%@7M#l#JE zs8kiR00`O7N;bA(%+Z;1BQN5H(X-J)2MC+;{%lXK$R9+uBdwq3DC1N497?2w%oE=o z8i@a3+>#i#+~Q|pH`Hf7VeFKbfA%uJIdeoRe45QPJn3>g+#1&IDW0Tm+j+sWbM(~8 zwwy#`-RL8p4tu!R{u8O2KW}xtS)tph`OFjM?rq&9ZV7ZalOuH5qP68NqffOY zML3Ns%#2E=OHFBk?nmOyv(3w*k`r=S3^!)Rr6ebmW|So-6lOdm zSGZRFIX_P+e&+EWU=~~9TSahgq5}vUwI-InL&4H@{GYi=p-c|WK3y+GNOWo6Go#s8 z=UC=MxV`U0sKm!^sqk+{hb7$mhu7P%MI^!9spW5{w3ha|Ep6-7X>Rz+oI*wtNj@Z{ z`&cvg`Zx`vKR%M}_D z)x-`*e>~qyZ2r6V=fsqFv$^$VBtx?l@lNB&@lBF7g9OiLKT&M)>Yr2jjf531B_6>M zJ*jJ6053nQb^iI%Er`$61W)Bd z8RWGEhf9;Koepg2nmp1}_f|$j!hJJo9mTI&!(TfDA&-De$j&LNzwH0ODxDcbtxRuNB9~o?$~2{?m|2F; zUR+sBxONEcdhDsp*D%*v*~>WGAr19QPfpPnN+>v-I>M!Q+D<)7*e%7`0&Ou5uSCSR zsrZ1mJ4Ct*HG>|rw^xDl^Pv`96 zim@3hjE2SH#}Ai43G~>6-up6CQeDzkTg?gAO zGyN+#_~}Jsdu;zSl^#))0#3rDQcK|3sFxL8Mh5fRwkB9%rp#T2hH2FU!E_`KiI>PpOZDqwrC$xcM4aZ_87Bz zW#SS(!YxlN^mc|?SXMkg`k$ed#_sv*sR*owV8WCg(1%t9LhUTin?weFarw^mDzQZD zO!UR~c5ZoEPHU3{g1F-Qs(|RFRRNdp@tecDaow&gd=`5jtT${u{UZjP+z)GdLca6ZXeoFA~tE==9#7`H1HU$WnH6vsSnueZm%zg>QNzauRocB6cuGad!$Sp5Or3k^SKscIHJsjEe z_Jq8`mJwf?$x%@h@(DVz>=T4QuqGh4Lktg!P9xOiWoq(F)J{le;EXQ0KYHV+%PaH! z`AOpG>Dsb>4^N`Ov8UH`u^qi-$)2*vhxyKD)GI@Jd2Kof3sr6#%qN}+CFiyYQj_Z9o z?!6M2v0N)GQp6=OvBXKKlw~oJ@PP?lK;~LqDQQ(r5QF+<9wmBV zP8OH%oFUo;B)!wAjxPz#MHEy^Ris|HkJyn%&B(2gj?`%R4SZYVaps%h9N=DlSDS|x z3XYkRpNo9jYopuo@xpr&a$I)$pdM4;I{o69Ysr#!a{s(jt*x95}MS>J$jC4!)i4 z!&JwGAr9ZJfYM5P(`}92k>QHS@nc58kEEKH!Aj7bS2XW$=JMpo4yiHxsGFRMqewjKJF8)B}V+*acXG!V&BhPfk&6V>ipZp zqcYJ`*RU4iY?q1_Viau;n&03XH@%v@$@SE7WdUG=D z8m0+Iw^sy_>mu!a>s~;wIE$-xL08Lwy#U*+ zz62kr=(aqp`^L4?av(kOIA2OPN79uUzNyJySqCzC0r;vE`E%Lnb?x4!cVsDPo92(5PJsPsI0555X)f(KVO=9f;8w1r1 zj{>aJAXQa=3A9kVWeCh?8W4vVXsR$zKw_lm%S3V;*r{N${1%`(6yF5_G^7{ca1;;wWtREvVZJ$oyuB6qYRraaa@57fDCCVO$eTA08Y}D~K0?Fr;6)I~-d~)}a$9Edi*Z7#yNb zFOXSq0y-*eGW#A82QV!McQDFnQST zPfoZ-E>()r&*i5qtpGPHgC0ZxH3<9bItoh3j+^BaRsa)L$pLvp0Y+$x+@@NO?5roK z02oXb4udKGc82AIdsqIN;fLZIcJB(?Kz3WI`qg2FaAiORzR`$TZd8VjHRUK4Fs!_nP`%Z zdMMW}Lr@U}KWQd{swjwLA#|J9(7>jkMqtxbn?u_0TI%yPhGUjPQp@DtxSrYqXVLV?Q z3&)*nk1b8cz7pl-pEv0{N{=PJpuh!k^?wq7W^QM;Z06zgg9J!In3Kk$EUC58PR3bX zY*kDi%s9BfU~)UGh{lIqjj#r`K@@3NTy70 zo);aSSv~6YWkz@D!zu@OvakAv!o^NKmB4V=QJ!kHAk8y38Ir`Ao6w|e zX1LIbaNU}%rYO+-hJ`0yzTd%zi!i9eJTob?pc21gZI; zM-DH$s8H~MC6N_(xeb1agF>oGll9SpzvZN|Z`O-HAmxa!+q<<(r?O`Cq}@F8{y!JP z(q?9cbuEJJ39t3}Ke31NenFmmYpBn9buu~xwTckZqlnj;nV$&_DPC0noK!gbDl4tG z)EK8$u`-LoVIKDDcepb?+GaFrU0ssGc~nJAJMu(I9($$7H#=oXw*8Se=qAf220tLx z3PPqAhC=(s`|=taJd>_JdVTY@=V_C{P@d#I&5F*}4!;Ct1Xi`U;Pjmz=nS&=p(vhw zoMLH_aozp>8+TJ)7e_!-L-|))1ot9un+nQq6;@|It@>IGj z=PB8~D(G4|2lD*Q*C{_(*&;qJ{gk)lS&H*x&M1kr(JN$&NcK1i5npC9r1l5bH?D=e zHuwXz)qC+&vi}L2{vzq3(hlokZ>K^wN0@b8eGwU3)b3?AoFSWVt}kYN({Vy9VRaqn zb3#1{&n%lX#liz+uq|rtQxirPH~J}Nx_`rp>Uk&y`-q#Bnw&)xK#k%_N zM6cjJvjetf>S?y+=uXP&Rd!d>b$DEx7;B(TKx|HC-0-F}KA=JFg6cz{my7>~m;KZg zHhYh9!2|SkW@IdO`=K3guOM_gre5F#nq%h?kwUyRk_V?()!ALinm#pnafe%B*_*;gUWjEQzXgo9F&FEN zVVu=RM(ax)xB?xxn2U7MG!#DmXQD#kR^E4>>W%DBVdE}`IBAGYu`thIP5UU$Nc1Zg zOWW;1%daazZfCmwls9aRV*k@~tkUNEAS(3i;1%`mT0fz=6EggRpK~gwmwAmFx3MyL zK{rzhxV2L^{05(3Q6m-k@j2S%4ujnxcgN3qoof3UbUki)iWNR^%nHgLX$EGw zNa$y-utiBz9%Js1`(<_GABa4)!Py#RsY<^_K$(|L6N=_(A z*DWr)l7*zJgA#F3uLN^HrDw1%+P2Lim*{_>7R+wv;w__V;zO?~vH+D@DM z3&#m$o9q5>E$B_19VyC#a=b))OAo_zit6zlCHPE-a;TxCvu+b7(LMYu3D*;#a~v}H zeblslc)zLn4Tt45->2RPG(N9kEtz6{savtTmm}u;)_8~vyQNVXHpwUg!C7X%)rXWq z6(*aZUl#i!cpa*ePVUTSD@hQO5r$g|#Jg>QAJ)S~3J;|w=uQhSV&G^asVXPC!<9VC zx`wG4V=n^?vz;zy^?edI$BFI#W;^`D!23KxJR@hM>V&&f$a7Cqoq4#7y!qLAv(hB5 zQYj-|&-Bo7XPegkaUlh4m`AOX&9(ynA*~u_SYx5wLb=5G0P&QX$H<3&7`wz?)C%B- zg}LXQS2`@8hAzd%=Jp2s^n6lfZidxG94#nd%g?s3zGZQ@*X0Tp`2uHyTI|UzdlGkR z+*~Ozv-9Z64f763GsU~VANL${$gc~Z)v$VZ|9RX~$nfFjJEw39X&+a!5e3i0xwmk( zsyI&B9O&Yq{=gGz^;!2T-Ld7b-2_>J^|ZM7ZJ6)RQUn@PW^W6OBR~7FU*jIUfT%?Y zYlmGP)-ufD{ydZQ;MLV29JzI;AxI`r+RE|6Qhd5|tazZF!(}d&1}sRKdK2v|cqcb+ zE;ohc^gR0Xg6NV@K+wW$@#-I4-{EnOiV@@0m&hcp4gP+c9?q9;(U|n>fIKdZc$P0B2e(|2&>2fn42| z@&?tep)qEEOg(|~Olvzy#cfzXBmH}3tVP5iq2hCG>=1GtgH0Hol4Wq&I^Te9_5e;F zgG%}ul6Lfs0#zuO8Q})JS*Oya^of_j9|m5g^-&s*xp25RdSy_8)lxssL|Nad@ySQO ztyHte#rFtHS+SNZ;AE^CtJj4Z1xG@?W6LfDxOQwPP8;cPKVHbzi}4Or3So~rVY0Or z8NF`;7M2u|a|T=`vd5htRNiab;ItBxkwfvLea4ugMG7Y> z!e0Dlxv-vgQ}0K95zU&5!p2zN*2*gf(-D}c27P%QC$rT)zL)v;PlxW0FciVmW_fRm z;BiM%(%x;#{d6o5yV!f z9J|x2!@+AlYs;r~WBz1z31vgY?V-Qd)@t8Z5sFDMRzM{rc#=z{$4MXc>JxW5L88~` zYk(4AQO`Tuj8#)v(nI87(X}wIE&jl|4&)bymFc`sTz7jK24a3P?A92_vK)xjY}%Q_ zXvGBOSV{v>unOp)F-_-88EJsSy^#*c9%8f>LvS+!-Sk*h=mZ_4geTI0IF?8U6OqaE zn13`63vHsvcy4xDQ%Xwhph<*&53tO*OA%Uq01Mq^k-Nf5vl|wYcxhU6JO~H0U{oE3 z4z>she7h#X&$|EtX!f#hF?z0RAeNct-YaB#g>0{o?G>`ULbg}P_6pfvA=@it|5hOj zV&n#}eT;u!ok6XIKx_B%jPSh>u+SPHWKajpcCW^u)H-mQ2JV*tQ)r+CFhPqYAd`;T z2;dY=94H0pbSl3doT8)ZvcCfCf8U@%?B&28;GwDpaD;9urS@JRoY@GD(#PAo<95iZ z5vb7#^9mpaOFRcftAPEG+hM>7C0770x|U1Tz$jE-0aWP3+%Ay;89W1;bi$yLntmD# zT`~faP-Nw=VA3uf6`I}>dhq|I6KJBQogw9>zcvHce`8P_17l#g&cwhV#qiHl5cBCO zglhta>5Dww&6PlXO}}0WMx+wj&;cSapgY`m2@}Y$3RnYMXpjhWcPlZ(*9^pgBeYrt z^y$7!&D4EKr9*}-U?23L862Y7QmcVDOc0{8q-r2XH_ug5Cxt@>E!3rG|K;RUYMQr@ z?wbq)B9Ln{{f#BS0cg1e=+mYEK zd{-e8eknpwVk_W-SZb*|7=)y1fjw-!9jeLzztMzrR3{(jug_HwBLs1`{rVDCZPbVr zbOcYe(l+gmrxI78NIX!c6BWBeCe(!oS7@8sJBfg4? Co)GH* diff --git a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java index 4dc1fa00fc..af6c1822fa 100644 --- a/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java +++ b/java_tools/configuration_definition/src/com/rusefi/board_generator/BoardReader.java @@ -45,6 +45,7 @@ public class BoardReader { Yaml yaml = new Yaml(); Map data = yaml.load(new FileReader(firmwarePath + "/config/boards/" + boardName + "/mapping.yaml")); + Objects.requireNonNull(data, "mapping for " + boardName); SystemOut.println(data); @@ -60,10 +61,12 @@ public class BoardReader { } private static String processSection(Map data, String headerEnumName, String outputEnumName, String sectionName, String NOTHING_NAME) { + Objects.requireNonNull(data, "data"); Map outputs = (Map) data.get(sectionName); if (outputs == null) return ""; + Objects.requireNonNull(data, "enums"); Map enumMap = EnumsReader.enums.get(headerEnumName); Objects.requireNonNull(enumMap, "enum for " + headerEnumName); SystemOut.println(enumMap.size());