From 3bbdaf55ed9a51026f71f9d824368c8e4f2841e4 Mon Sep 17 00:00:00 2001 From: HYOJIN Date: Thu, 26 Mar 2026 14:20:09 +0900 Subject: [PATCH 01/32] =?UTF-8?q?feat:=20favicon=20=EB=B3=80=EA=B2=BD=20(#?= =?UTF-8?q?105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitignore | 4 +--- frontend/index.html | 6 +++++- frontend/public/android-chrome-192x192.png | Bin 0 -> 10789 bytes frontend/public/android-chrome-512x512.png | Bin 0 -> 24740 bytes frontend/public/apple-touch-icon.png | Bin 0 -> 9624 bytes frontend/public/favicon-16x16.png | Bin 0 -> 636 bytes frontend/public/favicon-32x32.png | Bin 0 -> 1388 bytes frontend/public/favicon.ico | Bin 0 -> 15406 bytes frontend/public/site.webmanifest | 1 + 9 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 frontend/public/android-chrome-192x192.png create mode 100644 frontend/public/android-chrome-512x512.png create mode 100644 frontend/public/apple-touch-icon.png create mode 100644 frontend/public/favicon-16x16.png create mode 100644 frontend/public/favicon-32x32.png create mode 100644 frontend/public/favicon.ico create mode 100644 frontend/public/site.webmanifest diff --git a/.gitignore b/.gitignore index 6993c75..feba811 100644 --- a/.gitignore +++ b/.gitignore @@ -101,9 +101,7 @@ logs/ # Frontend (Vite + React) frontend/node_modules/ frontend/node/ -src/main/resources/static/assets/ -src/main/resources/static/index.html -src/main/resources/static/vite.svg +src/main/resources/static/ # Claude Code (개인 파일만 무시, 팀 파일은 추적) .claude/settings.local.json diff --git a/frontend/index.html b/frontend/index.html index d8729c6..b92b03d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,11 @@ - + + + + + S&P 배치 관리 diff --git a/frontend/public/android-chrome-192x192.png b/frontend/public/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..5717dba4c224c0845928891a1cf1c3602e6f941e GIT binary patch literal 10789 zcmV+=D%#bFP){sq%{VmS2|kww(I^$f6pdSW{CjHqWo z@yz+mXF|nrdO<-HOelf~NZ9`0w}*vgc4nu$tJCb(JXO;@)fK*a>-(y{`l`C70`?Og zfoiuUs@*kkiMt-gxf`Lz-5jIc-t>d$N77$SKZ*W%`giF+rT>1ul2nlF_%s8211&?&)ZUQD}?n(E^jO z49~#Do6PP-`ibl-P+t7EVUyHsieGB?Jr+bCznc^s}(kQL+P+rROMX!uy zEK6moY|${8>eoVz7NV_mNHS`q;(0Hq)r(yz5JVGuvuiRiDbIt>9?l;8IyFRZ$+OKCt5msw7C$C$9pu_VwP72)n%-^ zi&wX5w;jN`W`**U>97J&?Y1J5Y=_Y}32kr{THsMK&x>&I2ewU5dWXJTooMgr)nyr8 zgzBa`s;;Bm?V!4sYt15}yZH*h1onhA?qD+gLvZm3@w|fm1TxFEyjIdTHCMU3ZYQu} zS9o=9gNLZv4aNjw!NBI|nvVcfyA@PxI^r_+d^PSE%)zH{JzahP9CTshYZA&!vv6&f z*Li@4fv^xJ!e*4)kt0L1;fv-`(Tm*fXpNJ}+P7c{o@b+0>Y}Bhn<5d9+qR=9#oCm_)A_sv6_|u)VMpN4K6_~ zo@En^WCL0?hd?xNK>}O|!;uiC!d4guNuTk!O+x@Kr|rJRy@m|`0P#MPzAL?T(IOyB z&-5@B*1|m6{8P!TdN-cvuT_VLy&- z;Ib`ZC@hIA%ToZP=hxscEW@3sz)b{7IzBJfC5S*b4|}zN+CpuTVBt{}Rel0c<8Fwy zm`DJwr|(Z+esv(xO~eU%wZZjXo2YHdtYWG_d5~P=u1xzeo)QJ;KhC}YNWZLccO>E0aLB!uaIeRE>#~S|gY~>N z0c+cbm3XHNj`aa*7UebEAU!NpJjmGst? zCjymT8>%hUrfS=a)uSR~^Z*~@NP;FS&z_m1%@PzAfjzx8RojNmA*OWM5r9!{M~reW z=CCQ|*Y@OyRi2m-wAuPWKyBH@Yg@Ik+S*U51ma{v0LHl+5uEY#+NLb95~#W@A_W8- zuZOK)-_=S)W%18ZLYRYxuWR_fZos=?e50K zlP8HmPx_Yh)-?|V)Yd({wigeG7gDNsdIHc6`*Ap&K;J#3y4zyYM!-RLIG6zOLQ1rx zBLFq7md$UaWk5%GI4RY=`4pSgnrgj3$GFtuR<0atdrRV!CMy6s#&3*!7;8C!UN2hk zVx2_*;)MwiZ-_?{1SDAjXorKT_l;rCuOk2xtfnn0^9ZTWa8v%Bye#Z)uDk9@5D?%`~uJh zy~y}AtVbt$>ns9(5YRbAHE4rgej+y(r_{4}1t7Q3p{)&Dl_JDGw+Q4RAfB1Xk)TIj zc%(n$696rB*WzwcyD>)qYw9Er)&)R7CQ@KyPK@u4bK68b0-()KOK~x)yB)oC76B6k zwu5*{JY|wgk+ks$0HD*@4riHK^5(@li$G`u#6#jG@l@zciY1Iz0QADcDEDYM7|8;) z>4_KXECR*|wDNdLyd@qp&TeG}5ek6oU>f!yp|bd7K<8gsNqg5M5O6%+5|4qr7EzU= z6M##wE?oScbake;&LR*80-Ze`6R$;-do%(t!L39~3@1%}=^c9OECO*LAl~Zh@tSxp zf)dOHz~ylC9R^b}Pmh2en}tQ7Gy*P8hsSf|z0$E8jbSbTW6+bj+4(HRp58zZtV;xe zN{{EndxpiC2|$gjBk;~3F?NHSVM9ckyg6j%Ks%Je~}06$&l@mtk%8{3p_{ z5l3BYo)&??2sl`S{CFZR!`ea91{Z+E*q^=s-t>0j8x(CDKOO{f6XLxg-V9hmFafyS z?Scwa1N`QfbryjPAy7fCtcG|r08zmNUp8&K&7uHxu*R|j^ zqt23L5%3TYj~zf*}=nR>iId*HCmfswlcx9$(THW--7G3?D_fme9{(jY+oRo+iIF8Az-!+}5V z3;f@XK;N#wT4aDsRVpH4Ikgc~6Y!T`0x$e8@a_qKaHzxPW#aPMF}W~d_Q0=! zF@1p(wgt8(CrDr-A}79VTy$d3c1EcJ8W(_z-0o!lLrP_m=5zJz8?Z;;lT3SAzg%N} zb_#IMLBJ(@0LN?%?A#gn`P#r{YXO^d1bVEQ^Sa-BEnu59cGsfqq0gqAG$Mpk#Lx%42GhoY3 zfN&5VJ(gp$X-8lSV$*Yd;D0s+&e;XHkplDHZ*th&`77Yi&4F$mfcC9GUPJaiE)Ics zxDm>V3xLjLYzbBw>ot--wMT7R0{e6WM(+tcKoM2r4rQ+WLFJo@B1~8bT?9~*4 zrzvQIw<7Db$P6mt-F?y8<7E{36c>P2=*n?z&q9gP2&-VPrr~ycf9j^k0|#%$hHVFu zh{QgkL8{P^KZmC`k07I|H%yFxMha5TF1kLTiXzo-)3tzBEgDG>;UhMUH;LYks@BZ| zfk_AFRH`^TCEw&b*c0OAA_(G$?5I~7n?7TN(hUS1he@2;=_OmN%5 z1^d~0F;lu-ofE7pIAK%IzauAPX);mi0X&F3y zkQB=QWOfQNOKQy{NZK^w%9N@}^2QW`G|KnNbTJ6xZSTj*uZ9B920y0&a4x?xQqp&7 zR5h;b&skD=O5vc1sLZBEaU_U~ZgmF7aXuvVLPA%HrYt9EtE|_O`M01D1WA{*xat(nqptM-veJS0DfBLFHb+QGza+2cEHx__=(+koR(~*6PZ`9E{(?v`c(B*y{F9u zKKzyoj9&t;5+h;qPyQBWGk*Z){sh#zL31x2UyF3-?+OT`;;~|Q;*ht+1 zh4%hLuv?^Fo<45Xz=O5~qSTweAw%ExK5)j)oxt`t13TUd?0P%U^A=#+n}FSTKk#1Q#K(Zqud)OA99U9Ymy6l;=&hK4XR|y) zq^?Ac$5$j>RRA1tU30~=#BOBoA40R9_S~2jx{M8UHygL#UxCw}1a5p6c;gG;TQ<5| zpchkvYJ_byWaql{ssL0CEySW%h3O0m>Q9h7#qi&AxPNX2@axG`mp%r> zG(qynkE=y0ZAi-x_xoGBPY1KNbo?eL5^v5T;L?A<8~xs<+Ba`8INd7}xj?W4;;SEl zdp`np;z%KkmKEqw3M4HWv;#R#+enH=i08o$$nml2QLdqrz`EH;`&sGIEg!GIj4w0g#2ONR)Vj z>+yO{04{givZS5p6LqTi;aiv$sbTmQ>iG}Tx)Y_PqK>Lrv>;8G3e2NwR2LTXDr?6f zn+Hp!`NIG*hu&KbmU7kDvU*+r4vbZ~Rddb#l9lL!7tHeBb{$~zwR8C;_`MTyJdd0J z)Pf7uNPHvh9zTQkg1Sk?KW0xffepN1sYx!4r+sP~@Fq=!jmK*IsopaVvMW-ZgVIQN z8qc}-Q<*nMa!#a)e(_jlPaa^$^Ul}d^HBW`*(`kekSRM*;}OrV5P*&0qJ7BBLM4+G zK=1JeVTwWp-N4>iHtRyqq6*W*cs%D8Ci#h>_1>-DJk%>{lIS;np?IS>>6H)^dKOjK z*PIwX{s~|*`pQxk6+OQ45wF)`W5umM0<5Nhq`W3T+TU-o-$#oy*S&29zTf&jOpB1p z^BX@up7y_J0VqGb*zd!sGMQ`_kfrBQ(p)V6sKTX!zB&s~ClNN!E~~>kv>Em484%%l~4Voqn!Xm5*2f!DM5*Cfv*55H;E(DxfmBxTXjd&G{90>$_yrc?FC z&wdJg!?h0|#TiF=i|XO`G_#syBy+Ey^by5rACZbgk;OySF1Ji&N^Esk&Dx{|3)pi09i?pb~8<03nQYF!~JK#3(tmUqvgpX1N4Q{jcxL ztU+4w_Osf(FQ;cFs^NF+jo&tymc`hfA5Q&%xbIzb5${)^HQK6_4>x z(r7YYDV}rjCm(%V{F$F8>$F3%uf2-rTcb?{mQes)tmlWwsN!gEjC#Yc`7Pqm{tt}Nwv0AIBscJO8_Tqg_g1O$xBtrtA z9gHhOn$Ddj%6{ev#cHgcUpqL9J&!9~6L0M@4eO73DEH1rT=W&mx0?h&CeR|!;|cC+ zxaPcwtG?R&77uml=BiVvr4EFpLR*+MKM9*YY&r>^)Y7nCR-}b&*RbV>OxINc&^ct{ z(8+X;PUyr;_~m>+8`XH*Nx^fp){aiV=x$!<;!ZIY|DLWE7fFIPSE0!A8MTO2e3 z7NcFbn2rF&^0wgx5ojv`;IymY!zLN{r~dH%!9@RJlC;-fEa~jiCJAhLR?0igzD0S` zZmDh#2*g}R*&Sjo!e(y~$S?v@ftF>MK1-TKAWj69NdOkdS%S^mB9LJO7E1sYCP|>- zX?h;1CM%_01{wVlHhT9sqvSP3vKC4J<|kP*E!1e|ph=l+4YyL5lpSZ<+FHQ$B_C}y ziIc`AmiK%Kz}zG&rL!sh2|#hGOt%XZ&pF*EZNg= zCmALW{VmXiF9Biv#1F!h7%YuOfW-zQzGrF%CAVIyTSHA^RzZ}j_e7{~sG2Kc%)I1<;_S)PMaT+Dc|Gw2EzIa zdjl!V?WR}2fhNI;t_A2=Lz4v`SvqvIij&_8P2jgqbTj?0gWWew9*B+EA)US>5Y`{F zHPANMZJG1M`xR(`MZEbcNyv1IcPM0vr zBWT(!I|WU#YJ44Y^TU!=!(#me#HtefN!B(3&l>CaArq{)x#ooD0%`Qfqsb}&=CU%>(vPyjyTHBqPI zyG_rq8M+hD6xRcEw!e-V4BH?w6Yt&ykg6Cqk09xEsIC6eDM*_9xKk56&fP29fp~sF z1*)B;sD%`gM7Krj4=$#B38RnRvF*Q+Q5Km@EasOGge6Yz7561B9ovS@Ay~St*8$dS z9V|_L?1T^WUF`8Zd0!&{P=RSADAD7l^q*3%aS2ZQUs!f1r{4dfJYm`x0CUXvLk4abneq7G;ys#4d{)B4KeBCDHHQ9TbD-fptVaZL*d5S+lf_A|<{SOG!sxKGzf=FviQjS3xk}y+=6gKP zzzTZsheiOy4GLaPfxh(LyT*%RmB5*_KX*&?c&|X!3>8_YUz?~wDpY?wcY06V#pgBo z-IenVlM)_C_`lvr>)ho$&kKKHsI!olH|P^}dO7A=uFPsQ0Kyl&Nk`z$15;T^3{P~4 zlD%SS#5>bmjmWnu(or8L4-4~4*^1=G;fvX1qI_xZD7LcGz69}6=WV$z&^E`4R zfO4t8v$`bhAO0A4QS))bf_I`x^u}KT+i*hW80J+hx%MCxdlpCdW1j%}V?L9-*I5m? znDeBlw@2tNuCD42$Q*4#pGG-TH8^nj^>}@y0JwOX8JTQFXY$}q6QJL}1eo-6b*27t zW8mh2!1gixHwI$ zBB+U^dbp9h0?!-;n67q;#-RST56nja;UYWz6Gs3iZU^X{0WDqyp@q<*15KTMXkB{j zFyN@4!`SdJeID>AHGqVB-M28@<8`n472bEOV`y0#yB8aXjeT(+K;fm*#_?QxWQI{WjpA>QI&obmM2>K}zUuMF||KSK(BA%beIyIsn7s+b+0+W9Y zyutcDemHPFnOk9(5}RxG0VW;*yuy+6)nkDB8SgTxJcn%&T}SZBOyH*X{7@WeoF!=K z@%V~NR~3Mt@HzFP4_7=*@J1G)3tt9arv2Mw0VtnjF|Tx1nMrrr062Qf9OGZaUR{Eq z>)AU4$87`jr9FF#wE#`&SZ+GCgRE>u3 zl2aW|-2u?ribe?S@>IMi4FDR=G^&}r_YevR7au}AUN7;g0N%pG7eTWvJs^hdHeewi=!He)A)gT(* zc%P!X@m=85C#m-)zCk0pN-v?h^EXajk9rW$TX0e2EEVX|e*hW{qR20aJjDEO)5w0@ zBkTn7tUgJU@0H=;1Bkc1A1l8a3P829m;!M7$|&jGP5KvbHcfz0F;CJpx%GYE z5l&uJhgoEz)46PUB~=NN-L%Rp3ID-t;=s=A4GKXL;*s#HSU8aN2mTZD8z4ogPS3qE)c)4 z04QQh+`&s`G;r;WKaV}$0h72u!$lO*mKi4d7|0r&}o6r92#CZkmmihKl%>93$oy+7v$nhf6c zAt1fmM^fV`YE;>>ubcuLORL6S)NgN?3S>bw(}eix>A->PeTT5+ZlNXZ6HdV6RE_j* zw~Q6)koINAq(v?XgE7$2WFX#s0y$nTm}7APsCH_x6pt}gM{#FO000TXNkl2 z&OxK4@DVN&-u$>>erqI_pef(oX)ipHT%xTSiEnHxP5f6L4~v(J#4RoWN^pTQ4UT6K z(yvT<>ECK_^>o@yr{TBLm4H-|3tj{?I=n#(gbw7Dn()~?K*tZ(oxrAhh3UlVkJ(#l zvF0C~W86j)W)+!y;61?lR|7lT0%#5*6-=W|7If{#8br9LBT${RrsCl;9?@!D+n8b<|r-78EzrACFQ)PyYKQAe9L=&8q7-QQ;yr@2iXCYsP{1kglZ z_|>H;o2!fKA>J)PaA^Th1{Ju87aF(tZJjv+Hix(on1LM6mMq7g04xBtV$cGQWhHa8 z5iA1fA|M`}gdES7q{N>9R69CCo%RoK+Eg-68^I!wCIVk`&U!b*vnc)XCjiQ)%6Xj` zb75OQthWec6afd5Azt-Ko__&QhLyOK7uo^%ZJk9Rdk9QNjz@h{7EAz!Ix|s=YJlJT zvd$t96oDAy*ODu%As!7-NH76V#;x!O96Uqc6inl)k@e+{fCHEO_zc9G0qYW60M5p@ zEbcG#TvH8LnvHG|hywu^^T>~Xfp{}u{=o&naa=6IgOs?Z0+wZ?TLj`kz`;{Fo+NJu zEFri6sDPY_=`2d!SNdtaMIbc9|8`pg2!{gtv>k$ma-|^w!l!z}`oNz$|JSe}s4~q8y_W03ABo9WPKft0HZZR9>vJ2t+zO& zOuQCRwh;;dDLUL)hI5@eNa&^fRSs{Cl1%H$0D;9GPl>n0V-XS@tpKbf>@wcoL%)>X zI*Wh_0^%X@l6cA_pMq)Q5rA`@IcSOVS>jZB>ns8$2u$^ONjzneOOdqk2!IM3=6s3@ z9KqX9IB~Ia0s_$-UFbS%r5E_b<00`<=!_aq7@q*B+~Lm0ybPvK{SP-tgLUPFfOuvw zay%3pdn=KnREz zhIqUo9#Kd_K3M^%tCWVg3LMLk;C*^)BCW%vxm{)Ibnrg4f@2|`NTL4e2!JZO0FT4P z5c+BQX?-(9z{NC(2gD00RX;re&$UP!6Z z=?Oqxg|*Pp5{K~TUG#PX9YJW~PHlV_)aGjYlq;LQ00;mrb-Or&!{J!|EdMzHD`8zh z1hl1jEZg}EsLcyTNj5MW0-!o;v(vfG`2C-i>=RuF_s)9`A`nO@tfjn&o}saJLc zpbn58xQmt{3BmJqLH1hq2t4n#soFMURmq+J=!J(WJcngClAv7dpTVxS7mV4 zT~6ImTTJrWMs1|FN|h-8g_n;2)YVC+QZIz8L?(W6$*sBdrg4#rFlMWrB zOD#VEP*rsnd=>6R3;ZwDq7xW2o!+`+5t!~_uQpIys7;bBKa$eQQvg(T>6gQt*%;~E zidN`Nb?90Ke?hN5O6JA77!VM)UwBvxb78MGP+P=MSQ1%AC;&;2TcnJk&P-G}r@_HN z0IsB;L2q5O2nf?FA&iCfP+}f!{;A~FGz6dyx+>>&EW&x5jP+yCrEs7ZEqH5PXasT? zUg}{gY=v>?%(9oTX$gSvl`g7Xh9jKwXfo|dA<&6pnj+=E^?SvIm5{OQhf@?ZUUiA zTL9`B=mKXNe!`#m^EgyuPxfqMd2iJtg0S4p_An7Pz;PZ{!VFFS(>w$~?Wnho&UNPC zY-cJ*h2iLkjo{!IK6(-^wEbGcK7WRA<(FjP@;X21VIVB3oZ%ie!bn(^U!6ix+dlCL3L4`R5#Tzqg#{HK++08Db$BMU*a6+cB)G!pb|TivG$`-XznnK*KuUH zyP3sHyy_%uZ3X7fSl#^PWvR@&JsLo(O$FyOEwG5rC{t$#@vzF^`Re3e;)lc^!L%fK>r@SOo}=dQWI`% zD`1f4bgwWyQyj%r8l_bp%1e3n@ycj{y}dG3wrCJ7qDi!gMlZ``zRJCn{|5j7|Njrj j1Y-aI00v1!K~w_(pE%7P{bIV*00000NkvXXu0mjf194oc literal 0 HcmV?d00001 diff --git a/frontend/public/android-chrome-512x512.png b/frontend/public/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..99b3cda527ef5b07fd44e8790b154280764b5c7c GIT binary patch literal 24740 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 literal 0 HcmV?d00001 diff --git a/frontend/public/apple-touch-icon.png b/frontend/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..951b6fec4e525ca449d84727c3eb99a7155e0b01 GIT binary patch literal 9624 zcmV;JC1=`+P)_MNnB_`~Q92dks4?+g*Lk%x=xE-gI|$y{cEQzOH`ts=7M^ z`wOOlX>Kb_aXVw8yEP`ceMtSeKbUkj_pju3Ch0-a3#6r_k1@er&Fxx}TTN@L<38rG z(kQKXW>)8MHsc3#zdxxD_qX=SRN29#Z1$-vpz}dsyxWq1>PtF~AiM&fVFuP>9+NMC zi$~yM5%=#V{f_(RaeEwTAZb_9wxmtrpdGg@Nj0Hmb=;vpiYHyIm=F8>kLE+1x|(1+;p( zE8HE~>y5-7xC(9YAc68asxX@%I+noLgjA|w6Hi9T+6J$Cva1dg-H}k8RJT%<_&R*SA$2NG=tF!7p(cQYKRI*S#nl_*> zcl)t7{u33jkaP!ovQgZ2B{i4OwYtuCu)+&HT}UT9XsV&<0eYg_i4C_eZR2@pf#=v8 zpT@@PLuyNEu0eJ0=ndr`|)={UXrjVus=qa9$_-AaOxoo%v+zuhNB-xOy0qJB& zwT|ZU!vC4)>&{M7wnya;=-G6+O`xl-5{uai*OCU3+LLT3tO4mry1Ew9opdN&7Un7W zv*inDzegU4H}MDuLAO)W-AOi>X`s8OL+MhkKk3#ipQ3Y>C!i<0`>p+{TV5==mo}g^g?ojowG%Qg zE@6$gBRM1+($Ro)EuBmE_j6i(C(b^~OOj6M2BnlPps#Sdpe=rh3?65__9od-Tn+3E zwT0S5ZBtxX@|IqjfS%-TMddxnTi(T#ybH;O($GK`uT3&|kYkyxN<*YhHWm#G)Tw3x`C>z+-0K0l^q_$F

%$w1DGkC>1zY|lc!QW-AFc+wg%Kj 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 O0000*(P+=G&2!xDk9t! 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 Date: Thu, 26 Mar 2026 14:20:47 +0900 Subject: [PATCH 02/32] =?UTF-8?q?docs:=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md index d251e59..35ceaea 100644 --- a/docs/RELEASE-NOTES.md +++ b/docs/RELEASE-NOTES.md @@ -4,6 +4,9 @@ ## [Unreleased] +### 추가 +- favicon 변경 (#105) + ## [2026-03-25] ### 추가 -- 2.45.2 From 73ebfba27101d4010e4bddf6dbaa139466ef8990 Mon Sep 17 00:00:00 2001 From: HYOJIN Date: Thu, 26 Mar 2026 15:20:31 +0900 Subject: [PATCH 03/32] =?UTF-8?q?refactor:=20API=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B6=84=EB=A6=AC=20?= =?UTF-8?q?(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- .../config/FlagCodeImportJobConfig.java | 16 ++++++++-------- .../config/Stat5CodeImportJobConfig.java | 14 +++++++------- .../common}/dto/FlagCodeApiResponse.java | 2 +- .../common}/dto/FlagCodeDto.java | 2 +- .../common}/dto/Stat5CodeApiResponse.java | 2 +- .../common}/dto/Stat5CodeDto.java | 2 +- .../common}/entity/FlagCodeEntity.java | 2 +- .../common}/entity/Stat5CodeEntity.java | 2 +- .../processor/FlagCodeDataProcessor.java | 6 +++--- .../processor/Stat5CodeDataProcessor.java | 6 +++--- .../common}/reader/FlagCodeDataReader.java | 6 +++--- .../common}/reader/Stat5CodeDataReader.java | 6 +++--- .../common}/repository/FlagCodeRepository.java | 4 ++-- .../repository/FlagCodeRepositoryImpl.java | 4 ++-- .../repository/Stat5CodeRepository.java | 4 ++-- .../repository/Stat5CodeRepositoryImpl.java | 4 ++-- .../common}/writer/FlagCodeDataWriter.java | 6 +++--- .../common}/writer/Stat5CodeDataWriter.java | 6 +++--- .../CompanyComplianceImportRangeJobConfig.java | 12 ++++++------ .../config/ComplianceImportRangeJobConfig.java | 12 ++++++------ .../compliance}/dto/CompanyComplianceDto.java | 2 +- .../compliance}/dto/ComplianceDto.java | 2 +- .../entity/CompanyComplianceEntity.java | 2 +- .../compliance}/entity/ComplianceEntity.java | 2 +- .../CompanyComplianceDataProcessor.java | 6 +++--- .../processor/ComplianceDataProcessor.java | 6 +++--- .../CompanyComplianceDataRangeReader.java | 4 ++-- .../reader/ComplianceDataRangeReader.java | 4 ++-- .../CompanyComplianceRepository.java | 4 ++-- .../CompanyComplianceRepositoryImpl.java | 4 ++-- .../repository/ComplianceRepository.java | 4 ++-- .../repository/ComplianceRepositoryImpl.java | 4 ++-- .../writer/CompanyComplianceDataWriter.java | 6 +++--- .../writer/ComplianceDataWriter.java | 6 +++--- .../event}/config/EventImportJobConfig.java | 12 ++++++------ .../batch => batch/event}/dto/CargoDto.java | 4 ++-- .../event}/dto/EventDetailDto.java | 2 +- .../event}/dto/EventDetailResponse.java | 2 +- .../batch => batch/event}/dto/EventDto.java | 2 +- .../batch => batch/event}/dto/EventPeriod.java | 2 +- .../event}/dto/EventResponse.java | 2 +- .../event}/dto/HumanCasualtyDto.java | 4 ++-- .../event}/dto/RelationshipDto.java | 4 ++-- .../event}/entity/CargoEntity.java | 2 +- .../event}/entity/EventDetailEntity.java | 2 +- .../event}/entity/EventEntity.java | 2 +- .../event}/entity/HumanCasualtyEntity.java | 2 +- .../event}/entity/RelationshipEntity.java | 2 +- .../event}/processor/EventDataProcessor.java | 18 +++++++++--------- .../event}/reader/EventDataReader.java | 4 ++-- .../event/repository/EventRepository.java | 15 +++++++++++++++ .../event}/repository/EventRepositoryImpl.java | 10 +++++----- .../event}/repository/EventSql.java | 2 +- .../event}/writer/EventDataWriter.java | 6 +++--- .../facility}/config/PortImportJobConfig.java | 12 ++++++------ .../batch => batch/facility}/dto/PortDto.java | 2 +- .../facility}/dto/PortResponse.java | 2 +- .../facility}/entity/PortEntity.java | 2 +- .../facility}/processor/PortDataProcessor.java | 6 +++--- .../facility}/reader/PortDataReader.java | 4 ++-- .../repository/FacilityRepository.java | 9 +++++++++ .../repository/FacilityRepositoryImpl.java | 4 ++-- .../facility}/writer/PortDataWriter.java | 6 +++--- .../config/ImoMetaImportJobConfig.java | 14 +++++++------- .../imometa}/dto/ImoMetaDto.java | 2 +- .../imometa}/dto/ImoMetaResponse.java | 2 +- .../imometa}/entity/ImoMetaEntity.java | 2 +- .../imometa}/reader/ImoMetaDataReader.java | 6 +++--- .../imometa}/repository/ImoMetaRepository.java | 4 ++-- .../repository/ImoMetaRepositoryImpl.java | 4 ++-- .../imometa}/writer/ImoMetaDataWriter.java | 6 +++--- .../config/AnchorageCallsRangeJobConfig.java | 12 ++++++------ .../config/BerthCallsRangJobConfig.java | 12 ++++++------ .../config/CurrentlyAtRangeJobConfig.java | 12 ++++++------ .../config/DestinationsRangeJobConfig.java | 12 ++++++------ .../config/ShipPortCallsRangeJobConfig.java | 12 ++++++------ .../config/StsOperationRangeJobConfig.java | 12 ++++++------ .../config/TerminalCallsRangeJobConfig.java | 12 ++++++------ .../config/TransitsRangeJobConfig.java | 12 ++++++------ .../movement}/dto/AnchorageCallsDto.java | 2 +- .../dto/AnchorageCallsPositionDto.java | 2 +- .../movement}/dto/BerthCallsDto.java | 2 +- .../movement}/dto/BerthCallsPositionDto.java | 2 +- .../movement}/dto/CurrentlyAtDto.java | 2 +- .../movement}/dto/CurrentlyAtPositionDto.java | 2 +- .../movement}/dto/DestinationDto.java | 2 +- .../movement}/dto/DestinationPositionDto.java | 2 +- .../movement}/dto/PortCallsDto.java | 2 +- .../movement}/dto/PortCallsPositionDto.java | 2 +- .../movement}/dto/ShipMovementApiResponse.java | 2 +- .../movement}/dto/StsOperationDto.java | 2 +- .../movement}/dto/StsOperationPositionDto.java | 2 +- .../movement}/dto/TerminalCallsDto.java | 2 +- .../dto/TerminalCallsPositionDto.java | 2 +- .../movement}/dto/TransitsDto.java | 2 +- .../movement}/entity/AnchorageCallsEntity.java | 2 +- .../movement}/entity/BerthCallsEntity.java | 2 +- .../movement}/entity/CurrentlyAtEntity.java | 2 +- .../movement}/entity/DestinationEntity.java | 2 +- .../movement}/entity/PortCallsEntity.java | 2 +- .../movement}/entity/StsOperationEntity.java | 2 +- .../movement}/entity/TerminalCallsEntity.java | 2 +- .../movement}/entity/TransitsEntity.java | 2 +- .../processor/AnchorageCallsProcessor.java | 6 +++--- .../processor/BerthCallsProcessor.java | 6 +++--- .../processor/CurrentlyAtProcessor.java | 6 +++--- .../processor/DestinationProcessor.java | 6 +++--- .../processor/PortCallsProcessor.java | 6 +++--- .../processor/StsOperationProcessor.java | 6 +++--- .../processor/TerminalCallsProcessor.java | 6 +++--- .../movement}/processor/TransitsProcessor.java | 6 +++--- .../reader/AnchorageCallsRangeReader.java | 4 ++-- .../reader/BerthCallsRangeReader.java | 4 ++-- .../reader/CurrentlyAtRangeReader.java | 4 ++-- .../reader/DestinationRangeReader.java | 4 ++-- .../movement}/reader/PortCallsRangeReader.java | 4 ++-- .../reader/StsOperationRangeReader.java | 4 ++-- .../reader/TerminalCallsRangeReader.java | 4 ++-- .../movement}/reader/TransitsRangeReader.java | 6 +++--- .../repository/AnchorageCallsRepository.java | 4 ++-- .../AnchorageCallsRepositoryImpl.java | 4 ++-- .../repository/BerthCallsRepository.java | 4 ++-- .../repository/BerthCallsRepositoryImpl.java | 4 ++-- .../repository/CurrentlyAtRepository.java | 4 ++-- .../repository/CurrentlyAtRepositoryImpl.java | 4 ++-- .../repository/DestinationRepository.java | 4 ++-- .../repository/DestinationRepositoryImpl.java | 4 ++-- .../repository/PortCallsRepository.java | 4 ++-- .../repository/PortCallsRepositoryImpl.java | 4 ++-- .../repository/StsOperationRepository.java | 4 ++-- .../repository/StsOperationRepositoryImpl.java | 4 ++-- .../repository/TerminalCallsRepository.java | 4 ++-- .../TerminalCallsRepositoryImpl.java | 4 ++-- .../repository/TransitsRepository.java | 4 ++-- .../repository/TransitsRepositoryImpl.java | 4 ++-- .../movement}/writer/AnchorageCallsWriter.java | 6 +++--- .../movement}/writer/BerthCallsWriter.java | 6 +++--- .../movement}/writer/CurrentlyAtWriter.java | 6 +++--- .../movement}/writer/DestinationWriter.java | 6 +++--- .../movement}/writer/PortCallsWriter.java | 6 +++--- .../movement}/writer/StsOperationWriter.java | 6 +++--- .../movement}/writer/TerminalCallsWriter.java | 6 +++--- .../movement}/writer/TransitsWriter.java | 6 +++--- .../config/PscInspectionJobConfig.java | 14 +++++++------- .../dto/PscAllCertificateDto.java | 2 +- .../pscInspection}/dto/PscApiResponseDto.java | 2 +- .../pscInspection}/dto/PscApsStatusDto.java | 2 +- .../dto/PscDataSetVersionDto.java | 2 +- .../pscInspection}/dto/PscDefectDto.java | 2 +- .../pscInspection}/dto/PscInspectionDto.java | 2 +- .../entity/PscAllCertificateEntity.java | 2 +- .../pscInspection}/entity/PscDefectEntity.java | 2 +- .../entity/PscInspectionEntity.java | 2 +- .../processor/PscInspectionProcessor.java | 14 +++++++------- .../pscInspection}/reader/PscApiReader.java | 6 +++--- .../PscAllCertificateRepository.java | 4 ++-- .../PscAllCertificateRepositoryImpl.java | 4 ++-- .../repository/PscDefectRepository.java | 10 ++++++++++ .../repository/PscDefectRepositoryImpl.java | 6 +++--- .../repository/PscInspectionRepository.java | 4 ++-- .../PscInspectionRepositoryImpl.java | 4 ++-- .../writer/PscInspectionWriter.java | 10 +++++----- .../config/RiskDetailImoFetchTasklet.java | 2 +- .../config/RiskDetailImportJobConfig.java | 12 ++++++------ .../risk}/config/RiskImportRangeJobConfig.java | 12 ++++++------ .../batch => batch/risk}/dto/RiskDto.java | 2 +- .../batch => batch/risk}/dto/RiskResponse.java | 2 +- .../risk}/entity/RiskEntity.java | 2 +- .../risk}/processor/RiskDataProcessor.java | 6 +++--- .../risk}/reader/RiskDataRangeReader.java | 4 ++-- .../risk}/reader/RiskDetailDataReader.java | 4 ++-- .../risk}/repository/RiskRepository.java | 4 ++-- .../risk}/repository/RiskRepositoryImpl.java | 4 ++-- .../risk}/writer/RiskDataWriter.java | 6 +++--- .../risk}/writer/RiskDetailDataWriter.java | 6 +++--- .../config/ShipDetailImoFetchTasklet.java | 6 +++--- .../config/ShipDetailPartitioner.java | 2 +- .../config/ShipDetailUpdateJobConfig.java | 12 ++++++------ .../dto/AdditionalInformationDto.java | 4 ++-- .../dto/BareBoatCharterHistoryDto.java | 4 ++-- .../dto/CallSignAndMmsiHistoryDto.java | 4 ++-- .../shipdetail}/dto/ClassHistoryDto.java | 4 ++-- .../shipdetail}/dto/CompanyDetailDto.java | 4 ++-- .../dto/CompanyVesselRelationshipDto.java | 4 ++-- .../shipdetail}/dto/CrewListDto.java | 4 ++-- .../dto/DarkActivityConfirmedDto.java | 4 ++-- .../shipdetail}/dto/FlagHistoryDto.java | 4 ++-- .../dto/GroupBeneficialOwnerHistoryDto.java | 4 ++-- .../shipdetail}/dto/IceClassDto.java | 4 ++-- .../shipdetail}/dto/NameHistoryDto.java | 4 ++-- .../shipdetail}/dto/OperatorHistoryDto.java | 4 ++-- .../shipdetail}/dto/OwnerHistoryDto.java | 4 ++-- .../shipdetail}/dto/PandIHistoryDto.java | 4 ++-- .../SafetyManagementCertificateHistoryDto.java | 4 ++-- .../shipdetail}/dto/ShipDetailApiResponse.java | 2 +- .../dto/ShipDetailComparisonData.java | 2 +- .../shipdetail}/dto/ShipDetailDto.java | 2 +- .../shipdetail}/dto/ShipDetailUpdate.java | 4 ++-- .../shipdetail}/dto/ShipDto.java | 2 +- .../shipdetail}/dto/ShipManagerHistoryDto.java | 4 ++-- .../shipdetail}/dto/ShipResultDto.java | 2 +- .../shipdetail}/dto/ShipUpdateApiResponse.java | 2 +- .../shipdetail}/dto/SisterShipLinksDto.java | 4 ++-- .../shipdetail}/dto/SpecialFeatureDto.java | 4 ++-- .../shipdetail}/dto/StatusHistoryDto.java | 4 ++-- .../shipdetail}/dto/StowageCommodityDto.java | 4 ++-- .../shipdetail}/dto/SurveyDatesHistoryDto.java | 4 ++-- .../dto/SurveyDatesHistoryUniqueDto.java | 4 ++-- .../dto/TechnicalManagerHistoryDto.java | 4 ++-- .../shipdetail}/dto/ThrustersDto.java | 4 ++-- .../entity/AdditionalInformationEntity.java | 2 +- .../entity/BareBoatCharterHistoryEntity.java | 2 +- .../entity/CallSignAndMmsiHistoryEntity.java | 2 +- .../shipdetail}/entity/ClassHistoryEntity.java | 2 +- .../entity/CompanyDetailEntity.java | 2 +- .../CompanyVesselRelationshipEntity.java | 2 +- .../shipdetail}/entity/CrewListEntity.java | 2 +- .../entity/DarkActivityConfirmedEntity.java | 2 +- .../shipdetail}/entity/FlagHistoryEntity.java | 2 +- .../GroupBeneficialOwnerHistoryEntity.java | 2 +- .../shipdetail}/entity/IceClassEntity.java | 2 +- .../shipdetail}/entity/NameHistoryEntity.java | 2 +- .../entity/OperatorHistoryEntity.java | 2 +- .../shipdetail}/entity/OwnerHistoryEntity.java | 2 +- .../shipdetail}/entity/PandIHistoryEntity.java | 2 +- ...fetyManagementCertificateHistoryEntity.java | 2 +- .../shipdetail}/entity/ShipDetailEntity.java | 2 +- .../shipdetail}/entity/ShipHashEntity.java | 2 +- .../entity/ShipManagerHistoryEntity.java | 2 +- .../entity/SisterShipLinksEntity.java | 2 +- .../entity/SpecialFeatureEntity.java | 2 +- .../entity/StatusHistoryEntity.java | 2 +- .../entity/StowageCommodityEntity.java | 2 +- .../entity/SurveyDatesHistoryEntity.java | 2 +- .../entity/SurveyDatesHistoryUniqueEntity.java | 2 +- .../entity/TechnicalManagerHistoryEntity.java | 2 +- .../shipdetail}/entity/ThrustersEntity.java | 2 +- .../processor/ShipDetailDataProcessor.java | 6 +++--- .../reader/ShipDetailUpdateDataReader.java | 8 ++++---- .../repository/ShipDetailRepository.java | 4 ++-- .../repository/ShipDetailRepositoryImpl.java | 4 ++-- .../shipdetail}/repository/ShipDetailSql.java | 2 +- .../repository/ShipHashRepository.java | 4 ++-- .../repository/ShipHashRepositoryImpl.java | 4 ++-- .../writer/ShipDetailDataWriter.java | 10 +++++----- .../batch/repository/EventRepository.java | 15 --------------- .../batch/repository/FacilityRepository.java | 9 --------- .../batch/repository/PscDefectRepository.java | 10 ---------- .../risk}/controller/RiskController.java | 6 +++--- .../risk}/service/RiskBypassService.java | 4 ++-- 250 files changed, 567 insertions(+), 567 deletions(-) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/config/FlagCodeImportJobConfig.java (89%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/config/Stat5CodeImportJobConfig.java (89%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/dto/FlagCodeApiResponse.java (93%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/dto/FlagCodeDto.java (95%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/dto/Stat5CodeApiResponse.java (90%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/dto/Stat5CodeDto.java (96%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/entity/FlagCodeEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/entity/Stat5CodeEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/processor/FlagCodeDataProcessor.java (86%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/processor/Stat5CodeDataProcessor.java (89%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/reader/FlagCodeDataReader.java (92%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/reader/Stat5CodeDataReader.java (92%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/repository/FlagCodeRepository.java (51%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/repository/FlagCodeRepositoryImpl.java (96%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/repository/Stat5CodeRepository.java (51%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/repository/Stat5CodeRepositoryImpl.java (96%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/writer/FlagCodeDataWriter.java (78%) rename src/main/java/com/snp/batch/jobs/{common/batch => batch/common}/writer/Stat5CodeDataWriter.java (78%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/config/CompanyComplianceImportRangeJobConfig.java (96%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/config/ComplianceImportRangeJobConfig.java (96%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/dto/CompanyComplianceDto.java (97%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/dto/ComplianceDto.java (98%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/entity/CompanyComplianceEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/entity/ComplianceEntity.java (98%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/processor/CompanyComplianceDataProcessor.java (92%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/processor/ComplianceDataProcessor.java (95%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/reader/CompanyComplianceDataRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/reader/ComplianceDataRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/repository/CompanyComplianceRepository.java (66%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/repository/CompanyComplianceRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/repository/ComplianceRepository.java (62%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/repository/ComplianceRepositoryImpl.java (98%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/writer/CompanyComplianceDataWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{compliance/batch => batch/compliance}/writer/ComplianceDataWriter.java (80%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/config/EventImportJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/CargoDto.java (92%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/EventDetailDto.java (98%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/EventDetailResponse.java (89%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/EventDto.java (96%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/EventPeriod.java (82%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/EventResponse.java (90%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/HumanCasualtyDto.java (88%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/dto/RelationshipDto.java (91%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/entity/CargoEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/entity/EventDetailEntity.java (97%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/entity/EventEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/entity/HumanCasualtyEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/entity/RelationshipEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/processor/EventDataProcessor.java (89%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/reader/EventDataReader.java (99%) create mode 100644 src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/repository/EventRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/repository/EventSql.java (98%) rename src/main/java/com/snp/batch/jobs/{event/batch => batch/event}/writer/EventDataWriter.java (89%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/config/PortImportJobConfig.java (91%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/dto/PortDto.java (98%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/dto/PortResponse.java (84%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/entity/PortEntity.java (97%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/processor/PortDataProcessor.java (95%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/reader/PortDataReader.java (95%) create mode 100644 src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/repository/FacilityRepositoryImpl.java (98%) rename src/main/java/com/snp/batch/jobs/{facility/batch => batch/facility}/writer/PortDataWriter.java (79%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/config/ImoMetaImportJobConfig.java (95%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/dto/ImoMetaDto.java (93%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/dto/ImoMetaResponse.java (88%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/entity/ImoMetaEntity.java (90%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/reader/ImoMetaDataReader.java (96%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/repository/ImoMetaRepository.java (58%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/repository/ImoMetaRepositoryImpl.java (95%) rename src/main/java/com/snp/batch/jobs/{imometa/batch => batch/imometa}/writer/ImoMetaDataWriter.java (77%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/AnchorageCallsRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/BerthCallsRangJobConfig.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/CurrentlyAtRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/DestinationsRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/ShipPortCallsRangeJobConfig.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/StsOperationRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/TerminalCallsRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/config/TransitsRangeJobConfig.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/AnchorageCallsDto.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/AnchorageCallsPositionDto.java (89%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/BerthCallsDto.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/BerthCallsPositionDto.java (87%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/CurrentlyAtDto.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/CurrentlyAtPositionDto.java (87%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/DestinationDto.java (90%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/DestinationPositionDto.java (87%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/PortCallsDto.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/PortCallsPositionDto.java (87%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/ShipMovementApiResponse.java (82%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/StsOperationDto.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/StsOperationPositionDto.java (88%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/TerminalCallsDto.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/TerminalCallsPositionDto.java (88%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/dto/TransitsDto.java (84%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/AnchorageCallsEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/BerthCallsEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/CurrentlyAtEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/DestinationEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/PortCallsEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/StsOperationEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/TerminalCallsEntity.java (96%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/entity/TransitsEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/AnchorageCallsProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/BerthCallsProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/CurrentlyAtProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/DestinationProcessor.java (92%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/PortCallsProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/StsOperationProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/TerminalCallsProcessor.java (93%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/processor/TransitsProcessor.java (88%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/AnchorageCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/BerthCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/CurrentlyAtRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/DestinationRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/PortCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/StsOperationRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/TerminalCallsRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/reader/TransitsRangeReader.java (95%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/AnchorageCallsRepository.java (62%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/AnchorageCallsRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/BerthCallsRepository.java (60%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/BerthCallsRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/CurrentlyAtRepository.java (60%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/CurrentlyAtRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/DestinationRepository.java (60%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/DestinationRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/PortCallsRepository.java (50%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/PortCallsRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/StsOperationRepository.java (61%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/StsOperationRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/TerminalCallsRepository.java (61%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/TerminalCallsRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/TransitsRepository.java (59%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/repository/TransitsRepositoryImpl.java (96%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/AnchorageCallsWriter.java (82%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/BerthCallsWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/CurrentlyAtWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/DestinationWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/PortCallsWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/StsOperationWriter.java (82%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/TerminalCallsWriter.java (82%) rename src/main/java/com/snp/batch/jobs/{movement/batch => batch/movement}/writer/TransitsWriter.java (81%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/config/PscInspectionJobConfig.java (93%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscAllCertificateDto.java (97%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscApiResponseDto.java (87%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscApsStatusDto.java (92%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscDataSetVersionDto.java (78%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscDefectDto.java (97%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/dto/PscInspectionDto.java (98%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/entity/PscAllCertificateEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/entity/PscDefectEntity.java (96%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/entity/PscInspectionEntity.java (96%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/processor/PscInspectionProcessor.java (96%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/reader/PscApiReader.java (96%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/repository/PscAllCertificateRepository.java (56%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/repository/PscAllCertificateRepositoryImpl.java (97%) create mode 100644 src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/repository/PscDefectRepositoryImpl.java (96%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/repository/PscInspectionRepository.java (52%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/repository/PscInspectionRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{pscInspection/batch => batch/pscInspection}/writer/PscInspectionWriter.java (86%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/config/RiskDetailImoFetchTasklet.java (97%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/config/RiskDetailImportJobConfig.java (95%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/config/RiskImportRangeJobConfig.java (94%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/dto/RiskDto.java (99%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/dto/RiskResponse.java (85%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/entity/RiskEntity.java (98%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/processor/RiskDataProcessor.java (97%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/reader/RiskDataRangeReader.java (97%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/reader/RiskDetailDataReader.java (98%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/repository/RiskRepository.java (66%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/repository/RiskRepositoryImpl.java (99%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/writer/RiskDataWriter.java (78%) rename src/main/java/com/snp/batch/jobs/{risk/batch => batch/risk}/writer/RiskDetailDataWriter.java (78%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/config/ShipDetailImoFetchTasklet.java (97%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/config/ShipDetailPartitioner.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/config/ShipDetailUpdateJobConfig.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/AdditionalInformationDto.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/BareBoatCharterHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/CallSignAndMmsiHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ClassHistoryDto.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/CompanyDetailDto.java (97%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/CompanyVesselRelationshipDto.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/CrewListDto.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/DarkActivityConfirmedDto.java (97%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/FlagHistoryDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/GroupBeneficialOwnerHistoryDto.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/IceClassDto.java (89%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/NameHistoryDto.java (90%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/OperatorHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/OwnerHistoryDto.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/PandIHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/SafetyManagementCertificateHistoryDto.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipDetailApiResponse.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipDetailComparisonData.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipDetailDto.java (99%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipDetailUpdate.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipDto.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipManagerHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipResultDto.java (90%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ShipUpdateApiResponse.java (90%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/SisterShipLinksDto.java (89%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/SpecialFeatureDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/StatusHistoryDto.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/StowageCommodityDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/SurveyDatesHistoryDto.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/SurveyDatesHistoryUniqueDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/TechnicalManagerHistoryDto.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/dto/ThrustersDto.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/AdditionalInformationEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/BareBoatCharterHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/CallSignAndMmsiHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/ClassHistoryEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/CompanyDetailEntity.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/CompanyVesselRelationshipEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/CrewListEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/DarkActivityConfirmedEntity.java (96%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/FlagHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/GroupBeneficialOwnerHistoryEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/IceClassEntity.java (90%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/NameHistoryEntity.java (90%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/OperatorHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/OwnerHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/PandIHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/SafetyManagementCertificateHistoryEntity.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/ShipDetailEntity.java (99%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/ShipHashEntity.java (89%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/ShipManagerHistoryEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/SisterShipLinksEntity.java (89%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/SpecialFeatureEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/StatusHistoryEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/StowageCommodityEntity.java (94%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/SurveyDatesHistoryEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/SurveyDatesHistoryUniqueEntity.java (91%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/TechnicalManagerHistoryEntity.java (92%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/entity/ThrustersEntity.java (93%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/processor/ShipDetailDataProcessor.java (99%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/reader/ShipDetailUpdateDataReader.java (98%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/repository/ShipDetailRepository.java (95%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/repository/ShipDetailRepositoryImpl.java (99%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/repository/ShipDetailSql.java (99%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/repository/ShipHashRepository.java (50%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/repository/ShipHashRepositoryImpl.java (97%) rename src/main/java/com/snp/batch/jobs/{shipdetail/batch => batch/shipdetail}/writer/ShipDetailDataWriter.java (96%) delete mode 100644 src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java delete mode 100644 src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java delete mode 100644 src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java rename src/main/java/com/snp/batch/jobs/{risk/web => web/risk}/controller/RiskController.java (93%) rename src/main/java/com/snp/batch/jobs/{risk/web => web/risk}/service/RiskBypassService.java (94%) diff --git a/src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java index f30fcc9..87faea3 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/config/FlagCodeImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/config/FlagCodeImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.common.batch.config; +package com.snp.batch.jobs.batch.common.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; -import com.snp.batch.jobs.common.batch.processor.FlagCodeDataProcessor; -import com.snp.batch.jobs.common.batch.reader.FlagCodeDataReader; -import com.snp.batch.jobs.common.batch.repository.FlagCodeRepository; -import com.snp.batch.jobs.common.batch.writer.FlagCodeDataWriter; -import com.snp.batch.jobs.facility.batch.reader.PortDataReader; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.processor.FlagCodeDataProcessor; +import com.snp.batch.jobs.batch.common.reader.FlagCodeDataReader; +import com.snp.batch.jobs.batch.common.repository.FlagCodeRepository; +import com.snp.batch.jobs.batch.common.writer.FlagCodeDataWriter; +import com.snp.batch.jobs.batch.facility.reader.PortDataReader; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java index b27b652..24daba1 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/config/Stat5CodeImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/config/Stat5CodeImportJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.common.batch.config; +package com.snp.batch.jobs.batch.common.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; -import com.snp.batch.jobs.common.batch.processor.Stat5CodeDataProcessor; -import com.snp.batch.jobs.common.batch.reader.Stat5CodeDataReader; -import com.snp.batch.jobs.common.batch.repository.Stat5CodeRepository; -import com.snp.batch.jobs.common.batch.writer.Stat5CodeDataWriter; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.processor.Stat5CodeDataProcessor; +import com.snp.batch.jobs.batch.common.reader.Stat5CodeDataReader; +import com.snp.batch.jobs.batch.common.repository.Stat5CodeRepository; +import com.snp.batch.jobs.batch.common.writer.Stat5CodeDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java index 3e3a51f..11ecc8f 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java index c763da7..f8469bb 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/FlagCodeDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/FlagCodeDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java index f8f60e1..9cb25d2 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java rename to src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java index c50fc10..e851e4b 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/dto/Stat5CodeDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/dto/Stat5CodeDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.dto; +package com.snp.batch.jobs.batch.common.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java b/src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java rename to src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java index 995d108..e08384e 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/entity/FlagCodeEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/entity/FlagCodeEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.entity; +package com.snp.batch.jobs.batch.common.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java b/src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java rename to src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java index b5e2d76..e527b4d 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/entity/Stat5CodeEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/entity/Stat5CodeEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.common.batch.entity; +package com.snp.batch.jobs.batch.common.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java similarity index 86% rename from src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java index a5f95b1..1d3d21e 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/processor/FlagCodeDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/processor/FlagCodeDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.processor; +package com.snp.batch.jobs.batch.common.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java index 27fa993..4f58b96 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/processor/Stat5CodeDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/processor/Stat5CodeDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.processor; +package com.snp.batch.jobs.batch.common.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java b/src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java index 544851e..087f08a 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/reader/FlagCodeDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/reader/FlagCodeDataReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.reader; +package com.snp.batch.jobs.batch.common.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.common.batch.dto.FlagCodeApiResponse; -import com.snp.batch.jobs.common.batch.dto.FlagCodeDto; +import com.snp.batch.jobs.batch.common.dto.FlagCodeApiResponse; +import com.snp.batch.jobs.batch.common.dto.FlagCodeDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java b/src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java index e887aa0..06cd146 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/reader/Stat5CodeDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/reader/Stat5CodeDataReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.reader; +package com.snp.batch.jobs.batch.common.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeApiResponse; -import com.snp.batch.jobs.common.batch.dto.Stat5CodeDto; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeApiResponse; +import com.snp.batch.jobs.batch.common.dto.Stat5CodeDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java similarity index 51% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java index 304bb8b..46ced31 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java index 3a78ad8..82d3081 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/FlagCodeRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/FlagCodeRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java similarity index 51% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java index 10edd49..ccfb173 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java index bd52cd5..06b1bbe 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/repository/Stat5CodeRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/repository/Stat5CodeRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.common.batch.repository; +package com.snp.batch.jobs.batch.common.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java index 5c5b82e..6cd64a0 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/writer/FlagCodeDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/writer/FlagCodeDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.writer; +package com.snp.batch.jobs.batch.common.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.common.batch.entity.FlagCodeEntity; -import com.snp.batch.jobs.common.batch.repository.FlagCodeRepository; +import com.snp.batch.jobs.batch.common.entity.FlagCodeEntity; +import com.snp.batch.jobs.batch.common.repository.FlagCodeRepository; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java index 9f8267e..c78bc95 100644 --- a/src/main/java/com/snp/batch/jobs/common/batch/writer/Stat5CodeDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/common/writer/Stat5CodeDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.common.batch.writer; +package com.snp.batch.jobs.batch.common.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.common.batch.entity.Stat5CodeEntity; -import com.snp.batch.jobs.common.batch.repository.Stat5CodeRepository; +import com.snp.batch.jobs.batch.common.entity.Stat5CodeEntity; +import com.snp.batch.jobs.batch.common.repository.Stat5CodeRepository; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java index a4ce742..74e45e1 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/config/CompanyComplianceImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/config/CompanyComplianceImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.compliance.batch.config; +package com.snp.batch.jobs.batch.compliance.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; -import com.snp.batch.jobs.compliance.batch.processor.CompanyComplianceDataProcessor; -import com.snp.batch.jobs.compliance.batch.reader.CompanyComplianceDataRangeReader; -import com.snp.batch.jobs.compliance.batch.writer.CompanyComplianceDataWriter; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.processor.CompanyComplianceDataProcessor; +import com.snp.batch.jobs.batch.compliance.reader.CompanyComplianceDataRangeReader; +import com.snp.batch.jobs.batch.compliance.writer.CompanyComplianceDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java index fa496d2..463c767 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/config/ComplianceImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/config/ComplianceImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.compliance.batch.config; +package com.snp.batch.jobs.batch.compliance.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; -import com.snp.batch.jobs.compliance.batch.processor.ComplianceDataProcessor; -import com.snp.batch.jobs.compliance.batch.reader.ComplianceDataRangeReader; -import com.snp.batch.jobs.compliance.batch.writer.ComplianceDataWriter; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.processor.ComplianceDataProcessor; +import com.snp.batch.jobs.batch.compliance.reader.ComplianceDataRangeReader; +import com.snp.batch.jobs.batch.compliance.writer.ComplianceDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java index ecbc837..1d47c00 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/CompanyComplianceDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/CompanyComplianceDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.dto; +package com.snp.batch.jobs.batch.compliance.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java index 4b7d032..683145b 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/dto/ComplianceDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/dto/ComplianceDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.dto; +package com.snp.batch.jobs.batch.compliance.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java index 1ea272c..6515242 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/CompanyComplianceEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/CompanyComplianceEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.entity; +package com.snp.batch.jobs.batch.compliance.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java index e363042..c49ac02 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/entity/ComplianceEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/entity/ComplianceEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.compliance.batch.entity; +package com.snp.batch.jobs.batch.compliance.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java index 211ba1c..7ce2d3b 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/CompanyComplianceDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/CompanyComplianceDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.processor; +package com.snp.batch.jobs.batch.compliance.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java index 7145776..a33c7f3 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/processor/ComplianceDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/processor/ComplianceDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.processor; +package com.snp.batch.jobs.batch.compliance.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java index 6170041..5e76273 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/CompanyComplianceDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/CompanyComplianceDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.reader; +package com.snp.batch.jobs.batch.compliance.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.compliance.batch.dto.CompanyComplianceDto; +import com.snp.batch.jobs.batch.compliance.dto.CompanyComplianceDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java index 6c5c185..ee41d5a 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/reader/ComplianceDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/reader/ComplianceDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.reader; +package com.snp.batch.jobs.batch.compliance.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.compliance.batch.dto.ComplianceDto; +import com.snp.batch.jobs.batch.compliance.dto.ComplianceDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java similarity index 66% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java index 6277eec..073ccb9 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java index 08ded44..05dddb8 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/CompanyComplianceRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/CompanyComplianceRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java similarity index 62% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java index b34e42c..94e193d 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java index 3a4b365..346ff68 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/repository/ComplianceRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.compliance.batch.repository; +package com.snp.batch.jobs.batch.compliance.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java index 1f75813..0048638 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/CompanyComplianceDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/CompanyComplianceDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.writer; +package com.snp.batch.jobs.batch.compliance.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.compliance.batch.entity.CompanyComplianceEntity; -import com.snp.batch.jobs.compliance.batch.repository.CompanyComplianceRepository; +import com.snp.batch.jobs.batch.compliance.entity.CompanyComplianceEntity; +import com.snp.batch.jobs.batch.compliance.repository.CompanyComplianceRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java similarity index 80% rename from src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java index e102db3..ef842e3 100644 --- a/src/main/java/com/snp/batch/jobs/compliance/batch/writer/ComplianceDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/compliance/writer/ComplianceDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.compliance.batch.writer; +package com.snp.batch.jobs.batch.compliance.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.compliance.batch.entity.ComplianceEntity; -import com.snp.batch.jobs.compliance.batch.repository.ComplianceRepository; +import com.snp.batch.jobs.batch.compliance.entity.ComplianceEntity; +import com.snp.batch.jobs.batch.compliance.repository.ComplianceRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java index d7dd1c8..9f93445 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/config/EventImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/config/EventImportJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.event.batch.config; +package com.snp.batch.jobs.batch.event.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.event.batch.dto.EventDetailDto; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.processor.EventDataProcessor; -import com.snp.batch.jobs.event.batch.reader.EventDataReader; -import com.snp.batch.jobs.event.batch.writer.EventDataWriter; +import com.snp.batch.jobs.batch.event.dto.EventDetailDto; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.processor.EventDataProcessor; +import com.snp.batch.jobs.batch.event.reader.EventDataReader; +import com.snp.batch.jobs.batch.event.writer.EventDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java index 8a91382..0d57792 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/CargoDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/CargoDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java index 38a2fd6..93b90df 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java index fe67261..36fbd8a 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDetailResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDetailResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java index 00d2e07..06a46ac 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java index 05e4703..79e6b75 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventPeriod.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventPeriod.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java index 7c9118c..d701253 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/EventResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/EventResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java index 09ed21c..543db48 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/HumanCasualtyDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/HumanCasualtyDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java b/src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java rename to src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java index 1d1beae..45b57fa 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/dto/RelationshipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/dto/RelationshipDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.dto; +package com.snp.batch.jobs.batch.event.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java index 8e2e95d..ad3799e 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/CargoEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/CargoEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java index 58b4bda..f159f9c 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java index 6a55161..813ae9d 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/EventEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/EventEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java index d52bd9e..c511a08 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/HumanCasualtyEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/HumanCasualtyEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java b/src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java rename to src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java index e3c5ea7..014fa26 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/entity/RelationshipEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/entity/RelationshipEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.entity; +package com.snp.batch.jobs.batch.event.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java index 899a04b..f8876c5 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/processor/EventDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/processor/EventDataProcessor.java @@ -1,15 +1,15 @@ -package com.snp.batch.jobs.event.batch.processor; +package com.snp.batch.jobs.batch.event.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.event.batch.dto.CargoDto; -import com.snp.batch.jobs.event.batch.dto.EventDetailDto; -import com.snp.batch.jobs.event.batch.dto.HumanCasualtyDto; -import com.snp.batch.jobs.event.batch.dto.RelationshipDto; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.dto.CargoDto; +import com.snp.batch.jobs.batch.event.dto.EventDetailDto; +import com.snp.batch.jobs.batch.event.dto.HumanCasualtyDto; +import com.snp.batch.jobs.batch.event.dto.RelationshipDto; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java b/src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java index 602c2b5..ca96c57 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/reader/EventDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.event.batch.reader; +package com.snp.batch.jobs.batch.event.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.event.batch.dto.*; +import com.snp.batch.jobs.batch.event.dto.*; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java new file mode 100644 index 0000000..7cf97e0 --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepository.java @@ -0,0 +1,15 @@ +package com.snp.batch.jobs.batch.event.repository; + +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; + +import java.util.List; + +public interface EventRepository { + void saveEventAll(List items); + void saveCargoAll(List items); + void saveHumanCasualtyAll(List items); + void saveRelationshipAll(List items); +} diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java index abee759..e595e48 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.event.batch.repository; +package com.snp.batch.jobs.batch.event.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; +import com.snp.batch.jobs.batch.event.entity.CargoEntity; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.entity.HumanCasualtyEntity; +import com.snp.batch.jobs.batch.event.entity.RelationshipEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java rename to src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java index 8e25561..b7bcec4 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventSql.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/repository/EventSql.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.event.batch.repository; +package com.snp.batch.jobs.batch.event.repository; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java index 7185f9c..dafa951 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/writer/EventDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/event/writer/EventDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.event.batch.writer; +package com.snp.batch.jobs.batch.event.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.repository.EventRepository; +import com.snp.batch.jobs.batch.event.entity.EventDetailEntity; +import com.snp.batch.jobs.batch.event.repository.EventRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java index cf404e1..b5aa0dc 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/config/PortImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/config/PortImportJobConfig.java @@ -1,11 +1,11 @@ -package com.snp.batch.jobs.facility.batch.config; +package com.snp.batch.jobs.batch.facility.config; import com.snp.batch.common.batch.config.BaseJobConfig; -import com.snp.batch.jobs.facility.batch.dto.PortDto; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; -import com.snp.batch.jobs.facility.batch.processor.PortDataProcessor; -import com.snp.batch.jobs.facility.batch.reader.PortDataReader; -import com.snp.batch.jobs.facility.batch.writer.PortDataWriter; +import com.snp.batch.jobs.batch.facility.dto.PortDto; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.processor.PortDataProcessor; +import com.snp.batch.jobs.batch.facility.reader.PortDataReader; +import com.snp.batch.jobs.batch.facility.writer.PortDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java rename to src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java index f324028..8789e29 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.dto; +package com.snp.batch.jobs.batch.facility.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java rename to src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java index 99918db..4a85a4c 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/dto/PortResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/dto/PortResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.dto; +package com.snp.batch.jobs.batch.facility.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java b/src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java rename to src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java index b4b7875..49e08be 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/entity/PortEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/entity/PortEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.facility.batch.entity; +package com.snp.batch.jobs.batch.facility.entity; import com.snp.batch.common.batch.entity.BaseEntity; import jakarta.persistence.Embedded; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java index 391c264..9f5fcac 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/processor/PortDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/processor/PortDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.facility.batch.processor; +package com.snp.batch.jobs.batch.facility.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.facility.batch.dto.PortDto; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.dto.PortDto; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java b/src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java index 26cf8f9..aaff25a 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/reader/PortDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/reader/PortDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.facility.batch.reader; +package com.snp.batch.jobs.batch.facility.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.facility.batch.dto.PortDto; +import com.snp.batch.jobs.batch.facility.dto.PortDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; diff --git a/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java new file mode 100644 index 0000000..7e7223f --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepository.java @@ -0,0 +1,9 @@ +package com.snp.batch.jobs.batch.facility.repository; + +import com.snp.batch.jobs.batch.facility.entity.PortEntity; + +import java.util.List; + +public interface FacilityRepository { + void savePortAll(List items); +} diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java index b06eeab..105803b 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/repository/FacilityRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.facility.batch.repository; +package com.snp.batch.jobs.batch.facility.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java similarity index 79% rename from src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java index 2ddafcd..7e2984d 100644 --- a/src/main/java/com/snp/batch/jobs/facility/batch/writer/PortDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/facility/writer/PortDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.facility.batch.writer; +package com.snp.batch.jobs.batch.facility.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.facility.batch.entity.PortEntity; -import com.snp.batch.jobs.facility.batch.repository.FacilityRepository; +import com.snp.batch.jobs.batch.facility.entity.PortEntity; +import com.snp.batch.jobs.batch.facility.repository.FacilityRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java index bb17920..edf7387 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/config/ImoMetaImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/config/ImoMetaImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.imometa.batch.config; +package com.snp.batch.jobs.batch.imometa.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaDto; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaResponse; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; -import com.snp.batch.jobs.imometa.batch.reader.ImoMetaDataReader; -import com.snp.batch.jobs.imometa.batch.repository.ImoMetaRepository; -import com.snp.batch.jobs.imometa.batch.writer.ImoMetaDataWriter; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaDto; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaResponse; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.reader.ImoMetaDataReader; +import com.snp.batch.jobs.batch.imometa.repository.ImoMetaRepository; +import com.snp.batch.jobs.batch.imometa.writer.ImoMetaDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java index 68ddae6..9f43b94 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.dto; +package com.snp.batch.jobs.batch.imometa.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java index 57245b1..d653d23 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/dto/ImoMetaResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/dto/ImoMetaResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.dto; +package com.snp.batch.jobs.batch.imometa.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java b/src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java index b77dc9a..f7fdb65 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/entity/ImoMetaEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/entity/ImoMetaEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.imometa.batch.entity; +package com.snp.batch.jobs.batch.imometa.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java b/src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java index 3703c03..31d50cf 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/reader/ImoMetaDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/reader/ImoMetaDataReader.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.imometa.batch.reader; +package com.snp.batch.jobs.batch.imometa.reader; import com.snp.batch.common.batch.reader.BaseApiReader; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaDto; -import com.snp.batch.jobs.imometa.batch.dto.ImoMetaResponse; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaDto; +import com.snp.batch.jobs.batch.imometa.dto.ImoMetaResponse; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.reactive.function.client.WebClient; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java similarity index 58% rename from src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java index ee6edef..6f39731 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.imometa.batch.repository; +package com.snp.batch.jobs.batch.imometa.repository; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java index 9857ebd..826c507 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/repository/ImoMetaRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/repository/ImoMetaRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.imometa.batch.repository; +package com.snp.batch.jobs.batch.imometa.repository; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java similarity index 77% rename from src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java index 2ebc1be..9d5de26 100644 --- a/src/main/java/com/snp/batch/jobs/imometa/batch/writer/ImoMetaDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/imometa/writer/ImoMetaDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.imometa.batch.writer; +package com.snp.batch.jobs.batch.imometa.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.imometa.batch.entity.ImoMetaEntity; -import com.snp.batch.jobs.imometa.batch.repository.ImoMetaRepository; +import com.snp.batch.jobs.batch.imometa.entity.ImoMetaEntity; +import com.snp.batch.jobs.batch.imometa.repository.ImoMetaRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java index 55f5605..246d1e6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/AnchorageCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/AnchorageCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; -import com.snp.batch.jobs.movement.batch.processor.AnchorageCallsProcessor; -import com.snp.batch.jobs.movement.batch.reader.AnchorageCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.AnchorageCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.AnchorageCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.AnchorageCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.AnchorageCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java index e2c99cc..eb30f20 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/BerthCallsRangJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; -import com.snp.batch.jobs.movement.batch.processor.BerthCallsProcessor; -import com.snp.batch.jobs.movement.batch.reader.BerthCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.BerthCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.BerthCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.BerthCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.BerthCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java index 5bb8621..226ccd6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/CurrentlyAtRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/CurrentlyAtRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; -import com.snp.batch.jobs.movement.batch.processor.CurrentlyAtProcessor; -import com.snp.batch.jobs.movement.batch.reader.CurrentlyAtRangeReader; -import com.snp.batch.jobs.movement.batch.writer.CurrentlyAtWriter; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.processor.CurrentlyAtProcessor; +import com.snp.batch.jobs.batch.movement.reader.CurrentlyAtRangeReader; +import com.snp.batch.jobs.batch.movement.writer.CurrentlyAtWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java index 9aa35ea..9e74c79 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/DestinationsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/DestinationsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.DestinationDto; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; -import com.snp.batch.jobs.movement.batch.processor.DestinationProcessor; -import com.snp.batch.jobs.movement.batch.reader.DestinationRangeReader; -import com.snp.batch.jobs.movement.batch.writer.DestinationWriter; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.processor.DestinationProcessor; +import com.snp.batch.jobs.batch.movement.reader.DestinationRangeReader; +import com.snp.batch.jobs.batch.movement.writer.DestinationWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java index 92ce464..7758b53 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/ShipPortCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/ShipPortCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.movement.batch.processor.PortCallsProcessor; -import com.snp.batch.jobs.movement.batch.reader.PortCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.PortCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.PortCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.PortCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.PortCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java index 8b35c2a..93c388f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/StsOperationRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/StsOperationRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; -import com.snp.batch.jobs.movement.batch.processor.StsOperationProcessor; -import com.snp.batch.jobs.movement.batch.reader.StsOperationRangeReader; -import com.snp.batch.jobs.movement.batch.writer.StsOperationWriter; +import com.snp.batch.jobs.batch.movement.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.processor.StsOperationProcessor; +import com.snp.batch.jobs.batch.movement.reader.StsOperationRangeReader; +import com.snp.batch.jobs.batch.movement.writer.StsOperationWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java index 59f006a..bbc2f8a 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/TerminalCallsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/TerminalCallsRangeJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; -import com.snp.batch.jobs.movement.batch.processor.TerminalCallsProcessor; -import com.snp.batch.jobs.movement.batch.reader.TerminalCallsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.TerminalCallsWriter; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.processor.TerminalCallsProcessor; +import com.snp.batch.jobs.batch.movement.reader.TerminalCallsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.TerminalCallsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java index de521cd..b8b2a14 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/config/TransitsRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/config/TransitsRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.movement.batch.config; +package com.snp.batch.jobs.batch.movement.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.movement.batch.dto.TransitsDto; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; -import com.snp.batch.jobs.movement.batch.processor.TransitsProcessor; -import com.snp.batch.jobs.movement.batch.reader.TransitsRangeReader; -import com.snp.batch.jobs.movement.batch.writer.TransitsWriter; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.processor.TransitsProcessor; +import com.snp.batch.jobs.batch.movement.reader.TransitsRangeReader; +import com.snp.batch.jobs.batch.movement.writer.TransitsWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java index 0d4e885..f345154 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java index 419eb7d..856e271 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/AnchorageCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/AnchorageCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java index d133f60..e02a726 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java index 365cce3..73087d7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/BerthCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/BerthCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java index 7cdc0a9..22d2728 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java index 96e8b1b..633def4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/CurrentlyAtPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/CurrentlyAtPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java index ff5804e..b0aaa71 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java index d9f5d28..33380b4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/DestinationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/DestinationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java index f67a702..d8134dc 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java index fa1e531..ecb13d8 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/PortCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/PortCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java index f1464ef..c12d407 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/ShipMovementApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/ShipMovementApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java index 4318ec3..4b1c9c4 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java index 4410970..d6bbf9c 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/StsOperationPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/StsOperationPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java index 12281e6..6c5cbfe 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java index 1179f09..33b857d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsPositionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TerminalCallsPositionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java similarity index 84% rename from src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java rename to src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java index d3351b9..4e613f7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/dto/TransitsDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/dto/TransitsDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.dto; +package com.snp.batch.jobs.batch.movement.dto; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java index c21cbfd..8eee6dd 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/AnchorageCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/AnchorageCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java index 5553e94..35749a7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/BerthCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java index 5b5c60a..7ba34cf 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/CurrentlyAtEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/CurrentlyAtEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java index 3395baa..7ed8a3d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/DestinationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/DestinationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java index 651265a..f2735a7 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/PortCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/PortCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java index 81df3cf..c645a27 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/StsOperationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/StsOperationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.databind.JsonNode; import com.snp.batch.common.batch.entity.BaseEntity; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java index bb68aae..0211cb8 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TerminalCallsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java rename to src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java index cddbad6..2d3ef25 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/entity/TransitsEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/entity/TransitsEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.movement.batch.entity; +package com.snp.batch.jobs.batch.movement.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java index bd560dd..4174813 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/AnchorageCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/AnchorageCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java index 0b2a52f..7225e2b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/BerthCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java index f72b369..8cf0a11 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/CurrentlyAtProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/CurrentlyAtProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java index b6e085c..763c167 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/DestinationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/DestinationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.DestinationDto; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java index 52d518d..c767899 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/PortCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/PortCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java index 3f2fc9c..020f56d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/StsOperationProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/StsOperationProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java index 28bfa17..c8b686f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TerminalCallsProcessor.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java similarity index 88% rename from src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java index 199b9f3..059bbe9 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/processor/TransitsProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/processor/TransitsProcessor.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.movement.batch.processor; +package com.snp.batch.jobs.batch.movement.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.movement.batch.dto.TransitsDto; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java index bf0fd8d..82fc637 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/AnchorageCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/AnchorageCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java index a742932..ecccd69 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/BerthCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/BerthCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto; +import com.snp.batch.jobs.batch.movement.dto.BerthCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java index 0827855..bc28678 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/CurrentlyAtRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/CurrentlyAtRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.CurrentlyAtDto; +import com.snp.batch.jobs.batch.movement.dto.CurrentlyAtDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java index 2c43ec0..de8f560 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/DestinationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/DestinationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.DestinationDto; +import com.snp.batch.jobs.batch.movement.dto.DestinationDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java index aad0ebf..9b76f32 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/PortCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/PortCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.PortCallsDto; +import com.snp.batch.jobs.batch.movement.dto.PortCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java index b3640bf..fd52d8b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/StsOperationRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/StsOperationRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.StsOperationDto; +import com.snp.batch.jobs.batch.movement.dto.StsOperationDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java index 49e7704..c388b12 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TerminalCallsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TerminalCallsRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.TerminalCallsDto; +import com.snp.batch.jobs.batch.movement.dto.TerminalCallsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java index b2475be..def5cce 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/reader/TransitsRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/reader/TransitsRangeReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.reader; +package com.snp.batch.jobs.batch.movement.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.movement.batch.dto.AnchorageCallsDto; -import com.snp.batch.jobs.movement.batch.dto.TransitsDto; +import com.snp.batch.jobs.batch.movement.dto.AnchorageCallsDto; +import com.snp.batch.jobs.batch.movement.dto.TransitsDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java similarity index 62% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java index 7101a51..4a7d613 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java index 631fe6a..8600f22 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/AnchorageCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/AnchorageCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java index b501ac6..8914f3a 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java index d2db18c..0c3a39d 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/BerthCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java index 5f105c0..24489de 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java index 57851c5..b7702ff 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/CurrentlyAtRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/CurrentlyAtRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java similarity index 60% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java index 0bc014c..2b5d933 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java index e766a67..432831f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/DestinationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/DestinationRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java similarity index 50% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java index 9a7ab22..5e98851 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java index 9ff1123..c1897d2 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/PortCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java similarity index 61% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java index c9abd34..a152598 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import java.util.List; /** diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java index d023cd7..d549c3f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/StsOperationRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/StsOperationRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java similarity index 61% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java index 71ee017..c25a436 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java index 38b7f23..bd6f55c 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TerminalCallsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java similarity index 59% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java index 235f3ef..679e629 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java index f289162..24cc769 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/repository/TransitsRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/repository/TransitsRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.repository; +package com.snp.batch.jobs.batch.movement.repository; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java index b3600ab..4c33f8f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/AnchorageCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/AnchorageCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.AnchorageCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.AnchorageCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.AnchorageCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.AnchorageCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java index 9efb091..9152be2 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/BerthCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.BerthCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.BerthCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.BerthCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java index fbd95fe..7a0b179 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/CurrentlyAtWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/CurrentlyAtWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.CurrentlyAtRepository; -import com.snp.batch.jobs.movement.batch.entity.CurrentlyAtEntity; +import com.snp.batch.jobs.batch.movement.repository.CurrentlyAtRepository; +import com.snp.batch.jobs.batch.movement.entity.CurrentlyAtEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java index a7bf3b5..fa00c12 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/DestinationWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/DestinationWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.DestinationRepository; -import com.snp.batch.jobs.movement.batch.entity.DestinationEntity; +import com.snp.batch.jobs.batch.movement.repository.DestinationRepository; +import com.snp.batch.jobs.batch.movement.entity.DestinationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java index 8ec07cf..78d0b8b 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/PortCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/PortCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.entity.PortCallsEntity; -import com.snp.batch.jobs.movement.batch.repository.PortCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.PortCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.PortCallsRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java index 3decdc1..2c6a8f6 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/StsOperationWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/StsOperationWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.StsOperationRepository; -import com.snp.batch.jobs.movement.batch.entity.StsOperationEntity; +import com.snp.batch.jobs.batch.movement.repository.StsOperationRepository; +import com.snp.batch.jobs.batch.movement.entity.StsOperationEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java similarity index 82% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java index 70c779b..4b8d62f 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TerminalCallsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TerminalCallsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.TerminalCallsRepository; -import com.snp.batch.jobs.movement.batch.entity.TerminalCallsEntity; +import com.snp.batch.jobs.batch.movement.repository.TerminalCallsRepository; +import com.snp.batch.jobs.batch.movement.entity.TerminalCallsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java similarity index 81% rename from src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java rename to src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java index bcf3f49..96b6910 100644 --- a/src/main/java/com/snp/batch/jobs/movement/batch/writer/TransitsWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/movement/writer/TransitsWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.movement.batch.writer; +package com.snp.batch.jobs.batch.movement.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.movement.batch.repository.TransitsRepository; -import com.snp.batch.jobs.movement.batch.entity.TransitsEntity; +import com.snp.batch.jobs.batch.movement.repository.TransitsRepository; +import com.snp.batch.jobs.batch.movement.entity.TransitsEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java index 83ea48f..ebc0e8b 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/config/PscInspectionJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/config/PscInspectionJobConfig.java @@ -1,14 +1,14 @@ -package com.snp.batch.jobs.pscInspection.batch.config; +package com.snp.batch.jobs.batch.pscInspection.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.facility.batch.processor.PortDataProcessor; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; -import com.snp.batch.jobs.pscInspection.batch.processor.PscInspectionProcessor; -import com.snp.batch.jobs.pscInspection.batch.reader.PscApiReader; -import com.snp.batch.jobs.pscInspection.batch.writer.PscInspectionWriter; +import com.snp.batch.jobs.batch.facility.processor.PortDataProcessor; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.processor.PscInspectionProcessor; +import com.snp.batch.jobs.batch.pscInspection.reader.PscApiReader; +import com.snp.batch.jobs.batch.pscInspection.writer.PscInspectionWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java index 42540d6..1907919 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscAllCertificateDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscAllCertificateDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java similarity index 87% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java index 1d3af2a..5efb26d 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApiResponseDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApiResponseDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java index 8e7f20f..357b497 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscApsStatusDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscApsStatusDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java index 41fe574..5742f9f 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDataSetVersionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDataSetVersionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java index 3557833..7069b95 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscDefectDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscDefectDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java index 066a10e..2e810cd 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/dto/PscInspectionDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/dto/PscInspectionDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.dto; +package com.snp.batch.jobs.batch.pscInspection.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java index 7f7cd96..c6c8a6b 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscAllCertificateEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscAllCertificateEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java index 2eb74ba..7054b84 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscDefectEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscDefectEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java index bf54ad8..abaf8d3 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/entity/PscInspectionEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/entity/PscInspectionEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.pscInspection.batch.entity; +package com.snp.batch.jobs.batch.pscInspection.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java index f49f7c1..ac0c5b6 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/processor/PscInspectionProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/processor/PscInspectionProcessor.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.pscInspection.batch.processor; +package com.snp.batch.jobs.batch.pscInspection.processor; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.pscInspection.batch.dto.PscAllCertificateDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscDefectDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.dto.PscAllCertificateDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscDefectDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java index 6d00c24..91a16d0 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/reader/PscApiReader.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.pscInspection.batch.reader; +package com.snp.batch.jobs.batch.pscInspection.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.pscInspection.batch.dto.PscApiResponseDto; -import com.snp.batch.jobs.pscInspection.batch.dto.PscInspectionDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscApiResponseDto; +import com.snp.batch.jobs.batch.pscInspection.dto.PscInspectionDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java similarity index 56% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java index 5d4586a..415f17e 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java index 9fb897f..780847e 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscAllCertificateRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscAllCertificateEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscAllCertificateEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java new file mode 100644 index 0000000..c97eaeb --- /dev/null +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepository.java @@ -0,0 +1,10 @@ +package com.snp.batch.jobs.batch.pscInspection.repository; + +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; + +import java.util.List; + +public interface PscDefectRepository { + void saveDefects(List defects); +} diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java index 59daa26..7664742 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscDefectRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscDefectEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java similarity index 52% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java index 201f6c7..16dc7af 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java index 19dd984..b649ae5 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/repository/PscInspectionRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; +package com.snp.batch.jobs.batch.pscInspection.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java b/src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java similarity index 86% rename from src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java rename to src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java index 6e2d5cb..2b442d7 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/writer/PscInspectionWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/pscInspection/writer/PscInspectionWriter.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.pscInspection.batch.writer; +package com.snp.batch.jobs.batch.pscInspection.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; -import com.snp.batch.jobs.pscInspection.batch.repository.PscAllCertificateRepository; -import com.snp.batch.jobs.pscInspection.batch.repository.PscDefectRepository; -import com.snp.batch.jobs.pscInspection.batch.repository.PscInspectionRepository; +import com.snp.batch.jobs.batch.pscInspection.entity.PscInspectionEntity; +import com.snp.batch.jobs.batch.pscInspection.repository.PscAllCertificateRepository; +import com.snp.batch.jobs.batch.pscInspection.repository.PscDefectRepository; +import com.snp.batch.jobs.batch.pscInspection.repository.PscInspectionRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java index a81763c..94ee1eb 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImoFetchTasklet.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImoFetchTasklet.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.JobExecution; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java index ad2e7f7..44768a5 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskDetailImportJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskDetailImportJobConfig.java @@ -1,13 +1,13 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import com.snp.batch.common.batch.config.BasePartitionedJobConfig; import com.snp.batch.common.batch.partition.StringListPartitioner; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.processor.RiskDataProcessor; -import com.snp.batch.jobs.risk.batch.reader.RiskDetailDataReader; -import com.snp.batch.jobs.risk.batch.writer.RiskDetailDataWriter; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.processor.RiskDataProcessor; +import com.snp.batch.jobs.batch.risk.reader.RiskDetailDataReader; +import com.snp.batch.jobs.batch.risk.writer.RiskDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.Job; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java index f68cc89..34de74e 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/config/RiskImportRangeJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/config/RiskImportRangeJobConfig.java @@ -1,12 +1,12 @@ -package com.snp.batch.jobs.risk.batch.config; +package com.snp.batch.jobs.batch.risk.config; import com.snp.batch.common.batch.config.BaseMultiStepJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.processor.RiskDataProcessor; -import com.snp.batch.jobs.risk.batch.reader.RiskDataRangeReader; -import com.snp.batch.jobs.risk.batch.writer.RiskDetailDataWriter; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.processor.RiskDataProcessor; +import com.snp.batch.jobs.batch.risk.reader.RiskDataRangeReader; +import com.snp.batch.jobs.batch.risk.writer.RiskDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java rename to src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java index 6797e1c..2580eed 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.dto; +package com.snp.batch.jobs.batch.risk.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java similarity index 85% rename from src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java rename to src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java index 1ab23e9..697b8b4 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/dto/RiskResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/dto/RiskResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.dto; +package com.snp.batch.jobs.batch.risk.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java b/src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java rename to src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java index e5ccc1c..4ca4822 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/entity/RiskEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/entity/RiskEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.risk.batch.entity; +package com.snp.batch.jobs.batch.risk.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java index ca2a293..4f5415d 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/processor/RiskDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/processor/RiskDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.processor; +package com.snp.batch.jobs.batch.risk.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java rename to src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java index cae2ee1..ed75282 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDataRangeReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDataRangeReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.reader; +package com.snp.batch.jobs.batch.risk.reader; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java index 2e8e19a..31efaae 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/reader/RiskDetailDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/reader/RiskDetailDataReader.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.reader; +package com.snp.batch.jobs.batch.risk.reader; import com.snp.batch.global.model.BatchApiLog; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import com.snp.batch.service.BatchApiLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.item.ItemReader; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java similarity index 66% rename from src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java rename to src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java index 317e198..2cda84a 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.risk.batch.repository; +package com.snp.batch.jobs.batch.risk.repository; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java index 472da66..72fc1fd 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/repository/RiskRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.risk.batch.repository; +package com.snp.batch.jobs.batch.risk.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java index 658e468..64b01b5 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.writer; +package com.snp.batch.jobs.batch.risk.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.repository.RiskRepository; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.repository.RiskRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java similarity index 78% rename from src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java index fba0d13..293873f 100644 --- a/src/main/java/com/snp/batch/jobs/risk/batch/writer/RiskDetailDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/risk/writer/RiskDetailDataWriter.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.batch.writer; +package com.snp.batch.jobs.batch.risk.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.risk.batch.entity.RiskEntity; -import com.snp.batch.jobs.risk.batch.repository.RiskRepository; +import com.snp.batch.jobs.batch.risk.entity.RiskEntity; +import com.snp.batch.jobs.batch.risk.repository.RiskRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java index 713307d..84f250b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailImoFetchTasklet.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailImoFetchTasklet.java @@ -1,9 +1,9 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.snp.batch.global.model.BatchApiLog; import com.snp.batch.global.repository.BatchFailedRecordRepository; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDto; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipUpdateApiResponse; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipUpdateApiResponse; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java index 1cbaa3f..1b1f7bd 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailPartitioner.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailPartitioner.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.snp.batch.common.batch.partition.StringListPartitioner; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java index 1b911ba..4e2298a 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/config/ShipDetailUpdateJobConfig.java @@ -1,14 +1,14 @@ -package com.snp.batch.jobs.shipdetail.batch.config; +package com.snp.batch.jobs.batch.shipdetail.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.config.BasePartitionedJobConfig; import com.snp.batch.common.batch.tasklet.LastExecutionUpdateTasklet; import com.snp.batch.global.repository.BatchFailedRecordRepository; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailDto; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipDetailEntity; -import com.snp.batch.jobs.shipdetail.batch.processor.ShipDetailDataProcessor; -import com.snp.batch.jobs.shipdetail.batch.reader.ShipDetailUpdateDataReader; -import com.snp.batch.jobs.shipdetail.batch.writer.ShipDetailDataWriter; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailDto; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipDetailEntity; +import com.snp.batch.jobs.batch.shipdetail.processor.ShipDetailDataProcessor; +import com.snp.batch.jobs.batch.shipdetail.reader.ShipDetailUpdateDataReader; +import com.snp.batch.jobs.batch.shipdetail.writer.ShipDetailDataWriter; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import com.snp.batch.service.BatchFailedRecordService; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java index ffb07d6..aea8f1d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/AdditionalInformationDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.AdditionalInformationEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.AdditionalInformationEntity; import lombok.*; @Getter diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java index 10c2d1f..08031ea 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/BareBoatCharterHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/BareBoatCharterHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.BareBoatCharterHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.BareBoatCharterHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java index 861dc46..2493f3d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CallSignAndMmsiHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CallSignAndMmsiHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CallSignAndMmsiHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CallSignAndMmsiHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java index 73630e6..0b806c4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ClassHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ClassHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ClassHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ClassHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java index bfd9402..4d9cef3 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyDetailDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CompanyDetailEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CompanyDetailEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java index 3dace6e..cfd5f10 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyVesselRelationshipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CompanyVesselRelationshipDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CompanyVesselRelationshipEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CompanyVesselRelationshipEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java index 6a7ec75..ca185f1 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CrewListDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/CrewListDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CrewListEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.CrewListEntity; import lombok.*; @Data diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java index b868ccc..888047c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/DarkActivityConfirmedDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.DarkActivityConfirmedEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.DarkActivityConfirmedEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java index e27f484..39fac3d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/FlagHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/FlagHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.FlagHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.FlagHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java index 34a04fa..4f7e101 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/GroupBeneficialOwnerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/GroupBeneficialOwnerHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.GroupBeneficialOwnerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.GroupBeneficialOwnerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java index d639b52..55ec590 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/IceClassDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/IceClassDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.IceClassEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.IceClassEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java index 1ee30f7..da1d2d0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/NameHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/NameHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.NameHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.NameHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java index a3db024..106250f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OperatorHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OperatorHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.OperatorHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.OperatorHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java index ceacd38..42d8f69 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/OwnerHistoryDto.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.OwnerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.OwnerHistoryEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java index d6e1567..9ea963b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/PandIHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/PandIHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.PandIHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.PandIHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java index c993285..16df2cf 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SafetyManagementCertificateHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SafetyManagementCertificateHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SafetyManagementCertificateHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SafetyManagementCertificateHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java index dda21df..3e0a019 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java index 90c2ecb..1692036 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailComparisonData.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailComparisonData.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import lombok.Builder; import lombok.Getter; import java.util.Map; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java index 3cee449..e6ed1a8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java index 2c3f87e..a2d03f0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDetailUpdate.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java index ba849b2..a2fde4e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java index 4274828..7b93a7f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipManagerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipManagerHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipManagerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipManagerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java index 22d5faa..556e4ab 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipResultDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipResultDto.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java index b4d70d3..03416b6 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipUpdateApiResponse.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ShipUpdateApiResponse.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java index d18dcab..6c1931b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SisterShipLinksDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SisterShipLinksDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SisterShipLinksEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SisterShipLinksEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java index 571a7d0..6dd33fc 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SpecialFeatureDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SpecialFeatureDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SpecialFeatureEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SpecialFeatureEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java index f36c11c..d3a1c86 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StatusHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StatusHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.StatusHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.StatusHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java index 2b7bf42..585f41b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/StowageCommodityDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/StowageCommodityDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.StowageCommodityEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.StowageCommodityEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java index 41937dc..aa2c5d2 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SurveyDatesHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SurveyDatesHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java index d5ec0e5..afafda4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/SurveyDatesHistoryUniqueDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/SurveyDatesHistoryUniqueDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.SurveyDatesHistoryUniqueEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.SurveyDatesHistoryUniqueEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java index 250e5a8..590ea5b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TechnicalManagerHistoryDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/TechnicalManagerHistoryDto.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.TechnicalManagerHistoryEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.TechnicalManagerHistoryEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java index b6abce5..3ce623e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ThrustersDto.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/dto/ThrustersDto.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; +package com.snp.batch.jobs.batch.shipdetail.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.ThrustersEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ThrustersEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java index 06107b2..de9a8ab 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/AdditionalInformationEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java index 0bea631..26f934d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/BareBoatCharterHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/BareBoatCharterHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java index a8527d7..5ee60de 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CallSignAndMmsiHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CallSignAndMmsiHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java index ca8dfcf..24c5c87 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ClassHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ClassHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java index 98ecd3a..08c4206 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java index e799e31..9ffc9d8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyVesselRelationshipEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CompanyVesselRelationshipEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java index 86841af..e77cbe0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CrewListEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/CrewListEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java index f121368..b9ba5fd 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/DarkActivityConfirmedEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java index 4dc1b2e..6646582 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/FlagHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/FlagHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java index df62d89..b474dac 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/GroupBeneficialOwnerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/GroupBeneficialOwnerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java index a019a9a..54b9ff8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/IceClassEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/IceClassEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java similarity index 90% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java index 2b974c6..000a664 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/NameHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/NameHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java index c5ddf83..826d738 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OperatorHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OperatorHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java index ccd1ff9..80a06e3 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/OwnerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java index dfcc3d1..9c1af1c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/PandIHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/PandIHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java index 8ec438f..790127d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SafetyManagementCertificateHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SafetyManagementCertificateHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java index b0804db..617da18 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipDetailEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java index 3308325..5043e35 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipHashEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipHashEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java index 4fb5cca..2757146 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipManagerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ShipManagerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java similarity index 89% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java index dd7a084..04a05e7 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SisterShipLinksEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SisterShipLinksEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java index da57585..d7badea 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SpecialFeatureEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SpecialFeatureEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java index 48deefb..56bf51b 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StatusHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StatusHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java index 3934d95..bb44740 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/StowageCommodityEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/StowageCommodityEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java index 254d128..3a067d4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java similarity index 91% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java index 47f1ebc..b85bd9d 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/SurveyDatesHistoryUniqueEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/SurveyDatesHistoryUniqueEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java similarity index 92% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java index 996c761..9c9df56 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TechnicalManagerHistoryEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/TechnicalManagerHistoryEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java index 9067d73..4efc24e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ThrustersEntity.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/entity/ThrustersEntity.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; +package com.snp.batch.jobs.batch.shipdetail.entity; import com.snp.batch.common.batch.entity.BaseEntity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java index 7186342..600a64f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/processor/ShipDetailDataProcessor.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.shipdetail.batch.processor; +package com.snp.batch.jobs.batch.shipdetail.processor; import com.snp.batch.common.batch.processor.BaseProcessor; -import com.snp.batch.jobs.shipdetail.batch.dto.*; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.dto.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java similarity index 98% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java index 1ccd51d..a4716e4 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailUpdateDataReader.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/reader/ShipDetailUpdateDataReader.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipdetail.batch.reader; +package com.snp.batch.jobs.batch.shipdetail.reader; import com.fasterxml.jackson.databind.ObjectMapper; import com.snp.batch.common.batch.reader.BaseApiReader; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailApiResponse; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailDto; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipResultDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailApiResponse; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailDto; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipResultDto; import com.snp.batch.service.BatchApiLogService; import com.snp.batch.service.BatchDateService; import com.snp.batch.service.BatchFailedRecordService; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java similarity index 95% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java index 11e1ce6..ec03a52 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java index e70f8fb..359ad6c 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipdetail.batch.entity.*; +import com.snp.batch.jobs.batch.shipdetail.entity.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java similarity index 99% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java index 89e5bb9..db92f51 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipDetailSql.java @@ -1,4 +1,4 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import lombok.Setter; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java similarity index 50% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java index cf12ff4..cd96098 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepository.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepository.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipHashEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipHashEntity; import java.util.List; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java similarity index 97% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java index bac872b..10b682f 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipHashRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/repository/ShipHashRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.snp.batch.jobs.shipdetail.batch.repository; +package com.snp.batch.jobs.batch.shipdetail.repository; import com.snp.batch.common.batch.repository.BaseJdbcRepository; -import com.snp.batch.jobs.shipdetail.batch.entity.ShipHashEntity; +import com.snp.batch.jobs.batch.shipdetail.entity.ShipHashEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java b/src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java similarity index 96% rename from src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java rename to src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java index dabc3d7..8a7fa22 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/batch/shipdetail/writer/ShipDetailDataWriter.java @@ -1,10 +1,10 @@ -package com.snp.batch.jobs.shipdetail.batch.writer; +package com.snp.batch.jobs.batch.shipdetail.writer; import com.snp.batch.common.batch.writer.BaseWriter; -import com.snp.batch.jobs.shipdetail.batch.dto.ShipDetailUpdate; -import com.snp.batch.jobs.shipdetail.batch.entity.*; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipDetailRepository; -import com.snp.batch.jobs.shipdetail.batch.repository.ShipHashRepository; +import com.snp.batch.jobs.batch.shipdetail.dto.ShipDetailUpdate; +import com.snp.batch.jobs.batch.shipdetail.entity.*; +import com.snp.batch.jobs.batch.shipdetail.repository.ShipDetailRepository; +import com.snp.batch.jobs.batch.shipdetail.repository.ShipHashRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java b/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java deleted file mode 100644 index da65ba6..0000000 --- a/src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.snp.batch.jobs.event.batch.repository; - -import com.snp.batch.jobs.event.batch.entity.CargoEntity; -import com.snp.batch.jobs.event.batch.entity.EventDetailEntity; -import com.snp.batch.jobs.event.batch.entity.HumanCasualtyEntity; -import com.snp.batch.jobs.event.batch.entity.RelationshipEntity; - -import java.util.List; - -public interface EventRepository { - void saveEventAll(List items); - void saveCargoAll(List items); - void saveHumanCasualtyAll(List items); - void saveRelationshipAll(List items); -} diff --git a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java b/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java deleted file mode 100644 index 358b068..0000000 --- a/src/main/java/com/snp/batch/jobs/facility/batch/repository/FacilityRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.snp.batch.jobs.facility.batch.repository; - -import com.snp.batch.jobs.facility.batch.entity.PortEntity; - -import java.util.List; - -public interface FacilityRepository { - void savePortAll(List items); -} diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java deleted file mode 100644 index 35d9029..0000000 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.snp.batch.jobs.pscInspection.batch.repository; - -import com.snp.batch.jobs.pscInspection.batch.entity.PscDefectEntity; -import com.snp.batch.jobs.pscInspection.batch.entity.PscInspectionEntity; - -import java.util.List; - -public interface PscDefectRepository { - void saveDefects(List defects); -} diff --git a/src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java b/src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java similarity index 93% rename from src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java rename to src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java index 9113622..6ae954d 100644 --- a/src/main/java/com/snp/batch/jobs/risk/web/controller/RiskController.java +++ b/src/main/java/com/snp/batch/jobs/web/risk/controller/RiskController.java @@ -1,8 +1,8 @@ -package com.snp.batch.jobs.risk.web.controller; +package com.snp.batch.jobs.web.risk.controller; import com.snp.batch.common.web.ApiResponse; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; -import com.snp.batch.jobs.risk.web.service.RiskBypassService; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; +import com.snp.batch.jobs.web.risk.service.RiskBypassService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java b/src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java similarity index 94% rename from src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java rename to src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java index 5162dc9..c0eae98 100644 --- a/src/main/java/com/snp/batch/jobs/risk/web/service/RiskBypassService.java +++ b/src/main/java/com/snp/batch/jobs/web/risk/service/RiskBypassService.java @@ -1,6 +1,6 @@ -package com.snp.batch.jobs.risk.web.service; +package com.snp.batch.jobs.web.risk.service; -import com.snp.batch.jobs.risk.batch.dto.RiskDto; +import com.snp.batch.jobs.batch.risk.dto.RiskDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.ParameterizedTypeReference; -- 2.45.2 From 6fb6add932be506b313443fbd08274f48c4edc98 Mon Sep 17 00:00:00 2001 From: HYOJIN Date: Thu, 26 Mar 2026 15:21:22 +0900 Subject: [PATCH 04/32] =?UTF-8?q?docs:=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md index 35ceaea..ba14ac4 100644 --- a/docs/RELEASE-NOTES.md +++ b/docs/RELEASE-NOTES.md @@ -7,6 +7,9 @@ ### 추가 - favicon 변경 (#105) +### 변경 +- API 응답 처리 방식에 따른 패키지 분리 (jobs/batch, jobs/web) (#66) + ## [2026-03-25] ### 추가 -- 2.45.2 From 951b6c759d9e82b208bb9578a48797f3dd86d94d Mon Sep 17 00:00:00 2001 From: HYOJIN Date: Thu, 26 Mar 2026 16:24:54 +0900 Subject: [PATCH 05/32] =?UTF-8?q?feat:=20BYPASS=20API=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=ED=94=84=EB=A1=9C=EC=84=B8=EC=8A=A4=20=EC=84=A4=EA=B3=84=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B0=9C=EB=B0=9C=20(#63)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 공통 베이스 클래스 추가 (BaseBypassService, BaseBypassController) - 기존 Risk 모듈 베이스 클래스 상속으로 리팩토링 - BYPASS API 설정 CRUD API 구현 (/api/bypass-config) - Java 코드 생성기 구현 (Controller, Service, DTO 자동 생성) - JSON 샘플 파싱 기능 구현 - 프론트엔드 BYPASS API 관리 페이지 추가 (멀티스텝 등록 모달) Co-Authored-By: Claude Opus 4.6 (1M context) --- frontend/src/App.tsx | 2 + frontend/src/api/bypassApi.ts | 123 ++++++ frontend/src/components/Navbar.tsx | 1 + .../components/bypass/BypassConfigModal.tsx | 239 ++++++++++ .../src/components/bypass/BypassStepBasic.tsx | 168 +++++++ .../components/bypass/BypassStepFields.tsx | 233 ++++++++++ .../components/bypass/BypassStepParams.tsx | 146 ++++++ frontend/src/pages/BypassConfig.tsx | 279 ++++++++++++ .../web/controller/BaseBypassController.java | 28 ++ .../common/web/service/BaseBypassService.java | 101 +++++ .../controller/BypassConfigController.java | 133 ++++++ .../batch/global/dto/BypassConfigRequest.java | 45 ++ .../global/dto/BypassConfigResponse.java | 60 +++ .../snp/batch/global/dto/BypassFieldDto.java | 33 ++ .../snp/batch/global/dto/BypassParamDto.java | 36 ++ .../global/dto/CodeGenerationResult.java | 28 ++ .../batch/global/model/BypassApiConfig.java | 135 ++++++ .../batch/global/model/BypassApiField.java | 69 +++ .../batch/global/model/BypassApiParam.java | 77 ++++ .../repository/BypassApiConfigRepository.java | 25 ++ .../repository/BypassApiFieldRepository.java | 25 ++ .../repository/BypassApiParamRepository.java | 25 ++ .../web/risk/controller/RiskController.java | 23 +- .../web/risk/service/RiskBypassService.java | 37 +- .../batch/service/BypassCodeGenerator.java | 415 ++++++++++++++++++ .../batch/service/BypassConfigService.java | 228 ++++++++++ .../snp/batch/service/JsonSchemaParser.java | 114 +++++ 27 files changed, 2781 insertions(+), 47 deletions(-) create mode 100644 frontend/src/api/bypassApi.ts create mode 100644 frontend/src/components/bypass/BypassConfigModal.tsx create mode 100644 frontend/src/components/bypass/BypassStepBasic.tsx create mode 100644 frontend/src/components/bypass/BypassStepFields.tsx create mode 100644 frontend/src/components/bypass/BypassStepParams.tsx create mode 100644 frontend/src/pages/BypassConfig.tsx create mode 100644 src/main/java/com/snp/batch/common/web/controller/BaseBypassController.java create mode 100644 src/main/java/com/snp/batch/common/web/service/BaseBypassService.java create mode 100644 src/main/java/com/snp/batch/global/controller/BypassConfigController.java create mode 100644 src/main/java/com/snp/batch/global/dto/BypassConfigRequest.java create mode 100644 src/main/java/com/snp/batch/global/dto/BypassConfigResponse.java create mode 100644 src/main/java/com/snp/batch/global/dto/BypassFieldDto.java create mode 100644 src/main/java/com/snp/batch/global/dto/BypassParamDto.java create mode 100644 src/main/java/com/snp/batch/global/dto/CodeGenerationResult.java create mode 100644 src/main/java/com/snp/batch/global/model/BypassApiConfig.java create mode 100644 src/main/java/com/snp/batch/global/model/BypassApiField.java create mode 100644 src/main/java/com/snp/batch/global/model/BypassApiParam.java create mode 100644 src/main/java/com/snp/batch/global/repository/BypassApiConfigRepository.java create mode 100644 src/main/java/com/snp/batch/global/repository/BypassApiFieldRepository.java create mode 100644 src/main/java/com/snp/batch/global/repository/BypassApiParamRepository.java create mode 100644 src/main/java/com/snp/batch/service/BypassCodeGenerator.java create mode 100644 src/main/java/com/snp/batch/service/BypassConfigService.java create mode 100644 src/main/java/com/snp/batch/service/JsonSchemaParser.java diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index fa9d191..7e28c43 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -14,6 +14,7 @@ const Recollects = lazy(() => import('./pages/Recollects')); const RecollectDetail = lazy(() => import('./pages/RecollectDetail')); const Schedules = lazy(() => import('./pages/Schedules')); const Timeline = lazy(() => import('./pages/Timeline')); +const BypassConfig = lazy(() => import('./pages/BypassConfig')); function AppLayout() { const { toasts, removeToast } = useToastContext(); @@ -32,6 +33,7 @@ function AppLayout() { } /> } /> } /> + } /> diff --git a/frontend/src/api/bypassApi.ts b/frontend/src/api/bypassApi.ts new file mode 100644 index 0000000..62ca2cc --- /dev/null +++ b/frontend/src/api/bypassApi.ts @@ -0,0 +1,123 @@ +// API 응답 타입 +interface ApiResponse { + success: boolean; + message: string; + data: T; + errorCode?: string; +} + +// 타입 정의 +export interface BypassParamDto { + id?: number; + paramName: string; + paramType: string; // STRING, INTEGER, LONG, BOOLEAN + paramIn: string; // PATH, QUERY, BODY + required: boolean; + description: string; + sortOrder: number; +} + +export interface BypassFieldDto { + id?: number; + fieldName: string; + jsonProperty: string | null; + fieldType: string; // String, Integer, Long, Double, Boolean, LocalDateTime, List, Object + description: string; + sortOrder: number; +} + +export interface BypassConfigRequest { + domainName: string; + displayName: string; + webclientBean: string; + externalPath: string; + httpMethod: string; + responseType: string; + description: string; + params: BypassParamDto[]; + fields: BypassFieldDto[]; +} + +export interface BypassConfigResponse { + id: number; + domainName: string; + displayName: string; + webclientBean: string; + externalPath: string; + httpMethod: string; + responseType: string; + description: string; + generated: boolean; + generatedAt: string | null; + createdAt: string; + updatedAt: string; + params: BypassParamDto[]; + fields: BypassFieldDto[]; +} + +export interface CodeGenerationResult { + controllerPath: string; + servicePath: string; + dtoPath: string; + message: string; +} + +export interface WebClientBeanInfo { + name: string; + description: string; +} + +// BASE URL +const BASE = '/snp-api/api/bypass-config'; + +// 헬퍼 함수 (batchApi.ts 패턴과 동일) +async function fetchJson(url: string): Promise { + const res = await fetch(url); + if (!res.ok) throw new Error(`API Error: ${res.status} ${res.statusText}`); + return res.json(); +} + +async function postJson(url: string, body?: unknown): Promise { + const res = await fetch(url, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: body != null ? JSON.stringify(body) : undefined, + }); + if (!res.ok) throw new Error(`API Error: ${res.status} ${res.statusText}`); + return res.json(); +} + +async function putJson(url: string, body?: unknown): Promise { + const res = await fetch(url, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: body != null ? JSON.stringify(body) : undefined, + }); + if (!res.ok) throw new Error(`API Error: ${res.status} ${res.statusText}`); + return res.json(); +} + +async function deleteJson(url: string): Promise { + const res = await fetch(url, { method: 'DELETE' }); + if (!res.ok) throw new Error(`API Error: ${res.status} ${res.statusText}`); + return res.json(); +} + +export const bypassApi = { + getConfigs: () => + fetchJson>(BASE), + getConfig: (id: number) => + fetchJson>(`${BASE}/${id}`), + createConfig: (data: BypassConfigRequest) => + postJson>(BASE, data), + updateConfig: (id: number, data: BypassConfigRequest) => + putJson>(`${BASE}/${id}`, data), + deleteConfig: (id: number) => + deleteJson>(`${BASE}/${id}`), + generateCode: (id: number, force = false) => + postJson>(`${BASE}/${id}/generate?force=${force}`), + parseJson: (jsonSample: string) => + postJson>(`${BASE}/parse-json`, jsonSample), + getWebclientBeans: () => + fetchJson>(`${BASE}/webclient-beans`), +}; diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index fa9be55..b04af2d 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -8,6 +8,7 @@ const navItems = [ { path: '/jobs', label: '작업', icon: '⚙️' }, { path: '/schedules', label: '스케줄', icon: '🕐' }, { path: '/schedule-timeline', label: '타임라인', icon: '📅' }, + { path: '/bypass-config', label: 'Bypass API', icon: '🔗' }, ]; export default function Navbar() { diff --git a/frontend/src/components/bypass/BypassConfigModal.tsx b/frontend/src/components/bypass/BypassConfigModal.tsx new file mode 100644 index 0000000..edec66b --- /dev/null +++ b/frontend/src/components/bypass/BypassConfigModal.tsx @@ -0,0 +1,239 @@ +import { useState, useEffect } from 'react'; +import type { + BypassConfigRequest, + BypassConfigResponse, + BypassParamDto, + BypassFieldDto, + WebClientBeanInfo, +} from '../../api/bypassApi'; +import BypassStepBasic from './BypassStepBasic'; +import BypassStepParams from './BypassStepParams'; +import BypassStepFields from './BypassStepFields'; + +interface BypassConfigModalProps { + open: boolean; + editConfig: BypassConfigResponse | null; + webclientBeans: WebClientBeanInfo[]; + onSave: (data: BypassConfigRequest) => Promise; + onClose: () => void; +} + +type StepNumber = 1 | 2 | 3; + +const STEP_LABELS: Record = { + 1: '기본 정보', + 2: '파라미터', + 3: 'DTO 필드', +}; + +const DEFAULT_FORM: Omit = { + domainName: '', + displayName: '', + webclientBean: '', + externalPath: '', + httpMethod: 'GET', + responseType: 'LIST', + description: '', +}; + +export default function BypassConfigModal({ + open, + editConfig, + webclientBeans, + onSave, + onClose, +}: BypassConfigModalProps) { + const [step, setStep] = useState(1); + const [domainName, setDomainName] = useState(''); + const [displayName, setDisplayName] = useState(''); + const [webclientBean, setWebclientBean] = useState(''); + const [externalPath, setExternalPath] = useState(''); + const [httpMethod, setHttpMethod] = useState('GET'); + const [responseType, setResponseType] = useState('LIST'); + const [description, setDescription] = useState(''); + const [params, setParams] = useState([]); + const [fields, setFields] = useState([]); + const [saving, setSaving] = useState(false); + + useEffect(() => { + if (!open) return; + setStep(1); + if (editConfig) { + setDomainName(editConfig.domainName); + setDisplayName(editConfig.displayName); + setWebclientBean(editConfig.webclientBean); + setExternalPath(editConfig.externalPath); + setHttpMethod(editConfig.httpMethod); + setResponseType(editConfig.responseType); + setDescription(editConfig.description); + setParams(editConfig.params); + setFields(editConfig.fields); + } else { + setDomainName(DEFAULT_FORM.domainName); + setDisplayName(DEFAULT_FORM.displayName); + setWebclientBean(DEFAULT_FORM.webclientBean); + setExternalPath(DEFAULT_FORM.externalPath); + setHttpMethod(DEFAULT_FORM.httpMethod); + setResponseType(DEFAULT_FORM.responseType); + setDescription(DEFAULT_FORM.description); + setParams([]); + setFields([]); + } + }, [open, editConfig]); + + if (!open) return null; + + const handleBasicChange = (field: string, value: string) => { + switch (field) { + case 'domainName': setDomainName(value); break; + case 'displayName': setDisplayName(value); break; + case 'webclientBean': setWebclientBean(value); break; + case 'externalPath': setExternalPath(value); break; + case 'httpMethod': setHttpMethod(value); break; + case 'responseType': setResponseType(value); break; + case 'description': setDescription(value); break; + } + }; + + const handleSave = async () => { + setSaving(true); + try { + await onSave({ + domainName, + displayName, + webclientBean, + externalPath, + httpMethod, + responseType, + description, + params, + fields, + }); + onClose(); + } finally { + setSaving(false); + } + }; + + const steps: StepNumber[] = [1, 2, 3]; + + return ( +
+
e.stopPropagation()} + > + {/* 헤더 */} +
+

+ {editConfig ? 'Bypass API 수정' : 'Bypass API 등록'} +

+ + {/* 스텝 인디케이터 */} +
+ {steps.map((s, idx) => ( +
+
+ s + ? 'bg-wing-accent/30 text-wing-accent' + : 'bg-wing-card text-wing-muted border border-wing-border', + ].join(' ')} + > + {s} + + + {STEP_LABELS[s]} + +
+ {idx < steps.length - 1 && ( +
+ )} +
+ ))} +
+
+ + {/* 본문 */} +
+ {step === 1 && ( + + )} + {step === 2 && ( + + )} + {step === 3 && ( + + )} +
+ + {/* 하단 버튼 */} +
+
+ {step > 1 && ( + + )} +
+
+ {step === 1 && ( + + )} + {step < 3 ? ( + + ) : ( + + )} +
+
+
+
+ ); +} diff --git a/frontend/src/components/bypass/BypassStepBasic.tsx b/frontend/src/components/bypass/BypassStepBasic.tsx new file mode 100644 index 0000000..969450f --- /dev/null +++ b/frontend/src/components/bypass/BypassStepBasic.tsx @@ -0,0 +1,168 @@ +import type { WebClientBeanInfo } from '../../api/bypassApi'; + +interface BypassStepBasicProps { + domainName: string; + displayName: string; + webclientBean: string; + externalPath: string; + httpMethod: string; + responseType: string; + description: string; + webclientBeans: WebClientBeanInfo[]; + isEdit: boolean; + onChange: (field: string, value: string) => void; +} + +export default function BypassStepBasic({ + domainName, + displayName, + webclientBean, + externalPath, + httpMethod, + responseType, + description, + webclientBeans, + isEdit, + onChange, +}: BypassStepBasicProps) { + return ( +
+

+ BYPASS API의 기본 정보를 입력하세요. 도메인명을 기반으로 코드가 생성됩니다. +

+ +
+ {/* 도메인명 */} +
+ + onChange('domainName', e.target.value)} + disabled={isEdit} + placeholder="예: riskByImo" + pattern="[a-zA-Z][a-zA-Z0-9]*" + className={[ + 'w-full px-3 py-2 text-sm rounded-lg border', + 'border-wing-border bg-wing-card text-wing-text', + 'placeholder:text-wing-muted focus:outline-none focus:ring-2 focus:ring-wing-accent/50', + isEdit ? 'opacity-50 cursor-not-allowed' : '', + ].join(' ')} + /> +

영문 소문자/숫자 조합 (수정 불가)

+
+ + {/* 표시명 */} +
+ + onChange('displayName', e.target.value)} + placeholder="예: IMO 기반 리스크 조회" + className="w-full px-3 py-2 text-sm rounded-lg border border-wing-border bg-wing-card text-wing-text placeholder:text-wing-muted focus:outline-none focus:ring-2 focus:ring-wing-accent/50" + /> +
+ + {/* WebClient */} +
+ + +
+ + {/* 외부 API 경로 */} +
+ + onChange('externalPath', e.target.value)} + placeholder="/RiskAndCompliance/RisksByImos" + className="w-full px-3 py-2 text-sm rounded-lg border border-wing-border bg-wing-card text-wing-text placeholder:text-wing-muted focus:outline-none focus:ring-2 focus:ring-wing-accent/50" + /> +
+ + {/* HTTP 메서드 */} +
+ +
+ {['GET', 'POST'].map((method) => ( + + ))} +
+
+ + {/* 응답 타입 */} +
+ +
+ {['LIST', 'OBJECT'].map((type) => ( + + ))} +
+
+ + {/* 설명 */} +
+ +